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

---
 wifi/kcmwifi/CMakeLists.txt  | 2 +-
 wifi/kcmwifi/kcmwifi.desktop | 2 +-
 wifi/kwifimanager.cpp        | 6 +++---
 wifi/kwireless/kwireless.cpp | 2 +-
 wifi/kwireless/kwireless.h   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'wifi')

diff --git a/wifi/kcmwifi/CMakeLists.txt b/wifi/kcmwifi/CMakeLists.txt
index d7d5e5c1..24930ab8 100644
--- a/wifi/kcmwifi/CMakeLists.txt
+++ b/wifi/kcmwifi/CMakeLists.txt
@@ -33,6 +33,6 @@ tde_add_kpart( kcm_wifi AUTOMOC
     wificonfig.cpp kcmwifi.cpp configcrypto.ui ifconfigpagebase.ui
     configpower.ui mainconfigbase.ui mainconfig.cpp ifconfigpage.cpp
     vendorconfig.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/wifi/kcmwifi/kcmwifi.desktop b/wifi/kcmwifi/kcmwifi.desktop
index 5e5e0ecf..0ffef7e5 100644
--- a/wifi/kcmwifi/kcmwifi.desktop
+++ b/wifi/kcmwifi/kcmwifi.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=kwifimanager
 Type=Application
-Exec=kcmshell kcmwifi
+Exec=tdecmshell kcmwifi
 DocPath=
 X-TDE-ModuleType=Library
 X-TDE-Library=wifi
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index ef3d5588..9c3472da 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -31,7 +31,7 @@
 
 // include files for KDE
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kmenubar.h>
 #include <klocale.h>
 #include <kstdaction.h>
@@ -558,7 +558,7 @@ void
 KWiFiManagerApp::slotStartConfigEditor ()
 {
   TDEProcess startConf;
-  startConf << "tdesu" << locate("exe", "kcmshell") << "kcmwifi";
+  startConf << "tdesu" << locate("exe", "tdecmshell") << "kcmwifi";
   startConf.start (TDEProcess::DontCare);
 }
 
@@ -612,7 +612,7 @@ TQStringList usedInterfacesList()
   client->registerAs( "kwifimanager" );
   client->setDefaultObject( "dcop_interface" );
 
-  // shamelessly stolen from tdelibs/kio/booksmarks/kbookmarkimporter_crash.cc
+  // shamelessly stolen from tdelibs/tdeio/booksmarks/kbookmarkimporter_crash.cc
   TQStringList ignoreInterfaces;
   QCStringList apps = client->registeredApplications();
   for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it )
diff --git a/wifi/kwireless/kwireless.cpp b/wifi/kwireless/kwireless.cpp
index 8e4944d6..f2eabb6a 100644
--- a/wifi/kwireless/kwireless.cpp
+++ b/wifi/kwireless/kwireless.cpp
@@ -9,7 +9,7 @@
 
 #include <kglobal.h>
 #include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kmessagebox.h>
 
diff --git a/wifi/kwireless/kwireless.h b/wifi/kwireless/kwireless.h
index 68ce7401..0b0ae031 100644
--- a/wifi/kwireless/kwireless.h
+++ b/wifi/kwireless/kwireless.h
@@ -16,7 +16,7 @@
 
 #include <kpanelapplet.h>
 #include <tqstring.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class KWireLessWidget;
 
-- 
cgit v1.2.3