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

---
 khexedit/bitswapwidget.cc                      | 2 +-
 khexedit/chartabledialog.cc                    | 4 ++--
 khexedit/conversion.cc                         | 2 +-
 khexedit/converterdialog.cc                    | 2 +-
 khexedit/dialog.cc                             | 4 ++--
 khexedit/exportdialog.cc                       | 4 ++--
 khexedit/fileinfodialog.cc                     | 6 +++---
 khexedit/hexbuffer.cc                          | 6 +++---
 khexedit/hexeditorwidget.cc                    | 8 ++++----
 khexedit/hexeditstate.h                        | 2 +-
 khexedit/hexerror.cc                           | 2 +-
 khexedit/hexmanagerwidget.cc                   | 2 +-
 khexedit/hextoolwidget.cc                      | 2 +-
 khexedit/hexviewwidget.cc                      | 4 ++--
 khexedit/lib/codecs/ktextcharcodec.cpp         | 4 ++--
 khexedit/lib/kbufferdrag.cpp                   | 4 ++--
 khexedit/lib/kcharcolumn.cpp                   | 4 ++--
 khexedit/lib/khexedit.cpp                      | 2 +-
 khexedit/main.cc                               | 2 +-
 khexedit/optiondialog.cc                       | 4 ++--
 khexedit/parts/kbytesedit/kbyteseditwidget.cpp | 2 +-
 khexedit/parts/kpart/khepart.cpp               | 4 ++--
 khexedit/parts/kpart/khepartfactory.cpp        | 2 +-
 khexedit/printdialogpage.cc                    | 2 +-
 khexedit/searchbar.cc                          | 2 +-
 khexedit/statusbarprogress.cc                  | 4 ++--
 khexedit/stringdialog.cc                       | 6 +++---
 khexedit/toplevel.cc                           | 4 ++--
 28 files changed, 48 insertions(+), 48 deletions(-)

(limited to 'khexedit')

diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc
index 337b447..e281d2b 100644
--- a/khexedit/bitswapwidget.cc
+++ b/khexedit/bitswapwidget.cc
@@ -20,7 +20,7 @@
 
 #include <tqpainter.h>
  
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "bitswapwidget.h"
 
diff --git a/khexedit/chartabledialog.cc b/khexedit/chartabledialog.cc
index 933fa7e..a46bee0 100644
--- a/khexedit/chartabledialog.cc
+++ b/khexedit/chartabledialog.cc
@@ -25,8 +25,8 @@
 #include <tqlayout.h>
 #include <tqspinbox.h>
 
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 
 #include "chartabledialog.h"
diff --git a/khexedit/conversion.cc b/khexedit/conversion.cc
index 7eeea5d..a0b6195 100644
--- a/khexedit/conversion.cc
+++ b/khexedit/conversion.cc
@@ -20,7 +20,7 @@
 
 #include <string.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "conversion.h"
 
diff --git a/khexedit/converterdialog.cc b/khexedit/converterdialog.cc
index 6f3a82e..e742e73 100644
--- a/khexedit/converterdialog.cc
+++ b/khexedit/converterdialog.cc
@@ -22,7 +22,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "converterdialog.h"
 #include "hexvalidator.h"
diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc
index ce9b615..c2f2d80 100644
--- a/khexedit/dialog.cc
+++ b/khexedit/dialog.cc
@@ -28,8 +28,8 @@
 #include <tqvalidator.h>
 
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 #include <kstdguiitem.h>
 
diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cc
index 25ee291..2cdfae7 100644
--- a/khexedit/exportdialog.cc
+++ b/khexedit/exportdialog.cc
@@ -23,8 +23,8 @@
 #include <tqlineedit.h> 
 
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "dialog.h"
 #include "exportdialog.h"
diff --git a/khexedit/fileinfodialog.cc b/khexedit/fileinfodialog.cc
index bfa7ff2..96fb060 100644
--- a/khexedit/fileinfodialog.cc
+++ b/khexedit/fileinfodialog.cc
@@ -22,9 +22,9 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <kglobalsettings.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "fileinfodialog.h"
 #include "listview.h"
diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc
index 8a516a8..83cfa84 100644
--- a/khexedit/hexbuffer.cc
+++ b/khexedit/hexbuffer.cc
@@ -26,9 +26,9 @@
 
 #include <tqfileinfo.h>
 
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <knotifyclient.h>
 
 #include "hexbuffer.h"
diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index dc75008..09a9407 100644
--- a/khexedit/hexeditorwidget.cc
+++ b/khexedit/hexeditorwidget.cc
@@ -25,11 +25,11 @@
 #undef Unsorted
 
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 
diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h
index 82d7970..47ace2c 100644
--- a/khexedit/hexeditstate.h
+++ b/khexedit/hexeditstate.h
@@ -24,7 +24,7 @@
 #include <tdeapplication.h>
 #include <tqfont.h> 
 #include <tqpalette.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 
 class SDisplayLine
diff --git a/khexedit/hexerror.cc b/khexedit/hexerror.cc
index ed05b4b..6549f1d 100644
--- a/khexedit/hexerror.cc
+++ b/khexedit/hexerror.cc
@@ -18,7 +18,7 @@
  *
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "hexerror.h"
 
diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cc
index 8c4c00d..a8d4bed 100644
--- a/khexedit/hexmanagerwidget.cc
+++ b/khexedit/hexmanagerwidget.cc
@@ -18,7 +18,7 @@
  *
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include "hexmanagerwidget.h"
 #include "searchbar.h"
