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

---
 kfind/kdatecombo.cpp | 4 ++--
 kfind/kfind.cpp      | 2 +-
 kfind/kfinddlg.cpp   | 6 +++---
 kfind/kfindpart.cpp  | 2 +-
 kfind/kftabdlg.cpp   | 6 +++---
 kfind/kfwin.cpp      | 6 +++---
 kfind/kquery.cpp     | 4 ++--
 kfind/main.cpp       | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'kfind')

diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp
index d27ea7a3b..869753c5b 100644
--- a/kfind/kdatecombo.cpp
+++ b/kfind/kdatecombo.cpp
@@ -6,8 +6,8 @@
 
 #include <tqtimer.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdatepicker.h>
 #include <kdatetbl.h>
 #include <kdebug.h>
diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp
index 8908b26c8..b1afe1b05 100644
--- a/kfind/kfind.cpp
+++ b/kfind/kfind.cpp
@@ -31,7 +31,7 @@
 
 #include <kdialog.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp
index b426050a4..76fa6301c 100644
--- a/kfind/kfinddlg.cpp
+++ b/kfind/kfinddlg.cpp
@@ -7,11 +7,11 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kguiitem.h>
 #include <kstatusbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeaboutapplication.h>
 #include <kstandarddirs.h>
diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp
index 3f71bdfbd..54de01e9b 100644
--- a/kfind/kfindpart.cpp
+++ b/kfind/kfindpart.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeparts/genericfactory.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqdir.h>
 #include <kinstance.h>
diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp
index 83e98aff2..c2df7aa67 100644
--- a/kfind/kftabdlg.cpp
+++ b/kfind/kftabdlg.cpp
@@ -17,11 +17,11 @@
 #include <tqapplication.h>
 
 #include <kcalendarsystem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kregexpeditorinterface.h>
 #include <tdeparts/componentfactory.h>
diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp
index f06b1a2a9..7364aeb73 100644
--- a/kfind/kfwin.cpp
+++ b/kfind/kfwin.cpp
@@ -22,15 +22,15 @@
 #include <tqdragobject.h>
 
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <krun.h>
 #include <kprocess.h>
 #include <kpropertiesdialog.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdepopupmenu.h>
 #include <tdeio/netaccess.h>
 #include <kurldrag.h>
diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp
index 514e6f918..1e3617c70 100644
--- a/kfind/kquery.cpp
+++ b/kfind/kquery.cpp
@@ -5,8 +5,8 @@
 #include <tdefileitem.h>
 #include <tdefilemetainfo.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kzip.h>
 
diff --git a/kfind/main.cpp b/kfind/main.cpp
index 88aa60493..e0e8bc498 100644
--- a/kfind/main.cpp
+++ b/kfind/main.cpp
@@ -2,7 +2,7 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kopenwith.h>
-- 
cgit v1.2.1