From 980088ed866120f458c10c1ec64295e84ad8ba82 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 14 Feb 2013 17:19:31 -0600
Subject: Rename common header files for consistency with class renaming

---
 ark/ark_part.cpp                               | 2 +-
 ark/arkapp.cpp                                 | 2 +-
 ark/arkfactory.cpp                             | 2 +-
 ark/compressedfile.cpp                         | 2 +-
 ark/main.cpp                                   | 4 ++--
 ark/tar.cpp                                    | 2 +-
 charselectapplet/charselectapplet.cpp          | 2 +-
 kcalc/kcalc.cpp                                | 6 +++---
 kcalc/kcalc.kcfg                               | 2 +-
 kcharselect/kcharselectdia.cc                  | 2 +-
 kcharselect/main.cc                            | 6 +++---
 kdelirc/irkick/irkick.cpp                      | 6 +++---
 kdelirc/irkick/irkick.h                        | 2 +-
 kdelirc/irkick/klircclient.cpp                 | 6 +++---
 kdelirc/irkick/main.cpp                        | 4 ++--
 kdelirc/kcmlirc/addaction.cpp                  | 2 +-
 kdelirc/kcmlirc/editaction.cpp                 | 2 +-
 kdelirc/kcmlirc/kcmlirc.cpp                    | 2 +-
 kdessh/kdessh.cpp                              | 6 +++---
 kdf/distdelist.cpp                             | 2 +-
 kdf/kdf.cpp                                    | 6 +++---
 kdf/kdfconfig.cpp                              | 2 +-
 kdf/kdfwidget.cpp                              | 2 +-
 kdf/kwikdisk.cpp                               | 6 +++---
 kdf/mntconfig.cpp                              | 2 +-
 kdf/stdoption.cpp                              | 2 +-
 kdf/tdeconftest.cpp                            | 4 ++--
 kedit/kedit.cpp                                | 6 +++---
 kfloppy/floppy.cpp                             | 2 +-
 kfloppy/main.cpp                               | 6 +++---
 kgpg/keyservers.cpp                            | 2 +-
 kgpg/kgpg.cpp                                  | 6 +++---
 kgpg/kgpglibrary.cpp                           | 2 +-
 kgpg/listkeys.cpp                              | 2 +-
 kgpg/main.cpp                                  | 4 ++--
 khexedit/hexbuffer.h                           | 2 +-
 khexedit/hexeditorwidget.h                     | 2 +-
 khexedit/hexeditstate.h                        | 2 +-
 khexedit/hexviewwidget.h                       | 2 +-
 khexedit/main.cc                               | 6 +++---
 khexedit/parts/kbytesedit/kbyteseditwidget.cpp | 2 +-
 khexedit/parts/kpart/khepartfactory.cpp        | 2 +-
 khexedit/statusbarprogress.cc                  | 2 +-
 khexedit/toplevel.h                            | 2 +-
 kjots/KJotsMain.cpp                            | 2 +-
 kjots/kjotsentry.cpp                           | 2 +-
 kjots/main.cpp                                 | 4 ++--
 klaptopdaemon/acpi.cpp                         | 2 +-
 klaptopdaemon/apm.cpp                          | 2 +-
 klaptopdaemon/battery.cpp                      | 2 +-
 klaptopdaemon/buttons.cpp                      | 2 +-
 klaptopdaemon/daemon_state.cpp                 | 4 ++--
 klaptopdaemon/daemondock.cpp                   | 2 +-
 klaptopdaemon/laptop_check.cpp                 | 6 +++---
 klaptopdaemon/laptop_daemon.cpp                | 6 +++---
 klaptopdaemon/pcmcia.h                         | 4 ++--
 klaptopdaemon/power.cpp                        | 2 +-
 klaptopdaemon/profile.cpp                      | 2 +-
 klaptopdaemon/sony.cpp                         | 2 +-
 klaptopdaemon/wake_laptop.cpp                  | 2 +-
 klaptopdaemon/warning.cpp                      | 2 +-
 klaptopdaemon/xautolock.cc                     | 2 +-
 kmilo/asus/asus.h                              | 2 +-
 kmilo/delli8k/delli8k.h                        | 2 +-
 kmilo/generic/generic_monitor.h                | 2 +-
 kmilo/kmilo_kvaio/kcmkvaio/main.cpp            | 2 +-
 kmilo/kmilo_kvaio/kmilo_kvaio.h                | 2 +-
 kmilo/kmilo_kvaio/kvaio.cpp                    | 2 +-
 kmilo/thinkpad/kcmthinkpad/main.cpp            | 2 +-
 kmilo/thinkpad/thinkpad.h                      | 2 +-
 kregexpeditor/infopage.cpp                     | 2 +-
 kregexpeditor/kregexpeditorgui.cpp             | 2 +-
 kregexpeditor/main.cpp                         | 6 +++---
 kregexpeditor/test-without-dl/main.cpp         | 4 ++--
 ksim/generalprefs.cpp                          | 2 +-
 ksim/ksim.cpp                                  | 4 ++--
 ksim/ksimsysinfo.cpp                           | 2 +-
 ksim/ksimview.cpp                              | 2 +-
 ksim/library/pluginmodule.cpp                  | 4 ++--
 ksim/monitors/cpu/ksimcpu.cpp                  | 6 +++---
 ksim/monitors/disk/ksimdisk.cpp                | 6 +++---
 ksim/monitors/filesystem/fsystemconfig.cpp     | 2 +-
 ksim/monitors/filesystem/ksimfsystem.cpp       | 6 +++---
 ksim/monitors/i8k/ksimi8k.cpp                  | 4 ++--
 ksim/monitors/lm_sensors/ksimsensors.cpp       | 6 +++---
 ksim/monitors/mail/ksimmail.cpp                | 2 +-
 ksim/monitors/net/ksimnet.cpp                  | 6 +++---
 ksim/monitors/net/netconfig.cpp                | 2 +-
 ksim/monitors/net/netdialog.cpp                | 2 +-
 ksim/themeprefs.cpp                            | 2 +-
 ktimer/ktimer.cpp                              | 2 +-
 ktimer/main.cpp                                | 6 +++---
 superkaramba/src/karamba.h                     | 2 +-
 superkaramba/src/karambaapp.cpp                | 2 +-
 superkaramba/src/karambaapp.h                  | 2 +-
 superkaramba/src/karambasessionmanaged.cpp     | 2 +-
 superkaramba/src/main.cpp                      | 4 ++--
 superkaramba/src/sknewstuff.cpp                | 2 +-
 superkaramba/src/taskbartest.cpp               | 6 +++---
 superkaramba/src/themefile.cpp                 | 2 +-
 superkaramba/src/themesdlg.cpp                 | 2 +-
 tdewallet/allyourbase.cpp                      | 2 +-
 tdewallet/konfigurator/konfigurator.cpp        | 4 ++--
 tdewallet/main.cpp                             | 4 ++--
 tdewallet/tdewalleteditor.cpp                  | 2 +-
 tdewallet/tdewalletmanager.cpp                 | 2 +-
 106 files changed, 162 insertions(+), 162 deletions(-)

diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp
index f2e6f01..6feb309 100644
--- a/ark/ark_part.cpp
+++ b/ark/ark_part.cpp
@@ -31,7 +31,7 @@
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 #include <kmessagebox.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kxmlguifactory.h>
 #include <kstatusbar.h>
 #include <kiconloader.h>
diff --git a/ark/arkapp.cpp b/ark/arkapp.cpp
index e9f82fa..269b155 100644
--- a/ark/arkapp.cpp
+++ b/ark/arkapp.cpp
@@ -27,7 +27,7 @@
 
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <unistd.h>
 #include <tqfile.h>
diff --git a/ark/arkfactory.cpp b/ark/arkfactory.cpp
index b92b4aa..c0912ce 100644
--- a/ark/arkfactory.cpp
+++ b/ark/arkfactory.cpp
@@ -19,7 +19,7 @@
 
 */
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kinstance.h>
 
 #include "ark_part.h"
diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp
index 7e08c0e..b0dd55d 100644
--- a/ark/compressedfile.cpp
+++ b/ark/compressedfile.cpp
@@ -43,7 +43,7 @@
 #include <tdeio/netaccess.h>
 #include <tdeio/global.h>
 #include <tdefileitem.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 
 // ark includes
diff --git a/ark/main.cpp b/ark/main.cpp
index b010124..48589b6 100644
--- a/ark/main.cpp
+++ b/ark/main.cpp
@@ -39,8 +39,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE includes
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <tdelibs_export.h>
 // ark includes
 #include "arkapp.h"
diff --git a/ark/tar.cpp b/ark/tar.cpp
index 7e5a772..d767e4d 100644
--- a/ark/tar.cpp
+++ b/ark/tar.cpp
@@ -54,7 +54,7 @@
 #include <tqeventloop.h>
 
 // KDE includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klargefile.h>
 #include <klocale.h>
diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp
index 386d532..eed60bf 100644
--- a/charselectapplet/charselectapplet.cpp
+++ b/charselectapplet/charselectapplet.cpp
@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 
 #include "charselectapplet.h"
 #include "charselectapplet.moc"
diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp
index 7dacb16..3c48ed3 100644
--- a/kcalc/kcalc.cpp
+++ b/kcalc/kcalc.cpp
@@ -40,11 +40,11 @@
 
 
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kcolorbutton.h>
 #include <kcolordrag.h>
 #include <tdeconfig.h>
diff --git a/kcalc/kcalc.kcfg b/kcalc/kcalc.kcfg
index 25b2361..d1fbf7e 100644
--- a/kcalc/kcalc.kcfg
+++ b/kcalc/kcalc.kcfg
@@ -3,7 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <include>kapplication.h</include>
+  <include>tdeapplication.h</include>
   <include>kglobalsettings.h</include>
   <include>config.h</include>
   <kcfgfile name="kcalcrc"/>
diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc
index 49ea862..df3fa63 100644
--- a/kcharselect/kcharselectdia.cc
+++ b/kcharselect/kcharselectdia.cc
@@ -10,7 +10,7 @@
 #include <stdlib.h>
 
 #include <kdialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaccel.h>
 #include <tdeconfig.h>
 #include <klocale.h>
diff --git a/kcharselect/main.cc b/kcharselect/main.cc
index 006d095..66d5771 100644
--- a/kcharselect/main.cc
+++ b/kcharselect/main.cc
@@ -6,10 +6,10 @@
 
 #include "kcharselectdia.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kglobalsettings.h>
 
 static const char description[] = 
diff --git a/kdelirc/irkick/irkick.cpp b/kdelirc/irkick/irkick.cpp
index c2ba916..12122ae 100644
--- a/kdelirc/irkick/irkick.cpp
+++ b/kdelirc/irkick/irkick.cpp
@@ -15,7 +15,7 @@
 #include <tqevent.h>
 
 #include <tdeversion.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #if !(TDE_VERSION_MINOR<=1 && TDE_VERSION_RELEASE<=5)
 #include <tdeactioncollection.h>
