Rename common header files for consistency with class renaming

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>

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>

ark/arkfactory.cpp

@@ -19,7 +19,7 @@
 
 */
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kinstance.h>
 
 #include "ark_part.h"

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

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"

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>

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"

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>

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

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>

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[] = 

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>

kdelirc/irkick/irkick.h

@@ -18,7 +18,7 @@
 
 #include <ksystemtray.h>
 #include <kdedmodule.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <dcopobject.h>
 

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>

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>

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>

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>

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>

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>

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"
 

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>
 

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>

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>

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>

kdf/mntconfig.cpp

@@ -34,7 +34,7 @@
 
 #undef Unsorted
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kicondialog.h>
 #include <kmessagebox.h>

kdf/stdoption.cpp

@@ -26,7 +26,7 @@
 */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include "stdoption.h"

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

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>

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>

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"
 

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>

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>

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>

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>

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"
 

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"

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"

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>

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"

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

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"

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"

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>

khexedit/toplevel.h

@@ -26,7 +26,7 @@
 #endif
 
 #include <tqptrlist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdestdaccel.h>
 #include <tdemainwindow.h>
 

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>

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>

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"
 

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>

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>

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>
 

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>

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>

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>

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

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>

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
 {

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>
 

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>
 

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>

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

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>

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>

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"

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"

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"

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>

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"

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>

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>

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"

kregexpeditor/infopage.cpp

@@ -19,7 +19,7 @@
   #include "compat.h"
 #else
   #include <klocale.h>
-  #include <kapplication.h>
+  #include <tdeapplication.h>
 #endif
 
 #include "infopage.h"

kregexpeditor/kregexpeditorgui.cpp

@@ -21,7 +21,7 @@
 #else
   #include <klocale.h>
   #include <kgenericfactory.h>
-  #include <kapplication.h>
+  #include <tdeapplication.h>
   #include "kregexpeditorgui.moc"
 #endif
 

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

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

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>

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>

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"

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>

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>

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>

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>

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>
 

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"

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>
 

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>

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>
 

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"

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>

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>
 

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>

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>
 

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"
 

superkaramba/src/karamba.h

@@ -29,7 +29,7 @@
 #endif
 
 #include <tqwidget.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <twinmodule.h>
 #include <twin.h>

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>

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>
 

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"

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>

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>

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>
 

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>

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>

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>

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>

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>

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>

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>