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

---
 ksim/CMakeLists.txt                        | 2 +-
 ksim/library/chart.cpp                     | 2 +-
 ksim/library/ksimconfig.cpp                | 2 +-
 ksim/library/label.cpp                     | 2 +-
 ksim/library/pluginloader.h                | 2 +-
 ksim/library/pluginmodule.cpp              | 2 +-
 ksim/library/themeloader.h                 | 2 +-
 ksim/monitors/cpu/ksimcpu.cpp              | 2 +-
 ksim/monitors/disk/ksimdisk.cpp            | 2 +-
 ksim/monitors/filesystem/fsystemconfig.cpp | 2 +-
 ksim/monitors/filesystem/ksimfsystem.cpp   | 2 +-
 ksim/monitors/i8k/ksimi8k.cpp              | 2 +-
 ksim/monitors/lm_sensors/ksimsensors.cpp   | 2 +-
 ksim/monitors/lm_sensors/sensorbase.cpp    | 2 +-
 ksim/monitors/lm_sensors/sensorsconfig.cpp | 2 +-
 ksim/monitors/mail/CMakeLists.txt          | 2 +-
 ksim/monitors/net/CMakeLists.txt           | 2 +-
 ksim/monitors/snmp/CMakeLists.txt          | 2 +-
 ksim/monitors/snmp/chartmonitor.cpp        | 2 +-
 ksim/monitors/snmp/configpage.cpp          | 2 +-
 ksim/monitors/snmp/snmp.h                  | 2 +-
 ksim/monitors/snmp/view.cpp                | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'ksim')

