Rename additional header files to avoid conflicts with KDE4

29 files changed, 44 insertions, 44 deletions

diff --git a/kpackage/cache.cpp b/kpackage/cache.cpp
index 69ef37b..bcd45e0 100644
--- a/kpackage/cache.cpp
+++ b/kpackage/cache.cpp
@@ -31,7 +31,7 @@
 #include "kpackage.h"
 #include "options.h"
 #include "cache.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 extern Opts *opts;
diff --git a/kpackage/debAptInterface.cpp b/kpackage/debAptInterface.cpp
index b673b4f..d3451b7 100644
--- a/kpackage/debAptInterface.cpp
+++ b/kpackage/debAptInterface.cpp
@@ -27,7 +27,7 @@
 #include "../config.h"
 #include <stdlib.h>
 
-#include "klocale.h"
+#include "tdelocale.h"
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kdebug.h>
diff --git a/kpackage/debDpkgInterface.cpp b/kpackage/debDpkgInterface.cpp
index 62f199a..cb58908 100644
--- a/kpackage/debDpkgInterface.cpp
+++ b/kpackage/debDpkgInterface.cpp
@@ -35,7 +35,7 @@
 #include <iostream>
 
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
@@ -47,7 +47,7 @@
 #include "utils.h"
 #include "options.h"
 #include "cache.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 extern TDEApplication *app;
diff --git a/kpackage/debInterface.cpp b/kpackage/debInterface.cpp
index 70acb23..dddbe4f 100644
--- a/kpackage/debInterface.cpp
+++ b/kpackage/debInterface.cpp
@@ -35,7 +35,7 @@
 #include <iostream>
 
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
@@ -47,7 +47,7 @@
 #include "utils.h"
 #include "options.h"
 #include "cache.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern TDEApplication *app;
 
diff --git a/kpackage/fbsdInterface.cpp b/kpackage/fbsdInterface.cpp
index 167ec1b..b6d3605 100644
--- a/kpackage/fbsdInterface.cpp
+++ b/kpackage/fbsdInterface.cpp
@@ -37,8 +37,8 @@
 
 #include <tqstringlist.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
diff --git a/kpackage/findf.cpp b/kpackage/findf.cpp
index 6712d4b..bcb936f 100644
--- a/kpackage/findf.cpp
+++ b/kpackage/findf.cpp
@@ -29,7 +29,7 @@
 #include <tqlineedit.h>
 #include <tqpainter.h> 
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 #include <kiconloader.h>
diff --git a/kpackage/findf.h b/kpackage/findf.h
index 77cd5fb..44bd9cd 100644
--- a/kpackage/findf.h
+++ b/kpackage/findf.h
@@ -45,7 +45,7 @@
 
 // KDE headers
 #include <tdeapplication.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdelistview.h>
 #include <kdialogbase.h>
 
diff --git a/kpackage/gentooInterface.cpp b/kpackage/gentooInterface.cpp
index 448b74c..9e02035 100644
--- a/kpackage/gentooInterface.cpp
+++ b/kpackage/gentooInterface.cpp
@@ -23,7 +23,7 @@
 #include "kpackage.h"
 #include "cache.h"
 #include "kpTerm.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <kfilterdev.h>
diff --git a/kpackage/kissInterface.cpp b/kpackage/kissInterface.cpp
index e98d385..a882d5f 100644
--- a/kpackage/kissInterface.cpp
+++ b/kpackage/kissInterface.cpp
@@ -38,7 +38,7 @@
 #include <tqfileinfo.h>
 
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "packageInfo.h"
@@ -49,7 +49,7 @@
 #include "utils.h"
 #include "options.h"
 #include "cache.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 extern TDEApplication *app;
diff --git a/kpackage/kpTerm.cpp b/kpackage/kpTerm.cpp
index aaaae29..4f49dc4 100644
--- a/kpackage/kpTerm.cpp
+++ b/kpackage/kpTerm.cpp
@@ -29,7 +29,7 @@
 
 #include <tqvbox.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 
 #include <kpTerm.h>
diff --git a/kpackage/kpTerm.h b/kpackage/kpTerm.h
index 0f63dfd..66b7bea 100644
--- a/kpackage/kpTerm.h
+++ b/kpackage/kpTerm.h
@@ -36,7 +36,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kpackage.h>
 #include <kpPty.h>
diff --git a/kpackage/kpackage.cpp b/kpackage/kpackage.cpp
index 66e2663..2ba15bf 100644
--- a/kpackage/kpackage.cpp
+++ b/kpackage/kpackage.cpp
@@ -43,9 +43,9 @@
 #include <tdeapplication.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kstdaction.h>
 #include <kedittoolbar.h>
diff --git a/kpackage/kplview.cpp b/kpackage/kplview.cpp
index afd03f0..3c38fa6 100644
--- a/kpackage/kplview.cpp
+++ b/kpackage/kplview.cpp
@@ -30,7 +30,7 @@
 #include <tqheader.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // kpackage.headers
 #include "kpackage.h"
diff --git a/kpackage/main.cpp b/kpackage/main.cpp
index dbe2e33..396fe7b 100644
--- a/kpackage/main.cpp
+++ b/kpackage/main.cpp
@@ -36,8 +36,8 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <options.h>
 
