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/kcmwifi/ifconfigpage.cpp | 2 +-
 wifi/kcmwifi/kcmwifi.cpp      | 4 ++--
 wifi/kcmwifi/mainconfig.cpp   | 4 ++--
 wifi/kcmwifi/wificonfig.cpp   | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'wifi/kcmwifi')

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