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 +-
 ksplashml/main.cpp                               | 2 +-
 ksplashml/themeengine/default/themelegacy.cpp    | 2 +-
 ksplashml/themeengine/objkstheme.cpp             | 2 +-
 ksplashml/themeengine/redmond/CMakeLists.txt     | 2 +-
 ksplashml/themeengine/redmond/themeredmond.cpp   | 2 +-
 ksplashml/themeengine/standard/themestandard.cpp | 2 +-
 ksplashml/themeengine/themeengine.cpp            | 2 +-
 ksplashml/themeengine/unified/themeunified.cpp   | 2 +-
 ksplashml/wndmain.cpp                            | 2 +-
 12 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'ksplashml')

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
diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp
index f184fb7a6..8dd826d40 100644
--- a/ksplashml/main.cpp
+++ b/ksplashml/main.cpp
@@ -20,7 +20,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <dcopclient.h>
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index 39839cca6..830516355 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kglobalsettings.h>
diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp
index df7556bac..ca00f3406 100644
--- a/ksplashml/themeengine/objkstheme.cpp
+++ b/ksplashml/themeengine/objkstheme.cpp
@@ -11,7 +11,7 @@
 
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/ksplashml/themeengine/redmond/CMakeLists.txt b/ksplashml/themeengine/redmond/CMakeLists.txt
index b8947a0aa..a6e0b0229 100644
--- a/ksplashml/themeengine/redmond/CMakeLists.txt
+++ b/ksplashml/themeengine/redmond/CMakeLists.txt
@@ -33,6 +33,6 @@ install( FILES ksplashredmond.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 tde_add_kpart( ksplashredmond AUTOMOC
   SOURCES previewredmond.cpp themeredmond.cpp
-  LINK ksplashthemes-shared kio-shared
+  LINK ksplashthemes-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp
index 0328c0365..4b19a3012 100644
--- a/ksplashml/themeengine/redmond/themeredmond.cpp
+++ b/ksplashml/themeengine/redmond/themeredmond.cpp
@@ -14,7 +14,7 @@
 #include <unistd.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kfontcombo.h>
diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp
index 26c47eea0..df8067ace 100644
--- a/ksplashml/themeengine/standard/themestandard.cpp
+++ b/ksplashml/themeengine/standard/themestandard.cpp
@@ -16,7 +16,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqdesktopwidget.h>
 #include <tqlabel.h>
diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp
index b9a7c208f..ff069803a 100644
--- a/ksplashml/themeengine/themeengine.cpp
+++ b/ksplashml/themeengine/themeengine.cpp
@@ -15,7 +15,7 @@
 
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <twin.h>
diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp
index 21c899adc..611ddb345 100644
--- a/ksplashml/themeengine/unified/themeunified.cpp
+++ b/ksplashml/themeengine/unified/themeunified.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kglobalsettings.h>
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index cb71de070..4cbfc2513 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -12,7 +12,7 @@
 #include <unistd.h>
 
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-- 
cgit v1.2.3