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

---
 quanta/components/csseditor/colorrequester.cpp           | 2 +-
 quanta/components/csseditor/colorslider.cpp              | 2 +-
 quanta/components/csseditor/csseditor.cpp                | 2 +-
 quanta/components/csseditor/cssselector.cpp              | 4 ++--
 quanta/components/csseditor/encodingselector.cpp         | 2 +-
 quanta/components/csseditor/fontfamilychooser.cpp        | 4 ++--
 quanta/components/csseditor/propertysetter.cpp           | 2 +-
 quanta/components/csseditor/styleeditor.cpp              | 2 +-
 quanta/components/csseditor/stylesheetparser.cpp         | 2 +-
 quanta/components/csseditor/tlpeditors.cpp               | 2 +-
 quanta/components/cvsservice/cvsservice.cpp              | 4 ++--
 quanta/components/debugger/backtracelistview.cpp         | 2 +-
 quanta/components/debugger/dbgp/dbgpnetwork.cpp          | 2 +-
 quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp   | 4 ++--
 quanta/components/debugger/debuggerbreakpointview.cpp    | 2 +-
 quanta/components/debugger/debuggermanager.cpp           | 4 ++--
 quanta/components/debugger/debuggerui.cpp                | 2 +-
 quanta/components/debugger/debuggervariable.cpp          | 2 +-
 quanta/components/debugger/gubed/quantadebuggergubed.cpp | 2 +-
 quanta/components/debugger/interfaces/debuggerclient.cpp | 4 ++--
 quanta/components/debugger/pathmapper.cpp                | 2 +-
 quanta/components/debugger/quantadebuggerinterface.cpp   | 4 ++--
 quanta/components/debugger/variableslistview.cpp         | 2 +-
 quanta/components/framewizard/fmfpeditor.cpp             | 2 +-
 quanta/components/framewizard/framewizard.cpp            | 4 ++--
 quanta/components/tableeditor/tableeditor.cpp            | 4 ++--
 26 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'quanta/components')

diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp
index 043e3470..2548917b 100644
--- a/quanta/components/csseditor/colorrequester.cpp
+++ b/quanta/components/csseditor/colorrequester.cpp
@@ -21,7 +21,7 @@
 #include <tqtooltip.h>
 #include <tqiconset.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaccel.h>
 
 #include "propertysetter.h"
diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp
index 411f056c..d8d2b0f6 100644
--- a/quanta/components/csseditor/colorslider.cpp
+++ b/quanta/components/csseditor/colorslider.cpp
@@ -18,7 +18,7 @@
 #include <tqvbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "colorslider.h"
 #include "propertysetter.h"
diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp
index 9b84bd6a..c449b184 100644
--- a/quanta/components/csseditor/csseditor.cpp
+++ b/quanta/components/csseditor/csseditor.cpp
@@ -25,7 +25,7 @@
 #include <tqfileinfo.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
 #include <kstandarddirs.h>
diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp
index b1da7961..1124273e 100644
--- a/quanta/components/csseditor/cssselector.cpp
+++ b/quanta/components/csseditor/cssselector.cpp
@@ -30,9 +30,9 @@
 #include <tqwhatsthis.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include "project.h"
diff --git a/quanta/components/csseditor/encodingselector.cpp b/quanta/components/csseditor/encodingselector.cpp
index ad5b958b..2f1bc6f2 100644
--- a/quanta/components/csseditor/encodingselector.cpp
+++ b/quanta/components/csseditor/encodingselector.cpp
@@ -18,7 +18,7 @@
 
 
 #include "encodingselector.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h> 
 #include <tqtextcodec.h>
 
diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp
index 6a390340..7f62599e 100644
--- a/quanta/components/csseditor/fontfamilychooser.cpp
+++ b/quanta/components/csseditor/fontfamilychooser.cpp
@@ -20,12 +20,12 @@
 #include <tqstringlist.h>
 #include <tqlistbox.h>
 #include <tqfont.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqiconset.h>
 #include <tqpixmap.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqregexp.h>
 #include <tqlineedit.h>
 #include <tqwhatsthis.h>
diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp
index 922c7dbe..cbaabe5c 100644
--- a/quanta/components/csseditor/propertysetter.cpp
+++ b/quanta/components/csseditor/propertysetter.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 
diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp
index e39e5564..d40812ed 100644
--- a/quanta/components/csseditor/styleeditor.cpp
+++ b/quanta/components/csseditor/styleeditor.cpp
@@ -22,7 +22,7 @@
 //kde includes
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kurl.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp
index 0b80caa2..6ae436ff 100644
--- a/quanta/components/csseditor/stylesheetparser.cpp
+++ b/quanta/components/csseditor/stylesheetparser.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "stylesheetparser.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 static const TQString msg1(i18n("has not been closed")),
diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp
index ab70afd6..e5c3c2ff 100644
--- a/quanta/components/csseditor/tlpeditors.cpp
+++ b/quanta/components/csseditor/tlpeditors.cpp
@@ -25,7 +25,7 @@
 #include <kurl.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kimagefilepreview.h>
 
diff --git a/quanta/components/cvsservice/cvsservice.cpp b/quanta/components/cvsservice/cvsservice.cpp
index df0e916b..735eb2c8 100644
--- a/quanta/components/cvsservice/cvsservice.cpp
+++ b/quanta/components/cvsservice/cvsservice.cpp
@@ -29,8 +29,8 @@
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 
 // CvsService
diff --git a/quanta/components/debugger/backtracelistview.cpp b/quanta/components/debugger/backtracelistview.cpp
index 0c0afdc7..637f76a4 100644
--- a/quanta/components/debugger/backtracelistview.cpp
+++ b/quanta/components/debugger/backtracelistview.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
diff --git a/quanta/components/debugger/dbgp/dbgpnetwork.cpp b/quanta/components/debugger/dbgp/dbgpnetwork.cpp
index 4454f0d7..7730960d 100644
--- a/quanta/components/debugger/dbgp/dbgpnetwork.cpp
+++ b/quanta/components/debugger/dbgp/dbgpnetwork.cpp
@@ -22,7 +22,7 @@
 #include <kserversocket.h>
 #include <kstreamsocket.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 DBGpNetwork::DBGpNetwork()
 : TQObject()
diff --git a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
index 3fe2f972..6e2ec6ce 100644
--- a/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
+++ b/quanta/components/debugger/dbgp/quantadebuggerdbgp.cpp
@@ -18,9 +18,9 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
diff --git a/quanta/components/debugger/debuggerbreakpointview.cpp b/quanta/components/debugger/debuggerbreakpointview.cpp
index e32c0de8..d36fecf8 100644
--- a/quanta/components/debugger/debuggerbreakpointview.cpp
+++ b/quanta/components/debugger/debuggerbreakpointview.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
diff --git a/quanta/components/debugger/debuggermanager.cpp b/quanta/components/debugger/debuggermanager.cpp
index bdab1245..ff41b764 100644
--- a/quanta/components/debugger/debuggermanager.cpp
+++ b/quanta/components/debugger/debuggermanager.cpp
@@ -19,11 +19,11 @@
 #include <tdetexteditor/markinterfaceextension.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <tdeparts/componentfactory.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <qextfileinfo.h>
 #include <kinputdialog.h>
 #include <tqlineedit.h>
diff --git a/quanta/components/debugger/debuggerui.cpp b/quanta/components/debugger/debuggerui.cpp
index faf844bc..9f512460 100644
--- a/quanta/components/debugger/debuggerui.cpp
+++ b/quanta/components/debugger/debuggerui.cpp
@@ -19,7 +19,7 @@
 
 #include <kiconloader.h>
 #include <kdockwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqstring.h>
 #include <tdehtmlview.h>
