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

---
 src/Mainpage.dox                           |  2 +-
 src/core.cpp                               |  2 +-
 src/editorproxy.cpp                        |  2 +-
 src/generalinfowidget.cpp                  |  4 ++--
 src/kdevideextension.cpp                   |  2 +-
 src/languageselectwidget.cpp               |  4 ++--
 src/main.cpp                               |  2 +-
 src/main_assistant.cpp                     |  2 +-
 src/mainwindowshare.cpp                    |  4 ++--
 src/newui/button.cpp                       |  2 +-
 src/newui/buttonbar.cpp                    |  2 +-
 src/newui/ddockwindow.cpp                  |  4 ++--
 src/partcontroller.cpp                     |  6 +++---
 src/plugincontroller.cpp                   |  4 ++--
 src/profileengine/editor/profileeditor.cpp |  6 +++---
 src/profileengine/lib/profileengine.cpp    |  2 +-
 src/projectmanager.cpp                     | 10 +++++-----
 src/projectsession.cpp                     |  4 ++--
 src/simplemainwindow.cpp                   |  6 +++---
 src/splashscreen.cpp                       |  4 ++--
 src/statusbar.cpp                          |  4 ++--
 21 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'src')

diff --git a/src/Mainpage.dox b/src/Mainpage.dox
index 3fcece64..2f055d1b 100644
--- a/src/Mainpage.dox
+++ b/src/Mainpage.dox
@@ -20,7 +20,7 @@ Example:
     #include <tdeaboutdata.h>
     #include <tdeapplication.h>
     #include <tdecmdlineargs.h>
-    #include <klocale.h>
+    #include <tdelocale.h>
     #include <dcopclient.h>
     
     #include <splashscreen.h>
diff --git a/src/core.cpp b/src/core.cpp
index bdac9e49..ccdd0ace 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -8,7 +8,7 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeactioncollection.h>
 
 #include "toplevel.h"
diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp
index 82c5260b..73ff852b 100644
--- a/src/editorproxy.cpp
+++ b/src/editorproxy.cpp
@@ -20,7 +20,7 @@
 #include <kxmlguifactory.h>
 #include <tdemainwindow.h>
 #include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdestdaccel.h>
 
 #include "toplevel.h"
diff --git a/src/generalinfowidget.cpp b/src/generalinfowidget.cpp
index d84bc1e8..794ab8cd 100644
--- a/src/generalinfowidget.cpp
+++ b/src/generalinfowidget.cpp
@@ -16,11 +16,11 @@
 #include <tqdir.h>
 
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kcharsets.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "generalinfowidget.h"
 #include "generalinfowidget.moc"
diff --git a/src/kdevideextension.cpp b/src/kdevideextension.cpp
index 91548490..b669d717 100644
--- a/src/kdevideextension.cpp
+++ b/src/kdevideextension.cpp
@@ -26,7 +26,7 @@
 #include <tqcombobox.h>
 #include <klineedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp
index 6ba3ecd1..38b72e2a 100644
--- a/src/languageselectwidget.cpp
+++ b/src/languageselectwidget.cpp
@@ -21,8 +21,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kservice.h>
 #include <ktrader.h>
 #include <tdeapplication.h>
diff --git a/src/main.cpp b/src/main.cpp
index 37f178df..ef11d967 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,7 +3,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp
index 334aa8f1..f6b27273 100644
--- a/src/main_assistant.cpp
+++ b/src/main_assistant.cpp
@@ -3,7 +3,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp
index 6370dfdf..c77f05ac 100644
--- a/src/mainwindowshare.cpp
+++ b/src/mainwindowshare.cpp
@@ -27,13 +27,13 @@
 #include <tdeaboutdata.h>
 #include <kstdaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <tdeparts/mainwindow.h>
 #include <kdialogbase.h>
 #include <tdeconfig.h>
 #include <kkeydialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kedittoolbar.h>
 #include <kbugreport.h>
 #include <kurlrequester.h>
