From 783715b853042d24841e3e888051f3a184e78a40 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 22:00:04 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 ksim/generalprefs.cpp                         | 2 +-
 ksim/ksim.cpp                                 | 6 +++---
 ksim/ksimpref.cpp                             | 4 ++--
 ksim/ksimsysinfo.cpp                          | 4 ++--
 ksim/ksimview.cpp                             | 4 ++--
 ksim/library/chart.cpp                        | 4 ++--
 ksim/library/ksimconfig.cpp                   | 2 +-
 ksim/library/label.cpp                        | 4 ++--
 ksim/library/pluginglobal.cpp                 | 2 +-
 ksim/library/pluginloader.cpp                 | 6 +++---
 ksim/library/pluginmodule.cpp                 | 2 +-
 ksim/library/themeloader.cpp                  | 4 ++--
 ksim/monitorprefs.cpp                         | 4 ++--
 ksim/monitors/cpu/ksimcpu.cpp                 | 4 ++--
 ksim/monitors/disk/ksimdisk.cpp               | 2 +-
 ksim/monitors/filesystem/filesystemwidget.cpp | 4 ++--
 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/ksimmail.cpp               | 2 +-
 ksim/monitors/net/ksimnet.cpp                 | 4 ++--
 ksim/monitors/net/netconfig.cpp               | 4 ++--
 ksim/monitors/net/netdialog.cpp               | 2 +-
 ksim/monitors/snmp/browsedialog.cpp           | 2 +-
 ksim/monitors/snmp/configpage.cpp             | 4 ++--
 ksim/monitors/snmp/hostdialog.cpp             | 4 ++--
 ksim/monitors/snmp/monitordialog.cpp          | 2 +-
 ksim/monitors/snmp/probedialog.cpp            | 2 +-
 ksim/monitors/snmp/proberesultdialog.cpp      | 2 +-
 ksim/monitors/snmp/value.cpp                  | 2 +-
 ksim/themeprefs.cpp                           | 4 ++--
 34 files changed, 52 insertions(+), 52 deletions(-)

(limited to 'ksim')

diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp
index c07919e..a1457a6 100644
--- a/ksim/generalprefs.cpp
+++ b/ksim/generalprefs.cpp
@@ -31,7 +31,7 @@
 #include <tqtooltip.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp
