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

---
 wifi/interface_wireless.cpp                    | 2 +-
 wifi/interface_wireless_wirelessextensions.cpp | 4 ++--
 wifi/kcmwifi/ifconfigpage.cpp                  | 2 +-
 wifi/kcmwifi/kcmwifi.cpp                       | 4 ++--
 wifi/kcmwifi/mainconfig.cpp                    | 4 ++--
 wifi/kcmwifi/wificonfig.cpp                    | 6 +++---
 wifi/kwifimanager.cpp                          | 6 +++---
 wifi/kwireless/kwireless.cpp                   | 6 +++---
 wifi/kwireless/kwirelesswidget.cpp             | 4 ++--
 wifi/kwireless/linuxwirelesswidget.cpp         | 2 +-
 wifi/kwireless/propertytable.cpp               | 2 +-
 wifi/locator.h                                 | 2 +-
 wifi/main.cpp                                  | 2 +-
 wifi/networkscanning.cpp                       | 6 +++---
 wifi/speed.cpp                                 | 2 +-
 wifi/statistics.cpp                            | 2 +-
 wifi/status.cpp                                | 2 +-
 wifi/strength.cpp                              | 2 +-
 18 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'wifi')

diff --git a/wifi/interface_wireless.cpp b/wifi/interface_wireless.cpp
index 52513a59..59277473 100644
--- a/wifi/interface_wireless.cpp
+++ b/wifi/interface_wireless.cpp
@@ -29,7 +29,7 @@
 
 #include <iostream>
 #include <string>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocio.h>
 #include <kdebug.h>
 #include <tqstring.h>
diff --git a/wifi/interface_wireless_wirelessextensions.cpp b/wifi/interface_wireless_wirelessextensions.cpp
index f14d375b..928c2b6f 100644
--- a/wifi/interface_wireless_wirelessextensions.cpp
+++ b/wifi/interface_wireless_wirelessextensions.cpp
@@ -21,7 +21,7 @@
 #include <tqfile.h>
 #include <tqtable.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #ifndef WITHOUT_ARTS
 #include <arts/artsflow.h>
@@ -36,7 +36,7 @@
 
 #include <iostream>
 #include <string>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kprocio.h>
 #include <kdebug.h>
diff --git a/wifi/kcmwifi/ifconfigpage.cpp b/wifi/kcmwifi/ifconfigpage.cpp
index ff5d2cf9..1b80bb13 100644
--- a/wifi/kcmwifi/ifconfigpage.cpp
+++ b/wifi/kcmwifi/ifconfigpage.cpp
@@ -20,7 +20,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 #include <tqcheckbox.h>
diff --git a/wifi/kcmwifi/kcmwifi.cpp b/wifi/kcmwifi/kcmwifi.cpp
index 603546f5..f26a2774 100644
--- a/wifi/kcmwifi/kcmwifi.cpp
+++ b/wifi/kcmwifi/kcmwifi.cpp
@@ -27,8 +27,8 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocio.h>
 #include <klineedit.h>
 
diff --git a/wifi/kcmwifi/mainconfig.cpp b/wifi/kcmwifi/mainconfig.cpp
index c740df69..7ebb401b 100644
--- a/wifi/kcmwifi/mainconfig.cpp
+++ b/wifi/kcmwifi/mainconfig.cpp
@@ -24,8 +24,8 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocio.h>
 #include <kpushbutton.h>
 #include <knuminput.h>
diff --git a/wifi/kcmwifi/wificonfig.cpp b/wifi/kcmwifi/wificonfig.cpp
index 7a1cdac3..1958b475 100644
--- a/wifi/kcmwifi/wificonfig.cpp
+++ b/wifi/kcmwifi/wificonfig.cpp
@@ -20,11 +20,11 @@
 #include <tqfile.h>
 
 #include <ksimpleconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kprocio.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "wificonfig.h"
 
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 0500105c..21d19a07 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -32,15 +32,15 @@
 // include files for KDE
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kmenubar.h>
-#include <klocale.h>
+#include <tdemenubar.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kstdguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksystemtray.h>
 #include <kprocess.h>
 #include <dcopclient.h>
