Rename additional header files to avoid conflicts with KDE4

17 files changed, 38 insertions, 38 deletions

diff --git a/kooka/imageselectline.cpp b/kooka/imageselectline.cpp
index c037a958..71135dc2 100644
--- a/kooka/imageselectline.cpp
+++ b/kooka/imageselectline.cpp
@@ -32,7 +32,7 @@
 #include <tqlabel.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kurlcombobox.h>
 #include <tdefiledialog.h>
diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp
index 162cf3a2..8eb12701 100644
--- a/kooka/img_saver.cpp
+++ b/kooka/img_saver.cpp
@@ -30,19 +30,19 @@
 #include <unistd.h>
 
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kimageio.h>
 #include <kseparator.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdeio/jobclasses.h>
 #include <tdeio/file.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kinputdialog.h>
 
 #include <tqdir.h>
diff --git a/kooka/imgnamecombo.cpp b/kooka/imgnamecombo.cpp
index 3b954f79..14e261a2 100644
--- a/kooka/imgnamecombo.cpp
+++ b/kooka/imgnamecombo.cpp
@@ -32,7 +32,7 @@
 #include <kcombobox.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiletreebranch.h>
 
 #include "imgnamecombo.h"
diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp
index dd346b3c..a0182457 100644
--- a/kooka/imgprintdialog.cpp
+++ b/kooka/imgprintdialog.cpp
@@ -25,7 +25,7 @@
  ***************************************************************************/
 #include "imgprintdialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kdialog.h>
 
diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp
index 85f932fe..6cc012b3 100644
--- a/kooka/kocrbase.cpp
+++ b/kooka/kocrbase.cpp
@@ -33,12 +33,12 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kanimwidget.h>
 #include <kseparator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kactivelabel.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
diff --git a/kooka/kocrgocr.cpp b/kooka/kocrgocr.cpp
index f2eb41b6..8f1ba019 100644
--- a/kooka/kocrgocr.cpp
+++ b/kooka/kocrgocr.cpp
@@ -33,12 +33,12 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kanimwidget.h>
 #include <kseparator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "resource.h"
 #include "ksaneocr.h"  // TODO: Really needed?
diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp
index bc1b6def..0862f73b 100644
--- a/kooka/kocrkadmos.cpp
+++ b/kooka/kocrkadmos.cpp
@@ -37,12 +37,12 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kanimwidget.h>
 #include <kseparator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "resource.h"
 #include "ksaneocr.h"  // TODO: Really needed?
diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp
index ad4b39cd..2e824fae 100644
--- a/kooka/kocrocrad.cpp
+++ b/kooka/kocrocrad.cpp
@@ -34,12 +34,12 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kanimwidget.h>
 #include <kseparator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <kprocess.h>
 
diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp
index 5c08f69b..bdc99ee5 100644
--- a/kooka/kooka.cpp
+++ b/kooka/kooka.cpp
@@ -36,11 +36,11 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeaccel.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
@@ -51,7 +51,7 @@
 #include <kurlrequesterdlg.h>
 #include <tqstrlist.h>
 #include <kedittoolbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdockwidget.h>
 #include <tdeparts/partmanager.h>
 #include <tdestdaccel.h>
diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp
index 32477e67..d170840d 100644
--- a/kooka/kookapref.cpp
+++ b/kooka/kookapref.cpp
@@ -28,7 +28,7 @@
 #include "kookapref.h"
 #include "img_saver.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
@@ -50,7 +50,7 @@
 #include "kscanslider.h"
 #include "ksaneocr.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 #include <kurlrequester.h>
diff --git a/kooka/kookaprint.cpp b/kooka/kookaprint.cpp
index 829cd8a5..2a8cdfba 100644
--- a/kooka/kookaprint.cpp
+++ b/kooka/kookaprint.cpp
@@ -32,7 +32,7 @@
 #include <tqfontmetrics.h>
 #include "imgprintdialog.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KookaPrint::KookaPrint( KPrinter *printer )
     :TQObject(),
diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp
index 21f670b9..98b49ef7 100644
--- a/kooka/kookaview.cpp
+++ b/kooka/kookaview.cpp
@@ -63,8 +63,8 @@
 #include <kdebug.h>
 #include <ktrader.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <keditcl.h>
 #include <kled.h>
 #include <kcombobox.h>
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index efcb76d6..89660b53 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -27,10 +27,10 @@
 /* $Id$ */
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kprocess.h>
 #include <stdlib.h>
 #include <tdespell.h>
@@ -56,7 +56,7 @@
 
 #include <tqtimer.h>
 #include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpaintdevice.h>
 #include <tqpainter.h>
 #include <tqpen.h>
diff --git a/kooka/main.cpp b/kooka/main.cpp
index 48b32420..67caed2c 100644
--- a/kooka/main.cpp
+++ b/kooka/main.cpp
@@ -33,8 +33,8 @@
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kimageio.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/kooka/ocrresedit.cpp b/kooka/ocrresedit.cpp
index 3ea563cc..8b65c398 100644
--- a/kooka/ocrresedit.cpp
+++ b/kooka/ocrresedit.cpp
@@ -29,7 +29,7 @@
 #include "ocrword.h"
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 #include <tqtextstream.h>
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp
index 22339e78..22f9b06a 100644
--- a/kooka/scanpackager.cpp
+++ b/kooka/scanpackager.cpp
@@ -40,7 +40,7 @@
 #include <tqpopupmenu.h>
 #include <tqdict.h>
 #include <tqpixmap.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqfiledialog.h>
 #include <tqstringlist.h>
 #include <tqheader.h>
@@ -57,8 +57,8 @@
 #include <tdefiledialog.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeio/global.h>
 #include <tdeio/progressbase.h>
 #include <tdeio/netaccess.h>
diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp
index f202778f..4f5c1d7a 100644
--- a/kooka/thumbview.cpp
+++ b/kooka/thumbview.cpp
@@ -36,7 +36,7 @@
 #include <tdefileiconview.h>
 #include <tdefiletreeviewitem.h>
 #include <kimageeffect.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kprogress.h>