index 447cf94..91fb26d 100644
--- a/ksim/ksim.cpp
+++ b/ksim/ksim.cpp
@@ -29,9 +29,9 @@
 #include <kbugreport.h>
 #include <tdeaboutdata.h>
 #include <dcopclient.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 extern "C"
 {
diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp
index 073324b..871f3b0 100644
--- a/ksim/ksimpref.cpp
+++ b/ksim/ksimpref.cpp
@@ -27,11 +27,11 @@
 #include <ksimconfig.h>
 #include <pluginmodule.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqhbox.h>
 #include <tqframe.h>
diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp
index dbdd180..1f204b7 100644
--- a/ksim/ksimsysinfo.cpp
+++ b/ksim/ksimsysinfo.cpp
@@ -25,9 +25,9 @@
 #include <tqdatetime.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "ksimsysinfo.h"
 #include "ksimsysinfo.moc"
diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index d45a3dd..5e83641 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -38,10 +38,10 @@
 #include <themetypes.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdesktopfile.h>
 #include <twin.h>
 #include <krun.h>
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index 547729c..9995769 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -29,8 +29,8 @@
 #include <tqbitmap.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 
 #include <themeloader.h>
diff --git a/ksim/library/ksimconfig.cpp b/ksim/library/ksimconfig.cpp
index 04f4559..b781630 100644
--- a/ksim/library/ksimconfig.cpp
+++ b/ksim/library/ksimconfig.cpp
@@ -19,7 +19,7 @@
 
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "ksimconfig.h"
 #include "themeloader.h"
diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp
index 954b03f..b47309b 100644
--- a/ksim/library/label.cpp
+++ b/ksim/library/label.cpp
@@ -32,8 +32,8 @@
 
 #include <themeloader.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdeconfig.h>
 
 class KSim::Label::Private
diff --git a/ksim/library/pluginglobal.cpp b/ksim/library/pluginglobal.cpp
index 34a38c3..08ff3c9 100644
--- a/ksim/library/pluginglobal.cpp
+++ b/ksim/library/pluginglobal.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <kdesktopfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 class KSim::Plugin::Private
diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp
index 2126790..9518bbb 100644
--- a/ksim/library/pluginloader.cpp
+++ b/ksim/library/pluginloader.cpp
@@ -23,10 +23,10 @@
 #include <kdebug.h>
 #include <klibloader.h>
 #include <kdesktopfile.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqstringlist.h>
 
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index eb6f03b..7f450de 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -20,7 +20,7 @@
 #include "pluginmodule.h"
 #include "pluginmodule.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp
index 0548f73..5bc4038 100644
--- a/ksim/library/themeloader.cpp
+++ b/ksim/library/themeloader.cpp
@@ -34,9 +34,9 @@
 
 #include <kdebug.h>
 #include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class KSim::Theme::Private
 {
diff --git a/ksim/monitorprefs.cpp b/ksim/monitorprefs.cpp
index cbddf84..5f982a6 100644
--- a/ksim/monitorprefs.cpp
+++ b/ksim/monitorprefs.cpp
@@ -20,8 +20,8 @@
 #include "monitorprefs.h"
 #include "monitorprefs.moc"
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index fdb950f..af6074c 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -34,8 +34,8 @@
 #include <kdebug.h>
 #include <tdeaboutapplication.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kinputdialog.h>
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index 5247ad1..d3a3827 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <tdeaboutapplication.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdelistview.h>
 #include <kinputdialog.h>
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index b7ded52..981a678 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -27,8 +27,8 @@
 #include <tqcursor.h>
 
 #include <kprocess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp
index 3d3b671..7afd53a 100644
--- a/ksim/monitors/filesystem/fsystemconfig.cpp
+++ b/ksim/monitors/filesystem/fsystemconfig.cpp
@@ -21,7 +21,7 @@
 #include "fsystemconfig.moc"
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 #include <tdeapplication.h>
diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 1dbf35f..278a891 100644
--- a/ksim/monitors/filesystem/ksimfsystem.cpp
+++ b/ksim/monitors/filesystem/ksimfsystem.cpp
@@ -28,7 +28,7 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutapplication.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index 9638754..979c682 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -28,7 +28,7 @@
 #include <tqcheckbox.h>
 
 #include <label.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeaboutapplication.h>
diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp
index bef854a..9514bc5 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.cpp
+++ b/ksim/monitors/lm_sensors/ksimsensors.cpp
@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutapplication.h>
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp
index 42763c3..c81ad56 100644
--- a/ksim/monitors/lm_sensors/sensorbase.cpp
+++ b/ksim/monitors/lm_sensors/sensorbase.cpp
@@ -22,7 +22,7 @@
 #include <ksimconfig.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqglobal.h>
 #include <klibloader.h>
 #include <kstandarddirs.h>
diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp
index 4ecbe59..1a1f4a1 100644
--- a/ksim/monitors/lm_sensors/sensorsconfig.cpp
+++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp
@@ -21,7 +21,7 @@
 #include "sensorsconfig.moc"
 #include "sensorbase.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 #include <knuminput.h>
diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index e59c6e0..942397b 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -25,7 +25,7 @@
 
 #include <tdeaboutapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <label.h>
 #include <themeloader.h>
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index c1d56a8..065797d 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -44,11 +44,11 @@ static int mib[] = { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0 };
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutapplication.h>
 #include <tdeaboutdata.h>
 #include <ksimpleconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <krun.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp
index 73a995b..eb2c1a3 100644
--- a/ksim/monitors/net/netconfig.cpp
+++ b/ksim/monitors/net/netconfig.cpp
@@ -23,12 +23,12 @@
 
 #include <tdelistview.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "netconfig.h"
 #include "netconfig.moc"
diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp
index 6f713aa..21d6236 100644
--- a/ksim/monitors/net/netdialog.cpp
+++ b/ksim/monitors/net/netdialog.cpp
@@ -30,7 +30,7 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <klineedit.h>
diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp
index ec02173..2f16f36 100644
--- a/ksim/monitors/snmp/browsedialog.cpp
+++ b/ksim/monitors/snmp/browsedialog.cpp
@@ -23,7 +23,7 @@
 
 #include <tdelistview.h>
 #include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 
diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp
index 02ac2ba..d1f24a5 100644
--- a/ksim/monitors/snmp/configpage.cpp
+++ b/ksim/monitors/snmp/configpage.cpp
@@ -30,8 +30,8 @@
 
 #include <tdeconfig.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 using namespace KSim::Snmp;
 
diff --git a/ksim/monitors/snmp/hostdialog.cpp b/ksim/monitors/snmp/hostdialog.cpp
index 7d66a75..0712e54 100644
--- a/ksim/monitors/snmp/hostdialog.cpp
+++ b/ksim/monitors/snmp/hostdialog.cpp
@@ -28,8 +28,8 @@
 #include <tqpushbutton.h>
 #include <tqspinbox.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <assert.h>
 
diff --git a/ksim/monitors/snmp/monitordialog.cpp b/ksim/monitors/snmp/monitordialog.cpp
index 1bda0aa..bed4798 100644
--- a/ksim/monitors/snmp/monitordialog.cpp
+++ b/ksim/monitors/snmp/monitordialog.cpp
@@ -30,7 +30,7 @@
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include <assert.h>
diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp
index 7261f21..435ec9e 100644
--- a/ksim/monitors/snmp/probedialog.cpp
+++ b/ksim/monitors/snmp/probedialog.cpp
@@ -22,7 +22,7 @@
 
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 using namespace KSim::Snmp;
diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp
index 854b848..7550447 100644
--- a/ksim/monitors/snmp/proberesultdialog.cpp
+++ b/ksim/monitors/snmp/proberesultdialog.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 using namespace KSim::Snmp;
diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp
index f5e1d20..bb5b0c4 100644
--- a/ksim/monitors/snmp/value.cpp
+++ b/ksim/monitors/snmp/value.cpp
@@ -24,7 +24,7 @@
 
 #include <tqvariant.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 
diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp
index c0f3b06..9ab7f60 100644
--- a/ksim/themeprefs.cpp
+++ b/ksim/themeprefs.cpp
@@ -26,9 +26,9 @@
 #include <tqlabel.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kurllabel.h>
 #include <tdeapplication.h>
-- 
cgit v1.2.1