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

---
 src/cpufreqd/cpufreqd.cpp          | 2 +-
 src/kima.cpp                       | 6 +++---
 src/prefs.cpp                      | 2 +-
 src/sources/acpithermalsrc.cpp     | 2 +-
 src/sources/batterysrc.cpp         | 2 +-
 src/sources/cpuinfofreqsrc.cpp     | 2 +-
 src/sources/hddtempsrc.cpp         | 2 +-
 src/sources/hwmonfansrc.cpp        | 2 +-
 src/sources/hwmonthermalsrc.cpp    | 2 +-
 src/sources/i8ksrc.cpp             | 2 +-
 src/sources/ibmacpifansrc.cpp      | 2 +-
 src/sources/ibmacpithermalsrc.cpp  | 2 +-
 src/sources/ibmhdaps.cpp           | 2 +-
 src/sources/ibookg4thermalsrc.cpp  | 2 +-
 src/sources/labelsource.cpp        | 2 +-
 src/sources/labelsourcePrefs.cpp   | 2 +-
 src/sources/nvidiathermalsrc.cpp   | 2 +-
 src/sources/omnibookthermalsrc.cpp | 2 +-
 src/sources/source.cpp             | 4 ++--
 src/sources/sourceprefs.cpp        | 2 +-
 src/sources/sysfreqsrc.cpp         | 2 +-
 src/sources/uptimesrc.cpp          | 2 +-
 22 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/cpufreqd/cpufreqd.cpp b/src/cpufreqd/cpufreqd.cpp
index b5f1ad0..c510d90 100644
--- a/src/cpufreqd/cpufreqd.cpp
+++ b/src/cpufreqd/cpufreqd.cpp
@@ -22,7 +22,7 @@
 #include <tqdir.h>
 #include <tqkeysequence.h>
 #include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define CHUNK_SIZE 4096
 
diff --git a/src/kima.cpp b/src/kima.cpp
index aa000b1..1bc1169 100644
--- a/src/kima.cpp
+++ b/src/kima.cpp
@@ -33,7 +33,7 @@
 #include <tqwidgetstack.h> 
 
 // KDE
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaboutapplication.h>
 #include <tdepopupmenu.h>
 #include <kstdaction.h>
@@ -43,9 +43,9 @@
 #include <tdeapplication.h>
 #include <kdialogbase.h>
 #include <tdeconfig.h>
-//#include <kglobal.h>
+//#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Kima
 #include "kima.h"
diff --git a/src/prefs.cpp b/src/prefs.cpp
index 13b0133..4d9f6b1 100644
--- a/src/prefs.cpp
+++ b/src/prefs.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './prefs.ui'
 **
diff --git a/src/sources/acpithermalsrc.cpp b/src/sources/acpithermalsrc.cpp
index f762d00..a2340a0 100644
--- a/src/sources/acpithermalsrc.cpp
+++ b/src/sources/acpithermalsrc.cpp
@@ -21,7 +21,7 @@
 #include "acpithermalsrc.h"
 #include <tqtextstream.h> 
 #include <tqdir.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ACPIThermalSrc::ACPIThermalSrc(TQWidget* inParent, const TQFile& inSourceFile):
 		LabelSource(inParent),
diff --git a/src/sources/batterysrc.cpp b/src/sources/batterysrc.cpp
index a6d4ee8..8c5989d 100644
--- a/src/sources/batterysrc.cpp
+++ b/src/sources/batterysrc.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "batterysrc.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #define DBUS_DEBUG_MESSAGE(func, _dbus_err_) \
diff --git a/src/sources/cpuinfofreqsrc.cpp b/src/sources/cpuinfofreqsrc.cpp
index 6b1b55d..d10f360 100644
--- a/src/sources/cpuinfofreqsrc.cpp
+++ b/src/sources/cpuinfofreqsrc.cpp
@@ -21,7 +21,7 @@
 #include "cpuinfofreqsrc.h"
 #include <tqtextstream.h> 
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 CpuinfoFreqSrc::CpuinfoFreqSrc(TQWidget* inParent, const TQFile& inSourceFile):
 		LabelSource(inParent),
