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

---
 tderesources/configdialog.cpp    | 4 ++--
 tderesources/configpage.cpp      | 4 ++--
 tderesources/factory.cpp         | 2 +-
 tderesources/kcmtderesources.cpp | 2 +-
 tderesources/resource.cpp        | 2 +-
 tderesources/selectdialog.cpp    | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'tderesources')

diff --git a/tderesources/configdialog.cpp b/tderesources/configdialog.cpp
index b6d29dcd3..4eb528835 100644
--- a/tderesources/configdialog.cpp
+++ b/tderesources/configdialog.cpp
@@ -21,9 +21,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp
index e70332c71..8378707e6 100644
--- a/tderesources/configpage.cpp
+++ b/tderesources/configpage.cpp
@@ -28,8 +28,8 @@
 #include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
diff --git a/tderesources/factory.cpp b/tderesources/factory.cpp
index 09140e7b7..eea2d3673 100644
--- a/tderesources/factory.cpp
+++ b/tderesources/factory.cpp
@@ -22,7 +22,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
diff --git a/tderesources/kcmtderesources.cpp b/tderesources/kcmtderesources.cpp
index 1b779fabd..c3d5ae09e 100644
--- a/tderesources/kcmtderesources.cpp
+++ b/tderesources/kcmtderesources.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeaboutdata.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configpage.h"
 
diff --git a/tderesources/resource.cpp b/tderesources/resource.cpp
index 41c08767e..e6fc4ebbd 100644
--- a/tderesources/resource.cpp
+++ b/tderesources/resource.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "resource.h"
 
 using namespace KRES;
diff --git a/tderesources/selectdialog.cpp b/tderesources/selectdialog.cpp
index c50bd36fd..c8009ae47 100644
--- a/tderesources/selectdialog.cpp
+++ b/tderesources/selectdialog.cpp
@@ -23,8 +23,8 @@
 
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqgroupbox.h>
 #include <tqlayout.h>
-- 
cgit v1.2.1