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

---
 ksquirrel/ksquirrel.cpp                         | 8 ++++----
 ksquirrel/ksquirrel.h                           | 2 +-
 ksquirrel/ksquirrelpart/ksquirrelpart.cpp       | 2 +-
 ksquirrel/ksquirrelpart/sq_glwidget.cpp         | 2 +-
 ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp | 2 +-
 ksquirrel/ksquirrelpart/sq_glwidget_helpers.h   | 2 +-
 ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp   | 4 ++--
 ksquirrel/ksquirrelpart/sq_imageproperties.ui   | 4 ++--
 ksquirrel/ksquirrelpart/sq_popupmenu.h          | 2 +-
 ksquirrel/sidebar/sq_categoriesview.cpp         | 2 +-
 ksquirrel/sidebar/sq_imagebasket.cpp            | 2 +-
 ksquirrel/sidebar/sq_mountview.cpp              | 2 +-
 ksquirrel/sidebar/sq_mountview.h                | 2 +-
 ksquirrel/sidebar/sq_mountviewitem.h            | 2 +-
 ksquirrel/sidebar/sq_previewwidget.cpp          | 2 +-
 ksquirrel/sidebar/sq_treeviewmenu.h             | 2 +-
 ksquirrel/sq_diroperator.cpp                    | 2 +-
 ksquirrel/sq_filedetailview.cpp                 | 2 +-
 ksquirrel/sq_fileiconviewbase.cpp               | 2 +-
 ksquirrel/sq_glview.cpp                         | 6 +++---
 ksquirrel/sq_glview.h                           | 2 +-
 ksquirrel/sq_glwidget.cpp                       | 2 +-
 ksquirrel/sq_glwidget_helpers.cpp               | 2 +-
 ksquirrel/sq_glwidget_helpers.h                 | 2 +-
 ksquirrel/sq_glwidget_stuff.cpp                 | 4 ++--
 ksquirrel/sq_iconlistbox.h                      | 2 +-
 ksquirrel/sq_imageproperties.ui                 | 4 ++--
 ksquirrel/sq_kipimanager.cpp                    | 4 ++--
 ksquirrel/sq_kipimanager.h                      | 2 +-
 ksquirrel/sq_navigatordropmenu.cpp              | 2 +-
 ksquirrel/sq_popupmenu.h                        | 2 +-
 ksquirrel/sq_widgetstack.cpp                    | 4 ++--
 32 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp
index 5dd5e9d..86d0765 100644
--- a/ksquirrel/ksquirrel.cpp
+++ b/ksquirrel/ksquirrel.cpp
@@ -38,12 +38,12 @@
 
 #include <kapplication.h>
 #include <khelpmenu.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <twin.h>
 #include <kstatusbar.h>
 #include <kmenubar.h>
-#include <ktoolbar.h>
-#include <kaction.h>
+#include <tdetoolbar.h>
+#include <tdeaction.h>
 #include <kbookmarkmanager.h>
 #include <kbookmarkmenu.h>
 #include <kstandarddirs.h>
@@ -56,7 +56,7 @@
 #include <krun.h>
 #include <kanimwidget.h>
 #include <kglobalsettings.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <tdemultitabbar.h>
 #include <kurlcompletion.h>
 #include <konq_pixmapprovider.h>
diff --git a/ksquirrel/ksquirrel.h b/ksquirrel/ksquirrel.h
index 3a67885..900546d 100644
--- a/ksquirrel/ksquirrel.h
+++ b/ksquirrel/ksquirrel.h
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 #include <tqmap.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <dcopobject.h>
 #include <tdefileitem.h>
 #include <kurl.h>
diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
index 89181b6..54a19cc 100644
--- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
+++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/browserextension.h>
 #include <tdeparts/genericfactory.h>
 #include <tdefileitem.h>
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
index 2368aea..89b67f0 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp
@@ -30,7 +30,7 @@
 #include <tqlabel.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp
index ce49091..b407a86 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp
@@ -26,7 +26,7 @@
 
 #include <algorithm>
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <ksquirrel-libs/fmt_defs.h>
 
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.h b/ksquirrel/ksquirrelpart/sq_glwidget_helpers.h
index 4effa2d..f8cfbd3 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.h
+++ b/ksquirrel/ksquirrelpart/sq_glwidget_helpers.h
@@ -18,7 +18,7 @@
 #ifndef SQ_GLWIDGET_HELPERS
 #define SQ_GLWIDGET_HELPERS
 
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 class TQWMatrix;
 
diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
index 985dcd1..7546ce6 100644
--- a/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
+++ b/ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
@@ -28,10 +28,10 @@
 #include <tqpaintdevicemetrics.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ktabbar.h>
 #include <kcursor.h>
 #include <ktempfile.h>
diff --git a/ksquirrel/ksquirrelpart/sq_imageproperties.ui b/ksquirrel/ksquirrelpart/sq_imageproperties.ui
index 758515f..62df92b 100644
--- a/ksquirrel/ksquirrelpart/sq_imageproperties.ui
+++ b/ksquirrel/ksquirrelpart/sq_imageproperties.ui
@@ -922,9 +922,9 @@
     <include location="global" impldecl="in implementation">tqstringlist.h</include>
     <include location="global" impldecl="in implementation">tqfileinfo.h</include>
     <include location="global" impldecl="in implementation">tdeio/global.h</include>
-    <include location="global" impldecl="in implementation">kpopupmenu.h</include>
+    <include location="global" impldecl="in implementation">tdepopupmenu.h</include>
     <include location="global" impldecl="in implementation">kstdaction.h</include>
-    <include location="global" impldecl="in implementation">kaction.h</include>
+    <include location="global" impldecl="in implementation">tdeaction.h</include>
     <include location="global" impldecl="in implementation">tqapplication.h</include>
     <include location="global" impldecl="in implementation">tqclipboard.h</include>
     <include location="global" impldecl="in implementation">tqdir.h</include>
diff --git a/ksquirrel/ksquirrelpart/sq_popupmenu.h b/ksquirrel/ksquirrelpart/sq_popupmenu.h
index 12a06a5..efc12f2 100644
--- a/ksquirrel/ksquirrelpart/sq_popupmenu.h
+++ b/ksquirrel/ksquirrelpart/sq_popupmenu.h
@@ -18,7 +18,7 @@
 #ifndef SQ_POPUPMENU_H
 #define SQ_POPUPMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 /**
   *@author Baryshev Dmitry
diff --git a/ksquirrel/sidebar/sq_categoriesview.cpp b/ksquirrel/sidebar/sq_categoriesview.cpp
index ca7a466..049fdc6 100644
--- a/ksquirrel/sidebar/sq_categoriesview.cpp
+++ b/ksquirrel/sidebar/sq_categoriesview.cpp
@@ -23,7 +23,7 @@
 #include <tqheader.h>
 
 #include <tdeio/job.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kicontheme.h>
 #include <klocale.h>
 #include <kmimetype.h>
diff --git a/ksquirrel/sidebar/sq_imagebasket.cpp b/ksquirrel/sidebar/sq_imagebasket.cpp
index 67a021a..7086c96 100644
--- a/ksquirrel/sidebar/sq_imagebasket.cpp
+++ b/ksquirrel/sidebar/sq_imagebasket.cpp
@@ -21,7 +21,7 @@
 #include <tdefileview.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdefileiconview.h>
 #include <kpropertiesdialog.h>
 #include <tdeio/netaccess.h>
diff --git a/ksquirrel/sidebar/sq_mountview.cpp b/ksquirrel/sidebar/sq_mountview.cpp
index dabb968..15f545d 100644
--- a/ksquirrel/sidebar/sq_mountview.cpp
+++ b/ksquirrel/sidebar/sq_mountview.cpp
@@ -24,7 +24,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <kautomount.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include "ksquirrel.h"
 #include "sq_mountview.h"
diff --git a/ksquirrel/sidebar/sq_mountview.h b/ksquirrel/sidebar/sq_mountview.h
index 4caebe2..5bed9ed 100644
--- a/ksquirrel/sidebar/sq_mountview.h
+++ b/ksquirrel/sidebar/sq_mountview.h
@@ -20,7 +20,7 @@
 
 #include <tqstringlist.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TDEPopupMenu;
 
