Rename additional header files to avoid conflicts with KDE4

ksquirrel/imageedit/sq_converter.cpp

@@ -26,11 +26,11 @@
 #include <tqapplication.h>
 #include <tqfile.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstringhandler.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ksquirrel.h"
 #include "sq_converter.h"

ksquirrel/ksquirrel-libs-configurator/klc.cpp

@@ -1,5 +1,5 @@
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 /****************************************************************************
 ** Form implementation generated from reading ui file './klc.ui'
 **

ksquirrel/ksquirrel-libs-configurator/main.cpp

@@ -18,8 +18,8 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "klc.h"
 

ksquirrel/ksquirrel.cpp

@@ -41,7 +41,7 @@
 #include <tdepopupmenu.h>
 #include <twin.h>
 #include <kstatusbar.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdetoolbar.h>
 #include <tdeaction.h>
 #include <kbookmarkmanager.h>
@@ -49,13 +49,13 @@
 #include <kstandarddirs.h>
 #include <kcombobox.h>
 #include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <krun.h>
 #include <kanimwidget.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeactioncollection.h>
 #include <tdemultitabbar.h>
 #include <kurlcompletion.h>

ksquirrel/ksquirrelpart/ksquirrelpart.cpp

@@ -19,8 +19,8 @@
 #include <tdeparts/browserextension.h>
 #include <tdeparts/genericfactory.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 

ksquirrel/ksquirrelpart/sq_downloader.cpp

@@ -19,7 +19,7 @@
 
 #include <tdeio/job.h>
 #include <tdefileitem.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "sq_libraryhandler.h"
 #include "sq_downloader.h"

ksquirrel/ksquirrelpart/sq_errorstring.h

@@ -21,7 +21,7 @@
 #include <tqmap.h>
 #include <tqobject.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define SQE_NOTFINISHED 10000
 

ksquirrel/ksquirrelpart/sq_externaltool.cpp

@@ -22,11 +22,11 @@
 #include <tqfile.h>
 
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kicontheme.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "sq_iconloader.h"
 #include "sq_externaltool.h"

ksquirrel/ksquirrelpart/sq_glview.cpp

@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "sq_glview.h"
 

ksquirrel/ksquirrelpart/sq_glwidget.cpp

@@ -35,13 +35,13 @@
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <twin.h>
 #include <ktabbar.h>
 

ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp

@@ -30,12 +30,12 @@
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <ktabbar.h>
 #include <kcursor.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefileitem.h>
 #include <kprinter.h>
 

ksquirrel/ksquirrelpart/sq_iconloader.cpp

@@ -19,7 +19,7 @@
 #include "config.h"
 #endif
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "sq_iconloader.h"

ksquirrel/ksquirrelpart/sq_imageproperties.ui

@@ -930,7 +930,7 @@
     <include location="global" impldecl="in implementation">tqdir.h</include>
     <include location="local" impldecl="in implementation">sq_iconloader.h</include>
     <include location="global" impldecl="in implementation">tqbuttongroup.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
+    <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="local" impldecl="in implementation">sq_imageproperties.ui.h</include>
 </includes>
 <forwards>

ksquirrel/ksquirrelpart/sq_libraryhandler.cpp

@@ -26,9 +26,9 @@
 #include <tqdir.h>
 
 #include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kmimetype.h>

ksquirrel/main.cpp

@@ -22,10 +22,10 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <cstdlib>

ksquirrel/sidebar/sq_categoriesview.cpp

@@ -25,14 +25,14 @@
 #include <tdeio/job.h>
 #include <tdetoolbar.h>
 #include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <tdefileitem.h>
 #include <kurldrag.h>
 #include <kinputdialog.h>
 #include <kpropertiesdialog.h>
 #include <tdefiletreeviewitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "ksquirrel.h"
 #include "sq_dir.h"

ksquirrel/sidebar/sq_categorybrowsermenu.cpp

@@ -35,16 +35,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpixmap.h>
 #include <tqdir.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kprocess.h>
 #include <kiconloader.h>
 #include <ksimpleconfig.h>
 #include <kdesktopfile.h>
 #include <kmimetype.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeio/global.h>
 #include <krun.h>
 #include <konq_operations.h>

ksquirrel/sidebar/sq_directorybasket.cpp

@@ -21,8 +21,8 @@
 #include <tqcursor.h>
 #include <tqtimer.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurldrag.h>
 #include <kmimetype.h>
 #include <tdefiledialog.h>
@@ -32,7 +32,7 @@
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <kprogress.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "ksquirrel.h"
 #include "sq_directorybasket.h"

ksquirrel/sidebar/sq_imagebasket.cpp

@@ -19,8 +19,8 @@
 
 #include <kmdcodec.h>
 #include <tdefileview.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdepopupmenu.h>
 #include <tdefileiconview.h>
 #include <kpropertiesdialog.h>

ksquirrel/sidebar/sq_imagebasket.h

@@ -18,7 +18,7 @@
 #ifndef SQ_IMAGEBASKET_H
 #define SQ_IMAGEBASKET_H
 
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 
 class SQ_Dir;
 

ksquirrel/sidebar/sq_mountview.cpp

@@ -19,10 +19,10 @@
 #include "config.h"
 #endif
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmountpoint.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kautomount.h>
 #include <tdepopupmenu.h>
 

ksquirrel/sidebar/sq_multibar.cpp

@@ -24,7 +24,7 @@
 #include <tqsplitter.h>
 
 #include <tdemultitabbar.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "ksquirrel.h"

ksquirrel/sidebar/sq_previewwidget.cpp

@@ -23,7 +23,7 @@
 #include <tqimage.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
 #include <tdepopupmenu.h>
 #include <kcolordialog.h>

ksquirrel/sidebar/sq_threaddirlister.cpp

@@ -27,7 +27,7 @@
 #include <tqapplication.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "sq_threaddirlister.h"
 

ksquirrel/sidebar/sq_treeview.cpp

@@ -24,7 +24,7 @@
 #include <tqtimer.h>
 #include <tqcursor.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurldrag.h>
 #include <kurl.h>
 #include <kdirwatch.h>

ksquirrel/sidebar/sq_treeviewmenu.cpp

@@ -2,12 +2,12 @@
 #include <tqwidget.h>
 #include <tqstylesheet.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeio/job.h>
 #include <kpropertiesdialog.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "sq_treeviewmenu.h"
 #include "ksquirrel.h"

ksquirrel/sq_archivehandler.cpp

@@ -10,11 +10,11 @@
 #include "config.h"
 #endif
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include "sq_archivehandler.h"

ksquirrel/sq_diroperator.cpp

@@ -28,9 +28,9 @@
 
 #include <tdeapplication.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdestdaccel.h>
 #include <kdiskfreesp.h>
 #include <konq_operations.h>
@@ -616,7 +616,7 @@ void SQ_DirOperator::slotSetThumbSize(const TQString &size)
  *  Smart update. Store all file items, reset view,
  *  and transfer all items back.
  *
- *  Taken from tdelibs-3.2.3/tdeio/tdefile/kdiroperator.cpp
+ *  Taken from tdelibs-3.2.3/tdeio/tdefile/tdediroperator.cpp
  */
 void SQ_DirOperator::smartUpdate()
 {

ksquirrel/sq_diroperator.h

@@ -20,7 +20,7 @@
 
 #include <tqmap.h>
 
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 
 class TQTimer;
 class TQListViewItem;

ksquirrel/sq_downloader.cpp

@@ -19,7 +19,7 @@
 
 #include <tdeio/job.h>
 #include <tdefileitem.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include "sq_libraryhandler.h"
 #include "sq_downloader.h"

ksquirrel/sq_dragprovider.cpp

@@ -26,7 +26,7 @@
 
 #include <kstringhandler.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include <algorithm>

ksquirrel/sq_errorstring.h

@@ -21,7 +21,7 @@
 #include <tqmap.h>
 #include <tqobject.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define SQE_NOTFINISHED 10000
 

ksquirrel/sq_externaltool.cpp

@@ -22,11 +22,11 @@
 #include <tqfile.h>
 
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kicontheme.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "sq_iconloader.h"
 #include "sq_externaltool.h"

ksquirrel/sq_externaltools.ui

@@ -443,7 +443,7 @@
     <include location="global" impldecl="in implementation">kicondialog.h</include>
     <include location="local" impldecl="in implementation">sq_iconloader.h</include>
     <include location="global" impldecl="in implementation">tqwhatsthis.h</include>
-    <include location="global" impldecl="in implementation">kglobal.h</include>
+    <include location="global" impldecl="in implementation">tdeglobal.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
     <include location="local" impldecl="in implementation">sq_externaltools.ui.h</include>
 </includes>

ksquirrel/sq_filedetailview.cpp

@@ -24,7 +24,7 @@
 
 #include <tdepopupmenu.h>
 #include <tdefileitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <konq_filetip.h>
 
 #include "ksquirrel.h"

ksquirrel/sq_fileiconviewbase.cpp

@@ -22,7 +22,7 @@
 #include <tqdragobject.h>
 #include <tqcursor.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeaction.h>
 #include <tdefileitem.h>
 #include <tdeio/job.h>

ksquirrel/sq_filethumbview.cpp

@@ -29,10 +29,10 @@
 
 #include <kstandarddirs.h>
 #include <kstringhandler.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "ksquirrel.h"
 #include "sq_iconloader.h"

ksquirrel/sq_glview.cpp

@@ -30,7 +30,7 @@
 #include <tdetoolbar.h>
 #include <kstandarddirs.h>
 #include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
 #include <ktabbar.h>
 #include <kiconloader.h>

ksquirrel/sq_glwidget.cpp

@@ -35,13 +35,13 @@
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <twin.h>
 #include <ktabbar.h>
 

ksquirrel/sq_glwidget_stuff.cpp

@@ -30,12 +30,12 @@
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <ktabbar.h>
 #include <kcursor.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefileitem.h>
 #include <kprinter.h>
 

ksquirrel/sq_iconloader.cpp

@@ -19,7 +19,7 @@
 #include "config.h"
 #endif
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "sq_iconloader.h"

ksquirrel/sq_imageproperties.ui

@@ -930,7 +930,7 @@
     <include location="global" impldecl="in implementation">tqdir.h</include>
     <include location="local" impldecl="in implementation">sq_iconloader.h</include>
     <include location="global" impldecl="in implementation">tqbuttongroup.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
+    <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="local" impldecl="in implementation">sq_imageproperties.ui.h</include>
 </includes>
 <forwards>

ksquirrel/sq_kipiinterface.cpp

@@ -20,7 +20,7 @@
 #ifdef SQ_HAVE_KIPI
 
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdefileview.h>
 #include <tdefileiconview.h>

ksquirrel/sq_kipimanager.cpp

@@ -27,7 +27,7 @@
 
 #include <tdeactioncollection.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <libkipi/pluginloader.h>

ksquirrel/sq_libraryhandler.cpp

@@ -26,9 +26,9 @@
 #include <tqdir.h>
 
 #include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurl.h>
 #include <kmimetype.h>

ksquirrel/sq_navigatordropmenu.cpp

@@ -19,7 +19,7 @@
 #include "config.h"
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeio/job.h>
 #include <kstringhandler.h>

ksquirrel/sq_progress.cpp

@@ -25,7 +25,7 @@
 #include <tqbrush.h>
 #include <tqpen.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "sq_progress.h"
 

ksquirrel/sq_slideshowwidget.cpp

@@ -30,9 +30,9 @@
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/global.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <ksquirrel-libs/fmt_defs.h>
 

ksquirrel/sq_splashscreen.cpp

@@ -38,7 +38,7 @@
 #include "config.h"
 #endif
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>
 #include <kdebug.h>

ksquirrel/sq_thumbnailloadjob.cpp

@@ -35,7 +35,7 @@
 #include <tdefileitem.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 #include "sq_config.h"

ksquirrel/sq_widgetstack.cpp

@@ -30,10 +30,10 @@
 #include <kcombobox.h>
 #include <kstandarddirs.h>
 #include <tdestdaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstringhandler.h>
 
 #include "ksquirrel.h"