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

---
 tdefilereplace/kaddstringdlg.cpp      | 2 +-
 tdefilereplace/knewprojectdlg.cpp     | 6 +++---
 tdefilereplace/koptionsdlg.cpp        | 2 +-
 tdefilereplace/main.cpp               | 2 +-
 tdefilereplace/report.cpp             | 2 +-
 tdefilereplace/report.h               | 2 +-
 tdefilereplace/tdefilereplace.cpp     | 4 ++--
 tdefilereplace/tdefilereplacelib.cpp  | 2 +-
 tdefilereplace/tdefilereplacelib.h    | 2 +-
 tdefilereplace/tdefilereplacepart.cpp | 6 +++---
 tdefilereplace/tdefilereplaceview.cpp | 4 ++--
 tdefilereplace/whatthis.h             | 2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'tdefilereplace')

diff --git a/tdefilereplace/kaddstringdlg.cpp b/tdefilereplace/kaddstringdlg.cpp
index 6992ca20..0e3c5f02 100644
--- a/tdefilereplace/kaddstringdlg.cpp
+++ b/tdefilereplace/kaddstringdlg.cpp
@@ -25,7 +25,7 @@
 #include <tqwidgetstack.h>
 
 // KDE
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
diff --git a/tdefilereplace/knewprojectdlg.cpp b/tdefilereplace/knewprojectdlg.cpp
index 10402fa8..d21801bd 100644
--- a/tdefilereplace/knewprojectdlg.cpp
+++ b/tdefilereplace/knewprojectdlg.cpp
@@ -29,14 +29,14 @@
 
 //KDE
 #include <kseparator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcharsets.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <klineedit.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
diff --git a/tdefilereplace/koptionsdlg.cpp b/tdefilereplace/koptionsdlg.cpp
index f18681e0..94dab7d4 100644
--- a/tdefilereplace/koptionsdlg.cpp
+++ b/tdefilereplace/koptionsdlg.cpp
@@ -28,7 +28,7 @@
 #include <kcharsets.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 //#include <kdebug.h>
diff --git a/tdefilereplace/main.cpp b/tdefilereplace/main.cpp
index 87cba501..573577e6 100644
--- a/tdefilereplace/main.cpp
+++ b/tdefilereplace/main.cpp
@@ -19,7 +19,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("Batch search and replace tool");
diff --git a/tdefilereplace/report.cpp b/tdefilereplace/report.cpp
index 48e64031..a3b7dfab 100644
--- a/tdefilereplace/report.cpp
+++ b/tdefilereplace/report.cpp
@@ -21,7 +21,7 @@
 
 // KDE
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kuser.h>
 
 // local
diff --git a/tdefilereplace/report.h b/tdefilereplace/report.h
index 2255f240..75c27cb3 100644
--- a/tdefilereplace/report.h
+++ b/tdefilereplace/report.h
@@ -23,7 +23,7 @@
 class TQString;
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include "configurationclasses.h"
 class TDEListView;
 
diff --git a/tdefilereplace/tdefilereplace.cpp b/tdefilereplace/tdefilereplace.cpp
index b96883d9..24ead465 100644
--- a/tdefilereplace/tdefilereplace.cpp
+++ b/tdefilereplace/tdefilereplace.cpp
@@ -17,9 +17,9 @@
 //kde includes
 #include <kedittoolbar.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kkeydialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //app includes
 #include "tdefilereplace.h"
diff --git a/tdefilereplace/tdefilereplacelib.cpp b/tdefilereplace/tdefilereplacelib.cpp
index d638272b..558b9dfb 100644
--- a/tdefilereplace/tdefilereplacelib.cpp
+++ b/tdefilereplace/tdefilereplacelib.cpp
@@ -27,7 +27,7 @@
 
 //KDE
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 
diff --git a/tdefilereplace/tdefilereplacelib.h b/tdefilereplace/tdefilereplacelib.h
index eb83f9a2..74d26ee4 100644
--- a/tdefilereplace/tdefilereplacelib.h
+++ b/tdefilereplace/tdefilereplacelib.h
@@ -22,7 +22,7 @@
 #define TDEFILEREPLACELIB_H
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 class KlistView;
 
 // local
diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp
index 5a0e5520..db98b00d 100644
--- a/tdefilereplace/tdefilereplacepart.cpp
+++ b/tdefilereplace/tdefilereplacepart.cpp
@@ -30,12 +30,12 @@
 #include <tdefiledialog.h>
 #include <kinstance.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/genericfactory.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconeffect.h>
 #include <tdelistview.h>
 #include <kuser.h>
diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp
index 7897d7f5..1d60f3d5 100644
--- a/tdefilereplace/tdefilereplaceview.cpp
+++ b/tdefilereplace/tdefilereplaceview.cpp
@@ -22,8 +22,8 @@
 
 // KDE
 #include <tdelistview.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 #include <kpropertiesdialog.h>
diff --git a/tdefilereplace/whatthis.h b/tdefilereplace/whatthis.h
index 6692d373..cf05cc00 100644
--- a/tdefilereplace/whatthis.h
+++ b/tdefilereplace/whatthis.h
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace whatthisNameSpace
 {
-- 
cgit v1.2.1