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

---
 lib/cppparser/driver.cpp                          | 2 +-
 lib/cppparser/errors.cpp                          | 2 +-
 lib/cppparser/lexer.cpp                           | 2 +-
 lib/cppparser/parser.cpp                          | 2 +-
 lib/interfaces/kdevplugin.cpp                     | 2 +-
 lib/util/execcommand.cpp                          | 4 ++--
 lib/util/settings.cpp                             | 2 +-
 lib/util/tdescriptactionmanager.cpp               | 4 ++--
 lib/widgets/flagboxes.cpp                         | 2 +-
 lib/widgets/kdevhtmlpart.cpp                      | 2 +-
 lib/widgets/kdevtabwidget.cpp                     | 4 ++--
 lib/widgets/ksavealldialog.cpp                    | 2 +-
 lib/widgets/processwidget.cpp                     | 2 +-
 lib/widgets/propeditor/pcheckbox.cpp              | 2 +-
 lib/widgets/propeditor/pfontbutton.cpp            | 2 +-
 lib/widgets/propeditor/ppixmapedit.cpp            | 2 +-
 lib/widgets/propeditor/propertyeditor.cpp         | 2 +-
 lib/widgets/propeditor/propertymachinefactory.cpp | 2 +-
 lib/widgets/propeditor/psymbolcombo.cpp           | 2 +-
 lib/widgets/propeditor/pyesnobutton.cpp           | 2 +-
 lib/widgets/resizablecombo.cpp                    | 2 +-
 lib/widgets/tdelistviewaction.cpp                 | 2 +-
 22 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'lib')

diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp
index 0f5174a0..9dda06d2 100644
--- a/lib/cppparser/driver.cpp
+++ b/lib/cppparser/driver.cpp
@@ -24,7 +24,7 @@
 #include "lexer.h"
 #include "parser.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 #include <tqfile.h>
 #include <tqfileinfo.h>
diff --git a/lib/cppparser/errors.cpp b/lib/cppparser/errors.cpp
index 3fc2e697..81c15660 100644
--- a/lib/cppparser/errors.cpp
+++ b/lib/cppparser/errors.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "errors.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") );
 QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") );
diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp
index 4863a4a1..82d43aa9 100644
--- a/lib/cppparser/lexer.cpp
+++ b/lib/cppparser/lexer.cpp
@@ -21,7 +21,7 @@
 #include "lookup.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqregexp.h>
 #include <tqmap.h>
diff --git a/lib/cppparser/parser.cpp b/lib/cppparser/parser.cpp
index 6934675e..fb1cdac1 100644
--- a/lib/cppparser/parser.cpp
+++ b/lib/cppparser/parser.cpp
@@ -29,7 +29,7 @@
 #include <tqasciidict.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace std;
 
diff --git a/lib/interfaces/kdevplugin.cpp b/lib/interfaces/kdevplugin.cpp
index b7bf4f6c..7c978d50 100644
--- a/lib/interfaces/kdevplugin.cpp
+++ b/lib/interfaces/kdevplugin.cpp
@@ -33,7 +33,7 @@
 #include "kdevplugincontroller.h"
 
 #include <tdeaction.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include <tqdom.h>
diff --git a/lib/util/execcommand.cpp b/lib/util/execcommand.cpp
index d62cb2e7..fea82215 100644
--- a/lib/util/execcommand.cpp
+++ b/lib/util/execcommand.cpp
@@ -21,8 +21,8 @@
 
 #include <kprocess.h>
 #include <kprogress.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 ExecCommand::ExecCommand( const TQString& executable, const TQStringList& args, 
                           const TQString& workingDir, const TQStringList& env,
diff --git a/lib/util/settings.cpp b/lib/util/settings.cpp
index 0b05d445..8673b58d 100644
--- a/lib/util/settings.cpp
+++ b/lib/util/settings.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "settings.h"
diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp
index 20242f1a..c4b44894 100644
--- a/lib/util/tdescriptactionmanager.cpp
+++ b/lib/util/tdescriptactionmanager.cpp
@@ -24,8 +24,8 @@
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <scriptinterface.h>
 #include <tdeaction.h>
diff --git a/lib/widgets/flagboxes.cpp b/lib/widgets/flagboxes.cpp
index d0f002be..20fc45be 100644
--- a/lib/widgets/flagboxes.cpp
+++ b/lib/widgets/flagboxes.cpp
@@ -17,7 +17,7 @@
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
 #include <klineedit.h>
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index 494764fe..76697cfa 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -6,7 +6,7 @@
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
 #include <tdemainwindow.h>
