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

---
 src/HACKING                          |  2 +-
 src/app/bookmarkviewcontroller.cpp   |  8 ++++----
 src/app/bookmarkviewcontroller.h     |  2 +-
 src/app/history.cpp                  |  6 +++---
 src/app/mainwindow.cpp               | 12 ++++++------
 src/app/mainwindow.h                 |  2 +-
 src/gvcore/deletedialogbase.ui       |  2 +-
 src/gvcore/externaltoolaction.h      |  2 +-
 src/gvcore/externaltoolcontext.cpp   |  4 ++--
 src/gvcore/externaltooldialog.cpp    |  2 +-
 src/gvcore/externaltooldialogbase.ui |  4 ++--
 src/gvcore/filedetailview.h          |  2 +-
 src/gvcore/filedetailviewitem.h      |  2 +-
 src/gvcore/fileviewcontroller.cpp    |  8 ++++----
 src/gvcore/fullscreenbar.h           |  2 +-
 src/gvcore/imageview.cpp             |  2 +-
 src/gvcore/imageviewcontroller.cpp   |  4 ++--
 src/gvcore/imageviewcontroller.h     |  2 +-
 src/gvcore/imageviewtools.cpp        |  2 +-
 src/gvdirpart/gvdirpart.cpp          |  2 +-
 src/gvimagepart/gvimagepart.cpp      |  2 +-
 21 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/HACKING b/src/HACKING
index 599dd3b..3e45a7f 100644
--- a/src/HACKING
+++ b/src/HACKING
@@ -88,7 +88,7 @@ Q_OBJECT, make sure you include the .moc file, not the .h.
 
 // KDE
 #include <kiconview.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 // Local
 #include "aclass.h"
diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp
index e7fb24f..18f21cb 100644
--- a/src/app/bookmarkviewcontroller.cpp
+++ b/src/app/bookmarkviewcontroller.cpp
@@ -31,17 +31,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqvbox.h>
 
 // KDE
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <kbookmarkmanager.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kmimetype.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kurl.h>
 #include <kurldrag.h>
 
diff --git a/src/app/bookmarkviewcontroller.h b/src/app/bookmarkviewcontroller.h
index e7780e7..facf7b5 100644
--- a/src/app/bookmarkviewcontroller.h
+++ b/src/app/bookmarkviewcontroller.h
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqobject.h>
 
 // KDE
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 
 class TQDragMoveEvent;
diff --git a/src/app/history.cpp b/src/app/history.cpp
index 4105856..1bfe115 100644
--- a/src/app/history.cpp
+++ b/src/app/history.cpp
@@ -21,11 +21,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
 // KDE
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdeversion.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdguiitem.h>
 
 // Local
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 0ce4417..f07c219 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -28,8 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kaboutdata.h>
-#include <kaccel.h>
-#include <kaction.h>
+#include <tdeaccel.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kbookmarkmanager.h>
 #include <kbookmarkmenu.h>
@@ -47,18 +47,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klargefile.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmenubar.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kpropsdlg.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstdaction.h>
-#include <ktoolbarlabelaction.h>
+#include <tdetoolbarlabelaction.h>
 #include <kurlcompletion.h>
 #include <kurlpixmapprovider.h>
 #include <kprinter.h>
diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h
index 2bda2e2..eb21f27 100644
--- a/src/app/mainwindow.h
+++ b/src/app/mainwindow.h
@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqptrlist.h>
 
 // KDE
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 // Local
diff --git a/src/gvcore/deletedialogbase.ui b/src/gvcore/deletedialogbase.ui
index 1574b01..1312a06 100644
--- a/src/gvcore/deletedialogbase.ui
+++ b/src/gvcore/deletedialogbase.ui
@@ -106,6 +106,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>
diff --git a/src/gvcore/externaltoolaction.h b/src/gvcore/externaltoolaction.h
index 711f0c0..9b0f4b8 100644
--- a/src/gvcore/externaltoolaction.h
+++ b/src/gvcore/externaltoolaction.h
@@ -22,7 +22,7 @@ Copyright 2000-2004 Aur
 #define EXTERNALTOOLACTION_H
 
 // KDE
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kurl.h>
 
 class KService;
diff --git a/src/gvcore/externaltoolcontext.cpp b/src/gvcore/externaltoolcontext.cpp
index cbdbd9e..d002e65 100644
--- a/src/gvcore/externaltoolcontext.cpp
+++ b/src/gvcore/externaltoolcontext.cpp
@@ -21,11 +21,11 @@ Copyright 2000-2004 Aur
 #include "externaltoolcontext.moc"
 
 // KDE
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 #include <kservice.h>
 