diff --git a/ksquirrel/sidebar/sq_mountviewitem.h b/ksquirrel/sidebar/sq_mountviewitem.h
index 8e07a4b..7056c39 100644
--- a/ksquirrel/sidebar/sq_mountviewitem.h
+++ b/ksquirrel/sidebar/sq_mountviewitem.h
@@ -18,7 +18,7 @@
 #ifndef SQ_MOUNTVIEWITEM_H
 #define SQ_MOUNTVIEWITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class SQ_MountViewItem : public TDEListViewItem
 {
diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp
index b661d3d..f6213fc 100644
--- a/ksquirrel/sidebar/sq_previewwidget.cpp
+++ b/ksquirrel/sidebar/sq_previewwidget.cpp
@@ -25,7 +25,7 @@
 
 #include <klocale.h>
 #include <tdefileitem.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kcolordialog.h>
 #include <tdeio/global.h>
 
diff --git a/ksquirrel/sidebar/sq_treeviewmenu.h b/ksquirrel/sidebar/sq_treeviewmenu.h
index 3ba41a1..23090d7 100644
--- a/ksquirrel/sidebar/sq_treeviewmenu.h
+++ b/ksquirrel/sidebar/sq_treeviewmenu.h
@@ -1,7 +1,7 @@
 #ifndef SQ_TREEVIEWMENU_H
 #define SQ_TREEVIEWMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kurl.h>
 
 class TQPoint;
diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp
index 6e75244..baa32c0 100644
--- a/ksquirrel/sq_diroperator.cpp
+++ b/ksquirrel/sq_diroperator.cpp
@@ -31,7 +31,7 @@
 #include <klocale.h>
 #include <kprogress.h>
 #include <kglobal.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kdiskfreesp.h>
 #include <konq_operations.h>
 #include <kiconeffect.h>
diff --git a/ksquirrel/sq_filedetailview.cpp b/ksquirrel/sq_filedetailview.cpp
index 1fbb8c6..03b47f7 100644
--- a/ksquirrel/sq_filedetailview.cpp
+++ b/ksquirrel/sq_filedetailview.cpp
@@ -22,7 +22,7 @@
 #include <tqheader.h>
 #include <tqcursor.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <tdefileitem.h>
 #include <kglobalsettings.h>
 #include <konq_filetip.h>
diff --git a/ksquirrel/sq_fileiconviewbase.cpp b/ksquirrel/sq_fileiconviewbase.cpp
index 1aad6b7..4e203e0 100644
--- a/ksquirrel/sq_fileiconviewbase.cpp
+++ b/ksquirrel/sq_fileiconviewbase.cpp
@@ -23,7 +23,7 @@
 #include <tqcursor.h>
 
 #include <kglobalsettings.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdefileitem.h>
 #include <tdeio/job.h>
 #include <konq_filetip.h>
diff --git a/ksquirrel/sq_glview.cpp b/ksquirrel/sq_glview.cpp
index c9429f0..ad5039d 100644
--- a/ksquirrel/sq_glview.cpp
+++ b/ksquirrel/sq_glview.cpp
@@ -25,11 +25,11 @@
 #include <tqtooltip.h>
 #include <tqhbox.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstatusbar.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kstandarddirs.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <klocale.h>
 #include <ksqueezedtextlabel.h>
 #include <ktabbar.h>
diff --git a/ksquirrel/sq_glview.h b/ksquirrel/sq_glview.h
index d03b36e..498c18b 100644
--- a/ksquirrel/sq_glview.h
+++ b/ksquirrel/sq_glview.h
@@ -21,7 +21,7 @@
 #include <tqvbox.h>
 #include <tqmap.h>
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 class SQ_GLWidget;
 class SQ_LibraryListener;
diff --git a/ksquirrel/sq_glwidget.cpp b/ksquirrel/sq_glwidget.cpp
index 2368aea..89b67f0 100644
--- a/ksquirrel/sq_glwidget.cpp
+++ b/ksquirrel/sq_glwidget.cpp
@@ -30,7 +30,7 @@
 #include <tqlabel.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcursor.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
diff --git a/ksquirrel/sq_glwidget_helpers.cpp b/ksquirrel/sq_glwidget_helpers.cpp
index ce49091..b407a86 100644
--- a/ksquirrel/sq_glwidget_helpers.cpp
+++ b/ksquirrel/sq_glwidget_helpers.cpp
@@ -26,7 +26,7 @@
 
 #include <algorithm>
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <ksquirrel-libs/fmt_defs.h>
 
diff --git a/ksquirrel/sq_glwidget_helpers.h b/ksquirrel/sq_glwidget_helpers.h
index 4effa2d..f8cfbd3 100644
--- a/ksquirrel/sq_glwidget_helpers.h
+++ b/ksquirrel/sq_glwidget_helpers.h
@@ -18,7 +18,7 @@
 #ifndef SQ_GLWIDGET_HELPERS
 #define SQ_GLWIDGET_HELPERS
 
-#include <ktoolbarbutton.h>
+#include <tdetoolbarbutton.h>
 
 class TQWMatrix;
 
diff --git a/ksquirrel/sq_glwidget_stuff.cpp b/ksquirrel/sq_glwidget_stuff.cpp
index 985dcd1..7546ce6 100644
--- a/ksquirrel/sq_glwidget_stuff.cpp
+++ b/ksquirrel/sq_glwidget_stuff.cpp
@@ -28,10 +28,10 @@
 #include <tqpaintdevicemetrics.h>
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <ktabbar.h>
 #include <kcursor.h>
 #include <ktempfile.h>
diff --git a/ksquirrel/sq_iconlistbox.h b/ksquirrel/sq_iconlistbox.h
index 91c4a02..3fc7b68 100644
--- a/ksquirrel/sq_iconlistbox.h
+++ b/ksquirrel/sq_iconlistbox.h
@@ -18,7 +18,7 @@
 #ifndef SQ_ICONLISTBOX_H
 #define SQ_ICONLISTBOX_H
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 /* 
  *  SQ_IconListBox represents a listbox with fixed width.
diff --git a/ksquirrel/sq_imageproperties.ui b/ksquirrel/sq_imageproperties.ui
index eab75ac..e23b800 100644
--- a/ksquirrel/sq_imageproperties.ui
+++ b/ksquirrel/sq_imageproperties.ui
@@ -922,9 +922,9 @@
     <include location="global" impldecl="in implementation">tqstringlist.h</include>
     <include location="global" impldecl="in implementation">tqfileinfo.h</include>
     <include location="global" impldecl="in implementation">tdeio/global.h</include>
-    <include location="global" impldecl="in implementation">kpopupmenu.h</include>
+    <include location="global" impldecl="in implementation">tdepopupmenu.h</include>
     <include location="global" impldecl="in implementation">kstdaction.h</include>
-    <include location="global" impldecl="in implementation">kaction.h</include>
+    <include location="global" impldecl="in implementation">tdeaction.h</include>
     <include location="global" impldecl="in implementation">tqapplication.h</include>
     <include location="global" impldecl="in implementation">tqclipboard.h</include>
     <include location="global" impldecl="in implementation">tqdir.h</include>
diff --git a/ksquirrel/sq_kipimanager.cpp b/ksquirrel/sq_kipimanager.cpp
index 9a034b0..db9ac6f 100644
--- a/ksquirrel/sq_kipimanager.cpp
+++ b/ksquirrel/sq_kipimanager.cpp
@@ -25,8 +25,8 @@
 
 #include <tqwidget.h>
 
-#include <kactioncollection.h>
-#include <kpopupmenu.h>
+#include <tdeactioncollection.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/ksquirrel/sq_kipimanager.h b/ksquirrel/sq_kipimanager.h
index 336f2bd..7d8040f 100644
--- a/ksquirrel/sq_kipimanager.h
+++ b/ksquirrel/sq_kipimanager.h
@@ -32,7 +32,7 @@
 #include <tqmap.h>
 #include <tqvaluevector.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <libkipi/plugin.h>
 
diff --git a/ksquirrel/sq_navigatordropmenu.cpp b/ksquirrel/sq_navigatordropmenu.cpp
index 90fadad..ba873b6 100644
--- a/ksquirrel/sq_navigatordropmenu.cpp
+++ b/ksquirrel/sq_navigatordropmenu.cpp
@@ -20,7 +20,7 @@
 #endif
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeio/job.h>
 #include <kstringhandler.h>
 
diff --git a/ksquirrel/sq_popupmenu.h b/ksquirrel/sq_popupmenu.h
index 12a06a5..efc12f2 100644
--- a/ksquirrel/sq_popupmenu.h
+++ b/ksquirrel/sq_popupmenu.h
@@ -18,7 +18,7 @@
 #ifndef SQ_POPUPMENU_H
 #define SQ_POPUPMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 /**
   *@author Baryshev Dmitry
diff --git a/ksquirrel/sq_widgetstack.cpp b/ksquirrel/sq_widgetstack.cpp
index 70f9987..fafd685 100644
--- a/ksquirrel/sq_widgetstack.cpp
+++ b/ksquirrel/sq_widgetstack.cpp
@@ -26,10 +26,10 @@
 #include <tqtimer.h>
 #include <tqapplication.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcombobox.h>
 #include <kstandarddirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <klocale.h>
 #include <tdeio/job.h>
 #include <tdefiledialog.h>