diff --git a/ksim/CMakeLists.txt b/ksim/CMakeLists.txt
index 5d915fa..59037f7 100644
--- a/ksim/CMakeLists.txt
+++ b/ksim/CMakeLists.txt
@@ -43,7 +43,7 @@ tde_add_kpart( ksim_panelextension AUTOMOC
     ksimsysinfo.cpp ksimsysinfo.skel
     ksimframe.cpp ksimpref.cpp monitorprefs.cpp
     generalprefs.cpp themeprefs.cpp
-  LINK kio-shared ksimcore-shared systeminfo-static
+  LINK tdeio-shared ksimcore-shared systeminfo-static
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index 62a2328..547729c 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <themeloader.h>
 #include <led.h>
diff --git a/ksim/library/ksimconfig.cpp b/ksim/library/ksimconfig.cpp
index 3619f90..04f4559 100644
--- a/ksim/library/ksimconfig.cpp
+++ b/ksim/library/ksimconfig.cpp
@@ -18,7 +18,7 @@
  */
 
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 
 #include "ksimconfig.h"
diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp
index 91c23a6..954b03f 100644
--- a/ksim/library/label.cpp
+++ b/ksim/library/label.cpp
@@ -34,7 +34,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 class KSim::Label::Private
 {
diff --git a/ksim/library/pluginloader.h b/ksim/library/pluginloader.h
index 912297c..974a540 100644
--- a/ksim/library/pluginloader.h
+++ b/ksim/library/pluginloader.h
@@ -78,7 +78,7 @@ namespace KSim
       /**
        * loads a plugin, example:
        * <pre>
-       *   KDesktopFile deskfile("/home/user/foo.desktop");
+       *   KDesktopFile destdefile("/home/user/foo.desktop");
        *   KSim::PluginLoader::self().loadPlugin(deskFile);
        * </pre>
        * you can then use @ref pluginList() to access the plugin, view,
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index 74128d9..d668e82 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <tqregexp.h>
 #include <tqpopupmenu.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 
 class KSim::PluginObject::Private
diff --git a/ksim/library/themeloader.h b/ksim/library/themeloader.h
index 89ac67b..c70dc92 100644
--- a/ksim/library/themeloader.h
+++ b/ksim/library/themeloader.h
@@ -430,7 +430,7 @@ namespace KSim
        */
       void reColourImage(TQImage &image);
       /**
-       * changes some of the entries in the config file so kconfig
+       * changes some of the entries in the config file so tdeconfig
        * can handle the file better.
        * @return the location of the config file
        */
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index aaed602..7a092e1 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -36,7 +36,7 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kapplication.h>
 #include <kinputdialog.h>
 
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index 6c91d00..3a38100 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -35,7 +35,7 @@
 #include <kapplication.h>
 #include <klistview.h>
 #include <kinputdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <chart.h>
 #include <progress.h>
diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp
index 1ffe5a8..d9d55e9 100644
--- a/ksim/monitors/filesystem/fsystemconfig.cpp
+++ b/ksim/monitors/filesystem/fsystemconfig.cpp
@@ -20,7 +20,7 @@
 #include "fsystemconfig.h"
 #include "fsystemconfig.moc"
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <klistview.h>
diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 46edb3c..7a10595 100644
--- a/ksim/monitors/filesystem/ksimfsystem.cpp
+++ b/ksim/monitors/filesystem/ksimfsystem.cpp
@@ -32,7 +32,7 @@
 #include <kaboutapplication.h>
 #include <kaboutdata.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include "ksimfsystem.h"
 #include "fsystemconfig.h"
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index eb7f7ee..354005e 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -30,7 +30,7 @@
 #include <label.h>
 #include <klocale.h>
 #include <kapplication.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kaboutapplication.h>
 #include <knuminput.h>
 #include <kdebug.h>
diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp
index c3fcda3..13c4f20 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.cpp
+++ b/ksim/monitors/lm_sensors/ksimsensors.cpp
@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kaboutapplication.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqlayout.h>
 
diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp
index 7851509..42763c3 100644
--- a/ksim/monitors/lm_sensors/sensorbase.cpp
+++ b/ksim/monitors/lm_sensors/sensorbase.cpp
@@ -26,7 +26,7 @@
 #include <tqglobal.h>
 #include <klibloader.h>
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #include <tqtimer.h>
 #include <tqfile.h>
diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp
index 95e65e5..f32fb96 100644
--- a/ksim/monitors/lm_sensors/sensorsconfig.cpp
+++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp
@@ -25,7 +25,7 @@
 #include <kiconloader.h>
 #include <klistview.h>
 #include <knuminput.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinputdialog.h>
 
diff --git a/ksim/monitors/mail/CMakeLists.txt b/ksim/monitors/mail/CMakeLists.txt
index 918f977..0e207ee 100644
--- a/ksim/monitors/mail/CMakeLists.txt
+++ b/ksim/monitors/mail/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 
 tde_add_kpart( ksim_mail AUTOMOC
   SOURCES ksimmail.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/ksim/monitors/net/CMakeLists.txt b/ksim/monitors/net/CMakeLists.txt
index b05a923..a0d6f4b 100644
--- a/ksim/monitors/net/CMakeLists.txt
+++ b/ksim/monitors/net/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
 
 tde_add_kpart( ksim_net AUTOMOC
   SOURCES ksimnet.cpp netdialog.cpp netconfig.cpp
-  LINK ksimcore-shared kio-shared
+  LINK ksimcore-shared tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/ksim/monitors/snmp/CMakeLists.txt b/ksim/monitors/snmp/CMakeLists.txt
index f25b0bf..b86b909 100644
--- a/ksim/monitors/snmp/CMakeLists.txt
+++ b/ksim/monitors/snmp/CMakeLists.txt
@@ -37,7 +37,7 @@ tde_add_kpart( ksim_snmp AUTOMOC
     snmplib.cpp pdu.cpp proberesultdialogbase.ui
     proberesultdialog.cpp browsedialogbase.ui
     browsedialog.cpp walker.cpp
-  LINK kio-shared ksimcore-shared
+  LINK tdeio-shared ksimcore-shared
     ${NETSNMP_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/ksim/monitors/snmp/chartmonitor.cpp b/ksim/monitors/snmp/chartmonitor.cpp
index 47f5864..5b8438f 100644
--- a/ksim/monitors/snmp/chartmonitor.cpp
+++ b/ksim/monitors/snmp/chartmonitor.cpp
@@ -18,7 +18,7 @@
 */
 #include "chartmonitor.h"
 
-#include <kio/global.h>
+#include <tdeio/global.h>
 
 using namespace KSim::Snmp;
 
diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp
index 8e4102f..1227af1 100644
--- a/ksim/monitors/snmp/configpage.cpp
+++ b/ksim/monitors/snmp/configpage.cpp
@@ -28,7 +28,7 @@
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klistview.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/ksim/monitors/snmp/snmp.h b/ksim/monitors/snmp/snmp.h
index f7fa92c..213fa22 100644
--- a/ksim/monitors/snmp/snmp.h
+++ b/ksim/monitors/snmp/snmp.h
@@ -20,7 +20,7 @@
 #ifndef KSIM_SNMP_H
 #define KSIM_SNMP_H
 
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 
 #include <tqmap.h>
 
diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp
index ec26949..d109139 100644
--- a/ksim/monitors/snmp/view.cpp
+++ b/ksim/monitors/snmp/view.cpp
@@ -25,7 +25,7 @@
 
 #include <tqlayout.h>
 
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 using namespace KSim::Snmp;
 
-- 
cgit v1.2.3