diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:47 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 23:21:47 -0600 |
| commit | da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb (patch) | |
| tree | b42ba87fcdfa425a31e243a62d71e1de248b6ee8 /krdc | |
| parent | 4ed8d784e29102ed1659f4ccf71fcc6fb0dad5c8 (diff) | |
| download | tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.tar.gz tdenetwork-da47dd9fc60e6e0eecf609fb934eb0e2bd3ef3fb.zip | |
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'krdc')
| -rw-r--r-- | krdc/hostprofiles.ui | 2 | ||||
| -rw-r--r-- | krdc/keycapturedialog.cpp | 6 | ||||
| -rw-r--r-- | krdc/keycapturedialog.h | 2 | ||||
| -rw-r--r-- | krdc/krdc.cpp | 6 | ||||
| -rw-r--r-- | krdc/maindialogwidget.cpp | 2 | ||||
| -rw-r--r-- | krdc/preferencesdialog.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/krdc/hostprofiles.ui b/krdc/hostprofiles.ui index f32ef2e5..5a2f42d9 100644 --- a/krdc/hostprofiles.ui +++ b/krdc/hostprofiles.ui @@ -166,6 +166,6 @@ <layoutdefaults spacing="6" margin="11"/> <layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/> <includehints> - <includehint>klistview.h</includehint> + <includehint>tdelistview.h</includehint> </includehints> </UI> diff --git a/krdc/keycapturedialog.cpp b/krdc/keycapturedialog.cpp index 2d9f502b..9949471e 100644 --- a/krdc/keycapturedialog.cpp +++ b/krdc/keycapturedialog.cpp @@ -3,7 +3,7 @@ ------------------- begin : Wed Dec 25 01:20:22 CET 2002 copyright : (C) 2002-2003 by Tim Jansen - (C) unknown (whoever wrote kshortcutdialog.cpp) + (C) unknown (whoever wrote tdeshortcutdialog.cpp) (C) 2004 Nadeem Hasan <nhasan@kde.org> email : tim@tjansen.de ***************************************************************************/ @@ -18,7 +18,7 @@ ***************************************************************************/ // -// based on key capture code from tdelibs/tdeui/kshortcutdialog.cpp +// based on key capture code from tdelibs/tdeui/tdeshortcutdialog.cpp // #include "keycapturedialog.h" @@ -91,7 +91,7 @@ bool KeyCaptureDialog::x11Event(XEvent *pEvent) void KeyCaptureDialog::x11EventKeyPress( XEvent *pEvent ) { - // taken from kshortcutdialog.h + // taken from tdeshortcutdialog.h KKeyNative keyNative( pEvent ); uint keyModX = keyNative.mod(), keySymX = keyNative.sym(); if ((keySymX == XK_Escape) && !keyModX) { diff --git a/krdc/keycapturedialog.h b/krdc/keycapturedialog.h index 42a0f19d..94e81699 100644 --- a/krdc/keycapturedialog.h +++ b/krdc/keycapturedialog.h @@ -23,7 +23,7 @@ class KeyCaptureWidget; #include "keycapturedialog.h" -#include <kshortcut.h> +#include <tdeshortcut.h> #include <kkeynative.h> #include <kdialogbase.h> diff --git a/krdc/krdc.cpp b/krdc/krdc.cpp index b052f6b3..b8bdc69f 100644 --- a/krdc/krdc.cpp +++ b/krdc/krdc.cpp @@ -27,9 +27,9 @@ #include <kurl.h> #include <kiconloader.h> #include <klocale.h> -#include <ktoolbar.h> -#include <ktoolbarbutton.h> -#include <kpopupmenu.h> +#include <tdetoolbar.h> +#include <tdetoolbarbutton.h> +#include <tdepopupmenu.h> #include <kmessagebox.h> #include <twin.h> #include <kstartupinfo.h> diff --git a/krdc/maindialogwidget.cpp b/krdc/maindialogwidget.cpp index befd8656..a9ae12ce 100644 --- a/krdc/maindialogwidget.cpp +++ b/krdc/maindialogwidget.cpp @@ -24,7 +24,7 @@ #include <kcombobox.h> #include <kdebug.h> #include <klineedit.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> #include <kmessagebox.h> #include <kpushbutton.h> diff --git a/krdc/preferencesdialog.cpp b/krdc/preferencesdialog.cpp index b244c6ff..cffbfc26 100644 --- a/krdc/preferencesdialog.cpp +++ b/krdc/preferencesdialog.cpp @@ -29,7 +29,7 @@ #include <tqcheckbox.h> #include <tqvbox.h> -#include <klistview.h> +#include <tdelistview.h> #include <klocale.h> PreferencesDialog::PreferencesDialog( TQWidget *parent, const char *name ) |