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 /ksplashml/kcmksplash | |
| 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 'ksplashml/kcmksplash')
| -rw-r--r-- | ksplashml/kcmksplash/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ksplashml/kcmksplash/installer.cpp | 4 | ||||
| -rw-r--r-- | ksplashml/kcmksplash/ksplashthememgr.desktop | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ksplashml/kcmksplash/CMakeLists.txt b/ksplashml/kcmksplash/CMakeLists.txt index 45822facd..864346089 100644 --- a/ksplashml/kcmksplash/CMakeLists.txt +++ b/ksplashml/kcmksplash/CMakeLists.txt @@ -33,6 +33,6 @@ install( FILES ksplashthememgr.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) tde_add_kpart( kcm_ksplashthemes AUTOMOC SOURCES installer.cpp main.cpp - LINK kio-shared + LINK tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp index 1e17a301a..73c5da99e 100644 --- a/ksplashml/kcmksplash/installer.cpp +++ b/ksplashml/kcmksplash/installer.cpp @@ -20,7 +20,7 @@ #include "installer.h" #include <kdebug.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kglobalsettings.h> #include <klocale.h> #include <kmessagebox.h> @@ -30,7 +30,7 @@ #include <ktar.h> #include <ktrader.h> #include <kurldrag.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> ThemeListBox::ThemeListBox(TQWidget *parent) : KListBox(parent) diff --git a/ksplashml/kcmksplash/ksplashthememgr.desktop b/ksplashml/kcmksplash/ksplashthememgr.desktop index 5413c9924..295af7a6a 100644 --- a/ksplashml/kcmksplash/ksplashthememgr.desktop +++ b/ksplashml/kcmksplash/ksplashthememgr.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Icon=ksplash -Exec=kcmshell ksplashthememgr +Exec=tdecmshell ksplashthememgr DocPath=ksplashml/themes.html X-TDE-ModuleType=Library |