diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /khotkeys/kcontrol | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'khotkeys/kcontrol')
| -rw-r--r-- | khotkeys/kcontrol/init.cpp | 2 | ||||
| -rw-r--r-- | khotkeys/kcontrol/kcmkhotkeys.cpp | 4 | ||||
| -rw-r--r-- | khotkeys/kcontrol/khotkeys.desktop | 2 | ||||
| -rw-r--r-- | khotkeys/kcontrol/triggers_tab.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp index 518e45972..c1242f17e 100644 --- a/khotkeys/kcontrol/init.cpp +++ b/khotkeys/kcontrol/init.cpp @@ -16,7 +16,7 @@ #include <dcopref.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <stdlib.h> diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index ae2411b09..b0ddb16c9 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/khotkeys/kcontrol/kcmkhotkeys.cpp @@ -26,14 +26,14 @@ #include <kaboutdata.h> #include <klocale.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <dcopclient.h> #include <kdebug.h> #include <kmessagebox.h> #include <kglobal.h> #include <ksimpleconfig.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <dcopref.h> #include <klibloader.h> diff --git a/khotkeys/kcontrol/khotkeys.desktop b/khotkeys/kcontrol/khotkeys.desktop index bbd6d1429..0608bce34 100644 --- a/khotkeys/kcontrol/khotkeys.desktop +++ b/khotkeys/kcontrol/khotkeys.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell khotkeys +Exec=tdecmshell khotkeys Icon=khotkeys Type=Application diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index 2533b58a0..31eb7be27 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/khotkeys/kcontrol/triggers_tab.cpp @@ -28,7 +28,7 @@ #include <klocale.h> #include <kapplication.h> #include <kshortcut.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kshortcutlist.h> #include <kkeybutton.h> #include <kkeydialog.h> |