summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 22:00:04 -0600
commit783715b853042d24841e3e888051f3a184e78a40 (patch)
tree33ce107e439bb622368ba17b8a2a6485ef28e3b5
parent980088ed866120f458c10c1ec64295e84ad8ba82 (diff)
downloadtdeutils-783715b853042d24841e3e888051f3a184e78a40.tar.gz
tdeutils-783715b853042d24841e3e888051f3a184e78a40.zip
Rename additional header files to avoid conflicts with KDE4
-rw-r--r--ark/ace.cpp6
-rw-r--r--ark/ar.cpp4
-rw-r--r--ark/arch.cpp4
-rw-r--r--ark/archiveformatdlg.cpp2
-rw-r--r--ark/archiveformatinfo.cpp2
-rw-r--r--ark/arj.cpp4
-rw-r--r--ark/ark_part.cpp2
-rw-r--r--ark/arkapp.cpp2
-rw-r--r--ark/arkviewer.cpp4
-rw-r--r--ark/arkwidget.cpp6
-rw-r--r--ark/artdeutils.cpp4
-rw-r--r--ark/compressedfile.cpp6
-rw-r--r--ark/extractiondialog.cpp6
-rw-r--r--ark/filelistview.cpp6
-rw-r--r--ark/lha.cpp4
-rw-r--r--ark/mainwindow.cpp4
-rw-r--r--ark/rar.cpp6
-rw-r--r--ark/searchbar.cpp2
-rw-r--r--ark/sevenzip.cpp6
-rw-r--r--ark/tar.cpp6
-rw-r--r--ark/zip.cpp4
-rw-r--r--ark/zoo.cpp4
-rw-r--r--charselectapplet/charselectapplet.cpp4
-rw-r--r--kcalc/kcalc.cpp6
-rw-r--r--kcalc/kcalc.kcfg2
-rw-r--r--kcalc/kcalc_const_button.h2
-rw-r--r--kcalc/kcalc_const_menu.cpp2
-rw-r--r--kcalc/kcalc_core.cpp4
-rw-r--r--kcalc/kcalcdisplay.cpp4
-rw-r--r--kcharselect/kcharselectdia.cc2
-rw-r--r--kcharselect/main.cc2
-rw-r--r--kdelirc/irkick/irkick.cpp6
-rw-r--r--kdelirc/irkick/klircclient.cpp4
-rw-r--r--kdelirc/irkick/main.cpp4
-rw-r--r--kdelirc/kcmlirc/addaction.cpp4
-rw-r--r--kdelirc/kcmlirc/editaction.cpp2
-rw-r--r--kdelirc/kcmlirc/kcmlirc.cpp6
-rw-r--r--kdelirc/kdelirc/iraction.cpp2
-rw-r--r--kdelirc/kdelirc/profileserver.cpp2
-rw-r--r--kdelirc/kdelirc/remoteserver.cpp2
-rw-r--r--kdessh/kdessh.cpp4
-rw-r--r--kdessh/sshdlg.cpp4
-rw-r--r--kdf/disks.cpp2
-rw-r--r--kdf/disks.h2
-rw-r--r--kdf/distdelist.h2
-rw-r--r--kdf/kdf.h2
-rw-r--r--kdf/kdfconfig.cpp2
-rw-r--r--kdf/kdfwidget.cpp2
-rw-r--r--kdf/kwikdisk.cpp4
-rw-r--r--kdf/mntconfig.cpp2
-rw-r--r--kdf/tdeconftest.cpp2
-rw-r--r--kedit/kedit.cpp2
-rw-r--r--kedit/ktextfiledlg.cpp4
-rw-r--r--kfloppy/floppy.cpp4
-rw-r--r--kfloppy/format.cpp2
-rw-r--r--kfloppy/zip.cpp2
-rw-r--r--kgpg/CMakeLists.txt2
-rw-r--r--kgpg/detailedconsole.cpp6
-rw-r--r--kgpg/keygener.cpp4
-rw-r--r--kgpg/keyinfowidget.cpp6
-rw-r--r--kgpg/keyservers.cpp4
-rw-r--r--kgpg/kgpg.cpp8
-rw-r--r--kgpg/kgpgeditor.cpp6
-rw-r--r--kgpg/kgpginterface.cpp6
-rw-r--r--kgpg/kgpglibrary.cpp4
-rw-r--r--kgpg/kgpgoptions.cpp4
-rw-r--r--kgpg/kgpgview.cpp4
-rw-r--r--kgpg/listkeys.cpp10
-rw-r--r--kgpg/main.cpp4
-rw-r--r--kgpg/popuppublic.cpp2
-rw-r--r--khexedit/bitswapwidget.cc2
-rw-r--r--khexedit/chartabledialog.cc4
-rw-r--r--khexedit/conversion.cc2
-rw-r--r--khexedit/converterdialog.cc2
-rw-r--r--khexedit/dialog.cc4
-rw-r--r--khexedit/exportdialog.cc4
-rw-r--r--khexedit/fileinfodialog.cc6
-rw-r--r--khexedit/hexbuffer.cc6
-rw-r--r--khexedit/hexeditorwidget.cc8
-rw-r--r--khexedit/hexeditstate.h2
-rw-r--r--khexedit/hexerror.cc2
-rw-r--r--khexedit/hexmanagerwidget.cc2
-rw-r--r--khexedit/hextoolwidget.cc2
-rw-r--r--khexedit/hexviewwidget.cc4
-rw-r--r--khexedit/lib/codecs/ktextcharcodec.cpp4
-rw-r--r--khexedit/lib/kbufferdrag.cpp4
-rw-r--r--khexedit/lib/kcharcolumn.cpp4
-rw-r--r--khexedit/lib/khexedit.cpp2
-rw-r--r--khexedit/main.cc2
-rw-r--r--khexedit/optiondialog.cc4
-rw-r--r--khexedit/parts/kbytesedit/kbyteseditwidget.cpp2
-rw-r--r--khexedit/parts/kpart/khepart.cpp4
-rw-r--r--khexedit/parts/kpart/khepartfactory.cpp2
-rw-r--r--khexedit/printdialogpage.cc2
-rw-r--r--khexedit/searchbar.cc2
-rw-r--r--khexedit/statusbarprogress.cc4
-rw-r--r--khexedit/stringdialog.cc6
-rw-r--r--khexedit/toplevel.cc4
-rw-r--r--kjots/KJotsMain.cpp4
-rw-r--r--kjots/kjotsedit.cpp2
-rw-r--r--kjots/kjotsentry.cpp6
-rw-r--r--klaptopdaemon/acpi.cpp4
-rw-r--r--klaptopdaemon/apm.cpp4
-rw-r--r--klaptopdaemon/battery.cpp4
-rw-r--r--klaptopdaemon/buttons.cpp4
-rw-r--r--klaptopdaemon/daemon_state.cpp4
-rw-r--r--klaptopdaemon/daemondock.cpp6
-rw-r--r--klaptopdaemon/kpcmcia.cpp2
-rw-r--r--klaptopdaemon/kpcmciainfo.cpp2
-rw-r--r--klaptopdaemon/krichtextlabel.cpp2
-rw-r--r--klaptopdaemon/laptop_check.cpp2
-rw-r--r--klaptopdaemon/laptop_daemon.cpp4
-rw-r--r--klaptopdaemon/main.cpp4
-rw-r--r--klaptopdaemon/pcmcia.cpp4
-rw-r--r--klaptopdaemon/portable.cpp2
-rw-r--r--klaptopdaemon/power.cpp4
-rw-r--r--klaptopdaemon/profile.cpp4
-rw-r--r--klaptopdaemon/sony.cpp4
-rw-r--r--klaptopdaemon/warning.cpp4
-rw-r--r--kmilo/kmilo_kvaio/kvaio.cpp2
-rw-r--r--kmilo/kmilod/defaultskin.cpp2
-rw-r--r--kmilo/kmilod/kmilod.cpp2
-rw-r--r--kregexpeditor/KMultiFormListBox/ccp.cpp2
-rw-r--r--kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp2
-rw-r--r--kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp2
-rw-r--r--kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h2
-rw-r--r--kregexpeditor/altnwidget.cpp4
-rw-r--r--kregexpeditor/auxbuttons.cpp2
-rw-r--r--kregexpeditor/charselector.cpp2
-rw-r--r--kregexpeditor/compoundregexp.cpp2
-rw-r--r--kregexpeditor/compoundwidget.cpp2
-rw-r--r--kregexpeditor/editorwindow.cpp4
-rw-r--r--kregexpeditor/emacsregexpconverter.cpp4
-rw-r--r--kregexpeditor/errormap.cpp4
-rw-r--r--kregexpeditor/gen_qregexpparser.cc4
-rw-r--r--kregexpeditor/infopage.cpp2
-rw-r--r--kregexpeditor/kregexpeditorgui.cpp2
-rw-r--r--kregexpeditor/kregexpeditorprivate.cpp4
-rw-r--r--kregexpeditor/lookaheadwidget.cpp2
-rw-r--r--kregexpeditor/main.cpp2
-rw-r--r--kregexpeditor/qregexpparser.y4
-rw-r--r--kregexpeditor/regexpbuttons.cpp2
-rw-r--r--kregexpeditor/repeatregexp.cpp4
-rw-r--r--kregexpeditor/repeatwidget.cpp2
-rw-r--r--kregexpeditor/textrangeregexp.cpp4
-rw-r--r--kregexpeditor/textregexp.cpp4
-rw-r--r--kregexpeditor/userdefinedregexps.cpp4
-rw-r--r--kregexpeditor/verifier.cpp2
-rw-r--r--kregexpeditor/verifybuttons.cpp4
-rw-r--r--kregexpeditor/widgetfactory.cpp2
-rw-r--r--kregexpeditor/zerowidgets.cpp2
-rw-r--r--ksim/generalprefs.cpp2
-rw-r--r--ksim/ksim.cpp6
-rw-r--r--ksim/ksimpref.cpp4
-rw-r--r--ksim/ksimsysinfo.cpp4
-rw-r--r--ksim/ksimview.cpp4
-rw-r--r--ksim/library/chart.cpp4
-rw-r--r--ksim/library/ksimconfig.cpp2
-rw-r--r--ksim/library/label.cpp4
-rw-r--r--ksim/library/pluginglobal.cpp2
-rw-r--r--ksim/library/pluginloader.cpp6
-rw-r--r--ksim/library/pluginmodule.cpp2
-rw-r--r--ksim/library/themeloader.cpp4
-rw-r--r--ksim/monitorprefs.cpp4
-rw-r--r--ksim/monitors/cpu/ksimcpu.cpp4
-rw-r--r--ksim/monitors/disk/ksimdisk.cpp2
-rw-r--r--ksim/monitors/filesystem/filesystemwidget.cpp4
-rw-r--r--ksim/monitors/filesystem/fsystemconfig.cpp2
-rw-r--r--ksim/monitors/filesystem/ksimfsystem.cpp2
-rw-r--r--ksim/monitors/i8k/ksimi8k.cpp2
-rw-r--r--ksim/monitors/lm_sensors/ksimsensors.cpp2
-rw-r--r--ksim/monitors/lm_sensors/sensorbase.cpp2
-rw-r--r--ksim/monitors/lm_sensors/sensorsconfig.cpp2
-rw-r--r--ksim/monitors/mail/ksimmail.cpp2
-rw-r--r--ksim/monitors/net/ksimnet.cpp4
-rw-r--r--ksim/monitors/net/netconfig.cpp4
-rw-r--r--ksim/monitors/net/netdialog.cpp2
-rw-r--r--ksim/monitors/snmp/browsedialog.cpp2
-rw-r--r--ksim/monitors/snmp/configpage.cpp4
-rw-r--r--ksim/monitors/snmp/hostdialog.cpp4
-rw-r--r--ksim/monitors/snmp/monitordialog.cpp2
-rw-r--r--ksim/monitors/snmp/probedialog.cpp2
-rw-r--r--ksim/monitors/snmp/proberesultdialog.cpp2
-rw-r--r--ksim/monitors/snmp/value.cpp2
-rw-r--r--ksim/themeprefs.cpp4
-rw-r--r--ktimer/main.cpp2
-rw-r--r--superkaramba/src/imagelabel.cpp2
-rw-r--r--superkaramba/src/karamba.cpp4
-rw-r--r--superkaramba/src/karambaapp.cpp4
-rw-r--r--superkaramba/src/kwidgetlistbox.cpp2
-rw-r--r--superkaramba/src/main.cpp2
-rw-r--r--superkaramba/src/misc_python.cpp4
-rw-r--r--superkaramba/src/systemtray.cpp4
-rw-r--r--superkaramba/src/taskbartest.cpp2
-rw-r--r--superkaramba/src/taskmanager.cpp4
-rw-r--r--superkaramba/src/taskmanager.h2
-rw-r--r--superkaramba/src/themefile.cpp4
-rw-r--r--superkaramba/src/themelocale.cpp6
-rw-r--r--superkaramba/src/themesdlg.cpp2
-rw-r--r--superkaramba/src/themewidget.cpp2
-rw-r--r--tdewallet/allyourbase.cpp6
-rw-r--r--tdewallet/kwmapeditor.cpp2
-rw-r--r--tdewallet/main.cpp4
-rw-r--r--tdewallet/tdewalleteditor.cpp6
-rw-r--r--tdewallet/tdewalletmanager.cpp4
-rw-r--r--tdewallet/tdewalletpopup.cpp4
206 files changed, 351 insertions, 351 deletions
diff --git a/ark/ace.cpp b/ark/ace.cpp
index 2f29bf3..4f1d2e4 100644
--- a/ark/ace.cpp
+++ b/ark/ace.cpp
@@ -24,11 +24,11 @@
#include <tqdir.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <kstandarddirs.h>
diff --git a/ark/ar.cpp b/ark/ar.cpp
index 8edb2dd..181b9cc 100644
--- a/ark/ar.cpp
+++ b/ark/ar.cpp
@@ -36,8 +36,8 @@
// KDE includes
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
// ark includes
diff --git a/ark/arch.cpp b/ark/arch.cpp
index cd3d186..2ca8ec5 100644
--- a/ark/arch.cpp
+++ b/ark/arch.cpp
@@ -37,9 +37,9 @@
// KDE includes
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpassdlg.h>
#include <kprocess.h>
#include <kstandarddirs.h>
diff --git a/ark/archiveformatdlg.cpp b/ark/archiveformatdlg.cpp
index 5ac942c..f64bd45 100644
--- a/ark/archiveformatdlg.cpp
+++ b/ark/archiveformatdlg.cpp
@@ -23,7 +23,7 @@
#include "archiveformatinfo.h"
#include "arch.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqvbox.h>
diff --git a/ark/archiveformatinfo.cpp b/ark/archiveformatinfo.cpp
index 2f6fded..1cff881 100644
--- a/ark/archiveformatinfo.cpp
+++ b/ark/archiveformatinfo.cpp
@@ -24,7 +24,7 @@
#include "archiveformatinfo.h"
#include "settings.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kdesktopfile.h>
#include <kfilterdev.h>
diff --git a/ark/arj.cpp b/ark/arj.cpp
index 79574b1..f081e17 100644
--- a/ark/arj.cpp
+++ b/ark/arj.cpp
@@ -33,8 +33,8 @@
// KDE includes
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <kpassdlg.h>
diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp
index 6feb309..9a8cd50 100644
--- a/ark/ark_part.cpp
+++ b/ark/ark_part.cpp
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaboutdata.h>
#include <kxmlguifactory.h>
#include <kstatusbar.h>
diff --git a/ark/arkapp.cpp b/ark/arkapp.cpp
index 269b155..4a98c94 100644
--- a/ark/arkapp.cpp
+++ b/ark/arkapp.cpp
@@ -28,7 +28,7 @@
#include <dcopclient.h>
#include <kdebug.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <unistd.h>
#include <tqfile.h>
#include <errno.h>
diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index f011e62..34f9cfd 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -21,12 +21,12 @@
#include "arkviewer.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/componentfactory.h>
#include <kmimetype.h>
#include <kdebug.h>
#include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tqvbox.h>
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index 5f29b97..5dacb77 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -41,12 +41,12 @@
// KDE includes
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <kopenwith.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kmimemagic.h>
#include <kmimetype.h>
#include <kstandarddirs.h>
diff --git a/ark/artdeutils.cpp b/ark/artdeutils.cpp
index dbf5395..bdfec3f 100644
--- a/ark/artdeutils.cpp
+++ b/ark/artdeutils.cpp
@@ -65,8 +65,8 @@
// KDE includes
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <klargefile.h>
// TQt includes
diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp
index b0dd55d..a6b0ddc 100644
--- a/ark/compressedfile.cpp
+++ b/ark/compressedfile.cpp
@@ -34,8 +34,8 @@
// KDE includes
#include <kdebug.h>
#include <klargefile.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <ktempdir.h>
#include <kprocess.h>
@@ -44,7 +44,7 @@
#include <tdeio/global.h>
#include <tdefileitem.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
// ark includes
#include "arkwidget.h"
diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp
index ca82b56..0684ca1 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -36,13 +36,13 @@
#include <tqradiobutton.h>
#include <tqlayout.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kurlrequester.h>
#include <kurlcompletion.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcombobox.h>
#include <klineedit.h>
#include <kurlpixmapprovider.h>
diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp
index 8792239..0e099d0 100644
--- a/ark/filelistview.cpp
+++ b/ark/filelistview.cpp
@@ -32,10 +32,10 @@
#include <tqheader.h>
// KDE includes
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kmimetype.h>
#include "filelistview.h"
diff --git a/ark/lha.cpp b/ark/lha.cpp
index f0074aa..18a31db 100644
--- a/ark/lha.cpp
+++ b/ark/lha.cpp
@@ -40,8 +40,8 @@
// KDE includes
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
// ark includes
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index f89a573..0b3872e 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -26,11 +26,11 @@
// KDE includes
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kedittoolbar.h>
#include <kstatusbar.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <tdeparts/componentfactory.h>
#include <tdeparts/browserextension.h>
diff --git a/ark/rar.cpp b/ark/rar.cpp
index 500b338..5878769 100644
--- a/ark/rar.cpp
+++ b/ark/rar.cpp
@@ -36,9 +36,9 @@
// KDE includes
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kpassdlg.h>
#include <kprocess.h>
#include <kstandarddirs.h>
diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp
index a1fee6f..498e3e3 100644
--- a/ark/searchbar.cpp
+++ b/ark/searchbar.cpp
@@ -24,7 +24,7 @@
#include <tdelistviewsearchline.h>
#include <tdelistview.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdeactioncollection.h>
diff --git a/ark/sevenzip.cpp b/ark/sevenzip.cpp
index c683f67..3f5fff2 100644
--- a/ark/sevenzip.cpp
+++ b/ark/sevenzip.cpp
@@ -27,11 +27,11 @@
#include <tqdir.h>
#include <tqtextcodec.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpassdlg.h>
#include <kprocess.h>
#include <kstandarddirs.h>
diff --git a/ark/tar.cpp b/ark/tar.cpp
index d767e4d..10bf55f 100644
--- a/ark/tar.cpp
+++ b/ark/tar.cpp
@@ -57,9 +57,9 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <klargefile.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
#include <kmimetype.h>
#include <kstandarddirs.h>
#include <ktempdir.h>
diff --git a/ark/zip.cpp b/ark/zip.cpp
index 3f48607..4227ae5 100644
--- a/ark/zip.cpp
+++ b/ark/zip.cpp
@@ -31,8 +31,8 @@
// KDE includes
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <kpassdlg.h>
diff --git a/ark/zoo.cpp b/ark/zoo.cpp
index c9814b4..e173415 100644
--- a/ark/zoo.cpp
+++ b/ark/zoo.cpp
@@ -37,8 +37,8 @@
// KDE includes
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
// ark includes
diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp
index eed60bf..368f311 100644
--- a/charselectapplet/charselectapplet.cpp
+++ b/charselectapplet/charselectapplet.cpp
@@ -30,8 +30,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <tqspinbox.h>
#include <tqlabel.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <klineedit.h>
#include <tdeaboutapplication.h>
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 3c48ed3..3b186fd 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -51,10 +51,10 @@
#include <tdeconfigdialog.h>
#include <kdialog.h>
#include <tdefontdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kkeydialog.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <knotifyclient.h>
#include <knumvalidator.h>
#include <tdepopupmenu.h>
diff --git a/kcalc/kcalc.kcfg b/kcalc/kcalc.kcfg
index d1fbf7e..2192df3 100644
--- a/kcalc/kcalc.kcfg
+++ b/kcalc/kcalc.kcfg
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
<include>tdeapplication.h</include>
- <include>kglobalsettings.h</include>
+ <include>tdeglobalsettings.h</include>
<include>config.h</include>
<kcfgfile name="kcalcrc"/>
<group name="Colors">
diff --git a/kcalc/kcalc_const_button.h b/kcalc/kcalc_const_button.h
index a30b657..0658571 100644
--- a/kcalc/kcalc_const_button.h
+++ b/kcalc/kcalc_const_button.h
@@ -24,7 +24,7 @@
#ifndef _KCALC_CONST_BUTTON_H
#define _KCALC_CONST_BUTTON_H
-#include <klocale.h>
+#include <tdelocale.h>
#include "kcalc_button.h"
diff --git a/kcalc/kcalc_const_menu.cpp b/kcalc/kcalc_const_menu.cpp
index f758c9f..23790cb 100644
--- a/kcalc/kcalc_const_menu.cpp
+++ b/kcalc/kcalc_const_menu.cpp
@@ -19,7 +19,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "kcalc_const_menu.h"
diff --git a/kcalc/kcalc_core.cpp b/kcalc/kcalc_core.cpp
index ff7af42..068b442 100644
--- a/kcalc/kcalc_core.cpp
+++ b/kcalc/kcalc_core.cpp
@@ -49,8 +49,8 @@
#include <config.h>
#include "kcalc_core.h"
#include <stdlib.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kcalctype.h"
#ifndef HAVE_FUNC_ISINF
diff --git a/kcalc/kcalcdisplay.cpp b/kcalc/kcalcdisplay.cpp
index f768ffa..8ad1350 100644
--- a/kcalc/kcalcdisplay.cpp
+++ b/kcalc/kcalcdisplay.cpp
@@ -31,8 +31,8 @@
#include <tqpainter.h>
#include <tqregexp.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include "kcalc_settings.h"
#include "kcalcdisplay.h"
diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc
index df3fa63..1df590b 100644
--- a/kcharselect/kcharselectdia.cc
+++ b/kcharselect/kcharselectdia.cc
@@ -13,7 +13,7 @@
#include <tdeapplication.h>
#include <tdeaccel.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
/******************************************************************/
diff --git a/kcharselect/main.cc b/kcharselect/main.cc
index 66d5771..cb74af5 100644
--- a/kcharselect/main.cc
+++ b/kcharselect/main.cc
@@ -10,7 +10,7 @@
#include <tdeconfig.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
static const char description[] =
I18N_NOOP("TDE character selection utility");
diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp
index 12122ae..2d042f0 100644
--- a/kdelirc/irkick/irkick.cpp
+++ b/kdelirc/irkick/irkick.cpp
@@ -24,16 +24,16 @@
#include <ksystemtray.h>
#include <kiconloader.h>
#include <kpassivepopup.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdialog.h>
#include <tdeabouttde.h>
#include <twinmodule.h>
#include <twin.h>
#include <khelpmenu.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstdguiitem.h>
#include <dcopclient.h>
diff --git a/kdelirc/irkick/klircclient.cpp b/kdelirc/irkick/klircclient.cpp
index f6c8f00..b7051fc 100644
--- a/kdelirc/irkick/klircclient.cpp
+++ b/kdelirc/irkick/klircclient.cpp
@@ -30,10 +30,10 @@
#include <ksystemtray.h>
#include <kiconloader.h>
#include <kpassivepopup.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdialog.h>
#include <tdeabouttde.h>
diff --git a/kdelirc/irkick/main.cpp b/kdelirc/irkick/main.cpp
index 2aa30e0..aa9d697 100644
--- a/kdelirc/irkick/main.cpp
+++ b/kdelirc/irkick/main.cpp
@@ -7,11 +7,11 @@
// This program is free software.
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <twin.h>
#include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <kuniqueapplication.h>
diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp
index 38cd1d5..8a87775 100644
--- a/kdelirc/kcmlirc/addaction.cpp
+++ b/kdelirc/kcmlirc/addaction.cpp
@@ -19,10 +19,10 @@
#include <klineedit.h>
#include <tdelistview.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <keditlistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include <irkick_stub.h>
diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp
index 392b20d..8d8a0cb 100644
--- a/kdelirc/kcmlirc/editaction.cpp
+++ b/kdelirc/kcmlirc/editaction.cpp
@@ -22,7 +22,7 @@
#include <klineedit.h>
#include <tdelistview.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <keditlistbox.h>
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index 6ddf888..bf18895 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -19,8 +19,8 @@
#include <kpushbutton.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kicondialog.h>
#include <kiconloader.h>
@@ -28,7 +28,7 @@
#include <ksimpleconfig.h>
#include <kgenericfactory.h>
#include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <dcopclient.h>
diff --git a/kdelirc/kdelirc/iraction.cpp b/kdelirc/kdelirc/iraction.cpp
index 00be5da..46b581f 100644
--- a/kdelirc/kdelirc/iraction.cpp
+++ b/kdelirc/kdelirc/iraction.cpp
@@ -14,7 +14,7 @@
#include <tqvariant.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "iraction.h"
#include "profileserver.h"
diff --git a/kdelirc/kdelirc/profileserver.cpp b/kdelirc/kdelirc/profileserver.cpp
index 880b50f..ba39442 100644
--- a/kdelirc/kdelirc/profileserver.cpp
+++ b/kdelirc/kdelirc/profileserver.cpp
@@ -14,7 +14,7 @@
#include <tqfile.h>
#include <tqxml.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/kdelirc/kdelirc/remoteserver.cpp b/kdelirc/kdelirc/remoteserver.cpp
index 706bb0d..dafa67d 100644
--- a/kdelirc/kdelirc/remoteserver.cpp
+++ b/kdelirc/kdelirc/remoteserver.cpp
@@ -14,7 +14,7 @@
#include <tqfile.h>
#include <tqxml.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp
index 6aba0ec..5d64290 100644
--- a/kdessh/kdessh.cpp
+++ b/kdessh/kdessh.cpp
@@ -22,10 +22,10 @@
#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdesu/ssh.h>
#include <tdesu/client.h>
diff --git a/kdessh/sshdlg.cpp b/kdessh/sshdlg.cpp
index 31b0193..c7ca281 100644
--- a/kdessh/sshdlg.cpp
+++ b/kdessh/sshdlg.cpp
@@ -6,8 +6,8 @@
* Copyright (C) 2000 Geert Jansen <jansen@kde.org>
*/
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdesu/ssh.h>
#include "sshdlg.h"
diff --git a/kdf/disks.cpp b/kdf/disks.cpp
index c8a19d4..1084380 100644
--- a/kdf/disks.cpp
+++ b/kdf/disks.cpp
@@ -24,7 +24,7 @@
#include <tqfileinfo.h>
#include <tqdir.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include "disks.h"
diff --git a/kdf/disks.h b/kdf/disks.h
index 83b0d5d..0a0d529 100644
--- a/kdf/disks.h
+++ b/kdf/disks.h
@@ -35,7 +35,7 @@
#include <tdeio/global.h>
#include <kprogress.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
class DiskEntry : public TQObject
{
diff --git a/kdf/distdelist.h b/kdf/distdelist.h
index 81871b2..49e2a1b 100644
--- a/kdf/distdelist.h
+++ b/kdf/distdelist.h
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
//#include <kcontrol.h>
// defines the os-type
diff --git a/kdf/kdf.h b/kdf/kdf.h
index 9543650..c365294 100644
--- a/kdf/kdf.h
+++ b/kdf/kdf.h
@@ -23,7 +23,7 @@
#define __KDF_H__
#include <tdemainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include "kdfwidget.h"
diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp
index 7ea7590..1180d6d 100644
--- a/kdf/kdfconfig.cpp
+++ b/kdf/kdfconfig.cpp
@@ -38,7 +38,7 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include "listview.h"
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index edaa7c1..7c5121d 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -37,7 +37,7 @@
#include <tdeapplication.h>
#include <kcmenumngr.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <kprocess.h>
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index 76c07c3..67416c7 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -36,11 +36,11 @@
#include <tqpainter.h>
#include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <krun.h>
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index 6867fdf..e70f915 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -37,7 +37,7 @@
#include <tdeapplication.h>
#include <tdefiledialog.h>
#include <kicondialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "listview.h"
#include "mntconfig.h"
diff --git a/kdf/tdeconftest.cpp b/kdf/tdeconftest.cpp
index d6fe847..ff806f9 100644
--- a/kdf/tdeconftest.cpp
+++ b/kdf/tdeconftest.cpp
@@ -37,7 +37,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
static const char description[] =
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index c1aab5d..ecc036c 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -40,7 +40,7 @@
#include <tdefileitem.h>
#include <tdefontdialog.h>
#include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprinter.h>
#include <ksavefile.h>
#include <kstatusbar.h>
diff --git a/kedit/ktextfiledlg.cpp b/kedit/ktextfiledlg.cpp
index 41dd04e..a5b5b13 100644
--- a/kedit/ktextfiledlg.cpp
+++ b/kedit/ktextfiledlg.cpp
@@ -21,9 +21,9 @@
#include <tqlabel.h>
#include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcharsets.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
#include <tderecentdocument.h>
#include <tdetoolbar.h>
#include <kpushbutton.h>
diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index c3ee414..91593a6 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -32,14 +32,14 @@
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <khelpmenu.h>
#include <kpushbutton.h>
#include <tdepopupmenu.h>
#include <tdeapplication.h>
#include <kprogress.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
#include <klineedit.h>
#include <dcopref.h>
diff --git a/kfloppy/format.cpp b/kfloppy/format.cpp
index 1b26329..5c3729c 100644
--- a/kfloppy/format.cpp
+++ b/kfloppy/format.cpp
@@ -27,7 +27,7 @@
#include <tqtimer.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <kdebug.h>
#include <kstandarddirs.h>
diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp
index 2f9dd5d..a35a715 100644
--- a/kfloppy/zip.cpp
+++ b/kfloppy/zip.cpp
@@ -38,7 +38,7 @@
#include <tqtimer.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <tdeconfig.h>
diff --git a/kgpg/CMakeLists.txt b/kgpg/CMakeLists.txt
index 3bd5905..3121421 100644
--- a/kgpg/CMakeLists.txt
+++ b/kgpg/CMakeLists.txt
@@ -40,7 +40,7 @@ tde_add_executable( kgpg AUTOMOC
keyexport.ui sourceselect.ui
kgpgsettings.kcfgc conf_servers.ui
conf_ui2.ui conf_misc.ui
- LINK kabc-shared tdeutils-shared tdeprint-shared
+ LINK tdeabc-shared tdeutils-shared tdeprint-shared
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/kgpg/detailedconsole.cpp b/kgpg/detailedconsole.cpp
index 2fe2ce3..3eab40e 100644
--- a/kgpg/detailedconsole.cpp
+++ b/kgpg/detailedconsole.cpp
@@ -21,10 +21,10 @@
#include <tqvgroupbox.h>
#include <tqtextedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdelistbox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "kgpgoptions.h"
#include "detailedconsole.h"
diff --git a/kgpg/keygener.cpp b/kgpg/keygener.cpp
index 26ecebe..30fd99c 100644
--- a/kgpg/keygener.cpp
+++ b/kgpg/keygener.cpp
@@ -28,8 +28,8 @@
#include <tqbuttongroup.h>
#include <tqhbuttongroup.h>
#include <tqvbuttongroup.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include "keygener.h"
diff --git a/kgpg/keyinfowidget.cpp b/kgpg/keyinfowidget.cpp
index 06c6e04..1de61af 100644
--- a/kgpg/keyinfowidget.cpp
+++ b/kgpg/keyinfowidget.cpp
@@ -15,7 +15,7 @@
* *
***************************************************************************/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <tqdatetime.h>
#include <tqfile.h>
@@ -23,7 +23,7 @@
#include <kpassivepopup.h>
#include <tdeaction.h>
#include <tqregexp.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqimage.h>
#include <kdatepicker.h>
#include <tqpushbutton.h>
@@ -36,7 +36,7 @@
#include <klineedit.h>
#include <ktrader.h>
#include <kservice.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "keyinfowidget.h"
#include "keyproperties.h"
diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp
index f8d00c9..364de3a 100644
--- a/kgpg/keyservers.cpp
+++ b/kgpg/keyservers.cpp
@@ -23,7 +23,7 @@
#include <kiconloader.h>
#include <kcombobox.h>
#include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqtextcodec.h>
#include <tqlayout.h>
#include <tqlabel.h>
@@ -35,7 +35,7 @@
#include <tqregexp.h>
#include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <kprocio.h>
#include <tdelistview.h>
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index 7febe6b..c711e3a 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -26,13 +26,13 @@
#include <tqmovie.h>
#include <tqcstring.h>
#include <tqhbuttongroup.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kactivelabel.h>
#include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcombobox.h>
#include <tqregexp.h>
#include <tdecmdlineargs.h>
@@ -45,7 +45,7 @@
#include <tqlayout.h>
#include <tqbuttongroup.h>
#include <kiconloader.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <twin.h>
#include <kprocess.h>
#include <kprocio.h>
diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp
index 212d9a3..b60ee8d 100644
--- a/kgpg/kgpgeditor.cpp
+++ b/kgpg/kgpgeditor.cpp
@@ -19,7 +19,7 @@
#include <tdeaction.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include <tqpaintdevicemetrics.h>
#include <tqcstring.h>
@@ -31,12 +31,12 @@
#include <tqtextcodec.h>
#include <tqpainter.h>
#include <kprinter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <klineedit.h>
#include <tqcheckbox.h>
#include <kurlrequester.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeio/netaccess.h>
#include <tdeio/renamedlg.h>
#include <kedittoolbar.h>
diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp
index 965a9d9..637198b 100644
--- a/kgpg/kgpginterface.cpp
+++ b/kgpg/kgpginterface.cpp
@@ -27,8 +27,8 @@
#include <tdeio/netaccess.h>
#include <tqcheckbox.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kpassdlg.h>
#include <kmdcodec.h>
#include <klineedit.h>
@@ -43,7 +43,7 @@
#include <tqfile.h>
#include <kled.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include "kgpginterface.h"
#include "listkeys.h"
diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp
index 9c408b7..66fbc45 100644
--- a/kgpg/kgpglibrary.cpp
+++ b/kgpg/kgpglibrary.cpp
@@ -18,10 +18,10 @@
#include <tqhbox.h>
#include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <krun.h>
#include <tqfile.h>
#include <kpassivepopup.h>
diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp
index 8c6e92d..37533ae 100644
--- a/kgpg/kgpgoptions.cpp
+++ b/kgpg/kgpgoptions.cpp
@@ -25,14 +25,14 @@
#include <tqfile.h>
#include <tdeconfig.h>
#include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocio.h>
#include <tqcheckbox.h>
#include <tqradiobutton.h>
#include <tqpushbutton.h>
#include <tqfont.h>
#include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include <kcombobox.h>
#include <kurlrequester.h>
diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp
index aafa0fb..0c044f7 100644
--- a/kgpg/kgpgview.cpp
+++ b/kgpg/kgpgview.cpp
@@ -26,11 +26,11 @@
#include <tqregexp.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdaction.h>
#include <kurldrag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqfile.h>
#include <tqlayout.h>
#include <kbuttonbox.h>
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index 7b2b56f..f42e6b7 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -36,7 +36,7 @@
#include <tqpaintdevicemetrics.h>
#include <tqtooltip.h>
#include <tqheader.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kprocess.h>
#include <kprocio.h>
@@ -54,7 +54,7 @@
#include <tdefiledialog.h>
#include <tdeshortcut.h>
#include <tdestdaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ktip.h>
#include <krun.h>
#include <kprinter.h>
@@ -63,10 +63,10 @@
#include <dcopclient.h>
#include <klineedit.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addresseedialog.h>
#include <kdesktopfile.h>
#include <kmimetype.h>
#include <kstandarddirs.h>
diff --git a/kgpg/main.cpp b/kgpg/main.cpp
index 77c344c..44f4b7e 100644
--- a/kgpg/main.cpp
+++ b/kgpg/main.cpp
@@ -16,14 +16,14 @@
***************************************************************************/
#include <tqstring.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kuniqueapplication.h>
#include <dcopclient.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kgpg.h"
static const char description[] =
diff --git a/kgpg/popuppublic.cpp b/kgpg/popuppublic.cpp
index 59864f7..7ae2eb3 100644
--- a/kgpg/popuppublic.cpp
+++ b/kgpg/popuppublic.cpp
@@ -32,7 +32,7 @@
#include <tdelistview.h>
#include <kprocess.h>
#include <kprocio.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaccel.h>
#if KDE_IS_VERSION( 3, 2, 90 )
#include <tdelistviewsearchline.h>
diff --git a/khexedit/bitswapwidget.cc b/khexedit/bitswapwidget.cc
index 337b447..e281d2b 100644
--- a/khexedit/bitswapwidget.cc
+++ b/khexedit/bitswapwidget.cc
@@ -20,7 +20,7 @@
#include <tqpainter.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "bitswapwidget.h"
diff --git a/khexedit/chartabledialog.cc b/khexedit/chartabledialog.cc
index 933fa7e..a46bee0 100644
--- a/khexedit/chartabledialog.cc
+++ b/khexedit/chartabledialog.cc
@@ -25,8 +25,8 @@
#include <tqlayout.h>
#include <tqspinbox.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
#include "chartabledialog.h"
diff --git a/khexedit/conversion.cc b/khexedit/conversion.cc
index 7eeea5d..a0b6195 100644
--- a/khexedit/conversion.cc
+++ b/khexedit/conversion.cc
@@ -20,7 +20,7 @@
#include <string.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "conversion.h"
diff --git a/khexedit/converterdialog.cc b/khexedit/converterdialog.cc
index 6f3a82e..e742e73 100644
--- a/khexedit/converterdialog.cc
+++ b/khexedit/converterdialog.cc
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "converterdialog.h"
#include "hexvalidator.h"
diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc
index ce9b615..c2f2d80 100644
--- a/khexedit/dialog.cc
+++ b/khexedit/dialog.cc
@@ -28,8 +28,8 @@
#include <tqvalidator.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kseparator.h>
#include <kstdguiitem.h>
diff --git a/khexedit/exportdialog.cc b/khexedit/exportdialog.cc
index 25ee291..2cdfae7 100644
--- a/khexedit/exportdialog.cc
+++ b/khexedit/exportdialog.cc
@@ -23,8 +23,8 @@
#include <tqlineedit.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "dialog.h"
#include "exportdialog.h"
diff --git a/khexedit/fileinfodialog.cc b/khexedit/fileinfodialog.cc
index bfa7ff2..96fb060 100644
--- a/khexedit/fileinfodialog.cc
+++ b/khexedit/fileinfodialog.cc
@@ -22,9 +22,9 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "fileinfodialog.h"
#include "listview.h"
diff --git a/khexedit/hexbuffer.cc b/khexedit/hexbuffer.cc
index 8a516a8..83cfa84 100644
--- a/khexedit/hexbuffer.cc
+++ b/khexedit/hexbuffer.cc
@@ -26,9 +26,9 @@
#include <tqfileinfo.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <knotifyclient.h>
#include "hexbuffer.h"
diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc
index dc75008..09a9407 100644
--- a/khexedit/hexeditorwidget.cc
+++ b/khexedit/hexeditorwidget.cc
@@ -25,11 +25,11 @@
#undef Unsorted
#include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h
index 82d7970..47ace2c 100644
--- a/khexedit/hexeditstate.h
+++ b/khexedit/hexeditstate.h
@@ -24,7 +24,7 @@
#include <tdeapplication.h>
#include <tqfont.h>
#include <tqpalette.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
class SDisplayLine
diff --git a/khexedit/hexerror.cc b/khexedit/hexerror.cc
index ed05b4b..6549f1d 100644
--- a/khexedit/hexerror.cc
+++ b/khexedit/hexerror.cc
@@ -18,7 +18,7 @@
*
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "hexerror.h"
diff --git a/khexedit/hexmanagerwidget.cc b/khexedit/hexmanagerwidget.cc
index 8c4c00d..a8d4bed 100644
--- a/khexedit/hexmanagerwidget.cc
+++ b/khexedit/hexmanagerwidget.cc
@@ -18,7 +18,7 @@
*
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include "hexmanagerwidget.h"
#include "searchbar.h"
diff --git a/khexedit/hextoolwidget.cc b/khexedit/hextoolwidget.cc
index d3a17f0..fd5aeb1 100644
--- a/khexedit/hextoolwidget.cc
+++ b/khexedit/hextoolwidget.cc
@@ -19,7 +19,7 @@
*/
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "hextoolwidget.h"
#include <tqlabel.h>
diff --git a/khexedit/hexviewwidget.cc b/khexedit/hexviewwidget.cc
index 7e50919..a031703 100644
--- a/khexedit/hexviewwidget.cc
+++ b/khexedit/hexviewwidget.cc
@@ -24,8 +24,8 @@
#include <tqdrawutil.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kdebug.h>
#include <kurldrag.h>
diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp
index 6b27670..22c065d 100644
--- a/khexedit/lib/codecs/ktextcharcodec.cpp
+++ b/khexedit/lib/codecs/ktextcharcodec.cpp
@@ -18,8 +18,8 @@
// qt specific
#include "tqtextcodec.h"
// kde specific
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcharsets.h>
// lib specific
#include "ktextcharcodec.h"
diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp
index 83d2afc..1d7cec9 100644
--- a/khexedit/lib/kbufferdrag.cpp
+++ b/khexedit/lib/kbufferdrag.cpp
@@ -19,8 +19,8 @@
#include <tqcstring.h>
#include <tqtextcodec.h>
// kde specific
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
// lib specific
#include "kbordercoltextexport.h"
#include "koffsetcoltextexport.h"
diff --git a/khexedit/lib/kcharcolumn.cpp b/khexedit/lib/kcharcolumn.cpp
index a075d05..8fbffbb 100644
--- a/khexedit/lib/kcharcolumn.cpp
+++ b/khexedit/lib/kcharcolumn.cpp
@@ -21,8 +21,8 @@
#include <tqpainter.h>
// kde specific
#include <kcharsets.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
// lib specific
#include "kcolumnsview.h"
#include "kbuffercursor.h"
diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp
index edba5d7..4873fa3 100644
--- a/khexedit/lib/khexedit.cpp
+++ b/khexedit/lib/khexedit.cpp
@@ -30,7 +30,7 @@
#include <tqapplication.h>
// kde specific
#ifndef TQT_ONLY
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#endif
// lib specific
#include "kdatabuffer.h"
diff --git a/khexedit/main.cc b/khexedit/main.cc
index 5a054bf..56b50d2 100644
--- a/khexedit/main.cc
+++ b/khexedit/main.cc
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/khexedit/optiondialog.cc b/khexedit/optiondialog.cc
index 0b17930..789d739 100644
--- a/khexedit/optiondialog.cc
+++ b/khexedit/optiondialog.cc
@@ -35,8 +35,8 @@
#include <kcolordrag.h>
#include <tdefontdialog.h> // For TDEFontChooser
#include <kiconloader.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include "optiondialog.h"
#include <tqpushbutton.h>
diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
index 342e1cc..7c1d6c4 100644
--- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
+++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
@@ -18,7 +18,7 @@
// qt specific
#include <tqlayout.h>
// kde specific
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <tdeapplication.h>
// lib specific
diff --git a/khexedit/parts/kpart/khepart.cpp b/khexedit/parts/kpart/khepart.cpp
index f7afb56..e23e26a 100644
--- a/khexedit/parts/kpart/khepart.cpp
+++ b/khexedit/parts/kpart/khepart.cpp
@@ -16,11 +16,11 @@
// kde specific
-#include <klocale.h>
+#include <tdelocale.h>
//#include <kinstance.h>
#include <tdeaction.h>
#include <kstdaction.h>
-//#include <kglobalsettings.h>
+//#include <tdeglobalsettings.h>
// app specific
#include "khexedit.h"
#include "kcharcodec.h"
diff --git a/khexedit/parts/kpart/khepartfactory.cpp b/khexedit/parts/kpart/khepartfactory.cpp
index b7116e6..7a9cce4 100644
--- a/khexedit/parts/kpart/khepartfactory.cpp
+++ b/khexedit/parts/kpart/khepartfactory.cpp
@@ -18,7 +18,7 @@
// kde specific
#include <kinstance.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
// app specific
#include "khepart.h"
#include "khepartfactory.h"
diff --git a/khexedit/printdialogpage.cc b/khexedit/printdialogpage.cc
index 2677ac4..d421880 100644
--- a/khexedit/printdialogpage.cc
+++ b/khexedit/printdialogpage.cc
@@ -26,7 +26,7 @@
#include <tqstringlist.h>
#include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "printdialogpage.h"
diff --git a/khexedit/searchbar.cc b/khexedit/searchbar.cc
index 000a400..02fbb4e 100644
--- a/khexedit/searchbar.cc
+++ b/khexedit/searchbar.cc
@@ -19,7 +19,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "dialog.h"
#include "hexvalidator.h"
diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc
index f5e89d8..6ed24e3 100644
--- a/khexedit/statusbarprogress.cc
+++ b/khexedit/statusbarprogress.cc
@@ -24,8 +24,8 @@
#include <tqpainter.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <tqstyle.h>
CStatusBarProgress::CStatusBarProgress( TQWidget *parent, const char *name )
diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc
index 1fa8d1a..f1c79f4 100644
--- a/khexedit/stringdialog.cc
+++ b/khexedit/stringdialog.cc
@@ -25,9 +25,9 @@
#include <tqspinbox.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "listview.h"
#include "stringdialog.h"
diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc
index 13d70fb..9886b37 100644
--- a/khexedit/toplevel.cc
+++ b/khexedit/toplevel.cc
@@ -27,8 +27,8 @@
#include <tdeaction.h>
#include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstatusbar.h>
#include <tdepopupmenu.h>
#include <kstdaction.h>
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 088bc05..dfb8425 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -31,9 +31,9 @@
#include <kdebug.h>
#include <keditcl.h>
#include <kencodingfiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <krun.h>
#include <kstandarddirs.h>
diff --git a/kjots/kjotsedit.cpp b/kjots/kjotsedit.cpp
index 29fe021..420f715 100644
--- a/kjots/kjotsedit.cpp
+++ b/kjots/kjotsedit.cpp
@@ -26,7 +26,7 @@
#include <tdepopupmenu.h>
#include <keditcl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kopenwith.h>
#include <kprinter.h>
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index 4bf0f5f..03581cf 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -29,11 +29,11 @@
#include <tdeapplication.h>
#include <kiconloader.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprogress.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeio/job.h>
#include <assert.h>
diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index 8f434b0..efcdd67 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
@@ -29,13 +29,13 @@
#include <unistd.h>
// other KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <knuminput.h>
#include <kiconloader.h>
#include <kicondialog.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kprocess.h>
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
index d023c56..2ce09fa 100644
--- a/klaptopdaemon/apm.cpp
+++ b/klaptopdaemon/apm.cpp
@@ -30,13 +30,13 @@
#include <unistd.h>
// other KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <knuminput.h>
#include <kiconloader.h>
#include <kicondialog.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kprocess.h>
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index fde729a..9bf6be9 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -29,13 +29,13 @@
#include "portable.h"
// other KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <knuminput.h>
#include <kiconloader.h>
#include <kicondialog.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <krichtextlabel.h>
// other TQt headers:
diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp
index 144ce76..eed4b8d 100644
--- a/klaptopdaemon/buttons.cpp
+++ b/klaptopdaemon/buttons.cpp
@@ -26,8 +26,8 @@
#include "portable.h"
#include "version.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <knumvalidator.h>
#include <kdialog.h>
diff --git a/klaptopdaemon/daemon_state.cpp b/klaptopdaemon/daemon_state.cpp
index a8f69b1..477b0fa 100644
--- a/klaptopdaemon/daemon_state.cpp
+++ b/klaptopdaemon/daemon_state.cpp
@@ -32,14 +32,14 @@
#include <tqtimer.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include "daemon_state.h"
#include "portable.h"
#include <tdeaboutdata.h>
#include <kaudioplayer.h>
#include <sys/ioctl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <dcopclient.h>
#include <tqsocketnotifier.h>
#include <tqcursor.h>
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index 7ef844d..7c8ace6 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -27,7 +27,7 @@
#include <tqcursor.h>
#include <tqslider.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <dcopclient.h>
#include <dcopref.h>
@@ -39,8 +39,8 @@
#include <kprocess.h>
#include <kstandarddirs.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
#include <tqvbox.h>
#include <tqstringlist.h>
#include <tqbitmap.h>
diff --git a/klaptopdaemon/kpcmcia.cpp b/klaptopdaemon/kpcmcia.cpp
index a17b5f8..941f739 100644
--- a/klaptopdaemon/kpcmcia.cpp
+++ b/klaptopdaemon/kpcmcia.cpp
@@ -27,7 +27,7 @@
#include <tqfile.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <kstandarddirs.h>
diff --git a/klaptopdaemon/kpcmciainfo.cpp b/klaptopdaemon/kpcmciainfo.cpp
index 3e91f2d..e2e70d5 100644
--- a/klaptopdaemon/kpcmciainfo.cpp
+++ b/klaptopdaemon/kpcmciainfo.cpp
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <tqtimer.h>
#include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
diff --git a/klaptopdaemon/krichtextlabel.cpp b/klaptopdaemon/krichtextlabel.cpp
index 0df5a95..9130c4a 100644
--- a/klaptopdaemon/krichtextlabel.cpp
+++ b/klaptopdaemon/krichtextlabel.cpp
@@ -22,7 +22,7 @@
#include <tqstylesheet.h>
#include <tqsimplerichtext.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
static TQString qrichtextify( const TQString& text )
{
diff --git a/klaptopdaemon/laptop_check.cpp b/klaptopdaemon/laptop_check.cpp
index 7080798..676a26b 100644
--- a/klaptopdaemon/laptop_check.cpp
+++ b/klaptopdaemon/laptop_check.cpp
@@ -27,7 +27,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] =
I18N_NOOP("TDE laptop daemon starter");
diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp
index 142b922..97e70ba 100644
--- a/klaptopdaemon/laptop_daemon.cpp
+++ b/klaptopdaemon/laptop_daemon.cpp
@@ -32,7 +32,7 @@
#include <tqtimer.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include "laptop_daemon.h"
#include "portable.h"
@@ -40,7 +40,7 @@
#include <kaudioplayer.h>
#include <tdeapplication.h>
#include <sys/ioctl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpassivepopup.h>
#include <dcopclient.h>
#include <tqsocketnotifier.h>
diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp
index 27d2451..5068a4e 100644
--- a/klaptopdaemon/main.cpp
+++ b/klaptopdaemon/main.cpp
@@ -22,10 +22,10 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqlayout.h>
#include <unistd.h>
#include <fcntl.h>
diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp
index 88ee06d..cc66217 100644
--- a/klaptopdaemon/pcmcia.cpp
+++ b/klaptopdaemon/pcmcia.cpp
@@ -29,8 +29,8 @@
#include <tqfileinfo.h>
#include <tqlayout.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <stdio.h>
#include "pcmcia.h"
diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp
index b351a1c..bfaa787 100644
--- a/klaptopdaemon/portable.cpp
+++ b/klaptopdaemon/portable.cpp
@@ -59,7 +59,7 @@
//
#include <config.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <stdio.h>
#include "portable.h"
diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp
index 0d25e8b..c29c425 100644
--- a/klaptopdaemon/power.cpp
+++ b/klaptopdaemon/power.cpp
@@ -26,8 +26,8 @@
#include "portable.h"
#include "version.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <knumvalidator.h>
#include <kdialog.h>
diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp
index 9e9a0da..e60109e 100644
--- a/klaptopdaemon/profile.cpp
+++ b/klaptopdaemon/profile.cpp
@@ -31,13 +31,13 @@
#include <sys/ioctl.h>
// other KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <knuminput.h>
#include <kiconloader.h>
#include <kicondialog.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcombobox.h>
// other TQt headers:
diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp
index 7e097be..02b941a 100644
--- a/klaptopdaemon/sony.cpp
+++ b/klaptopdaemon/sony.cpp
@@ -31,7 +31,7 @@
#include <sys/ioctl.h>
// other KDE headers:
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <knuminput.h>
#include <kiconloader.h>
@@ -39,7 +39,7 @@
#include <tdeapplication.h>
#include <kprocess.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <krichtextlabel.h>
// other TQt headers:
diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp
index 99b8d6e..5152d05 100644
--- a/klaptopdaemon/warning.cpp
+++ b/klaptopdaemon/warning.cpp
@@ -25,9 +25,9 @@
#include "portable.h"
#include "version.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <kurlrequester.h>
#include <tdeapplication.h>
diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp
index 19d125d..a7c28d5 100644
--- a/kmilo/kmilo_kvaio/kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kvaio.cpp
@@ -36,7 +36,7 @@
#include <tqevent.h>
#include <tqdatastream.h>
#include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kdialogbase.h>
#include <dcopclient.h>
diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp
index a89617b..0602614 100644
--- a/kmilo/kmilod/defaultskin.cpp
+++ b/kmilo/kmilod/defaultskin.cpp
@@ -31,7 +31,7 @@
#include <twin.h>
#include <netwm.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeversion.h>
#include <tdeconfig.h>
diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp
index cfa121d..3535ee0 100644
--- a/kmilo/kmilod/kmilod.cpp
+++ b/kmilo/kmilod/kmilod.cpp
@@ -30,7 +30,7 @@
#include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kservicetype.h>
#include <kservice.h>
diff --git a/kregexpeditor/KMultiFormListBox/ccp.cpp b/kregexpeditor/KMultiFormListBox/ccp.cpp
index 8197d2c..078ee7f 100644
--- a/kregexpeditor/KMultiFormListBox/ccp.cpp
+++ b/kregexpeditor/KMultiFormListBox/ccp.cpp
@@ -26,7 +26,7 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
+ #include <tdelocale.h>
#endif
CCP::CCP(KMultiFormListBoxMultiVisible *ee_, KMultiFormListBoxEntry *eee_) : TQObject() {
diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
index 5c67526..09c5052 100644
--- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-multivisible.cpp
@@ -20,7 +20,7 @@
#include "compat.h"
#include <tqmessagebox.h>
#else
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
#include "tdemultiformlistbox-multivisible.moc"
#endif
diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp
index 29f2ea3..f39c9e9 100644
--- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox-windowed.cpp
@@ -18,7 +18,7 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
#include "tdemultiformlistbox-windowed.moc"
diff --git a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h
index 1151581..1918625 100644
--- a/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h
+++ b/kregexpeditor/KMultiFormListBox/tdemultiformlistbox.h
@@ -28,7 +28,7 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
+ #include <tdelocale.h>
#endif
class TQDataStream;
diff --git a/kregexpeditor/altnwidget.cpp b/kregexpeditor/altnwidget.cpp
index f34c8c5..3196288 100644
--- a/kregexpeditor/altnwidget.cpp
+++ b/kregexpeditor/altnwidget.cpp
@@ -18,8 +18,8 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
- #include <kmessagebox.h>
+ #include <tdelocale.h>
+ #include <tdemessagebox.h>
#endif
#include "altnwidget.h"
diff --git a/kregexpeditor/auxbuttons.cpp b/kregexpeditor/auxbuttons.cpp
index e276acf..e47abfa 100644
--- a/kregexpeditor/auxbuttons.cpp
+++ b/kregexpeditor/auxbuttons.cpp
@@ -22,7 +22,7 @@
#else
#include "auxbuttons.moc"
#include <kiconloader.h>
- #include <klocale.h>
+ #include <tdelocale.h>
#endif
#include "auxbuttons.h"
diff --git a/kregexpeditor/charselector.cpp b/kregexpeditor/charselector.cpp
index 4eb9ada..5574c0f 100644
--- a/kregexpeditor/charselector.cpp
+++ b/kregexpeditor/charselector.cpp
@@ -19,7 +19,7 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
-#include <klocale.h>
+#include <tdelocale.h>
#include "charselector.moc"
#endif
diff --git a/kregexpeditor/compoundregexp.cpp b/kregexpeditor/compoundregexp.cpp
index 150ee97..ae7bab9 100644
--- a/kregexpeditor/compoundregexp.cpp
+++ b/kregexpeditor/compoundregexp.cpp
@@ -19,7 +19,7 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
+ #include <tdelocale.h>
#endif
#include "compoundregexp.h"
diff --git a/kregexpeditor/compoundwidget.cpp b/kregexpeditor/compoundwidget.cpp
index e19e3aa..98f3975 100644
--- a/kregexpeditor/compoundwidget.cpp
+++ b/kregexpeditor/compoundwidget.cpp
@@ -19,7 +19,7 @@
#include "compat.h"
#include "images.h"
#else
- #include <klocale.h>
+ #include <tdelocale.h>
#include <kdialogbase.h>
#include <kiconloader.h>
#include "compoundwidget.moc"
diff --git a/kregexpeditor/editorwindow.cpp b/kregexpeditor/editorwindow.cpp
index e6a92e7..1b43041 100644
--- a/kregexpeditor/editorwindow.cpp
+++ b/kregexpeditor/editorwindow.cpp
@@ -20,8 +20,8 @@
#include "compat.h"
#include "images.h"
#else
- #include <klocale.h>
- #include <kmessagebox.h>
+ #include <tdelocale.h>
+ #include <tdemessagebox.h>
// #include <tdefiledialog.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
diff --git a/kregexpeditor/emacsregexpconverter.cpp b/kregexpeditor/emacsregexpconverter.cpp
index 491e989..316cf7c 100644
--- a/kregexpeditor/emacsregexpconverter.cpp
+++ b/kregexpeditor/emacsregexpconverter.cpp
@@ -28,8 +28,8 @@
#include "positionregexp.h"
#include "repeatregexp.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
bool EmacsRegExpConverter::canParse()
{
return false;
diff --git a/kregexpeditor/errormap.cpp b/kregexpeditor/errormap.cpp
index 65ca557..68b8de9 100644
--- a/kregexpeditor/errormap.cpp
+++ b/kregexpeditor/errormap.cpp
@@ -19,8 +19,8 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <kmessagebox.h>
- #include <klocale.h>
+ #include <tdemessagebox.h>
+ #include <tdelocale.h>
#endif
#include "errormap.h"
diff --git a/kregexpeditor/gen_qregexpparser.cc b/kregexpeditor/gen_qregexpparser.cc
index f72775b..377f549 100644
--- a/kregexpeditor/gen_qregexpparser.cc
+++ b/kregexpeditor/gen_qregexpparser.cc
@@ -103,8 +103,8 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
- #include <kmessagebox.h>
+ #include <tdelocale.h>
+ #include <tdemessagebox.h>
#endif
#include <tqstring.h>
diff --git a/kregexpeditor/infopage.cpp b/kregexpeditor/infopage.cpp
index 558f00c..0afa3ea 100644
--- a/kregexpeditor/infopage.cpp
+++ b/kregexpeditor/infopage.cpp
@@ -18,7 +18,7 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
+ #include <tdelocale.h>
#include <tdeapplication.h>
#endif
diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp
index d604e79..46fc452 100644
--- a/kregexpeditor/kregexpeditorgui.cpp
+++ b/kregexpeditor/kregexpeditorgui.cpp
@@ -19,7 +19,7 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
+ #include <tdelocale.h>
#include <kgenericfactory.h>
#include <tdeapplication.h>
#include "kregexpeditorgui.moc"
diff --git a/kregexpeditor/kregexpeditorprivate.cpp b/kregexpeditor/kregexpeditorprivate.cpp
index 147e348..04ae00a 100644
--- a/kregexpeditor/kregexpeditorprivate.cpp
+++ b/kregexpeditor/kregexpeditorprivate.cpp
@@ -19,10 +19,10 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
+ #include <tdelocale.h>
#include <kiconloader.h>
#include <kstandarddirs.h>
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
#include "kregexpeditorprivate.moc"
#endif
diff --git a/kregexpeditor/lookaheadwidget.cpp b/kregexpeditor/lookaheadwidget.cpp
index 5ae0b9d..c45268e 100644
--- a/kregexpeditor/lookaheadwidget.cpp
+++ b/kregexpeditor/lookaheadwidget.cpp
@@ -19,7 +19,7 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
+ #include <tdelocale.h>
#include "lookaheadwidget.moc"
#endif
diff --git a/kregexpeditor/main.cpp b/kregexpeditor/main.cpp
index 20eb040..728bb19 100644
--- a/kregexpeditor/main.cpp
+++ b/kregexpeditor/main.cpp
@@ -23,7 +23,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
- #include <klocale.h>
+ #include <tdelocale.h>
#include <kpushbutton.h>
#endif
diff --git a/kregexpeditor/qregexpparser.y b/kregexpeditor/qregexpparser.y
index 080dc2c..868c1dd 100644
--- a/kregexpeditor/qregexpparser.y
+++ b/kregexpeditor/qregexpparser.y
@@ -19,8 +19,8 @@
#ifdef QT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
- #include <kmessagebox.h>
+ #include <tdelocale.h>
+ #include <tdemessagebox.h>
#endif
#include <qstring.h>
diff --git a/kregexpeditor/regexpbuttons.cpp b/kregexpeditor/regexpbuttons.cpp
index 62500c8..a6bb121 100644
--- a/kregexpeditor/regexpbuttons.cpp
+++ b/kregexpeditor/regexpbuttons.cpp
@@ -20,7 +20,7 @@
#include "images.h"
#else
#include <kiconloader.h>
- #include <klocale.h>
+ #include <tdelocale.h>
#include <kstandarddirs.h>
#include "regexpbuttons.moc"
#endif
diff --git a/kregexpeditor/repeatregexp.cpp b/kregexpeditor/repeatregexp.cpp
index 92b5ac8..931b61f 100644
--- a/kregexpeditor/repeatregexp.cpp
+++ b/kregexpeditor/repeatregexp.cpp
@@ -18,8 +18,8 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include "kmessagebox.h"
- #include <klocale.h>
+ #include "tdemessagebox.h"
+ #include <tdelocale.h>
#endif
#include "repeatregexp.h"
diff --git a/kregexpeditor/repeatwidget.cpp b/kregexpeditor/repeatwidget.cpp
index e934122..085c36b 100644
--- a/kregexpeditor/repeatwidget.cpp
+++ b/kregexpeditor/repeatwidget.cpp
@@ -18,7 +18,7 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
+ #include <tdelocale.h>
#include <kdialogbase.h>
#include "repeatwidget.moc"
#endif
diff --git a/kregexpeditor/textrangeregexp.cpp b/kregexpeditor/textrangeregexp.cpp
index 0a92073..fe572cc 100644
--- a/kregexpeditor/textrangeregexp.cpp
+++ b/kregexpeditor/textrangeregexp.cpp
@@ -18,8 +18,8 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
- #include <kmessagebox.h>
+ #include <tdelocale.h>
+ #include <tdemessagebox.h>
#endif
#include "textrangeregexp.h"
diff --git a/kregexpeditor/textregexp.cpp b/kregexpeditor/textregexp.cpp
index c31f9ac..ffcc14b 100644
--- a/kregexpeditor/textregexp.cpp
+++ b/kregexpeditor/textregexp.cpp
@@ -18,8 +18,8 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <kmessagebox.h>
- #include <klocale.h>
+ #include <tdemessagebox.h>
+ #include <tdelocale.h>
#endif
#include "textregexp.h"
diff --git a/kregexpeditor/userdefinedregexps.cpp b/kregexpeditor/userdefinedregexps.cpp
index 16f191f..e6d83aa 100644
--- a/kregexpeditor/userdefinedregexps.cpp
+++ b/kregexpeditor/userdefinedregexps.cpp
@@ -19,8 +19,8 @@
#include "compat.h"
#else
#include <klineeditdlg.h>
- #include <klocale.h>
- #include <kmessagebox.h>
+ #include <tdelocale.h>
+ #include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include "userdefinedregexps.moc"
diff --git a/kregexpeditor/verifier.cpp b/kregexpeditor/verifier.cpp
index 23198be..81e7ffe 100644
--- a/kregexpeditor/verifier.cpp
+++ b/kregexpeditor/verifier.cpp
@@ -18,7 +18,7 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
+ #include <tdelocale.h>
#include "verifier.moc"
#endif
diff --git a/kregexpeditor/verifybuttons.cpp b/kregexpeditor/verifybuttons.cpp
index ed47b7c..5f60e0b 100644
--- a/kregexpeditor/verifybuttons.cpp
+++ b/kregexpeditor/verifybuttons.cpp
@@ -20,12 +20,12 @@
#include <tqfiledialog.h>
#include "images.h"
#else
-#include <klocale.h>
+#include <tdelocale.h>
#include "verifybuttons.moc"
#include <kstandarddirs.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#endif
#include "verifybuttons.h"
diff --git a/kregexpeditor/widgetfactory.cpp b/kregexpeditor/widgetfactory.cpp
index 43a1008..d42e7fe 100644
--- a/kregexpeditor/widgetfactory.cpp
+++ b/kregexpeditor/widgetfactory.cpp
@@ -18,7 +18,7 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
#endif
#include "widgetfactory.h"
diff --git a/kregexpeditor/zerowidgets.cpp b/kregexpeditor/zerowidgets.cpp
index c403dce..c2a19ef 100644
--- a/kregexpeditor/zerowidgets.cpp
+++ b/kregexpeditor/zerowidgets.cpp
@@ -19,7 +19,7 @@
#ifdef TQT_ONLY
#include "compat.h"
#else
- #include <klocale.h>
+ #include <tdelocale.h>
#endif
#include "zerowidgets.h"
diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp
index c07919e..a1457a6 100644
--- a/ksim/generalprefs.cpp
+++ b/ksim/generalprefs.cpp
@@ -31,7 +31,7 @@
#include <tqtooltip.h>
#include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kcombobox.h>
#include <kdebug.h>
diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp
index 447cf94..91fb26d 100644
--- a/ksim/ksim.cpp
+++ b/ksim/ksim.cpp
@@ -29,9 +29,9 @@
#include <kbugreport.h>
#include <tdeaboutdata.h>
#include <dcopclient.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
extern "C"
{
diff --git a/ksim/ksimpref.cpp b/ksim/ksimpref.cpp
index 073324b..871f3b0 100644
--- a/ksim/ksimpref.cpp
+++ b/ksim/ksimpref.cpp
@@ -27,11 +27,11 @@
#include <ksimconfig.h>
#include <pluginmodule.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqhbox.h>
#include <tqframe.h>
diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp
index dbdd180..1f204b7 100644
--- a/ksim/ksimsysinfo.cpp
+++ b/ksim/ksimsysinfo.cpp
@@ -25,9 +25,9 @@
#include <tqdatetime.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "ksimsysinfo.h"
#include "ksimsysinfo.moc"
diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index d45a3dd..5e83641 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -38,10 +38,10 @@
#include <themetypes.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdesktopfile.h>
#include <twin.h>
#include <krun.h>
diff --git a/ksim/library/chart.cpp b/ksim/library/chart.cpp
index 547729c..9995769 100644
--- a/ksim/library/chart.cpp
+++ b/ksim/library/chart.cpp
@@ -29,8 +29,8 @@
#include <tqbitmap.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <tdeconfig.h>
#include <themeloader.h>
diff --git a/ksim/library/ksimconfig.cpp b/ksim/library/ksimconfig.cpp
index 04f4559..b781630 100644
--- a/ksim/library/ksimconfig.cpp
+++ b/ksim/library/ksimconfig.cpp
@@ -19,7 +19,7 @@
#include <kstandarddirs.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "ksimconfig.h"
#include "themeloader.h"
diff --git a/ksim/library/label.cpp b/ksim/library/label.cpp
index 954b03f..b47309b 100644
--- a/ksim/library/label.cpp
+++ b/ksim/library/label.cpp
@@ -32,8 +32,8 @@
#include <themeloader.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <tdeconfig.h>
class KSim::Label::Private
diff --git a/ksim/library/pluginglobal.cpp b/ksim/library/pluginglobal.cpp
index 34a38c3..08ff3c9 100644
--- a/ksim/library/pluginglobal.cpp
+++ b/ksim/library/pluginglobal.cpp
@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <kdesktopfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
class KSim::Plugin::Private
diff --git a/ksim/library/pluginloader.cpp b/ksim/library/pluginloader.cpp
index 2126790..9518bbb 100644
--- a/ksim/library/pluginloader.cpp
+++ b/ksim/library/pluginloader.cpp
@@ -23,10 +23,10 @@
#include <kdebug.h>
#include <klibloader.h>
#include <kdesktopfile.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqstringlist.h>
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index eb6f03b..7f450de 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -20,7 +20,7 @@
#include "pluginmodule.h"
#include "pluginmodule.moc"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp
index 0548f73..5bc4038 100644
--- a/ksim/library/themeloader.cpp
+++ b/ksim/library/themeloader.cpp
@@ -34,9 +34,9 @@
#include <kdebug.h>
#include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
class KSim::Theme::Private
{
diff --git a/ksim/monitorprefs.cpp b/ksim/monitorprefs.cpp
index cbddf84..5f982a6 100644
--- a/ksim/monitorprefs.cpp
+++ b/ksim/monitorprefs.cpp
@@ -20,8 +20,8 @@
#include "monitorprefs.h"
#include "monitorprefs.moc"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdesktopfile.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index fdb950f..af6074c 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -34,8 +34,8 @@
#include <kdebug.h>
#include <tdeaboutapplication.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
#include <kinputdialog.h>
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index 5247ad1..d3a3827 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <tdeaboutapplication.h>
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdelistview.h>
#include <kinputdialog.h>
diff --git a/ksim/monitors/filesystem/filesystemwidget.cpp b/ksim/monitors/filesystem/filesystemwidget.cpp
index b7ded52..981a678 100644
--- a/ksim/monitors/filesystem/filesystemwidget.cpp
+++ b/ksim/monitors/filesystem/filesystemwidget.cpp
@@ -27,8 +27,8 @@
#include <tqcursor.h>
#include <kprocess.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp
index 3d3b671..7afd53a 100644
--- a/ksim/monitors/filesystem/fsystemconfig.cpp
+++ b/ksim/monitors/filesystem/fsystemconfig.cpp
@@ -21,7 +21,7 @@
#include "fsystemconfig.moc"
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdelistview.h>
#include <tdeapplication.h>
diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 1dbf35f..278a891 100644
--- a/ksim/monitors/filesystem/ksimfsystem.cpp
+++ b/ksim/monitors/filesystem/ksimfsystem.cpp
@@ -28,7 +28,7 @@
#include <tqregexp.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutapplication.h>
#include <tdeaboutdata.h>
#include <tdeapplication.h>
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index 9638754..979c682 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -28,7 +28,7 @@
#include <tqcheckbox.h>
#include <label.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <tdeaboutapplication.h>
diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp
index bef854a..9514bc5 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.cpp
+++ b/ksim/monitors/lm_sensors/ksimsensors.cpp
@@ -22,7 +22,7 @@
#include <kdebug.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutapplication.h>
#include <tdeaboutdata.h>
#include <tdeconfig.h>
diff --git a/ksim/monitors/lm_sensors/sensorbase.cpp b/ksim/monitors/lm_sensors/sensorbase.cpp
index 42763c3..c81ad56 100644
--- a/ksim/monitors/lm_sensors/sensorbase.cpp
+++ b/ksim/monitors/lm_sensors/sensorbase.cpp
@@ -22,7 +22,7 @@
#include <ksimconfig.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqglobal.h>
#include <klibloader.h>
#include <kstandarddirs.h>
diff --git a/ksim/monitors/lm_sensors/sensorsconfig.cpp b/ksim/monitors/lm_sensors/sensorsconfig.cpp
index 4ecbe59..1a1f4a1 100644
--- a/ksim/monitors/lm_sensors/sensorsconfig.cpp
+++ b/ksim/monitors/lm_sensors/sensorsconfig.cpp
@@ -21,7 +21,7 @@
#include "sensorsconfig.moc"
#include "sensorbase.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdelistview.h>
#include <knuminput.h>
diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index e59c6e0..942397b 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -25,7 +25,7 @@
#include <tdeaboutapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <label.h>
#include <themeloader.h>
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index c1d56a8..065797d 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -44,11 +44,11 @@ static int mib[] = { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0 };
#include <tqpopupmenu.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutapplication.h>
#include <tdeaboutdata.h>
#include <ksimpleconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <krun.h>
#include <tdeapplication.h>
#include <kiconloader.h>
diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp
index 73a995b..eb2c1a3 100644
--- a/ksim/monitors/net/netconfig.cpp
+++ b/ksim/monitors/net/netconfig.cpp
@@ -23,12 +23,12 @@
#include <tdelistview.h>
#include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdeapplication.h>
#include <tdepopupmenu.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "netconfig.h"
#include "netconfig.moc"
diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp
index 6f713aa..21d6236 100644
--- a/ksim/monitors/net/netdialog.cpp
+++ b/ksim/monitors/net/netdialog.cpp
@@ -30,7 +30,7 @@
#include <tqfile.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
#include <kdebug.h>
#include <klineedit.h>
diff --git a/ksim/monitors/snmp/browsedialog.cpp b/ksim/monitors/snmp/browsedialog.cpp
index ec02173..2f16f36 100644
--- a/ksim/monitors/snmp/browsedialog.cpp
+++ b/ksim/monitors/snmp/browsedialog.cpp
@@ -23,7 +23,7 @@
#include <tdelistview.h>
#include <kguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <klineedit.h>
diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp
index 02ac2ba..d1f24a5 100644
--- a/ksim/monitors/snmp/configpage.cpp
+++ b/ksim/monitors/snmp/configpage.cpp
@@ -30,8 +30,8 @@
#include <tdeconfig.h>
#include <tdelistview.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
using namespace KSim::Snmp;
diff --git a/ksim/monitors/snmp/hostdialog.cpp b/ksim/monitors/snmp/hostdialog.cpp
index 7d66a75..0712e54 100644
--- a/ksim/monitors/snmp/hostdialog.cpp
+++ b/ksim/monitors/snmp/hostdialog.cpp
@@ -28,8 +28,8 @@
#include <tqpushbutton.h>
#include <tqspinbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <assert.h>
diff --git a/ksim/monitors/snmp/monitordialog.cpp b/ksim/monitors/snmp/monitordialog.cpp
index 1bda0aa..bed4798 100644
--- a/ksim/monitors/snmp/monitordialog.cpp
+++ b/ksim/monitors/snmp/monitordialog.cpp
@@ -30,7 +30,7 @@
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <assert.h>
diff --git a/ksim/monitors/snmp/probedialog.cpp b/ksim/monitors/snmp/probedialog.cpp
index 7261f21..435ec9e 100644
--- a/ksim/monitors/snmp/probedialog.cpp
+++ b/ksim/monitors/snmp/probedialog.cpp
@@ -22,7 +22,7 @@
#include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
using namespace KSim::Snmp;
diff --git a/ksim/monitors/snmp/proberesultdialog.cpp b/ksim/monitors/snmp/proberesultdialog.cpp
index 854b848..7550447 100644
--- a/ksim/monitors/snmp/proberesultdialog.cpp
+++ b/ksim/monitors/snmp/proberesultdialog.cpp
@@ -21,7 +21,7 @@
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistview.h>
using namespace KSim::Snmp;
diff --git a/ksim/monitors/snmp/value.cpp b/ksim/monitors/snmp/value.cpp
index f5e1d20..bb5b0c4 100644
--- a/ksim/monitors/snmp/value.cpp
+++ b/ksim/monitors/snmp/value.cpp
@@ -24,7 +24,7 @@
#include <tqvariant.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <assert.h>
diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp
index c0f3b06..9ab7f60 100644
--- a/ksim/themeprefs.cpp
+++ b/ksim/themeprefs.cpp
@@ -26,9 +26,9 @@
#include <tqlabel.h>
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kurllabel.h>
#include <tdeapplication.h>
diff --git a/ktimer/main.cpp b/ktimer/main.cpp
index f5f968a..6e8d5ee 100644
--- a/ktimer/main.cpp
+++ b/ktimer/main.cpp
@@ -17,7 +17,7 @@
*/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp
index 91638b6..514e7f8 100644
--- a/superkaramba/src/imagelabel.cpp
+++ b/superkaramba/src/imagelabel.cpp
@@ -27,7 +27,7 @@
#include <kpixmapeffect.h>
#include <kdebug.h>
#include <kimageeffect.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeio/job.h>
#include "karambaapp.h"
#include "imagelabel.h"
diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp
index e4116f1..316d0f4 100644
--- a/superkaramba/src/karamba.cpp
+++ b/superkaramba/src/karamba.cpp
@@ -32,9 +32,9 @@
#include "superkarambasettings.h"
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <twin.h>
#include <tdeversion.h>
#include <kdirwatch.h>
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index 3f751d8..d567eb7 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -14,8 +14,8 @@
#include <tdefiledialog.h>
#include <tdecmdlineargs.h>
#include <fcntl.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <khelpmenu.h>
diff --git a/superkaramba/src/kwidgetlistbox.cpp b/superkaramba/src/kwidgetlistbox.cpp
index 0193926..1811f38 100644
--- a/superkaramba/src/kwidgetlistbox.cpp
+++ b/superkaramba/src/kwidgetlistbox.cpp
@@ -19,7 +19,7 @@
****************************************************************************/
#include "kwidgetlistbox.h"
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
KWidgetListbox::KWidgetListbox(TQWidget *parent, const char *name)
: TQTable(parent, name)
diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp
index e29b3c3..ec9e686 100644
--- a/superkaramba/src/main.cpp
+++ b/superkaramba/src/main.cpp
@@ -25,7 +25,7 @@
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdemainwindow.h>
#include <tqfileinfo.h>
diff --git a/superkaramba/src/misc_python.cpp b/superkaramba/src/misc_python.cpp
index 3dc5213..e4a6fa4 100644
--- a/superkaramba/src/misc_python.cpp
+++ b/superkaramba/src/misc_python.cpp
@@ -31,8 +31,8 @@
#include <tqglobal.h>
#include <tqobject.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "kdebug.h"
#include "karamba.h"
diff --git a/superkaramba/src/systemtray.cpp b/superkaramba/src/systemtray.cpp
index fbe220d..ab539cd 100644
--- a/superkaramba/src/systemtray.cpp
+++ b/superkaramba/src/systemtray.cpp
@@ -21,9 +21,9 @@
#include <tqobject.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <twinmodule.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <twin.h>
diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp
index c385042..22f60d7 100644
--- a/superkaramba/src/taskbartest.cpp
+++ b/superkaramba/src/taskbartest.cpp
@@ -24,7 +24,7 @@
#include <tdefiledialog.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tqfileinfo.h>
diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp
index 4e3afb2..48cef86 100644
--- a/superkaramba/src/taskmanager.cpp
+++ b/superkaramba/src/taskmanager.cpp
@@ -21,8 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************/
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <kiconloader.h>
diff --git a/superkaramba/src/taskmanager.h b/superkaramba/src/taskmanager.h
index 6740f54..ceb62ff 100644
--- a/superkaramba/src/taskmanager.h
+++ b/superkaramba/src/taskmanager.h
@@ -35,7 +35,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dcopobject.h>
#include <twin.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
#include "karambaapp.h"
class TaskManager;
diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp
index 4e3258b..04020a6 100644
--- a/superkaramba/src/themefile.cpp
+++ b/superkaramba/src/themefile.cpp
@@ -28,9 +28,9 @@
#include <kurl.h>
#include <kzip.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeio/netaccess.h>
#include <tqtextstream.h>
#include <tqfileinfo.h>
diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp
index 7d9490a..f451eaf 100644
--- a/superkaramba/src/themelocale.cpp
+++ b/superkaramba/src/themelocale.cpp
@@ -1,5 +1,5 @@
/*
- * languageList from klocale.cpp
+ * languageList from tdelocale.cpp
* Copyright (c) 1997,2001 Stephan Kulow <coolo@kde.org>
* Copyright (c) 1999 Preston Brown <pbrown@kde.org>
* Copyright (c) 1999-2002 Hans Petter Bieker <bieker@kde.org>
@@ -31,8 +31,8 @@
#include "themefile.h"
#include <kdebug.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqbuffer.h>
#include <tqglobal.h>
#include <tqiodevice.h>
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index 107d2c5..d24fa8b 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -41,7 +41,7 @@
#include <kstandarddirs.h>
#include <tdeapplication.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlineedit.h>
#include <tqtable.h>
#include <tqdir.h>
diff --git a/superkaramba/src/themewidget.cpp b/superkaramba/src/themewidget.cpp
index cad020c..a0acbde 100644
--- a/superkaramba/src/themewidget.cpp
+++ b/superkaramba/src/themewidget.cpp
@@ -21,7 +21,7 @@
#include "themelocale.h"
#include <kpushbutton.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp
index 27ff44e..1aac8e1 100644
--- a/tdewallet/allyourbase.cpp
+++ b/tdewallet/allyourbase.cpp
@@ -22,10 +22,10 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kurl.h>
#include <kurldrag.h>
diff --git a/tdewallet/kwmapeditor.cpp b/tdewallet/kwmapeditor.cpp
index c7b17ae..a6c09b4 100644
--- a/tdewallet/kwmapeditor.cpp
+++ b/tdewallet/kwmapeditor.cpp
@@ -21,7 +21,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kstdaction.h>
#include <twin.h>
diff --git a/tdewallet/main.cpp b/tdewallet/main.cpp
index f58a36c..3ecba8f 100644
--- a/tdewallet/main.cpp
+++ b/tdewallet/main.cpp
@@ -20,8 +20,8 @@
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kmimetype.h>
#include <kstandarddirs.h>
#include <kuniqueapplication.h>
diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp
index 885391e..6075c42 100644
--- a/tdewallet/tdewalleteditor.cpp
+++ b/tdewallet/tdewalleteditor.cpp
@@ -35,15 +35,15 @@
#include <kinputdialog.h>
#include <tdeio/netaccess.h>
#include <tdelistviewsearchline.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdepopupmenu.h>
#include <ksqueezedtextlabel.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
#include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqcheckbox.h>
#include <tqcombobox.h>
diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp
index c406e01..df1e5b1 100644
--- a/tdewallet/tdewalletmanager.cpp
+++ b/tdewallet/tdewalletmanager.cpp
@@ -32,8 +32,8 @@
#include <kiconloader.h>
#include <kiconview.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kstdaction.h>
#include <ksystemtray.h>
diff --git a/tdewallet/tdewalletpopup.cpp b/tdewallet/tdewalletpopup.cpp
index d95ac73..b3c0d1b 100644
--- a/tdewallet/tdewalletpopup.cpp
+++ b/tdewallet/tdewalletpopup.cpp
@@ -23,8 +23,8 @@
#include <tdeaction.h>
#include <kdebug.h>
#include <kiconview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdewallet.h>
#include <kstdguiitem.h>