@@ -28,8 +28,8 @@
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaboutdialog.h>
-#include <kaboutkde.h>
+#include <tdeaboutdialog.h>
+#include <tdeabouttde.h>
 #include <twinmodule.h>
 #include <twin.h>
 #include <khelpmenu.h>
diff --git a/kdelirc/irkick/irkick.h b/kdelirc/irkick/irkick.h
index 2dd568b..786e100 100644
--- a/kdelirc/irkick/irkick.h
+++ b/kdelirc/irkick/irkick.h
@@ -18,7 +18,7 @@
 
 #include <ksystemtray.h>
 #include <kdedmodule.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <dcopobject.h>
 
diff --git a/kdelirc/irkick/klircclient.cpp b/kdelirc/irkick/klircclient.cpp
index a9373f9..f6c8f00 100644
--- a/kdelirc/irkick/klircclient.cpp
+++ b/kdelirc/irkick/klircclient.cpp
@@ -26,7 +26,7 @@
 #include <tqsocketnotifier.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksystemtray.h>
 #include <kiconloader.h>
 #include <kpassivepopup.h>
@@ -34,8 +34,8 @@
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaboutdialog.h>
-#include <kaboutkde.h>
+#include <tdeaboutdialog.h>
+#include <tdeabouttde.h>
 
 #include <dcopclient.h>
 #include <dcopref.h>
diff --git a/kdelirc/irkick/main.cpp b/kdelirc/irkick/main.cpp
index 95ba384..2aa30e0 100644
--- a/kdelirc/irkick/main.cpp
+++ b/kdelirc/irkick/main.cpp
@@ -8,9 +8,9 @@
 // This program is free software.
 
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <twin.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kuniqueapplication.h>
diff --git a/kdelirc/kcmlirc/addaction.cpp b/kdelirc/kcmlirc/addaction.cpp
index 5e7fd1c..38cd1d5 100644
--- a/kdelirc/kcmlirc/addaction.cpp
+++ b/kdelirc/kcmlirc/addaction.cpp
@@ -18,7 +18,7 @@
 #include <kdebug.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <keditlistbox.h>
diff --git a/kdelirc/kcmlirc/editaction.cpp b/kdelirc/kcmlirc/editaction.cpp
index 9b65e19..392b20d 100644
--- a/kdelirc/kcmlirc/editaction.cpp
+++ b/kdelirc/kcmlirc/editaction.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <keditlistbox.h>
diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp
index 3858937..6ddf888 100644
--- a/kdelirc/kcmlirc/kcmlirc.cpp
+++ b/kdelirc/kcmlirc/kcmlirc.cpp
@@ -18,7 +18,7 @@
 #include <tqlistview.h>
 
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp
index 6a010d3..6aba0ec 100644
--- a/kdessh/kdessh.cpp
+++ b/kdessh/kdessh.cpp
@@ -19,12 +19,12 @@
 
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 
 #include <tdesu/ssh.h>
diff --git a/kdf/distdelist.cpp b/kdf/distdelist.cpp
index 27e26a6..2623ecd 100644
--- a/kdf/distdelist.cpp
+++ b/kdf/distdelist.cpp
@@ -26,7 +26,7 @@
 #include <math.h>
 #include <stdlib.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "distdelist.h"
 
diff --git a/kdf/kdf.cpp b/kdf/kdf.cpp
index 4b816e4..e316b3e 100644
--- a/kdf/kdf.cpp
+++ b/kdf/kdf.cpp
@@ -19,10 +19,10 @@
  *
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdestdaccel.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 
diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp
index 1b86925..7ea7590 100644
--- a/kdf/kdfconfig.cpp
+++ b/kdf/kdfconfig.cpp
@@ -35,7 +35,7 @@
 #include <tqlcdnumber.h>
 #include <tqlineedit.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <klocale.h>
diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp
index 2698038..edaa7c1 100644
--- a/kdf/kdfwidget.cpp
+++ b/kdf/kdfwidget.cpp
@@ -35,7 +35,7 @@
 #include <tqlayout.h>
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcmenumngr.h>
 #include <kmessagebox.h>
 #include <tdepopupmenu.h>
diff --git a/kdf/kwikdisk.cpp b/kdf/kwikdisk.cpp
index 8145e15..76c07c3 100644
--- a/kdf/kwikdisk.cpp
+++ b/kdf/kwikdisk.cpp
@@ -37,9 +37,9 @@
 
 #include <tdemainwindow.h>
 #include <klocale.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
diff --git a/kdf/mntconfig.cpp b/kdf/mntconfig.cpp
index db4e715..6867fdf 100644
--- a/kdf/mntconfig.cpp
+++ b/kdf/mntconfig.cpp
@@ -34,7 +34,7 @@
 
 #undef Unsorted
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kicondialog.h>
 #include <kmessagebox.h>
diff --git a/kdf/stdoption.cpp b/kdf/stdoption.cpp
index ee004cd..297274b 100644
--- a/kdf/stdoption.cpp
+++ b/kdf/stdoption.cpp
@@ -26,7 +26,7 @@
 */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "stdoption.h"
diff --git a/kdf/tdeconftest.cpp b/kdf/tdeconftest.cpp
index 63d904f..d6fe847 100644
--- a/kdf/tdeconftest.cpp
+++ b/kdf/tdeconftest.cpp
@@ -36,9 +36,9 @@
 #include <tqdict.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 static const char description[] =
 	I18N_NOOP("A test application");
diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp
index cd5dbeb..c1aab5d 100644
--- a/kedit/kedit.cpp
+++ b/kedit/kedit.cpp
@@ -30,10 +30,10 @@
 #include <tqpaintdevicemetrics.h>
 #include <tqpainter.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfigdialog.h>
 #include <kcursor.h>
 #include <keditcl.h>
diff --git a/kfloppy/floppy.cpp b/kfloppy/floppy.cpp
index dcc9d27..c3ee414 100644
--- a/kfloppy/floppy.cpp
+++ b/kfloppy/floppy.cpp
@@ -37,7 +37,7 @@
 #include <khelpmenu.h>
 #include <kpushbutton.h>
 #include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprogress.h>
 #include <klocale.h>
 #include <kcombobox.h>
diff --git a/kfloppy/main.cpp b/kfloppy/main.cpp
index 2a49da3..9c8823f 100644
--- a/kfloppy/main.cpp
+++ b/kfloppy/main.cpp
@@ -23,9 +23,9 @@
 */
 
 #include <tdeversion.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "floppy.h"
 
diff --git a/kgpg/keyservers.cpp b/kgpg/keyservers.cpp
index 0044387..f8d00c9 100644
--- a/kgpg/keyservers.cpp
+++ b/kgpg/keyservers.cpp
@@ -19,7 +19,7 @@
 
 #include <tqfile.h>
 #include <tqcheckbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
 #include <kdialogbase.h>
diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp
index bea4ce0..7febe6b 100644
--- a/kgpg/kgpg.cpp
+++ b/kgpg/kgpg.cpp
@@ -31,11 +31,11 @@
 #include <tdeversion.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kcombobox.h>
 #include <tqregexp.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tqtooltip.h>
 #include <kdebug.h>
 #include <kurlrequesterdlg.h>
@@ -49,7 +49,7 @@
 #include <twin.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kurlrequester.h>
 #include <ktip.h>
 #include <kurldrag.h>
diff --git a/kgpg/kgpglibrary.cpp b/kgpg/kgpglibrary.cpp
index b8d62f6..9c408b7 100644
--- a/kgpg/kgpglibrary.cpp
+++ b/kgpg/kgpglibrary.cpp
@@ -19,7 +19,7 @@
 #include <tqvbox.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kmessagebox.h>
 #include <krun.h>
diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp
index 903fe3d..7b2b56f 100644
--- a/kgpg/listkeys.cpp
+++ b/kgpg/listkeys.cpp
@@ -64,7 +64,7 @@
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kabc/stdaddressbook.h>
 #include <kabc/addresseedialog.h>
 #include <kdesktopfile.h>
diff --git a/kgpg/main.cpp b/kgpg/main.cpp
index 0d0e635..77c344c 100644
--- a/kgpg/main.cpp
+++ b/kgpg/main.cpp
@@ -21,8 +21,8 @@
 
 #include <kuniqueapplication.h>
 #include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include "kgpg.h"
 
diff --git a/khexedit/hexbuffer.h b/khexedit/hexbuffer.h
index b06a40b..938309d 100644
--- a/khexedit/hexbuffer.h
+++ b/khexedit/hexbuffer.h
@@ -37,7 +37,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "conversion.h"
 #include "hexeditstate.h"
diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h
index 0f63a89..030b135 100644
--- a/khexedit/hexeditorwidget.h
+++ b/khexedit/hexeditorwidget.h
@@ -28,7 +28,7 @@
 
 #include <tqvariant.h>
 #include <tqptrdict.h> 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "hexbuffer.h"
 #include "hexviewwidget.h"
diff --git a/khexedit/hexeditstate.h b/khexedit/hexeditstate.h
index 339a26a..82d7970 100644
--- a/khexedit/hexeditstate.h
+++ b/khexedit/hexeditstate.h
@@ -21,7 +21,7 @@
 #ifndef _HEX_EDIT_STATE_H_
 #define _HEX_EDIT_STATE_H_
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqfont.h> 
 #include <tqpalette.h>
 #include <kglobalsettings.h>
diff --git a/khexedit/hexviewwidget.h b/khexedit/hexviewwidget.h
index 85fd284..358cab4 100644
--- a/khexedit/hexviewwidget.h
+++ b/khexedit/hexviewwidget.h
@@ -31,7 +31,7 @@
 #include <tqpopupmenu.h> 
 #include <tqscrollbar.h> 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcmenumngr.h>
 
 #include "hexclipboard.h"
diff --git a/khexedit/main.cc b/khexedit/main.cc
index d687ce9..5a054bf 100644
--- a/khexedit/main.cc
+++ b/khexedit/main.cc
@@ -21,10 +21,10 @@
 
 #include <stdlib.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "toplevel.h"
 #include "version.h" // Contains khexedit name string and version string
diff --git a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
index cb2b549..342e1cc 100644
--- a/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
+++ b/khexedit/parts/kbytesedit/kbyteseditwidget.cpp
@@ -20,7 +20,7 @@
 // kde specific
 #include <klocale.h>
 #include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 // lib specific
 #include "kbytesedit.h"
 #include "kbyteseditwidget.h"