diff --git a/quanta/components/debugger/debuggervariable.cpp b/quanta/components/debugger/debuggervariable.cpp
index 390290a7..219f607d 100644
--- a/quanta/components/debugger/debuggervariable.cpp
+++ b/quanta/components/debugger/debuggervariable.cpp
@@ -17,7 +17,7 @@
 
 #include "debuggervariable.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 DebuggerVariable::DebuggerVariable()
     : m_isReference(false)
diff --git a/quanta/components/debugger/gubed/quantadebuggergubed.cpp b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
index 872e1707..14d46941 100644
--- a/quanta/components/debugger/gubed/quantadebuggergubed.cpp
+++ b/quanta/components/debugger/gubed/quantadebuggergubed.cpp
@@ -17,7 +17,7 @@
 #include <kdebug.h>
 #include <kserversocket.h>
 #include <kstreamsocket.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <tqlineedit.h>
 #include <tqslider.h>
diff --git a/quanta/components/debugger/interfaces/debuggerclient.cpp b/quanta/components/debugger/interfaces/debuggerclient.cpp
index 97140dbb..38ab9b67 100644
--- a/quanta/components/debugger/interfaces/debuggerclient.cpp
+++ b/quanta/components/debugger/interfaces/debuggerclient.cpp
@@ -18,8 +18,8 @@
 #include "debuggerclient.h"
 #include "debuggerinterface.h"
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 // CTor
diff --git a/quanta/components/debugger/pathmapper.cpp b/quanta/components/debugger/pathmapper.cpp
index c38e2fec..23cc6171 100644
--- a/quanta/components/debugger/pathmapper.cpp
+++ b/quanta/components/debugger/pathmapper.cpp
@@ -22,7 +22,7 @@
 #include "project.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <qextfileinfo.h>
 #include <tqdom.h>
diff --git a/quanta/components/debugger/quantadebuggerinterface.cpp b/quanta/components/debugger/quantadebuggerinterface.cpp
index 83f5ce0c..b73ae953 100644
--- a/quanta/components/debugger/quantadebuggerinterface.cpp
+++ b/quanta/components/debugger/quantadebuggerinterface.cpp
@@ -17,9 +17,9 @@
 
 #include <tdetexteditor/document.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "debuggerinterface.h"
 #include "quantadebuggerinterface.h"
diff --git a/quanta/components/debugger/variableslistview.cpp b/quanta/components/debugger/variableslistview.cpp
index 04eb90a1..4799afe4 100644
--- a/quanta/components/debugger/variableslistview.cpp
+++ b/quanta/components/debugger/variableslistview.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 // KDE Includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
diff --git a/quanta/components/framewizard/fmfpeditor.cpp b/quanta/components/framewizard/fmfpeditor.cpp
index a191cd19..2815e280 100644
--- a/quanta/components/framewizard/fmfpeditor.cpp
+++ b/quanta/components/framewizard/fmfpeditor.cpp
@@ -23,7 +23,7 @@
 #include <kurlrequester.h>
 #include <tqstringlist.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 //#include <kpreviewwidgetbase.h> 
 
 /*class PreviewWidget : public KPreviewWidgetBase {
diff --git a/quanta/components/framewizard/framewizard.cpp b/quanta/components/framewizard/framewizard.cpp
index 08ee1090..97cfadf0 100644
--- a/quanta/components/framewizard/framewizard.cpp
+++ b/quanta/components/framewizard/framewizard.cpp
@@ -18,9 +18,9 @@
 #include "framewizard.h"
 #include "fmrceditor.h"
 #include "fmfpeditor.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 //#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpushbutton.h>
 
 #include "fwglobal.h"
diff --git a/quanta/components/tableeditor/tableeditor.cpp b/quanta/components/tableeditor/tableeditor.cpp
index fe1d201f..f5f6ec31 100644
--- a/quanta/components/tableeditor/tableeditor.cpp
+++ b/quanta/components/tableeditor/tableeditor.cpp
@@ -16,8 +16,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <tdepopupmenu.h>
 #include <kpushbutton.h>
-- 
cgit v1.2.1