diff --git a/src/sources/hddtempsrc.cpp b/src/sources/hddtempsrc.cpp
index 34995d5..31fee40 100644
--- a/src/sources/hddtempsrc.cpp
+++ b/src/sources/hddtempsrc.cpp
@@ -24,7 +24,7 @@
 #include <tqhostaddress.h>
 #include <tqcstring.h> 
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 //#include <kdebug.h>
 
diff --git a/src/sources/hwmonfansrc.cpp b/src/sources/hwmonfansrc.cpp
index abd428f..cc05f93 100644
--- a/src/sources/hwmonfansrc.cpp
+++ b/src/sources/hwmonfansrc.cpp
@@ -21,7 +21,7 @@
 #include "hwmonfansrc.h"
 #include <tqtextstream.h> 
 #include <tqdir.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 HwMonFanSrc::HwMonFanSrc(TQWidget* inParent, const TQFile& inSourceFile, unsigned int inIndex):
 		LabelSource(inParent),
diff --git a/src/sources/hwmonthermalsrc.cpp b/src/sources/hwmonthermalsrc.cpp
index 24aa3f0..c9b56e4 100644
--- a/src/sources/hwmonthermalsrc.cpp
+++ b/src/sources/hwmonthermalsrc.cpp
@@ -21,7 +21,7 @@
 #include "hwmonthermalsrc.h"
 #include <tqtextstream.h> 
 #include <tqdir.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 HwMonThermalSrc::HwMonThermalSrc(TQWidget* inParent, const TQFile& inSourceFile, unsigned int inIndex):
 		LabelSource(inParent),
diff --git a/src/sources/i8ksrc.cpp b/src/sources/i8ksrc.cpp
index 50c1bf5..d2dfc10 100644
--- a/src/sources/i8ksrc.cpp
+++ b/src/sources/i8ksrc.cpp
@@ -21,7 +21,7 @@
 #include "i8ksrc.h"
 #include <tqtextstream.h> 
 #include <tqdir.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 I8kSrc::I8kSrc(TQWidget* inParent, const TQFile& inSourceFile, unsigned int inIndex):
 		LabelSource(inParent),
diff --git a/src/sources/ibmacpifansrc.cpp b/src/sources/ibmacpifansrc.cpp
index a311bda..2fcfb1d 100644
--- a/src/sources/ibmacpifansrc.cpp
+++ b/src/sources/ibmacpifansrc.cpp
@@ -21,7 +21,7 @@
 #include "ibmacpifansrc.h"
 #include <tqtextstream.h> 
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 IBMACPIFanSrc::IBMACPIFanSrc(TQWidget* inParent, const TQFile& inSourceFile):
 		LabelSource(inParent),
diff --git a/src/sources/ibmacpithermalsrc.cpp b/src/sources/ibmacpithermalsrc.cpp
index 770c885..918770b 100644
--- a/src/sources/ibmacpithermalsrc.cpp
+++ b/src/sources/ibmacpithermalsrc.cpp
@@ -21,7 +21,7 @@
 #include "ibmacpithermalsrc.h"
 #include <tqtextstream.h> 
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 //#include "hal/libhal.h" 
 // hal-get-property --udi /org/freedesktop/Hal/devices/computer --key system.product
 
diff --git a/src/sources/ibmhdaps.cpp b/src/sources/ibmhdaps.cpp
index 64d3d9a..23f758f 100644
--- a/src/sources/ibmhdaps.cpp
+++ b/src/sources/ibmhdaps.cpp
@@ -21,7 +21,7 @@
 #include "ibmhdaps.h"
 #include <tqtextstream.h> 
 #include <tqdir.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 IBMHDAPSSrc::IBMHDAPSSrc(TQWidget* inParent, const TQFile& inSourceFile):
 		LabelSource(inParent),