diff --git a/khexedit/parts/kpart/khepartfactory.cpp b/khexedit/parts/kpart/khepartfactory.cpp
index 4f6cd8f..b7116e6 100644
--- a/khexedit/parts/kpart/khepartfactory.cpp
+++ b/khexedit/parts/kpart/khepartfactory.cpp
@@ -17,7 +17,7 @@
 
 // kde specific
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 // app specific
 #include "khepart.h"
diff --git a/khexedit/statusbarprogress.cc b/khexedit/statusbarprogress.cc
index 5e7814d..f5e89d8 100644
--- a/khexedit/statusbarprogress.cc
+++ b/khexedit/statusbarprogress.cc
@@ -23,7 +23,7 @@
 
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <klocale.h>
 #include <tqstyle.h>
diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h
index a31871c..6991a58 100644
--- a/khexedit/toplevel.h
+++ b/khexedit/toplevel.h
@@ -26,7 +26,7 @@
 #endif
 
 #include <tqptrlist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdestdaccel.h>
 #include <tdemainwindow.h>
 
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index a91ea78..088bc05 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -25,7 +25,7 @@
 #include <tdeio/netaccess.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbookmarkmenu.h>
 #include <tdeconfigdialog.h>
 #include <kdebug.h>
diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp
index 1376a68..4bf0f5f 100644
--- a/kjots/kjotsentry.cpp
+++ b/kjots/kjotsentry.cpp
@@ -26,7 +26,7 @@
 #include <tqtextcodec.h>
 #include <tqdom.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <klocale.h>
diff --git a/kjots/main.cpp b/kjots/main.cpp
index f91298e..c9d158b 100644
--- a/kjots/main.cpp
+++ b/kjots/main.cpp
@@ -27,9 +27,9 @@
 
 #include <stdlib.h>
 #include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "KJotsMain.h"
 
diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
index 131e92c..8f434b0 100644
--- a/klaptopdaemon/acpi.cpp
+++ b/klaptopdaemon/acpi.cpp
@@ -34,7 +34,7 @@
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
index bde1410..d023c56 100644
--- a/klaptopdaemon/apm.cpp
+++ b/klaptopdaemon/apm.cpp
@@ -35,7 +35,7 @@
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp
index 31ad563..fde729a 100644
--- a/klaptopdaemon/battery.cpp
+++ b/klaptopdaemon/battery.cpp
@@ -34,7 +34,7 @@
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <krichtextlabel.h>
 
diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp
index a489944..144ce76 100644
--- a/klaptopdaemon/buttons.cpp
+++ b/klaptopdaemon/buttons.cpp
@@ -31,7 +31,7 @@
 #include <tdeconfig.h>
 #include <knumvalidator.h>
 #include <kdialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 
 #include <tqlayout.h>
diff --git a/klaptopdaemon/daemon_state.cpp b/klaptopdaemon/daemon_state.cpp
index 9daaca6..a8f69b1 100644
--- a/klaptopdaemon/daemon_state.cpp
+++ b/klaptopdaemon/daemon_state.cpp
@@ -33,10 +33,10 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include "daemon_state.h"
 #include "portable.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kaudioplayer.h>
 #include <sys/ioctl.h>
 #include <kmessagebox.h>
diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp
index f734de0..7ef844d 100644
--- a/klaptopdaemon/daemondock.cpp
+++ b/klaptopdaemon/daemondock.cpp
@@ -35,7 +35,7 @@
 #include "daemondock.h"
 #include "portable.h"
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
diff --git a/klaptopdaemon/laptop_check.cpp b/klaptopdaemon/laptop_check.cpp
index b3432cb..7080798 100644
--- a/klaptopdaemon/laptop_check.cpp
+++ b/klaptopdaemon/laptop_check.cpp
@@ -24,9 +24,9 @@
 
 #include "daemon_state.h"
 #include <stdlib.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 static const char description[] =
         I18N_NOOP("TDE laptop daemon starter");
diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp
index 3fffeed..142b922 100644
--- a/klaptopdaemon/laptop_daemon.cpp
+++ b/klaptopdaemon/laptop_daemon.cpp
@@ -33,12 +33,12 @@
 
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include "laptop_daemon.h"
 #include "portable.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kaudioplayer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <sys/ioctl.h>
 #include <kmessagebox.h>
 #include <kpassivepopup.h>
