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

---
 knetworkconf/knetworkconf/kadddevicecontainer.h  | 4 ++--
 knetworkconf/knetworkconf/kadddnsserverdlg.ui.h  | 2 +-
 knetworkconf/knetworkconf/kaddknownhostdlg.ui.h  | 2 +-
 knetworkconf/knetworkconf/knetworkconf.h         | 4 ++--
 knetworkconf/knetworkconf/knetworkconfigparser.h | 4 ++--
 knetworkconf/knetworkconf/knetworkconfmodule.cpp | 2 +-
 knetworkconf/knetworkconf/main.cpp               | 6 +++---
 7 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'knetworkconf')

diff --git a/knetworkconf/knetworkconf/kadddevicecontainer.h b/knetworkconf/knetworkconf/kadddevicecontainer.h
index 4491991..80e954e 100644
--- a/knetworkconf/knetworkconf/kadddevicecontainer.h
+++ b/knetworkconf/knetworkconf/kadddevicecontainer.h
@@ -29,8 +29,8 @@
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 
 #include "kadddevicedlg.h"
diff --git a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
index dd6057f..3eba8a6 100644
--- a/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
+++ b/knetworkconf/knetworkconf/kadddnsserverdlg.ui.h
@@ -7,7 +7,7 @@
 ** place of a destructor.
 *****************************************************************************/
 #include "kaddressvalidator.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 bool _modified2;
 bool addingAlias;
diff --git a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
index 1ace4eb..bbf6e8f 100644
--- a/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
+++ b/knetworkconf/knetworkconf/kaddknownhostdlg.ui.h
@@ -9,7 +9,7 @@
 #include "kaddressvalidator.h"
 #include "kadddnsserverdlg.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 bool _modifiedhost;
 
diff --git a/knetworkconf/knetworkconf/knetworkconf.h b/knetworkconf/knetworkconf/knetworkconf.h
index ee7e08a..b215847 100644
--- a/knetworkconf/knetworkconf/knetworkconf.h
+++ b/knetworkconf/knetworkconf/knetworkconf.h
@@ -48,9 +48,9 @@
 #include <klineedit.h>
 #include <tdelistbox.h>
 #include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaboutapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 
diff --git a/knetworkconf/knetworkconf/knetworkconfigparser.h b/knetworkconf/knetworkconf/knetworkconfigparser.h
index 8e95737..461241d 100644
--- a/knetworkconf/knetworkconf/knetworkconfigparser.h
+++ b/knetworkconf/knetworkconf/knetworkconfigparser.h
@@ -31,8 +31,8 @@
 #include <stdlib.h>
 
 #include <kapp.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqobject.h>
 #include <tqdir.h>
 #include <tqfile.h>
diff --git a/knetworkconf/knetworkconf/knetworkconfmodule.cpp b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
index 93a930c..f2e7e8d 100644
--- a/knetworkconf/knetworkconf/knetworkconfmodule.cpp
+++ b/knetworkconf/knetworkconf/knetworkconfmodule.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmodule.h>
 #include <tqlayout.h> 
 #include <version.h>
diff --git a/knetworkconf/knetworkconf/main.cpp b/knetworkconf/knetworkconf/main.cpp
index 1a6b89e..8411d76 100644
--- a/knetworkconf/knetworkconf/main.cpp
+++ b/knetworkconf/knetworkconf/main.cpp
@@ -16,13 +16,13 @@
  ***************************************************************************/
 #include <unistd.h>
 #include <sys/types.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kuniqueapplication.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kgenericfactory.h>
 
 //#include "knetworkconf.h"
-- 
cgit v1.2.1