diff --git a/khexedit/hextoolwidget.cc b/khexedit/hextoolwidget.cc
index d3a17f0..fd5aeb1 100644
--- a/khexedit/hextoolwidget.cc
+++ b/khexedit/hextoolwidget.cc
@@ -19,7 +19,7 @@
  */
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "hextoolwidget.h"
 #include <tqlabel.h>
diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index 7e50919..a031703 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -24,8 +24,8 @@
 #include <tqdrawutil.h>
 
 
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kurldrag.h>
diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp
index 6b27670..22c065d 100644
--- a/khexedit/lib/codecs/ktextcharcodec.cpp
+++ b/khexedit/lib/codecs/ktextcharcodec.cpp
@@ -18,8 +18,8 @@
 // qt specific
 #include "tqtextcodec.h"
 // kde specific
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 // lib specific
 #include "ktextcharcodec.h"
diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp
index 83d2afc..1d7cec9 100644
--- a/khexedit/lib/kbufferdrag.cpp
+++ b/khexedit/lib/kbufferdrag.cpp
@@ -19,8 +19,8 @@
 #include <tqcstring.h>
 #include <tqtextcodec.h>
 // kde specific
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 // lib specific
 #include "kbordercoltextexport.h"
 #include "koffsetcoltextexport.h"
diff --git a/khexedit/lib/kcharcolumn.cpp b/khexedit/lib/kcharcolumn.cpp
index a075d05..8fbffbb 100644
--- a/khexedit/lib/kcharcolumn.cpp
+++ b/khexedit/lib/kcharcolumn.cpp
@@ -21,8 +21,8 @@
 #include <tqpainter.h>
 // kde specific
 #include <kcharsets.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 // lib specific
 #include "kcolumnsview.h"
 #include "kbuffercursor.h"
diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp
index edba5d7..4873fa3 100644
--- a/khexedit/lib/khexedit.cpp
+++ b/khexedit/lib/khexedit.cpp
@@ -30,7 +30,7 @@
 #include <tqapplication.h>
 // kde specific
 #ifndef TQT_ONLY
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #endif
 // lib specific
 #include "kdatabuffer.h"
diff --git a/khexedit/main.cc b/khexedit/main.cc
index 5a054bf..56b50d2 100644
--- a/khexedit/main.cc
+++ b/khexedit/main.cc
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index 0b17930..789d739 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -35,8 +35,8 @@
 #include <kcolordrag.h>
 #include <tdefontdialog.h> // For TDEFontChooser
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 
 #include "optiondialog.h"
 #include <tqpushbutton.h>
diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
index 342e1cc..7c1d6c4 100644
--- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
+++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
@@ -18,7 +18,7 @@
 // qt specific
 #include <tqlayout.h>
 // kde specific
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <tdeapplication.h>
 // lib specific
diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp
index f7afb56..e23e26a 100644
--- a/khexedit/parts/kpart/khepart.cpp
+++ b/khexedit/parts/kpart/khepart.cpp
@@ -16,11 +16,11 @@
 
 
 // kde specific
-#include <klocale.h>
+#include <tdelocale.h>
 //#include <kinstance.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
-//#include <kglobalsettings.h>
+//#include <tdeglobalsettings.h>
 // app specific
 #include "khexedit.h"
 #include "kcharcodec.h"
diff --git a/khexedit/parts/kpart/khepartfactory.cpp b/khexedit/parts/kpart/khepartfactory.cpp
index b7116e6..7a9cce4 100644
--- a/khexedit/parts/kpart/khepartfactory.cpp
+++ b/khexedit/parts/kpart/khepartfactory.cpp
@@ -18,7 +18,7 @@
 // kde specific
 #include <kinstance.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 // app specific
 #include "khepart.h"
 #include "khepartfactory.h"
diff --git a/khexedit/printdialogpage.cc b/khexedit/printdialogpage.cc
index 2677ac4..d421880 100644
--- a/khexedit/printdialogpage.cc
+++ b/khexedit/printdialogpage.cc
@@ -26,7 +26,7 @@
 #include <tqstringlist.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 #include "printdialogpage.h"
diff --git a/khexedit/searchbar.cc b/khexedit/searchbar.cc
index 000a400..02fbb4e 100644
--- a/khexedit/searchbar.cc
+++ b/khexedit/searchbar.cc
@@ -19,7 +19,7 @@
  */
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "dialog.h"
 #include "hexvalidator.h"
diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc
index f5e89d8..6ed24e3 100644
--- a/khexedit/statusbarprogress.cc
+++ b/khexedit/statusbarprogress.cc
@@ -24,8 +24,8 @@
 #include <tqpainter.h>
 
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <tqstyle.h>
 
 CStatusBarProgress::CStatusBarProgress( TQWidget *parent, const char *name )
diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc
index 1fa8d1a..f1c79f4 100644
--- a/khexedit/stringdialog.cc
+++ b/khexedit/stringdialog.cc
@@ -25,9 +25,9 @@
 #include <tqspinbox.h>
 
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "listview.h"
 #include "stringdialog.h"
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index 13d70fb..9886b37 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -27,8 +27,8 @@
 
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <tdepopupmenu.h>
 #include <kstdaction.h>
-- 
cgit v1.2.1