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

---
 tdeutils/kcmultidialog.cpp              | 4 ++--
 tdeutils/kcmultidialog.h                | 2 +-
 tdeutils/kfind.cpp                      | 4 ++--
 tdeutils/kfinddialog.cpp                | 4 ++--
 tdeutils/kplugininfo.cpp                | 2 +-
 tdeutils/kpluginselector.cpp            | 6 +++---
 tdeutils/kreplace.cpp                   | 4 ++--
 tdeutils/kreplacedialog.cpp             | 4 ++--
 tdeutils/ksettings/componentsdialog.cpp | 2 +-
 tdeutils/ksettings/dialog.cpp           | 2 +-
 tdeutils/tdecmodulecontainer.cpp        | 2 +-
 tdeutils/tdecmoduleinfo.cpp             | 4 ++--
 tdeutils/tdecmoduleloader.cpp           | 4 ++--
 tdeutils/tdecmoduleproxy.cpp            | 2 +-
 14 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'tdeutils')

diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp
index 9bb067ca0..6a074040b 100644
--- a/tdeutils/kcmultidialog.cpp
+++ b/tdeutils/kcmultidialog.cpp
@@ -31,8 +31,8 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <kstdguiitem.h>
diff --git a/tdeutils/kcmultidialog.h b/tdeutils/kcmultidialog.h
index 46dde98fb..ca6d2d6c7 100644
--- a/tdeutils/kcmultidialog.h
+++ b/tdeutils/kcmultidialog.h
@@ -26,7 +26,7 @@
 #include <tqptrdict.h>
 
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 
 class TDECModuleProxy;
diff --git a/tdeutils/kfind.cpp b/tdeutils/kfind.cpp
index 99ef317b6..74fb46e9a 100644
--- a/tdeutils/kfind.cpp
+++ b/tdeutils/kfind.cpp
@@ -22,8 +22,8 @@
 #include "kfind.h"
 #include "kfinddialog.h"
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqlabel.h>
 #include <tqregexp.h>
 #include <tqstylesheet.h>
diff --git a/tdeutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp
index d9a5284e1..718fdca2f 100644
--- a/tdeutils/kfinddialog.cpp
+++ b/tdeutils/kfinddialog.cpp
@@ -29,8 +29,8 @@
 #include <tqregexp.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <assert.h>
 #include <tqwhatsthis.h>
 
diff --git a/tdeutils/kplugininfo.cpp b/tdeutils/kplugininfo.cpp
index cb93b2600..9ea0eb2bc 100644
--- a/tdeutils/kplugininfo.cpp
+++ b/tdeutils/kplugininfo.cpp
@@ -22,7 +22,7 @@
 #include <ktrader.h>
 #include <kdebug.h>
 #include <tdeconfigbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 #include <kservice.h>
diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp
index 5747df7c4..9fe08b027 100644
--- a/tdeutils/kpluginselector.cpp
+++ b/tdeutils/kpluginselector.cpp
@@ -35,12 +35,12 @@
 #include <tqcstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <ksimpleconfig.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <ktabctl.h>
 #include <tdecmoduleinfo.h>
diff --git a/tdeutils/kreplace.cpp b/tdeutils/kreplace.cpp
index 0aad733da..98e3ce93c 100644
--- a/tdeutils/kreplace.cpp
+++ b/tdeutils/kreplace.cpp
@@ -22,8 +22,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include "kreplace.h"
 #include "kreplacedialog.h"
 #include <tqregexp.h>
diff --git a/tdeutils/kreplacedialog.cpp b/tdeutils/kreplacedialog.cpp
index 88c006b4d..d8e74af44 100644
--- a/tdeutils/kreplacedialog.cpp
+++ b/tdeutils/kreplacedialog.cpp
@@ -26,8 +26,8 @@
 #include <tqlayout.h>
 #include <tqregexp.h>
 #include <kcombobox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 /**
diff --git a/tdeutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp
index 50ad97a03..f60613bce 100644
--- a/tdeutils/ksettings/componentsdialog.cpp
+++ b/tdeutils/ksettings/componentsdialog.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "ksettings/componentsdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tdelistview.h>
 #include <tqlabel.h>
diff --git a/tdeutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp
index 49918b5e7..e74b9ac48 100644
--- a/tdeutils/ksettings/dialog.cpp
+++ b/tdeutils/ksettings/dialog.cpp
@@ -21,7 +21,7 @@
 
 
 #include <kcmultidialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
 #include <ktrader.h>
diff --git a/tdeutils/tdecmodulecontainer.cpp b/tdeutils/tdecmodulecontainer.cpp
index c379a9857..004ceb78a 100644
--- a/tdeutils/tdecmodulecontainer.cpp
+++ b/tdeutils/tdecmodulecontainer.cpp
@@ -30,7 +30,7 @@
 #include <tdecmoduleproxy.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kservice.h>
diff --git a/tdeutils/tdecmoduleinfo.cpp b/tdeutils/tdecmoduleinfo.cpp
index 3a7fdfd63..4869bb1ef 100644
--- a/tdeutils/tdecmoduleinfo.cpp
+++ b/tdeutils/tdecmoduleinfo.cpp
@@ -25,9 +25,9 @@
 
 #include <kdesktopfile.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdecmoduleinfo.h"
 
diff --git a/tdeutils/tdecmoduleloader.cpp b/tdeutils/tdecmoduleloader.cpp
index 73f92379f..ced28ae7a 100644
--- a/tdeutils/tdecmoduleloader.cpp
+++ b/tdeutils/tdecmoduleloader.cpp
@@ -27,8 +27,8 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 
 #include "tdecmoduleloader.h"
diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp
index 2d3150935..eeac43b02 100644
--- a/tdeutils/tdecmoduleproxy.cpp
+++ b/tdeutils/tdecmoduleproxy.cpp
@@ -42,7 +42,7 @@
 #include <tdecmoduleloader.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
-- 
cgit v1.2.1