diff --git a/src/gvcore/externaltooldialog.cpp b/src/gvcore/externaltooldialog.cpp
index 33c4aff..b891bcc 100644
--- a/src/gvcore/externaltooldialog.cpp
+++ b/src/gvcore/externaltooldialog.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <krun.h>
diff --git a/src/gvcore/externaltooldialogbase.ui b/src/gvcore/externaltooldialogbase.ui
index ee43330..03cbe33 100644
--- a/src/gvcore/externaltooldialogbase.ui
+++ b/src/gvcore/externaltooldialogbase.ui
@@ -360,7 +360,7 @@ You can use keywords in the Command field:
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kurllabel.h</includehint>
     <includehint>kicondialog.h</includehint>
     <includehint>kurllabel.h</includehint>
@@ -368,6 +368,6 @@ You can use keywords in the Command field:
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/src/gvcore/filedetailview.h b/src/gvcore/filedetailview.h
index 64569bf..62b2ea7 100644
--- a/src/gvcore/filedetailview.h
+++ b/src/gvcore/filedetailview.h
@@ -32,7 +32,7 @@ class TQKeyEvent;
 #include <tqdir.h>
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmimetyperesolver.h>
 
 // Our includes
diff --git a/src/gvcore/filedetailviewitem.h b/src/gvcore/filedetailviewitem.h
index 1c04e24..2c814ce 100644
--- a/src/gvcore/filedetailviewitem.h
+++ b/src/gvcore/filedetailviewitem.h
@@ -25,7 +25,7 @@
 #define FILEDETAILVIEWITEM_H
 
 // KDE includes
-#include <klistview.h>
+#include <tdelistview.h>
 #include <tdefileitem.h>
 namespace Gwenview {
 
diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
index 4c0aa22..90c5bc7 100644
--- a/src/gvcore/fileviewcontroller.cpp
+++ b/src/gvcore/fileviewcontroller.cpp
@@ -30,7 +30,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqwidgetstack.h>
 
 // KDE
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
@@ -39,13 +39,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kiconeffect.h>
 #include <kiconloader.h>
 #include <kimageio.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
 #include <kstdaction.h>
-#include <ktoolbar.h>
-#include <ktoolbarlabelaction.h>
+#include <tdetoolbar.h>
+#include <tdetoolbarlabelaction.h>
 #include <kurldrag.h>
 #include <tdeio/job.h>
 #include <tdeio/file.h>
diff --git a/src/gvcore/fullscreenbar.h b/src/gvcore/fullscreenbar.h
index 41a6049..07bec14 100644
--- a/src/gvcore/fullscreenbar.h
+++ b/src/gvcore/fullscreenbar.h
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define FULLSCREENBAR_H   
 
 // KDE
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 class TQResizeEvent;
 class TQShowEvent;
diff --git a/src/gvcore/imageview.cpp b/src/gvcore/imageview.cpp
index 47438fd..52ba14c 100644
--- a/src/gvcore/imageview.cpp
+++ b/src/gvcore/imageview.cpp
@@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqvaluevector.h>
 
 // KDE 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
diff --git a/src/gvcore/imageviewcontroller.cpp b/src/gvcore/imageviewcontroller.cpp
index 63b48a4..fa16b40 100644
--- a/src/gvcore/imageviewcontroller.cpp
+++ b/src/gvcore/imageviewcontroller.cpp
@@ -28,13 +28,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqwidgetstack.h>
 
 // KDE
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdemediaplayer/player.h>
 #include <kmimetype.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kuserprofile.h>
 #include <tdeparts/componentfactory.h>
 #include <kxmlguibuilder.h>
diff --git a/src/gvcore/imageviewcontroller.h b/src/gvcore/imageviewcontroller.h
index 614df4f..98b1120 100644
--- a/src/gvcore/imageviewcontroller.h
+++ b/src/gvcore/imageviewcontroller.h
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqobject.h>
 
 // KDE
-#include <kaction.h>
+#include <tdeaction.h>
 
 // Local
 #include "libgwenview_export.h"
diff --git a/src/gvcore/imageviewtools.cpp b/src/gvcore/imageviewtools.cpp
index 789ca55..eabbfa7 100644
--- a/src/gvcore/imageviewtools.cpp
+++ b/src/gvcore/imageviewtools.cpp
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "imageviewtools.h"
 
 // KDE 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp
index 8be8496..f5678bb 100644
--- a/src/gvdirpart/gvdirpart.cpp
+++ b/src/gvdirpart/gvdirpart.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
index 0be5847..d329fb3 100644
--- a/src/gvimagepart/gvimagepart.cpp
+++ b/src/gvimagepart/gvimagepart.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqfile.h>
 #include <tqpoint.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-- 
cgit v1.2.1