diff --git a/lib/widgets/kdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp
index ec749bd2..33c9f733 100644
--- a/lib/widgets/kdevtabwidget.cpp
+++ b/lib/widgets/kdevtabwidget.cpp
@@ -11,8 +11,8 @@
 
 #include <tqpopupmenu.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
 
diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp
index e82788de..be5b658f 100644
--- a/lib/widgets/ksavealldialog.cpp
+++ b/lib/widgets/ksavealldialog.cpp
@@ -21,7 +21,7 @@
 #include <tqlabel.h>
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdelistbox.h>
 #include <tdelistview.h>
diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp
index 5bb0bc4e..4f1e6e83 100644
--- a/lib/widgets/processwidget.cpp
+++ b/lib/widgets/processwidget.cpp
@@ -23,7 +23,7 @@
 #include <tdeversion.h>
 #include <tqdir.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tqpainter.h>
 #include <tqapplication.h>
diff --git a/lib/widgets/propeditor/pcheckbox.cpp b/lib/widgets/propeditor/pcheckbox.cpp
index f3bd2673..6e9c06b7 100644
--- a/lib/widgets/propeditor/pcheckbox.cpp
+++ b/lib/widgets/propeditor/pcheckbox.cpp
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #include "compat_tools.h"
 #endif
diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp
index de850890..8932c4ae 100644
--- a/lib/widgets/propeditor/pfontbutton.cpp
+++ b/lib/widgets/propeditor/pfontbutton.cpp
@@ -26,7 +26,7 @@
 #include <tdefontrequester.h>
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #include "compat_tools.h"
 #endif
diff --git a/lib/widgets/propeditor/ppixmapedit.cpp b/lib/widgets/propeditor/ppixmapedit.cpp
index e7980d66..452b9637 100644
--- a/lib/widgets/propeditor/ppixmapedit.cpp
+++ b/lib/widgets/propeditor/ppixmapedit.cpp
@@ -27,7 +27,7 @@
 #include <tqcursor.h>
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #include "compat_tools.h"
 #endif
diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp
index 1bf3adc9..e9bd4786 100644
--- a/lib/widgets/propeditor/propertyeditor.cpp
+++ b/lib/widgets/propeditor/propertyeditor.cpp
@@ -20,7 +20,7 @@
 #include "propertyeditor.h"
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #else
diff --git a/lib/widgets/propeditor/propertymachinefactory.cpp b/lib/widgets/propeditor/propertymachinefactory.cpp
index e8390e18..882964bc 100644
--- a/lib/widgets/propeditor/propertymachinefactory.cpp
+++ b/lib/widgets/propeditor/propertymachinefactory.cpp
@@ -20,7 +20,7 @@
 #include "propertymachinefactory.h"
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #define i18n TQObject::tr
 #endif
diff --git a/lib/widgets/propeditor/psymbolcombo.cpp b/lib/widgets/propeditor/psymbolcombo.cpp
index f4f947f5..ee91ea48 100644
--- a/lib/widgets/propeditor/psymbolcombo.cpp
+++ b/lib/widgets/propeditor/psymbolcombo.cpp
@@ -25,7 +25,7 @@
 
 #ifndef PURE_QT
 #include <kcharselect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include <tqdialog.h>
diff --git a/lib/widgets/propeditor/pyesnobutton.cpp b/lib/widgets/propeditor/pyesnobutton.cpp
index 308570be..dae82868 100644
--- a/lib/widgets/propeditor/pyesnobutton.cpp
+++ b/lib/widgets/propeditor/pyesnobutton.cpp
@@ -24,7 +24,7 @@
 #include <tqpushbutton.h>
 
 #ifndef PURE_QT
-#include <klocale.h>
+#include <tdelocale.h>
 #else
 #include "compat_tools.h"
 #endif
diff --git a/lib/widgets/resizablecombo.cpp b/lib/widgets/resizablecombo.cpp
index aba2f658..ef96e724 100644
--- a/lib/widgets/resizablecombo.cpp
+++ b/lib/widgets/resizablecombo.cpp
@@ -26,7 +26,7 @@
 #include <tqapplication.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char * resize_xpm[] = {
 "9 18 2 1",
diff --git a/lib/widgets/tdelistviewaction.cpp b/lib/widgets/tdelistviewaction.cpp
index bfd73887..978eb220 100644
--- a/lib/widgets/tdelistviewaction.cpp
+++ b/lib/widgets/tdelistviewaction.cpp
@@ -24,7 +24,7 @@
 #include <tqwhatsthis.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 TDEListViewAction::~TDEListViewAction()
 {
-- 
cgit v1.2.1