From 843e7a1b7cafbc680f1fda7000dd8188e8197857 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:47:00 -0600
Subject: [PATCH] Rename additional header files to avoid conflicts with KDE4

---
 src/kcm/configdialog.cpp                 | 4 ++--
 src/knemod/backends/backendbase.h        | 2 +-
 src/knemod/backends/daemonregistry.h     | 2 +-
 src/knemod/backends/kcmregistry.h        | 2 +-
 src/knemod/interface.cpp                 | 2 +-
 src/knemod/interfaceicon.cpp             | 4 ++--
 src/knemod/interfacestatisticsdialog.cpp | 2 +-
 src/knemod/interfacestatusdialog.cpp     | 4 ++--
 src/knemod/interfacetooltip.cpp          | 2 +-
 src/knemod/interfacetray.cpp             | 4 ++--
 src/knemod/knemodaemon.cpp               | 6 +++---
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/kcm/configdialog.cpp b/src/kcm/configdialog.cpp
index c2438c0..cfa9909 100644
--- a/src/kcm/configdialog.cpp
+++ b/src/kcm/configdialog.cpp
@@ -33,9 +33,9 @@
 #include <tqstringlist.h>
 #include <tqdatastream.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <dcopclient.h>
 #include <kiconloader.h>
diff --git a/src/knemod/backends/backendbase.h b/src/knemod/backends/backendbase.h
index 06fbb4d..4f8c12c 100644
--- a/src/knemod/backends/backendbase.h
+++ b/src/knemod/backends/backendbase.h
@@ -23,7 +23,7 @@
 #include <tqdict.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "data.h"
 #include "interface.h"
diff --git a/src/knemod/backends/daemonregistry.h b/src/knemod/backends/daemonregistry.h
index 7e811f5..1c0674b 100644
--- a/src/knemod/backends/daemonregistry.h
+++ b/src/knemod/backends/daemonregistry.h
@@ -22,7 +22,7 @@
 
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "backendbase.h"
 #include "sysbackend.h"
diff --git a/src/knemod/backends/kcmregistry.h b/src/knemod/backends/kcmregistry.h
index 08efe4a..0dde2e8 100644
--- a/src/knemod/backends/kcmregistry.h
+++ b/src/knemod/backends/kcmregistry.h
@@ -22,7 +22,7 @@
 
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 /**
  * This registry tells the KCM module what backends are available
diff --git a/src/knemod/interface.cpp b/src/knemod/interface.cpp
index 905702a..ed672a4 100644
--- a/src/knemod/interface.cpp
+++ b/src/knemod/interface.cpp
@@ -22,7 +22,7 @@
 
 #include <twin.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twinmodule.h>
 #include <kiconloader.h>
 
diff --git a/src/knemod/interfaceicon.cpp b/src/knemod/interfaceicon.cpp
index 8a9c35c..7b99041 100644
--- a/src/knemod/interfaceicon.cpp
+++ b/src/knemod/interfaceicon.cpp
@@ -22,8 +22,8 @@
 #include <tqpixmap.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
diff --git a/src/knemod/interfacestatisticsdialog.cpp b/src/knemod/interfacestatisticsdialog.cpp
index 489f158..5fe9634 100644
--- a/src/knemod/interfacestatisticsdialog.cpp
+++ b/src/knemod/interfacestatisticsdialog.cpp
@@ -21,7 +21,7 @@
 #include <tqdatetime.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 #include <kiconloader.h>
 #include <kcalendarsystem.h>
diff --git a/src/knemod/interfacestatusdialog.cpp b/src/knemod/interfacestatusdialog.cpp
index f4b9c0b..12bc469 100644
--- a/src/knemod/interfacestatusdialog.cpp
+++ b/src/knemod/interfacestatusdialog.cpp
@@ -26,8 +26,8 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kactivelabel.h>
 #include <tdeio/global.h>
diff --git a/src/knemod/interfacetooltip.cpp b/src/knemod/interfacetooltip.cpp
index dd4c32b..57dc05f 100644
--- a/src/knemod/interfacetooltip.cpp
+++ b/src/knemod/interfacetooltip.cpp
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
 
 #include "data.h"
diff --git a/src/knemod/interfacetray.cpp b/src/knemod/interfacetray.cpp
index 0410171..51d6204 100644
--- a/src/knemod/interfacetray.cpp
+++ b/src/knemod/interfacetray.cpp
@@ -20,8 +20,8 @@
 #include <tqwidget.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kbugreport.h>
 #include <tdeaboutdata.h>
 #include <tdepopupmenu.h>
diff --git a/src/knemod/knemodaemon.cpp b/src/knemod/knemodaemon.cpp
index a48aa17..4666476 100644
--- a/src/knemod/knemodaemon.cpp
+++ b/src/knemod/knemodaemon.cpp
@@ -21,12 +21,12 @@
 #include <tqstrlist.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kprocess.h>
 #include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "knemodaemon.h"