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/kwireless/kwireless.cpp           | 6 +++---
 wifi/kwireless/kwirelesswidget.cpp     | 4 ++--
 wifi/kwireless/linuxwirelesswidget.cpp | 2 +-
 wifi/kwireless/propertytable.cpp       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'wifi/kwireless')

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"
 
-- 
cgit v1.2.1