Rename common header files for consistency with class renaming

11 years ago · 980088ed86
parent a2e800c25b
commit 980088ed86
106 changed files with 162 additions and 162 deletions
--- 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>
--- 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>
--- 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"
--- 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
--- 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"
--- 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>
--- 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"
--- 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>
--- 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"/>
--- 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>
--- 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[] = 
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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"

--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- a/kdf/stdoption.cpp
+++ b/kdf/stdoption.cpp
@ -26,7 +26,7 @@
 */


-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>

 #include "stdoption.h"
--- 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");
--- 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>
--- 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>
--- 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"

--- 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>
--- 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>
--- 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>
--- 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>
--- 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"

--- 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"
--- 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"
--- 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>
--- 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"
--- 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
--- 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"
--- 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"
--- 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>
--- 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>

--- 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>
--- 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>
--- 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"

--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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");
--- 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>
--- 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
 {
--- 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>

--- 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>

--- 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>
--- 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()
--- 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>
--- 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>
--- 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"
--- 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"
--- 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"
--- 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>
--- 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"
--- 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>
--- 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>
--- 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"
--- 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"
--- 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

--- 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
--- 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
--- 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>
--- 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>
--- 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"
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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"
--- 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>

--- 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>
--- 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>

--- 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"
--- 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>
--- 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>

--- 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>
--- 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>

--- 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"

--- 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>
--- 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>
--- 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>

--- 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"
--- 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>
--- 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>
--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>