diff --git a/src/sources/ibookg4thermalsrc.cpp b/src/sources/ibookg4thermalsrc.cpp
index 54f5a91..4d137ae 100644
--- a/src/sources/ibookg4thermalsrc.cpp
+++ b/src/sources/ibookg4thermalsrc.cpp
@@ -21,7 +21,7 @@
 
 #include "ibookg4thermalsrc.h"
 #include <tqtextstream.h> 
-#include <klocale.h>
+#include <tdelocale.h>
 
 IbookG4ThermalSrc::IbookG4ThermalSrc(TQWidget* inParent, const TQFile& inSourceFile, const TQString& inName):
 		LabelSource(inParent),
diff --git a/src/sources/labelsource.cpp b/src/sources/labelsource.cpp
index 2c93479..ba4f8fc 100644
--- a/src/sources/labelsource.cpp
+++ b/src/sources/labelsource.cpp
@@ -24,7 +24,7 @@
 #include <tdefontrequester.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //#include "kdebug.h"
 
diff --git a/src/sources/labelsourcePrefs.cpp b/src/sources/labelsourcePrefs.cpp
index 1091847..8104c87 100644
--- a/src/sources/labelsourcePrefs.cpp
+++ b/src/sources/labelsourcePrefs.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './labelsourcePrefs.ui'
 **
diff --git a/src/sources/nvidiathermalsrc.cpp b/src/sources/nvidiathermalsrc.cpp
index 1e67e29..7fff602 100644
--- a/src/sources/nvidiathermalsrc.cpp
+++ b/src/sources/nvidiathermalsrc.cpp
@@ -21,7 +21,7 @@
 #include "nvidiathermalsrc.h"
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #ifndef HAVE_NVCONTROL
diff --git a/src/sources/omnibookthermalsrc.cpp b/src/sources/omnibookthermalsrc.cpp
index 11f8cd9..2a347b2 100644
--- a/src/sources/omnibookthermalsrc.cpp
+++ b/src/sources/omnibookthermalsrc.cpp
@@ -21,7 +21,7 @@
 #include "omnibookthermalsrc.h"
 #include <tqtextstream.h> 
 #include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 OmnibookThermalSrc::OmnibookThermalSrc(TQWidget* inParent, const TQFile& inSourceFile):
 		LabelSource(inParent),
diff --git a/src/sources/source.cpp b/src/sources/source.cpp
index 36de899..6ebe6b4 100644
--- a/src/sources/source.cpp
+++ b/src/sources/source.cpp
@@ -24,8 +24,8 @@
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 //#include "kdebug.h"
 
diff --git a/src/sources/sourceprefs.cpp b/src/sources/sourceprefs.cpp
index 1e0f3c7..4db4da0 100644
--- a/src/sources/sourceprefs.cpp
+++ b/src/sources/sourceprefs.cpp
@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './sourceprefs.ui'
 **
diff --git a/src/sources/sysfreqsrc.cpp b/src/sources/sysfreqsrc.cpp
index a90c127..22242f8 100644
--- a/src/sources/sysfreqsrc.cpp
+++ b/src/sources/sysfreqsrc.cpp
@@ -22,7 +22,7 @@
 #include <tqtextstream.h> 
 #include <tqfile.h>
 #include <tqdir.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 SysFreqSrc::SysFreqSrc(TQWidget* inParent, const TQFile& inSourceFile):
 		LabelSource(inParent),
diff --git a/src/sources/uptimesrc.cpp b/src/sources/uptimesrc.cpp
index 2daca75..8ec0db5 100644
--- a/src/sources/uptimesrc.cpp
+++ b/src/sources/uptimesrc.cpp
@@ -20,7 +20,7 @@
 
 #include "uptimesrc.h"
 #include <tqtextstream.h> 
-#include <klocale.h>
+#include <tdelocale.h>
 
 UptimeSrc::UptimeSrc(TQWidget* inParent, const TQFile& inSourceFile):
 		LabelSource(inParent),
-- 
cgit v1.2.1