diff --git a/wifi/kwireless/kwireless.cpp b/wifi/kwireless/kwireless.cpp
index c09aa33e..7f226199 100644
--- a/wifi/kwireless/kwireless.cpp
+++ b/wifi/kwireless/kwireless.cpp
@@ -7,11 +7,11 @@
          http://www.hackerbuero.org $
 */
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "kwireless.h"
 #include "kwirelesswidget.h"
diff --git a/wifi/kwireless/kwirelesswidget.cpp b/wifi/kwireless/kwirelesswidget.cpp
index 362740e1..51b694cd 100644
--- a/wifi/kwireless/kwirelesswidget.cpp
+++ b/wifi/kwireless/kwirelesswidget.cpp
@@ -12,10 +12,10 @@
 #include <tqpen.h>
 #include <tqcolor.h>
 #include <tqpointarray.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <kpassivepopup.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kwirelesswidget.h"
 #include "propertytable.h"
diff --git a/wifi/kwireless/linuxwirelesswidget.cpp b/wifi/kwireless/linuxwirelesswidget.cpp
index 3efdbf98..9b8638e1 100644
--- a/wifi/kwireless/linuxwirelesswidget.cpp
+++ b/wifi/kwireless/linuxwirelesswidget.cpp
@@ -10,7 +10,7 @@
 #include <tqtooltip.h>
 #include <tqtimer.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <unistd.h> // for ::close
 #include "linuxwirelesswidget.h"
 #include "config.h"
diff --git a/wifi/kwireless/propertytable.cpp b/wifi/kwireless/propertytable.cpp
index 7c73b1c2..fb32d938 100644
--- a/wifi/kwireless/propertytable.cpp
+++ b/wifi/kwireless/propertytable.cpp
@@ -13,7 +13,7 @@
 #include <tqptrlist.h>
 #include <tqtextstream.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "propertytable.h"
 #include "kwirelesswidget.h"
 
diff --git a/wifi/locator.h b/wifi/locator.h
index b1629b19..c89a2057 100644
--- a/wifi/locator.h
+++ b/wifi/locator.h
@@ -22,7 +22,7 @@
 #include <tqpixmap.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 class Interface_wireless;
 
diff --git a/wifi/main.cpp b/wifi/main.cpp
index c705185f..67074d43 100644
--- a/wifi/main.cpp
+++ b/wifi/main.cpp
@@ -17,7 +17,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 
 #include "kwifimanager.h"
diff --git a/wifi/networkscanning.cpp b/wifi/networkscanning.cpp
index d7f07db7..08fb28b8 100644
--- a/wifi/networkscanning.cpp
+++ b/wifi/networkscanning.cpp
@@ -24,10 +24,10 @@
 #include <tqtable.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 
 #include "networkscanning.h"
 #include "interface_wireless.h"
diff --git a/wifi/speed.cpp b/wifi/speed.cpp
index 6fdff63d..9c0a1062 100644
--- a/wifi/speed.cpp
+++ b/wifi/speed.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "speed.h"
 #include "interface_wireless.h"
diff --git a/wifi/statistics.cpp b/wifi/statistics.cpp
index 15295180..458b4abe 100644
--- a/wifi/statistics.cpp
+++ b/wifi/statistics.cpp
@@ -17,7 +17,7 @@
 
 #include <tqwidget.h>
 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "statistics.h"
 #include "interface_wireless.h"
 
diff --git a/wifi/status.cpp b/wifi/status.cpp
index 4d8b5784..3632342e 100644
--- a/wifi/status.cpp
+++ b/wifi/status.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "status.h"
 #include "interface_wireless.h"
 
diff --git a/wifi/strength.cpp b/wifi/strength.cpp
index 35d156bd..ef62322b 100644
--- a/wifi/strength.cpp
+++ b/wifi/strength.cpp
@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqlabel.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "strength.h"
 #include "interface_wireless.h"
-- 
cgit v1.2.1