diff --git a/kpackage/managementWidget.cpp b/kpackage/managementWidget.cpp
index 8856276..649d24e 100644
--- a/kpackage/managementWidget.cpp
+++ b/kpackage/managementWidget.cpp
@@ -32,7 +32,7 @@
 #include <tqsplitter.h>
 #include <tqtoolbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdelistviewsearchline.h>
 #include <tdeaction.h>
diff --git a/kpackage/options.cpp b/kpackage/options.cpp
index 41b2377..3edf36f 100644
--- a/kpackage/options.cpp
+++ b/kpackage/options.cpp
@@ -34,7 +34,7 @@
 
 #include <tqvbox.h>
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
 #include <tqframe.h>
diff --git a/kpackage/packageDisplay.cpp b/kpackage/packageDisplay.cpp
index f416f21..57d1ed7 100644
--- a/kpackage/packageDisplay.cpp
+++ b/kpackage/packageDisplay.cpp
@@ -39,7 +39,7 @@
 
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <krun.h>
 #include <kopenwith.h>
 
@@ -50,7 +50,7 @@
 #include "pkgInterface.h"
 #include "utils.h"
 #include "options.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern Opts *opts;
 
diff --git a/kpackage/packageInfo.cpp b/kpackage/packageInfo.cpp
index b5a3a52..7dcbf9f 100644
--- a/kpackage/packageInfo.cpp
+++ b/kpackage/packageInfo.cpp
@@ -40,8 +40,8 @@
 #include <ctype.h>
 
 // KDE headers
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 // kpackage headers
diff --git a/kpackage/packageProperties.h b/kpackage/packageProperties.h
index 4b332c1..75a6ee8 100644
--- a/kpackage/packageProperties.h
+++ b/kpackage/packageProperties.h
@@ -41,7 +41,7 @@
 #include <tqregexp.h>
 
 // KDE Headers
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktextbrowser.h>
 
 // kpackage Headers
diff --git a/kpackage/pkgInterface.cpp b/kpackage/pkgInterface.cpp
index f5f31dc..c32bef4 100644
--- a/kpackage/pkgInterface.cpp
+++ b/kpackage/pkgInterface.cpp
@@ -24,8 +24,8 @@
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 
diff --git a/kpackage/pkgInterface.h b/kpackage/pkgInterface.h
index 8b4c779..05d4089 100644
--- a/kpackage/pkgInterface.h
+++ b/kpackage/pkgInterface.h
@@ -33,7 +33,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "packageInfo.h"
diff --git a/kpackage/pkgOptions.cpp b/kpackage/pkgOptions.cpp
index b17d9f5..acf9c4f 100644
--- a/kpackage/pkgOptions.cpp
+++ b/kpackage/pkgOptions.cpp
@@ -29,9 +29,9 @@
 // qt headers
 #include <tqlabel.h>
 
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <tdelistview.h>
 #include <kseparator.h>
 #include <kdebug.h>
diff --git a/kpackage/procbuf.cpp b/kpackage/procbuf.cpp
index 8da355a..122bf18 100644
--- a/kpackage/procbuf.cpp
+++ b/kpackage/procbuf.cpp
@@ -28,7 +28,7 @@
 #include "procbuf.h"
 #include <kprocess.h>
 #include "kpackage.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <kdebug.h>
 
diff --git a/kpackage/rpmInterface.cpp b/kpackage/rpmInterface.cpp
index 8096a78..a881c44 100644
--- a/kpackage/rpmInterface.cpp
+++ b/kpackage/rpmInterface.cpp
@@ -32,8 +32,8 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "kpPty.h"
diff --git a/kpackage/search.cpp b/kpackage/search.cpp
index a2cf9ff..aeab3ee 100644
--- a/kpackage/search.cpp
+++ b/kpackage/search.cpp
@@ -29,7 +29,7 @@
 #include "kpackage.h"
 #include "managementWidget.h"
 #include "search.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqframe.h>
diff --git a/kpackage/search.h b/kpackage/search.h
index 5af5b0b..0fc2b4d 100644
--- a/kpackage/search.h
+++ b/kpackage/search.h
@@ -40,7 +40,7 @@ class TQCheckBox;
 
 // KDE headers
 #include <tdeapplication.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kdialogbase.h>
 
 class Search : public KDialogBase
diff --git a/kpackage/slackInterface.cpp b/kpackage/slackInterface.cpp
index 33120c2..84e07a6 100644
--- a/kpackage/slackInterface.cpp
+++ b/kpackage/slackInterface.cpp
@@ -39,7 +39,7 @@
 #include <tqregexp.h>
 
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 
@@ -52,7 +52,7 @@
 #include "procbuf.h"
 #include "options.h"
 #include "cache.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 #define DIR "/var/log/packages/"
diff --git a/kpackage/updateLoc.cpp b/kpackage/updateLoc.cpp
index 9338a3d..4bee494 100644
--- a/kpackage/updateLoc.cpp
+++ b/kpackage/updateLoc.cpp
@@ -34,8 +34,8 @@
 
 #include <tqvbox.h>
 #include <tqscrollview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/kpackage/utils.cpp b/kpackage/utils.cpp
index 679b037..a4ca350 100644
--- a/kpackage/utils.cpp
+++ b/kpackage/utils.cpp
@@ -26,8 +26,8 @@
 
 #include "../config.h"
 #include <kpackage.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "utils.h"
 #include "kplview.h"