From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:02:02 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 ksplashml/kcmksplash/CMakeLists.txt          | 2 +-
 ksplashml/kcmksplash/installer.cpp           | 4 ++--
 ksplashml/kcmksplash/ksplashthememgr.desktop | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'ksplashml/kcmksplash')

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
-- 
cgit v1.2.1