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

---
 kxsldbg/kxsldbg.cpp                              | 4 ++--
 kxsldbg/kxsldbgpart/kxsldbg_part.cpp             | 2 +-
 kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp      | 2 +-
 kxsldbg/kxsldbgpart/libxsldbg/options.cpp        | 2 +-
 kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp         | 2 +-
 kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h           | 2 +-
 kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp | 2 +-
 kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp    | 2 +-
 kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp         | 2 +-
 kxsldbg/kxsldbgpart/xsldbgdebugger.cpp           | 2 +-
 kxsldbg/kxsldbgpart/xsldbginspector.cpp          | 2 +-
 kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp      | 2 +-
 kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp | 2 +-
 kxsldbg/kxsldbgpart/xsldbgoutputview.cpp         | 2 +-
 kxsldbg/main.cpp                                 | 2 +-
 kxsldbg/xsldbgmain.cpp                           | 4 ++--
 16 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'kxsldbg')

diff --git a/kxsldbg/kxsldbg.cpp b/kxsldbg/kxsldbg.cpp
index f0f7c4d8..465bd8af 100644
--- a/kxsldbg/kxsldbg.cpp
+++ b/kxsldbg/kxsldbg.cpp
@@ -7,7 +7,7 @@
 
 #include <kkeydialog.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kedittoolbar.h>
 
@@ -15,7 +15,7 @@
 #include <kstdaction.h>
 
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 
 KXsldbg::KXsldbg()
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
index 7b69ec0c..870ff927 100644
--- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
+++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp
@@ -22,7 +22,7 @@
 #include <kinstance.h>
 #include <kiconloader.h>
 #include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 #if KDE_IS_VERSION(3,1,90)
 #include <kinputdialog.h>
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
index 79ff678e..8593ab6b 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/help_unix.cpp
@@ -27,7 +27,7 @@
 #include "help.h"
 #include "files.h"
 #include <stdlib.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h> 
 
 /**
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
index 525c3728..196f2ba9 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/options.cpp
@@ -23,7 +23,7 @@
 #include "arraylist.h"
 #include "xsldbgmsg.h"
 #include "utils.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h> 
 #include <tqfileinfo.h>
 #include <tqstringlist.h>
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
index 6d9fe60e..46e270df 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.cpp
@@ -100,7 +100,7 @@
 #include <libexslt/exsltconfig.h>
 
 #include <tdecmdlineargs.h> 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqfile.h>
 
 #ifdef WIN32
diff --git a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h
index 26abeb49..27250e31 100644
--- a/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h
+++ b/kxsldbg/kxsldbgpart/libxsldbg/xsldbg.h
@@ -81,7 +81,7 @@
 #include <libxslt/xsltutils.h>
 
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "breakpoint.h"
 
diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp
index a94e3a0f..05e59b8c 100644
--- a/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointlistitem.cpp
@@ -15,7 +15,7 @@
  *                                                                         										*
  ************************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "xsldbgbreakpointlistitem.h"
 
 XsldbgBreakpointListItem::XsldbgBreakpointListItem(TQListView *parent,
diff --git a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp
index ba14d115..453b4f60 100644
--- a/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgbreakpointsimpl.cpp
@@ -15,7 +15,7 @@
  *                                                                         										*
  ************************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlistview.h>
 #include <tqlineedit.h>
 #include <tqmessagebox.h>
diff --git a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
index ddf862ca..ade07c6e 100644
--- a/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgconfigimpl.cpp
@@ -15,7 +15,7 @@
  *                                                                         										*
  ************************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 
 #include <tqdialog.h>
diff --git a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
index deead4fa..a9521964 100644
--- a/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgdebugger.cpp
@@ -15,7 +15,7 @@
  *                                                                         										*
  ************************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include <libxml/tree.h>
diff --git a/kxsldbg/kxsldbgpart/xsldbginspector.cpp b/kxsldbg/kxsldbgpart/xsldbginspector.cpp
index d280adbd..8b1a2734 100644
--- a/kxsldbg/kxsldbgpart/xsldbginspector.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbginspector.cpp
@@ -8,7 +8,7 @@
 
 #include "xsldbginspector.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqvariant.h>
 #include <tqlistbox.h>
diff --git a/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp b/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp
index 0d27f916..3d0725b1 100644
--- a/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbglocallistitem.cpp
@@ -16,7 +16,7 @@
  ************************************************************************************/ 
  
 #include "xsldbglocallistitem.h" 
-#include <klocale.h>
+#include <tdelocale.h>
  
 XsldbgLocalListItem::XsldbgLocalListItem(TQListView *parent, TQString fileName, int lineNumber, 
 	TQString localName, TQString templateContext, TQString selectXPath, bool localVariable) 
diff --git a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp
index fa8c756b..7f3e857d 100644
--- a/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbglocalvariablesimpl.cpp
@@ -23,7 +23,7 @@
 #include "xsldbglocalvariablesimpl.h" 
 #include "xsldbglocallistitem.h" 
 #include "xsldbgdebugger.h"
-#include <klocale.h> 
+#include <tdelocale.h> 
  
  
 XsldbgLocalVariablesImpl::XsldbgLocalVariablesImpl(XsldbgDebugger *debugger, 
diff --git a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
index ae3531a5..1b6ee2bc 100644
--- a/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
+++ b/kxsldbg/kxsldbgpart/xsldbgoutputview.cpp
@@ -19,7 +19,7 @@
   *@author Keith Isdale
   */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqmessagebox.h>
diff --git a/kxsldbg/main.cpp b/kxsldbg/main.cpp
index 46653c1a..f90cfb77 100644
--- a/kxsldbg/main.cpp
+++ b/kxsldbg/main.cpp
@@ -2,7 +2,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 static const char *description =
diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp
index 8c5ee55e..fb9b619d 100644
--- a/kxsldbg/xsldbgmain.cpp
+++ b/kxsldbg/xsldbgmain.cpp
@@ -37,8 +37,8 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 /* Forward delare private functions */
 static int notifyXsldbgAppSimple(XsldbgMessageEnum type, const void *data);
-- 
cgit v1.2.1