From bd11bce76f195adf4f3806cef8cf2e0737c99ff2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:22:31 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 khexedit/hexviewwidget.cc                    | 2 +-
 khexedit/lib/Makefile.am                     | 2 +-
 khexedit/lib/kbufferranges.h                 | 2 +-
 khexedit/listview.h                          | 2 +-
 khexedit/optiondialog.cc                     | 2 +-
 khexedit/optiondialog.h                      | 2 +-
 khexedit/parts/kpart/khebrowserextension.cpp | 2 +-
 khexedit/parts/kpart/khepart.cpp             | 2 +-
 khexedit/toplevel.cc                         | 8 ++++----
 khexedit/toplevel.h                          | 4 ++--
 10 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'khexedit')

diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index 50ce5cc..7e50919 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -26,7 +26,7 @@
 
 #include <kglobalsettings.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 
diff --git a/khexedit/lib/Makefile.am b/khexedit/lib/Makefile.am
index e2f9b3c..6b124d3 100644
--- a/khexedit/lib/Makefile.am
+++ b/khexedit/lib/Makefile.am
@@ -26,7 +26,7 @@ noinst_HEADERS = kcolumn.h kbordercolumn.h koffsetcolumn.h \
                  kbuffercolumn.h kvaluecolumn.h kcharcolumn.h \
                  kbytecodec.h koffsetformat.h khexedit_export.h \
                  kbuffercursor.h kbufferlayout.h kbufferranges.h \
-                 kbuffercoord.h kselection.h \
+                 kbuffercoord.h tdeselection.h \
                  kcursor.h kbufferdrag.h \
                  kcoordrange.h ksectionlist.h kcoordrangelist.h \
                  khechar.h kcharcodec.h \
diff --git a/khexedit/lib/kbufferranges.h b/khexedit/lib/kbufferranges.h
index 622ff4a..28e9f80 100644
--- a/khexedit/lib/kbufferranges.h
+++ b/khexedit/lib/kbufferranges.h
@@ -20,7 +20,7 @@
 
 // lib specific
 #include "kbufferlayout.h"
-#include "kselection.h"
+#include "tdeselection.h"
 #include "ksectionlist.h"
 #include "kcoordrangelist.h"
 
diff --git a/khexedit/listview.h b/khexedit/listview.h
index acb020d..6fe963c 100644
--- a/khexedit/listview.h
+++ b/khexedit/listview.h
@@ -21,7 +21,7 @@
 #ifndef _LISTVIEW_H_
 #define _LISTVIEW_H_
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class CListView : public TDEListView
 {
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index 94c18d1..05a86ca 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -33,7 +33,7 @@
 
 #include <kcolordialog.h>
 #include <kcolordrag.h>
-#include <kfontdialog.h> // For TDEFontChooser
+#include <tdefontdialog.h> // For TDEFontChooser
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
diff --git a/khexedit/optiondialog.h b/khexedit/optiondialog.h
index 31debab..9cf9e1e 100644
--- a/khexedit/optiondialog.h
+++ b/khexedit/optiondialog.h
@@ -35,7 +35,7 @@ class TDEFontChooser;
 
 
 #include <kdialogbase.h>
-#include <klistbox.h> 
+#include <tdelistbox.h> 
 #include "hexeditstate.h"
 
 
diff --git a/khexedit/parts/kpart/khebrowserextension.cpp b/khexedit/parts/kpart/khebrowserextension.cpp
index 5c6a192..6adebaa 100644
--- a/khexedit/parts/kpart/khebrowserextension.cpp
+++ b/khexedit/parts/kpart/khebrowserextension.cpp
@@ -16,7 +16,7 @@
 
 
 // qt specific
-#include <kaction.h>
+#include <tdeaction.h>
 // app specific
 #include "khexedit.h"
 #include "khepart.h"
diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp
index 7fb6a33..f7afb56 100644
--- a/khexedit/parts/kpart/khepart.cpp
+++ b/khexedit/parts/kpart/khepart.cpp
@@ -18,7 +18,7 @@
 // kde specific
 #include <klocale.h>
 //#include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 //#include <kglobalsettings.h>
 // app specific
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index ded9e20..13d70fb 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -25,14 +25,14 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kstatusbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstdaction.h>
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kurldrag.h>
@@ -376,7 +376,7 @@ void KHexEdit::initialize( bool openFiles )
 
   if ( openFiles && editor()->openFile() != SDisplayMisc::none )
   {
-    // Code modified from tdelibs/tdeui/kactionclasses.cpp TDERecentFilesAction::loadEntries
+    // Code modified from tdelibs/tdeui/tdeactionclasses.cpp TDERecentFilesAction::loadEntries
       
     TDEConfig* config = kapp->config();
 
diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h
index e92503d..a31871c 100644
--- a/khexedit/toplevel.h
+++ b/khexedit/toplevel.h
@@ -27,8 +27,8 @@
 
 #include <tqptrlist.h>
 #include <kapplication.h>
-#include <kstdaccel.h>
-#include <kmainwindow.h>
+#include <tdestdaccel.h>
+#include <tdemainwindow.h>
 
 #include "hexbuffer.h"
 #include "hexmanagerwidget.h"
-- 
cgit v1.2.1