diff --git a/klaptopdaemon/pcmcia.h b/klaptopdaemon/pcmcia.h
index 4ed5ee1..ea915d6 100644
--- a/klaptopdaemon/pcmcia.h
+++ b/klaptopdaemon/pcmcia.h
@@ -32,11 +32,11 @@
 #include <tqradiobutton.h>
 #include <tqbuttongroup.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knuminput.h>
 
 #include <tdecmodule.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 class PcmciaConfig : public TDECModule
 {
diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp
index e1dfd5e..0d25e8b 100644
--- a/klaptopdaemon/power.cpp
+++ b/klaptopdaemon/power.cpp
@@ -31,7 +31,7 @@
 #include <tdeconfig.h>
 #include <knumvalidator.h>
 #include <kdialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <knuminput.h>
 
diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp
index f2c9a3b..9e9a0da 100644
--- a/klaptopdaemon/profile.cpp
+++ b/klaptopdaemon/profile.cpp
@@ -36,7 +36,7 @@
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kcombobox.h>
 
diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp
index 33d3a05..7e097be 100644
--- a/klaptopdaemon/sony.cpp
+++ b/klaptopdaemon/sony.cpp
@@ -36,7 +36,7 @@
 #include <knuminput.h>
 #include <kiconloader.h>
 #include <kicondialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
diff --git a/klaptopdaemon/wake_laptop.cpp b/klaptopdaemon/wake_laptop.cpp
index 1e9d92b..c994057 100644
--- a/klaptopdaemon/wake_laptop.cpp
+++ b/klaptopdaemon/wake_laptop.cpp
@@ -24,7 +24,7 @@
 #include <tdeconfig.h>
 #include <kdatastream.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 KDE_EXPORT void
 wake_laptop_daemon()
diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp
index 259c48c..99b8d6e 100644
--- a/klaptopdaemon/warning.cpp
+++ b/klaptopdaemon/warning.cpp
@@ -30,7 +30,7 @@
 #include <kmessagebox.h>
 #include <tdeconfig.h>
 #include <kurlrequester.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 
 #include <tqlayout.h>
diff --git a/klaptopdaemon/xautolock.cc b/klaptopdaemon/xautolock.cc
index 61502ab..93834af 100644
--- a/klaptopdaemon/xautolock.cc
+++ b/klaptopdaemon/xautolock.cc
@@ -15,7 +15,7 @@
 #include "xautolock.h"
 #include "xautolock.moc"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <X11/Xlib.h>
diff --git a/kmilo/asus/asus.h b/kmilo/asus/asus.h
index c809eea..7b8646b 100644
--- a/kmilo/asus/asus.h
+++ b/kmilo/asus/asus.h
@@ -23,7 +23,7 @@
 #ifndef ASUS_H
 #define ASUS_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopref.h>
 
 #include "monitor.h"
diff --git a/kmilo/delli8k/delli8k.h b/kmilo/delli8k/delli8k.h
index 424f80a..c8cf25f 100644
--- a/kmilo/delli8k/delli8k.h
+++ b/kmilo/delli8k/delli8k.h
@@ -29,7 +29,7 @@
 #ifndef DELLI8K_H
 #define DELLI8K_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopref.h>
 
 #include "monitor.h"
diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h
index 7730a58..44ff970 100644
--- a/kmilo/generic/generic_monitor.h
+++ b/kmilo/generic/generic_monitor.h
@@ -28,7 +28,7 @@
 #include <tdemainwindow.h>
 #include <kglobalaccel.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "kmilod.h"
diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
index 45af318..e1522d4 100644
--- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
+++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp
@@ -27,7 +27,7 @@
 
 #include <dcopclient.h>
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kled.h>
diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h
index 1d4f3a9..851a74e 100644
--- a/kmilo/kmilo_kvaio/kmilo_kvaio.h
+++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h
@@ -25,7 +25,7 @@
 #include <tdemainwindow.h>
 #include <kglobalaccel.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kmilod.h"
 #include "monitor.h"
diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp
index cfdd231..19d125d 100644
--- a/kmilo/kmilo_kvaio/kvaio.cpp
+++ b/kmilo/kmilo_kvaio/kvaio.cpp
@@ -40,7 +40,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 extern "C" {
 #include <stdio.h>
diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp
index 5b8d8d3..9113f36 100644
--- a/kmilo/thinkpad/kcmthinkpad/main.cpp
+++ b/kmilo/thinkpad/kcmthinkpad/main.cpp
@@ -31,7 +31,7 @@
 
 #include <dcopclient.h>
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <kurlrequester.h>
diff --git a/kmilo/thinkpad/thinkpad.h b/kmilo/thinkpad/thinkpad.h
index fe2b364..27d86ed 100644
--- a/kmilo/thinkpad/thinkpad.h
+++ b/kmilo/thinkpad/thinkpad.h
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopref.h>
 
 #include "monitor.h"
diff --git a/kregexpeditor/infopage.cpp b/kregexpeditor/infopage.cpp
index bd192e2..558f00c 100644
--- a/kregexpeditor/infopage.cpp
+++ b/kregexpeditor/infopage.cpp
@@ -19,7 +19,7 @@
   #include "compat.h"
 #else
   #include <klocale.h>
-  #include <kapplication.h>
+  #include <tdeapplication.h>
 #endif
 
 #include "infopage.h"
diff --git a/kregexpeditor/kregexpeditorgui.cpp b/kregexpeditor/kregexpeditorgui.cpp
index 0dae863..d604e79 100644
--- a/kregexpeditor/kregexpeditorgui.cpp
+++ b/kregexpeditor/kregexpeditorgui.cpp
@@ -21,7 +21,7 @@
 #else
   #include <klocale.h>
   #include <kgenericfactory.h>
-  #include <kapplication.h>
+  #include <tdeapplication.h>
   #include "kregexpeditorgui.moc"
 #endif
 
diff --git a/kregexpeditor/main.cpp b/kregexpeditor/main.cpp
index 48b4a0a..20eb040 100644
--- a/kregexpeditor/main.cpp
+++ b/kregexpeditor/main.cpp
@@ -20,9 +20,9 @@
   #include "compat.h"
   #include <tqapplication.h>
 #else
-  #include <kaboutdata.h>
-  #include <kapplication.h>
-  #include <kcmdlineargs.h>
+  #include <tdeaboutdata.h>
+  #include <tdeapplication.h>
+  #include <tdecmdlineargs.h>
   #include <klocale.h>
   #include <kpushbutton.h>
 #endif
diff --git a/kregexpeditor/test-without-dl/main.cpp b/kregexpeditor/test-without-dl/main.cpp
index a0c0c00..3235b40 100644
--- a/kregexpeditor/test-without-dl/main.cpp
+++ b/kregexpeditor/test-without-dl/main.cpp
@@ -15,8 +15,8 @@
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tqfile.h>
 #include "../kregexpeditorgui.h"
 class ShootABug :public TQObject
diff --git a/ksim/generalprefs.cpp b/ksim/generalprefs.cpp
index dc35e6d..c07919e 100644
--- a/ksim/generalprefs.cpp
+++ b/ksim/generalprefs.cpp
@@ -32,7 +32,7 @@
 #include <tqpopupmenu.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kiconloader.h>
diff --git a/ksim/ksim.cpp b/ksim/ksim.cpp
index 5059cce..447cf94 100644
--- a/ksim/ksim.cpp
+++ b/ksim/ksim.cpp
@@ -25,9 +25,9 @@
 
 #include <tqlayout.h>
 
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kbugreport.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <dcopclient.h>
 #include <kmessagebox.h>
 #include <kglobal.h>
diff --git a/ksim/ksimsysinfo.cpp b/ksim/ksimsysinfo.cpp
index 7c39e22..dbdd180 100644
--- a/ksim/ksimsysinfo.cpp
+++ b/ksim/ksimsysinfo.cpp
@@ -26,7 +26,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 
 #include "ksimsysinfo.h"
diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp
index 09b5cf7..d45a3dd 100644
--- a/ksim/ksimview.cpp
+++ b/ksim/ksimview.cpp
@@ -37,7 +37,7 @@
 #include "baselist.h"
 #include <themetypes.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp
index d668e82..eb6f03b 100644
--- a/ksim/library/pluginmodule.cpp
+++ b/ksim/library/pluginmodule.cpp
@@ -21,8 +21,8 @@
 #include "pluginmodule.moc"
 
 #include <klocale.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tqregexp.h>
 #include <tqpopupmenu.h>
diff --git a/ksim/monitors/cpu/ksimcpu.cpp b/ksim/monitors/cpu/ksimcpu.cpp
index 3403244..fdb950f 100644
--- a/ksim/monitors/cpu/ksimcpu.cpp
+++ b/ksim/monitors/cpu/ksimcpu.cpp
@@ -32,12 +32,12 @@
 
 #include <tdelistview.h>
 #include <kdebug.h>
-#include <kaboutapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutapplication.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 
 #include <themetypes.h>
diff --git a/ksim/monitors/disk/ksimdisk.cpp b/ksim/monitors/disk/ksimdisk.cpp
index 52fae76..5247ad1 100644
--- a/ksim/monitors/disk/ksimdisk.cpp
+++ b/ksim/monitors/disk/ksimdisk.cpp
@@ -29,10 +29,10 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <kaboutapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutapplication.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdelistview.h>
 #include <kinputdialog.h>
 #include <tdeconfig.h>
diff --git a/ksim/monitors/filesystem/fsystemconfig.cpp b/ksim/monitors/filesystem/fsystemconfig.cpp
index 9d85bb0..3d3b671 100644
--- a/ksim/monitors/filesystem/fsystemconfig.cpp
+++ b/ksim/monitors/filesystem/fsystemconfig.cpp
@@ -24,7 +24,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <knuminput.h>
 #include <kdebug.h>
 
diff --git a/ksim/monitors/filesystem/ksimfsystem.cpp b/ksim/monitors/filesystem/ksimfsystem.cpp
index 7e0df68..1dbf35f 100644
--- a/ksim/monitors/filesystem/ksimfsystem.cpp
+++ b/ksim/monitors/filesystem/ksimfsystem.cpp
@@ -29,9 +29,9 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaboutapplication.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "ksimfsystem.h"
diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp
index c2e4f42..9638754 100644
--- a/ksim/monitors/i8k/ksimi8k.cpp
+++ b/ksim/monitors/i8k/ksimi8k.cpp
@@ -29,9 +29,9 @@
 
 #include <label.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <knuminput.h>
 #include <kdebug.h>
 
diff --git a/ksim/monitors/lm_sensors/ksimsensors.cpp b/ksim/monitors/lm_sensors/ksimsensors.cpp
index 933af43..bef854a 100644
--- a/ksim/monitors/lm_sensors/ksimsensors.cpp
+++ b/ksim/monitors/lm_sensors/ksimsensors.cpp
@@ -21,10 +21,10 @@
 #include "ksimsensors.moc"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutapplication.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 
 #include <tqlayout.h>
diff --git a/ksim/monitors/mail/ksimmail.cpp b/ksim/monitors/mail/ksimmail.cpp
index a60ccfd..e59c6e0 100644
--- a/ksim/monitors/mail/ksimmail.cpp
+++ b/ksim/monitors/mail/ksimmail.cpp
@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqtimer.h>
 
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 
diff --git a/ksim/monitors/net/ksimnet.cpp b/ksim/monitors/net/ksimnet.cpp
index 36a8c6d..c1d56a8 100644
--- a/ksim/monitors/net/ksimnet.cpp
+++ b/ksim/monitors/net/ksimnet.cpp
@@ -45,12 +45,12 @@ static int mib[] = { CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0 };
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kaboutapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutapplication.h>
+#include <tdeaboutdata.h>
 #include <ksimpleconfig.h>
 #include <kglobal.h>
 #include <krun.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include "ksimnet.h"
diff --git a/ksim/monitors/net/netconfig.cpp b/ksim/monitors/net/netconfig.cpp
index a960574..73a995b 100644
--- a/ksim/monitors/net/netconfig.cpp
+++ b/ksim/monitors/net/netconfig.cpp
@@ -25,7 +25,7 @@
 #include <ksimpleconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
diff --git a/ksim/monitors/net/netdialog.cpp b/ksim/monitors/net/netdialog.cpp
index 735e3ce..6f713aa 100644
--- a/ksim/monitors/net/netdialog.cpp
+++ b/ksim/monitors/net/netdialog.cpp
@@ -34,7 +34,7 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurlrequester.h>
 #include <kstdguiitem.h>
 
diff --git a/ksim/themeprefs.cpp b/ksim/themeprefs.cpp
index f275b0e..c0f3b06 100644
--- a/ksim/themeprefs.cpp
+++ b/ksim/themeprefs.cpp
@@ -31,7 +31,7 @@
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kurllabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefontdialog.h>
 #include <kcombobox.h>
 #include <tdelistview.h>
diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp
index c83dedd..de3eb4f 100644
--- a/ktimer/ktimer.cpp
+++ b/ktimer/ktimer.cpp
@@ -29,7 +29,7 @@
 #include <klineedit.h>
 
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksystemtray.h>
 #include <tdefiledialog.h>
 
diff --git a/ktimer/main.cpp b/ktimer/main.cpp
index 63c3608..f5f968a 100644
--- a/ktimer/main.cpp
+++ b/ktimer/main.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 
 #include "ktimer.h"
 
diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h
index 9036844..6930c5c 100644
--- a/superkaramba/src/karamba.h
+++ b/superkaramba/src/karamba.h
@@ -29,7 +29,7 @@
 #endif
 
 #include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <twinmodule.h>
 #include <twin.h>
diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp
index b85137c..3f751d8 100644
--- a/superkaramba/src/karambaapp.cpp
+++ b/superkaramba/src/karambaapp.cpp
@@ -12,7 +12,7 @@
 #include <tqstringlist.h>
 #include <tqdir.h>
 #include <tdefiledialog.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <fcntl.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/superkaramba/src/karambaapp.h b/superkaramba/src/karambaapp.h
index d4470aa..330a6ed 100644
--- a/superkaramba/src/karambaapp.h
+++ b/superkaramba/src/karambaapp.h
@@ -11,7 +11,7 @@
 #ifndef KARAMBAAPP_H
 #define KARAMBAAPP_H
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include <tdeversion.h>
 #include <ksystemtray.h>
 
diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp
index 46d2805..6d3c46c 100644
--- a/superkaramba/src/karambasessionmanaged.cpp
+++ b/superkaramba/src/karambasessionmanaged.cpp
@@ -20,7 +20,7 @@
 *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ****************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include "karambasessionmanaged.h"
 #include "karamba.h"
diff --git a/superkaramba/src/main.cpp b/superkaramba/src/main.cpp
index e1c19b0..e29b3c3 100644
--- a/superkaramba/src/main.cpp
+++ b/superkaramba/src/main.cpp
@@ -23,8 +23,8 @@
 #include <karambaapp.h>
 #include <tqobject.h>
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <tdemainwindow.h>
diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp
index 130d58a..e5a413b 100644
--- a/superkaramba/src/sknewstuff.cpp
+++ b/superkaramba/src/sknewstuff.cpp
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  ****************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefilemetainfo.h>
 #include <tdeio/netaccess.h>
diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp
index 95a40a1..c385042 100644
--- a/superkaramba/src/taskbartest.cpp
+++ b/superkaramba/src/taskbartest.cpp
@@ -20,10 +20,10 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  ****************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 
diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp
index de38b14..4e3258b 100644
--- a/superkaramba/src/themefile.cpp
+++ b/superkaramba/src/themefile.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kzip.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp
index 9311853..107d2c5 100644
--- a/superkaramba/src/themesdlg.cpp
+++ b/superkaramba/src/themesdlg.cpp
@@ -39,7 +39,7 @@
 #include <tdefiledialog.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tqlineedit.h>
diff --git a/tdewallet/allyourbase.cpp b/tdewallet/allyourbase.cpp
index 3da85ee..27ff44e 100644
--- a/tdewallet/allyourbase.cpp
+++ b/tdewallet/allyourbase.cpp
@@ -20,7 +20,7 @@
 
 #include "allyourbase.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <tdeio/netaccess.h>
diff --git a/tdewallet/konfigurator/konfigurator.cpp b/tdewallet/konfigurator/konfigurator.cpp
index 96cd94b..3d3c2c3 100644
--- a/tdewallet/konfigurator/konfigurator.cpp
+++ b/tdewallet/konfigurator/konfigurator.cpp
@@ -21,8 +21,8 @@
 #include "walletconfigwidget.h"
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
diff --git a/tdewallet/main.cpp b/tdewallet/main.cpp
index 7d47c39..f58a36c 100644
--- a/tdewallet/main.cpp
+++ b/tdewallet/main.cpp
@@ -17,8 +17,8 @@
    Boston, MA 02110-1301, USA.
  */
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/tdewallet/tdewalleteditor.cpp b/tdewallet/tdewalleteditor.cpp
index 6755d60..885391e 100644
--- a/tdewallet/tdewalleteditor.cpp
+++ b/tdewallet/tdewalleteditor.cpp
@@ -27,7 +27,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <tdefiledialog.h>
diff --git a/tdewallet/tdewalletmanager.cpp b/tdewallet/tdewalletmanager.cpp
index aafbdfa..c406e01 100644
--- a/tdewallet/tdewalletmanager.cpp
+++ b/tdewallet/tdewalletmanager.cpp
@@ -26,7 +26,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-- 
cgit v1.2.1