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

---
 kate/part/kateautoindent.cpp      |  2 +-
 kate/part/katebookmarks.cpp       |  2 +-
 kate/part/katebuffer.cpp          |  2 +-
 kate/part/katecmds.cpp            |  2 +-
 kate/part/kateconfig.cpp          |  4 ++--
 kate/part/katedialogs.cpp         | 10 +++++-----
 kate/part/katedocument.cpp        | 10 +++++-----
 kate/part/katedocument.h          |  2 +-
 kate/part/katedocumenthelpers.cpp |  2 +-
 kate/part/katefactory.cpp         |  2 +-
 kate/part/katefiletype.cpp        |  2 +-
 kate/part/katefont.cpp            |  2 +-
 kate/part/katehighlight.cpp       |  8 ++++----
 kate/part/katejscript.cpp         |  4 ++--
 kate/part/kateluaindentscript.cpp |  4 ++--
 kate/part/kateprinter.cpp         |  2 +-
 kate/part/kateschema.cpp          |  4 ++--
 kate/part/katesearch.cpp          |  4 ++--
 kate/part/katespell.cpp           |  2 +-
 kate/part/katesyntaxdocument.cpp  |  4 ++--
 kate/part/katetextline.cpp        |  2 +-
 kate/part/kateview.cpp            |  8 ++++----
 kate/part/kateviewhelpers.cpp     |  6 +++---
 kate/part/kateviewinternal.cpp    |  2 +-
 kate/part/test_regression.cpp     |  2 +-
 25 files changed, 47 insertions(+), 47 deletions(-)

(limited to 'kate/part')

diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp
index d904e16ce..9bbe317df 100644
--- a/kate/part/kateautoindent.cpp
+++ b/kate/part/kateautoindent.cpp
@@ -27,7 +27,7 @@
 #include "katejscript.h"
 #include "kateview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 
diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp
index 5a1a085c2..f29ec9915 100644
--- a/kate/part/katebookmarks.cpp
+++ b/kate/part/katebookmarks.cpp
@@ -23,7 +23,7 @@
 #include "katedocument.h"
 #include "kateview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>
diff --git a/kate/part/katebuffer.cpp b/kate/part/katebuffer.cpp
index 7d930570d..61f81fadf 100644
--- a/kate/part/katebuffer.cpp
+++ b/kate/part/katebuffer.cpp
@@ -31,7 +31,7 @@
 #include "kateautoindent.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 #include <tqpopupmenu.h>
diff --git a/kate/part/katecmds.cpp b/kate/part/katecmds.cpp
index ad8943328..09dd46f13 100644
--- a/kate/part/katecmds.cpp
+++ b/kate/part/katecmds.cpp
@@ -32,7 +32,7 @@
 #include "../interfaces/katecmd.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kshellcompletion.h>
 
diff --git a/kate/part/kateconfig.cpp b/kate/part/kateconfig.cpp
index 9c8e0856f..ed4eaacd2 100644
--- a/kate/part/kateconfig.cpp
+++ b/kate/part/kateconfig.cpp
@@ -29,9 +29,9 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcharsets.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kfinddialog.h>
 #include <kreplacedialog.h>
 #include <kinstance.h>
diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp
index 03257735c..1b8ce89eb 100644
--- a/kate/part/katedialogs.cpp
+++ b/kate/part/katedialogs.cpp
@@ -53,15 +53,15 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefontdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kkeybutton.h>
 #include <kkeydialog.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetypechooser.h>
 #include <knuminput.h>
 #include <tdeparts/componentfactory.h>
@@ -72,7 +72,7 @@
 #include <krun.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp
index 1928ec225..e42bfb0bd 100644
--- a/kate/part/katedocument.cpp
+++ b/kate/part/katedocument.cpp
@@ -49,24 +49,24 @@
 
 #include <tdeparts/event.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
 #include <kxmlguifactory.h>
 #include <kdialogbase.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <klibloader.h>
 #include <kdirwatch.h>
 #include <twin.h>
 #include <kencodingfiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index a2a2c6408..adc0dc92a 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -38,7 +38,7 @@
 #include <dcopobject.h>
 
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqintdict.h>
 #include <tqmap.h>
diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp
index e50906b0d..b2e43758f 100644
--- a/kate/part/katedocumenthelpers.cpp
+++ b/kate/part/katedocumenthelpers.cpp
@@ -25,7 +25,7 @@
 #include "kateview.h"
 
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KateBrowserExtension::KateBrowserExtension( KateDocument* doc )
 : KParts::BrowserExtension( doc, "katepartbrowserextension" ),
diff --git a/kate/part/katefactory.cpp b/kate/part/katefactory.cpp
index eb760aaff..d6a9e0d59 100644
--- a/kate/part/katefactory.cpp
+++ b/kate/part/katefactory.cpp
@@ -34,7 +34,7 @@
 #include "../interfaces/katecmd.h"
 
 #include <kvmallocator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdirwatch.h>
 #include <kstaticdeleter.h>
 
diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp
index f0b01ef2d..281bf7e2d 100644
--- a/kate/part/katefiletype.cpp
+++ b/kate/part/katefiletype.cpp
@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <tqregexp.h>
diff --git a/kate/part/katefont.cpp b/kate/part/katefont.cpp
index 29955d7e2..c00953469 100644
--- a/kate/part/katefont.cpp
+++ b/kate/part/katefont.cpp
@@ -21,7 +21,7 @@
 
 #include "katefont.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqfontinfo.h>
 
diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp
index f6d5ae315..119b718fb 100644
--- a/kate/part/katehighlight.cpp
+++ b/kate/part/katehighlight.cpp
@@ -33,16 +33,16 @@
 #include "kateconfig.h"
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kregexp.h>
 #include <tdepopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 #include <tdeapplication.h>
 
diff --git a/kate/part/katejscript.cpp b/kate/part/katejscript.cpp
index f3a5cd548..cab335312 100644
--- a/kate/part/katejscript.cpp
+++ b/kate/part/katejscript.cpp
@@ -35,8 +35,8 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 
 #include <kjs/function_object.h>
diff --git a/kate/part/kateluaindentscript.cpp b/kate/part/kateluaindentscript.cpp
index 46cf531a7..375b0b7d4 100644
--- a/kate/part/kateluaindentscript.cpp
+++ b/kate/part/kateluaindentscript.cpp
@@ -32,8 +32,8 @@
 #include <kstandarddirs.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 extern "C" {
 #include <lua.h> 
diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp
index 6f22b2407..e66119747 100644
--- a/kate/part/kateprinter.cpp
+++ b/kate/part/kateprinter.cpp
@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <kdialog.h> // for spacingHint()
 #include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 #include <kurl.h>
 #include <kuser.h> // for loginName
diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp
index 388513f17..5b71c92e8 100644
--- a/kate/part/kateschema.cpp
+++ b/kate/part/kateschema.cpp
@@ -27,7 +27,7 @@
 #include "kateview.h"
 #include "katerenderer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
@@ -35,7 +35,7 @@
 #include <tdefontdialog.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kcolordialog.h>
 #include <tdeapplication.h>
diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp
index 9d0dc896b..930e4d906 100644
--- a/kate/part/katesearch.cpp
+++ b/kate/part/katesearch.cpp
@@ -31,9 +31,9 @@
 #include "kateconfig.h"
 #include "katehighlight.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstringhandler.h>
 #include <kdebug.h>
 #include <kfinddialog.h>
diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp
index fc7e943cf..494e52894 100644
--- a/kate/part/katespell.cpp
+++ b/kate/part/katespell.cpp
@@ -31,7 +31,7 @@
 #include <tdespell.h>
 #include <ksconfig.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 KateSpell::KateSpell( KateView* view )
   : TQObject( view )
diff --git a/kate/part/katesyntaxdocument.cpp b/kate/part/katesyntaxdocument.cpp
index d90f5de73..700daa9da 100644
--- a/kate/part/katesyntaxdocument.cpp
+++ b/kate/part/katesyntaxdocument.cpp
@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 
 #include <tqfile.h>
diff --git a/kate/part/katetextline.cpp b/kate/part/katetextline.cpp
index 6c701e1ed..005892607 100644
--- a/kate/part/katetextline.cpp
+++ b/kate/part/katetextline.cpp
@@ -23,7 +23,7 @@
 #include "katetextline.h"
 #include "katerenderer.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqregexp.h>
 
diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp
index 92d1bb97e..821cb0faf 100644
--- a/kate/part/kateview.cpp
+++ b/kate/part/kateview.cpp
@@ -57,10 +57,10 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kcursor.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kxmlguifactory.h>
@@ -68,7 +68,7 @@
 #include <klibloader.h>
 #include <kencodingfiledialog.h>
 #include <tdemultipledrag.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksavefile.h>
 
 #include <tqfont.h>
diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp
index e8df70aa8..dd52451b0 100644
--- a/kate/part/kateviewhelpers.cpp
+++ b/kate/part/kateviewhelpers.cpp
@@ -33,10 +33,10 @@
 #include "kateviewinternal.h"
 
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 #include <tdepopupmenu.h>
 
diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp
index a687c5523..c2b0ca4db 100644
--- a/kate/part/kateviewinternal.cpp
+++ b/kate/part/kateviewinternal.cpp
@@ -38,7 +38,7 @@
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
 
 #include <tqstyle.h>
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index a503020c3..1b6decfe3 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -45,7 +45,7 @@
 #include <tdeio/job.h>
 #include <tdemainwindow.h>
 #include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqcolor.h>
 #include <tqcursor.h>
-- 
cgit v1.2.3