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 /kcontrol/konsole | |
| 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 'kcontrol/konsole')
| -rw-r--r-- | kcontrol/konsole/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kcontrol/konsole/kcmkonsole.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/konsole/kcmkonsole.desktop | 2 | ||||
| -rw-r--r-- | kcontrol/konsole/schemaeditor.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/konsole/sessioneditor.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kcontrol/konsole/CMakeLists.txt b/kcontrol/konsole/CMakeLists.txt index 34e2b0041..c7e2ea1ed 100644 --- a/kcontrol/konsole/CMakeLists.txt +++ b/kcontrol/konsole/CMakeLists.txt @@ -32,6 +32,6 @@ tde_add_kpart( kcm_konsole AUTOMOC SOURCES schemaeditor.cpp sessioneditor.cpp kcmkonsole.cpp schemadialog.ui sessiondialog.ui kcmkonsoledialog.ui - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 3d4e00bdd..6001c26d9 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/kcontrol/konsole/kcmkonsole.cpp @@ -23,7 +23,7 @@ #include <dcopclient.h> #include <kaboutdata.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kfontdialog.h> #include <kgenericfactory.h> @@ -154,7 +154,7 @@ void KCMKonsole::save() DCOPClient *dcc = kapp->dcopClient(); dcc->send("konsole-*", "konsole", "reparseConfiguration()", TQByteArray()); dcc->send("kdesktop", "default", "configure()", TQByteArray()); - dcc->send("klauncher", "klauncher", "reparseConfiguration()", TQByteArray()); + dcc->send("tdelauncher", "tdelauncher", "reparseConfiguration()", TQByteArray()); if (xonXoffOrig != xonXoffNew) { diff --git a/kcontrol/konsole/kcmkonsole.desktop b/kcontrol/konsole/kcmkonsole.desktop index 2336d5e11..c387ec6e7 100644 --- a/kcontrol/konsole/kcmkonsole.desktop +++ b/kcontrol/konsole/kcmkonsole.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Icon=konsole Type=Application -Exec=kcmshell kcmkonsole +Exec=tdecmshell kcmkonsole DocPath=kcontrol/kcmkonsole/index.html X-TDE-Library=konsole diff --git a/kcontrol/konsole/schemaeditor.cpp b/kcontrol/konsole/schemaeditor.cpp index f712c8c0d..7dd2bb19b 100644 --- a/kcontrol/konsole/schemaeditor.cpp +++ b/kcontrol/konsole/schemaeditor.cpp @@ -35,7 +35,7 @@ #include <tqslider.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kinputdialog.h> #include <tqtoolbutton.h> #include <kmessagebox.h> diff --git a/kcontrol/konsole/sessioneditor.cpp b/kcontrol/konsole/sessioneditor.cpp index c9a767cac..d0f4f822a 100644 --- a/kcontrol/konsole/sessioneditor.cpp +++ b/kcontrol/konsole/sessioneditor.cpp @@ -24,7 +24,7 @@ #include <kstandarddirs.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kinputdialog.h> #include <kicondialog.h> #include <kmessagebox.h> |