Rename many classes and header files to avoid conflicts with KDE4

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 <tdetoolbar.h>
-#include <kaction.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>

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>

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>

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>

ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp

@@ -26,7 +26,7 @@
 
 #include <algorithm>
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <ksquirrel-libs/fmt_defs.h>
 

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;
 

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>

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>

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

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>

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>

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"

ksquirrel/sidebar/sq_mountview.h

@@ -20,7 +20,7 @@
 
 #include <tqstringlist.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TDEPopupMenu;
 

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
 {

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>
 

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;

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>

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>

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>

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>

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;

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>

ksquirrel/sq_glwidget_helpers.cpp

@@ -26,7 +26,7 @@
 
 #include <algorithm>
 
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 
 #include <ksquirrel-libs/fmt_defs.h>
 

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;
 

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>

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.

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>

ksquirrel/sq_kipimanager.cpp

@@ -25,8 +25,8 @@
 
 #include <tqwidget.h>
 
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <klocale.h>
 #include <kdebug.h>
 

ksquirrel/sq_kipimanager.h

@@ -32,7 +32,7 @@
 #include <tqmap.h>
 #include <tqvaluevector.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <libkipi/plugin.h>
 

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>
 

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

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>