diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:03:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:03:37 -0600 |
| commit | 2e25fa39cd67cca2472d3eabdb478feb517d72a5 (patch) | |
| tree | 63725962f632d152cbf20709191d39f6fc865966 /kmrml/kmrml/kcontrol | |
| parent | 190d88dfc662f3fc466c9d1f53acbbea65f33c49 (diff) | |
| download | tdegraphics-2e25fa39cd67cca2472d3eabdb478feb517d72a5.tar.gz tdegraphics-2e25fa39cd67cca2472d3eabdb478feb517d72a5.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kmrml/kmrml/kcontrol')
| -rw-r--r-- | kmrml/kmrml/kcontrol/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/indextest.cpp | 2 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/kcmkmrml.desktop | 2 | ||||
| -rw-r--r-- | kmrml/kmrml/kcontrol/mainpage.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/kmrml/kmrml/kcontrol/CMakeLists.txt b/kmrml/kmrml/kcontrol/CMakeLists.txt index 15f85e95..6ff6fbb6 100644 --- a/kmrml/kmrml/kcontrol/CMakeLists.txt +++ b/kmrml/kmrml/kcontrol/CMakeLists.txt @@ -33,6 +33,6 @@ tde_add_kpart( kcm_kmrml AUTOMOC kcmkmrml.cpp mainpage.cpp indexer.cpp serverconfigwidget.ui indexcleaner.cpp LINK - kmrmlstuff-static tdeparts-shared kio-shared + kmrmlstuff-static tdeparts-shared tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kmrml/kmrml/kcontrol/indextest.cpp b/kmrml/kmrml/kcontrol/indextest.cpp index 9571a88f..6fe6587f 100644 --- a/kmrml/kmrml/kcontrol/indextest.cpp +++ b/kmrml/kmrml/kcontrol/indextest.cpp @@ -3,7 +3,7 @@ #include "indextest.moc" #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobal.h> using namespace KMrmlConfig; diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.desktop b/kmrml/kmrml/kcontrol/kcmkmrml.desktop index 1de03e4a..b8f9e4ba 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.desktop +++ b/kmrml/kmrml/kcontrol/kcmkmrml.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell kcmkmrml +Exec=tdecmshell kcmkmrml Icon=folder_image Type=Application diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp index a8a0ab84..ee8fd88f 100644 --- a/kmrml/kmrml/kcontrol/mainpage.cpp +++ b/kmrml/kmrml/kcontrol/mainpage.cpp @@ -36,8 +36,8 @@ #include <tdeversion.h> #include <kdebug.h> -#include <kio/slaveconfig.h> -#include <kio/ioslave_defaults.h> // MAX_PORT_VALUE +#include <tdeio/slaveconfig.h> +#include <tdeio/ioslave_defaults.h> // MAX_PORT_VALUE #include "serverconfigwidget.h" #include "mainpage.h" |