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 /kxkb | |
| 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 'kxkb')
| -rw-r--r-- | kxkb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kxkb/kcmlayout.cpp | 2 | ||||
| -rw-r--r-- | kxkb/kcmmisc.cpp | 2 | ||||
| -rw-r--r-- | kxkb/keyboard.desktop | 2 | ||||
| -rw-r--r-- | kxkb/keyboard_layout.desktop | 2 | ||||
| -rw-r--r-- | kxkb/kxkb.cpp | 4 | ||||
| -rw-r--r-- | kxkb/kxkbconfig.cpp | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/kxkb/CMakeLists.txt b/kxkb/CMakeLists.txt index f36a003bd..9ba350e94 100644 --- a/kxkb/CMakeLists.txt +++ b/kxkb/CMakeLists.txt @@ -40,7 +40,7 @@ tde_add_kpart( kcm_keyboard AUTOMOC extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp pixmap.cpp kcmlayout.cpp kcmlayoutwidget.ui kcmmisc.cpp kcmmiscwidget.ui - LINK kio-shared xkbfile ${XTEST_LIBRARIES} + LINK tdeio-shared xkbfile ${XTEST_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index c73fb620f..a87844875 100644 --- a/kxkb/kcmlayout.cpp +++ b/kxkb/kcmlayout.cpp @@ -16,7 +16,7 @@ #include <kkeydialog.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp index e3f8f66c8..780fad7e8 100644 --- a/kxkb/kcmmisc.cpp +++ b/kxkb/kcmmisc.cpp @@ -38,7 +38,7 @@ #include <tqradiobutton.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <knuminput.h> #include <kapplication.h> #include <kglobal.h> diff --git a/kxkb/keyboard.desktop b/kxkb/keyboard.desktop index 0b1c8bd33..d087acdfc 100644 --- a/kxkb/keyboard.desktop +++ b/kxkb/keyboard.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell keyboard +Exec=tdecmshell keyboard Icon=keyboard Type=Application DocPath=kcontrol/keyboard/index.html diff --git a/kxkb/keyboard_layout.desktop b/kxkb/keyboard_layout.desktop index 1080dbdd3..3486ca845 100644 --- a/kxkb/keyboard_layout.desktop +++ b/kxkb/keyboard_layout.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell keyboard_layout +Exec=tdecmshell keyboard_layout Icon=keyboard Type=Application DocPath=kxkb/index.html diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index 7e9b11fa9..4e5ad5192 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -46,7 +46,7 @@ DESCRIPTION #include <kaction.h> #include <kpopupmenu.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include "x11helper.h" #include "kxkb.h" @@ -269,7 +269,7 @@ void KXKBApp::menuActivated(int id) else if (id == KxkbLabelController::CONFIG_MENU_ID) { TDEProcess p; - p << "kcmshell" << "keyboard_layout"; + p << "tdecmshell" << "keyboard_layout"; p.start(TDEProcess::DontCare); } else if (id == KxkbLabelController::HELP_MENU_ID) diff --git a/kxkb/kxkbconfig.cpp b/kxkb/kxkbconfig.cpp index 5ddfe8b9a..517f0ccdd 100644 --- a/kxkb/kxkbconfig.cpp +++ b/kxkb/kxkbconfig.cpp @@ -15,7 +15,7 @@ #include <tqstringlist.h> #include <tqdict.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "kxkbconfig.h" |