diff --git a/src/newui/button.cpp b/src/newui/button.cpp
index 332147e3..83fa358d 100644
--- a/src/newui/button.cpp
+++ b/src/newui/button.cpp
@@ -31,7 +31,7 @@
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 
diff --git a/src/newui/buttonbar.cpp b/src/newui/buttonbar.cpp
index 13afb6c0..0218a2dc 100644
--- a/src/newui/buttonbar.cpp
+++ b/src/newui/buttonbar.cpp
@@ -24,7 +24,7 @@
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "button.h"
 
diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp
index 6e90e6b3..11e917e1 100644
--- a/src/newui/ddockwindow.cpp
+++ b/src/newui/ddockwindow.cpp
@@ -28,10 +28,10 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp
index cc3c699e..21b78a8c 100644
--- a/src/partcontroller.cpp
+++ b/src/partcontroller.cpp
@@ -17,8 +17,8 @@
 #include <tdeapplication.h>
 #include <krun.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/part.h>
 #include <tdeparts/factory.h>
 #include <tdeparts/partmanager.h>
@@ -26,7 +26,7 @@
 #include <tdefiledialog.h>
 #include <tdemainwindow.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <tdehtml_part.h>
 #include <tdepopupmenu.h>
diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp
index 8a3da03f..30aa9171 100644
--- a/src/plugincontroller.cpp
+++ b/src/plugincontroller.cpp
@@ -6,9 +6,9 @@
 #include <klibloader.h>
 #include <kservice.h>
 #include <ktrader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
 #include <tdeparts/componentfactory.h>
 #include <assert.h>
diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp
index bb887f39..0fa5d5fe 100644
--- a/src/profileengine/editor/profileeditor.cpp
+++ b/src/profileengine/editor/profileeditor.cpp
@@ -28,10 +28,10 @@
 #include <tdelistbox.h>
 #include <tdelistview.h>
 #include <kcombobox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeversion.h>
 
 #include <profile.h>
diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp
index e811740c..51131566 100644
--- a/src/profileengine/lib/profileengine.cpp
+++ b/src/profileengine/lib/profileengine.cpp
@@ -22,7 +22,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <kdevplugin.h>
diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp
index 5190fb7c..c0380ffb 100644
--- a/src/projectmanager.cpp
+++ b/src/projectmanager.cpp
@@ -10,9 +10,9 @@
 
 class TQDomDocument;
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 #include <ktrader.h>
 #include <tdefiledialog.h>
@@ -22,11 +22,11 @@ class TQDomDocument;
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kprocess.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
-#include <kmenubar.h>
+#include <tdetempfile.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kiconloader.h>
 
diff --git a/src/projectsession.cpp b/src/projectsession.cpp
index 0448521c..4db00f06 100644
--- a/src/projectsession.cpp
+++ b/src/projectsession.cpp
@@ -22,8 +22,8 @@
 
 #include <tdeparts/part.h>
 #include <kurl.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/document.h>
diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp
index fae441a7..45545089 100644
--- a/src/simplemainwindow.cpp
+++ b/src/simplemainwindow.cpp
@@ -25,9 +25,9 @@
 #include <kstdaction.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kedittoolbar.h>
 #include <tdetexteditor/view.h>
diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp
index 4ec02322..205656bd 100644
--- a/src/splashscreen.cpp
+++ b/src/splashscreen.cpp
@@ -7,8 +7,8 @@
 #include <tqtimer.h>
 #include <tqfont.h>
 
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 
 KDevSplashScreen::KDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f)
 {
diff --git a/src/statusbar.cpp b/src/statusbar.cpp
index 08a5cab2..65c6c819 100644
--- a/src/statusbar.cpp
+++ b/src/statusbar.cpp
@@ -16,8 +16,8 @@
 #include <tqfontmetrics.h>
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdeversion.h>
-- 
cgit v1.2.1