Rename common header files for consistency with class renaming

doc/ksplashml/index.docbook

@@ -1083,7 +1083,7 @@ appropriate plugin.</para>
 #include &lt;qlabel.h&gt;
 #include &lt;qwidget.h&gt;
 
-#include &lt;kapplication.h&gt;
+#include &lt;tdeapplication.h&gt;
 #include &lt;tdeconfig.h&gt;
 #include &lt;kdebug.h&gt;
 #include &lt;kdialogbase.h&gt;

drkonqi/crashtest.cpp

@@ -1,7 +1,7 @@
 // Let's crash.
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <stdio.h>
 #include <assert.h>

drkonqi/krashconf.cpp

@@ -27,8 +27,8 @@
 
 #include <tdeconfig.h>
 #include <kglobal.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kstartupinfo.h>

drkonqi/krashconf.h

@@ -28,7 +28,7 @@
 #ifndef KRASHCONF_H
 #define KRASHCONF_H
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqstring.h>
 #include <tqobject.h>
 

drkonqi/krashdcopinterface.h

@@ -34,7 +34,7 @@
 
 #include <tqstring.h>
 #include <tqcstring.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 /**
  * Provides information about a crashed process over dcop.

drkonqi/main.cpp

@@ -30,9 +30,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <dcopclient.h>
 

drkonqi/toplevel.cpp

@@ -37,7 +37,7 @@
 #include <kbugreport.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include "backtrace.h"

kappfinder/main.cpp

@@ -17,9 +17,9 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 #include "toplevel.h"

kappfinder/main_install.cpp

@@ -19,7 +19,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <kinstance.h>
 #include <klocale.h>

kappfinder/toplevel.cpp

@@ -20,7 +20,7 @@
 */
 
 #include <tdeaccelmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>

kate/app/kateapp.cpp

@@ -30,7 +30,7 @@
 #include "../interfaces/application.h"
 
 #include <tdeversion.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
 #include <twin.h>

kate/app/kateapp.h

@@ -22,7 +22,7 @@
 
 #include "katemain.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqvaluelist.h>
 

kate/app/katefilelist.cpp

@@ -44,7 +44,7 @@
 #include <kglobalsettings.h>
 #include <kpassivepopup.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstringhandler.h>
 #include <kcolorbutton.h>
 #include <kdialog.h>

kate/app/katefileselector.cpp

@@ -47,7 +47,7 @@
 #include <tqtimer.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kurlcombobox.h>
 #include <kurlcompletion.h>

kate/app/kategrepdialog.cpp

@@ -31,12 +31,12 @@
 #include <tqwhatsthis.h>
 #include <tqcursor.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaccelmanager.h>
 #include <kbuttonbox.h>
 #include <tdefiledialog.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>

kate/app/katemain.cpp

@@ -21,8 +21,8 @@
 
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kinstance.h>

kate/app/katemainwindow.cpp

@@ -45,9 +45,9 @@
 
 #include <dcopclient.h>
 #include <kinstance.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kdiroperator.h>

kate/app/katemdi.cpp

@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>

kate/app/kateviewmanager.cpp

@@ -29,7 +29,7 @@
 
 #include <dcopclient.h>
 #include <tdeaction.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kdiroperator.h>
 #include <kdockwidget.h>

kate/app/kateviewspacecontainer.cpp

@@ -30,7 +30,7 @@
 
 #include <dcopclient.h>
 #include <tdeaction.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kdiroperator.h>
 #include <kdockwidget.h>

kate/app/kwritemain.cpp

@@ -40,17 +40,17 @@
 #include <kencodingfiledialog.h>
 #include <kdiroperator.h>
 #include <kiconloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstatusbar.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kurl.h>
 #include <tdeconfig.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>

kcminit/main.cpp

@@ -26,9 +26,9 @@
 #include <tqfile.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kservice.h>
 #include <klibloader.h>
 #include <kdebug.h>

kcontrol/access/kcmaccess.cpp

@@ -27,8 +27,8 @@
 #include <kstandarddirs.h>
 #include <kcolorbutton.h>
 #include <tdefiledialog.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeshortcut.h>
 #include <kkeynative.h>
 #include <knotifydialog.h>

kcontrol/access/main.cpp

@@ -1,7 +1,7 @@
 
 #include "kaccess.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] )

kcontrol/accessibility/accessibility.cpp

@@ -22,7 +22,7 @@
 #include <tqradiobutton.h>
 #include <tqtabwidget.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>

kcontrol/arts/arts.cpp

@@ -36,8 +36,8 @@
 
 #include <dcopref.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdecmoduleloader.h>
 #include <kdebug.h>
 #include <kdialog.h>

kcontrol/arts/arts.h

@@ -26,7 +26,7 @@
 #ifndef KARTSCONFIG_H
 #define KARTSCONFIG_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>

kcontrol/background/bgrender.cpp

@@ -21,7 +21,7 @@
 #include <tqdir.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kimageeffect.h>

kcontrol/background/bgsettings.cpp

@@ -21,7 +21,7 @@
 #include <tqpixmap.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <ksimpleconfig.h>

kcontrol/background/main.cpp

@@ -16,8 +16,8 @@
  */
 
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <dcopclient.h>

kcontrol/bell/bell.cpp

@@ -25,8 +25,8 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>

kcontrol/clock/main.cpp

@@ -25,8 +25,8 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 

kcontrol/colors/colorscm.cpp

@@ -33,7 +33,7 @@
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #if defined Q_WS_X11 && !defined K_WS_QTONLY
 #include <X11/Xlib.h>

kcontrol/colors/widgetcanvas.h

@@ -10,7 +10,7 @@
 
 #include <tqmap.h>
 #undef None	// Qt4
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #define MAX_HOTSPOTS   28
 #define SCROLLBAR_SIZE 16

kcontrol/componentchooser/componentchooser.cpp

@@ -27,7 +27,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kemailsettings.h>
 #include <kipc.h>
 #include <klocale.h>

kcontrol/componentchooser/kcm_componentchooser.cpp

@@ -15,7 +15,7 @@
 
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 
 #include "kcm_componentchooser.h"

kcontrol/crypto/crypto.cpp

@@ -48,7 +48,7 @@
 #include <tqvgroupbox.h>
 #include <tqwhatsthis.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kdatepicker.h>

kcontrol/css/kcmcss.cpp

@@ -5,7 +5,7 @@
 #include <tqradiobutton.h>
 #include <tqtextbrowser.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>

kcontrol/displayconfig/displayconfig.cpp

@@ -28,8 +28,8 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>

kcontrol/dnssd/kcmdnssd.cpp

@@ -39,7 +39,7 @@
 #include <klineedit.h>
 #include <kpassdlg.h>
 #include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include "kcmdnssd.h"

kcontrol/dnssd/kcmdnssd.h

@@ -24,7 +24,7 @@
 #include <tqmap.h>
 
 #include <configdialog.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 class KSimpleConfig;
 class KCMDnssd: public ConfigDialog

kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp

@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <kglobal.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>

kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp

@@ -32,7 +32,7 @@
 #include <kurl.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kprotocolinfo.h>
 #include <ksimpleconfig.h>

kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp

@@ -21,7 +21,7 @@
 #include <tqpushbutton.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kcharsets.h>

kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp

@@ -29,7 +29,7 @@
 #include <tqdir.h>
 #include <tqregexp.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>

kcontrol/filetypes/filetypedetails.cpp

@@ -4,7 +4,7 @@
 #include <tqvbuttongroup.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kicondialog.h>

kcontrol/filetypes/filetypesview.cpp

@@ -8,7 +8,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>

kcontrol/filetypes/keditfiletype.cpp

@@ -22,10 +22,10 @@
 #include <tqfile.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdesycoca.h>
 #include <kstandarddirs.h>
 

kcontrol/filetypes/kservicelistwidget.cpp

@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>

kcontrol/fonts/fonts.cpp

@@ -23,7 +23,7 @@
 #include <dcopclient.h>
 
 #include <tdeaccelmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kgenericfactory.h>
 #include <kipc.h>
 #include <kmessagebox.h>

kcontrol/hwmanager/devicepropsdlg.cpp

@@ -35,7 +35,7 @@
 #include <kbuttonbox.h>
 #include <kcombobox.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klineedit.h>
 #include <kstdguiitem.h>
 #include <kmessagebox.h>

kcontrol/hwmanager/hwmanager.cpp

@@ -26,8 +26,8 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>

kcontrol/iccconfig/iccconfig.cpp

@@ -26,8 +26,8 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>

kcontrol/icons/icons.cpp

@@ -18,7 +18,7 @@
 #include <tqlayout.h>
 #include <tqslider.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kdebug.h>

kcontrol/icons/iconthemes.cpp

@@ -27,7 +27,7 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kservice.h>
 #include <klocale.h>

kcontrol/icons/main.cpp

@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "icons.h"
 #include "iconthemes.h"

kcontrol/icons/testicons.cpp

@@ -1,6 +1,6 @@
 /* Test programme for icons setup module. */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "icons.h"
 
 int main(int argc, char **argv)

kcontrol/info/info.h

@@ -13,7 +13,7 @@
 #include <tqevent.h>
 
 #include <tdecmodule.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "config.h"
 

kcontrol/info/info_linux.cpp

@@ -38,7 +38,7 @@
 
 #include <tqregexp.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kstdguiitem.h>
 

kcontrol/info/memory.h

@@ -9,7 +9,7 @@
 #include <tqtimer.h>
 
 #include <tdecmodule.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <config.h>
 
 #ifdef HAVE_LONG_LONG

kcontrol/input/mouse.cpp

@@ -61,7 +61,7 @@
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include <config.h>
 

kcontrol/input/mouse.h

@@ -38,7 +38,7 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kglobalsettings.h>
 #include <knuminput.h>

kcontrol/input/xcursor/themepage.cpp

@@ -21,7 +21,7 @@
 #endif
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstandarddirs.h>
 #include <tdelistview.h>
 #include <ksimpleconfig.h>

kcontrol/ioslaveinfo/kcmioslaveinfo.h

@@ -27,7 +27,7 @@
 #include <tqlistbox.h>
 #include <tqstring.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdecmodule.h>
 #include <tdeio/job.h>
 #include <tdelistbox.h>

kcontrol/joystick/joystick.cpp

@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>

kcontrol/kcontrol/aboutwidget.cpp

@@ -31,7 +31,7 @@
 #include <kcursor.h>
 #include <kglobalsettings.h>
 #include <tdehtml_part.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include "global.h"

kcontrol/kcontrol/dockcontainer.cpp

@@ -25,7 +25,7 @@
 #include <tqapplication.h>
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kdebug.h>

kcontrol/kcontrol/global.cpp

@@ -23,7 +23,7 @@
 #include <sys/utsname.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kuser.h>
 
 #include <tqobjectlist.h>

kcontrol/kcontrol/helpwidget.cpp

@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <krun.h>
 
 #include "global.h"

kcontrol/kcontrol/main.cpp

@@ -34,9 +34,9 @@
 
 #include <tqpaintdevicemetrics.h>
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobalsettings.h>
 #include <tdeconfig.h>
 #include <kdebug.h>

kcontrol/kcontrol/modules.cpp

@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqvbox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kservicegroup.h>
 #include <kprocess.h>

kcontrol/kcontrol/proxywidget.cpp

@@ -22,7 +22,7 @@
 #include <kpushbutton.h>
 #include <tqlayout.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdecmodule.h>
 #include <kseparator.h>
 #include <kdialog.h>

kcontrol/kcontrol/toplevel.cpp

@@ -18,11 +18,11 @@
   MA  02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <kbugreport.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kmessagebox.h>
 #include <kinstance.h>
 #include <tdeaction.h>

kcontrol/kcontrol/version.h

@@ -1,2 +1,2 @@
-#include <kapplication.h>
+#include <tdeapplication.h>
 #define KCONTROL_VERSION TDE_VERSION_STRING

kcontrol/kded/kcmkded.cpp

@@ -27,8 +27,8 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>

kcontrol/keys/commandShortcuts.cpp

@@ -28,7 +28,7 @@
 #include <tqwhatsthis.h>
 
 #include <kactivelabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
 #include <khotkeys.h>

kcontrol/keys/keyconfig.cpp

@@ -25,7 +25,7 @@
 #include <kmessagebox.h>
 #include <kseparator.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kkey_x11.h>	// Used in KKeyModule::init()
 
 #include "keyconfig.h"

kcontrol/keys/modifiers.cpp

@@ -6,7 +6,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>

kcontrol/keys/shortcuts.cpp

@@ -31,7 +31,7 @@
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kipc.h>
 #include <kkeynative.h>

kcontrol/kicker/lookandfeeltab_kcm.cpp

@@ -25,7 +25,7 @@
 #include "lookandfeeltab_impl.h"
 
 #include <X11/Xlib.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdialog.h>
 
 LookAndFeelConfig::LookAndFeelConfig(TQWidget *parent, const char *name)

kcontrol/kicker/main.cpp

@@ -18,8 +18,8 @@
 #include <tqcombobox.h>
 
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdecmodulecontainer.h>
 #include <kdirwatch.h>
 #include <kimageio.h>

kcontrol/kicker/menutab_impl.cpp

@@ -27,7 +27,7 @@
 #include <tqlineedit.h>
 
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kiconloader.h>

kcontrol/kicker/positiontab_impl.cpp

@@ -27,7 +27,7 @@
 #include <tqtooltip.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <knuminput.h>

kcontrol/knotify/knotify.cpp

@@ -27,7 +27,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <knotifydialog.h>

kcontrol/konq/behaviour.cpp

@@ -28,7 +28,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeio/uiserver_stub.h>
 #include <klocale.h>

kcontrol/konq/desktop.cpp

@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 #include <tqslider.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <dcopclient.h>
 #include <klocale.h>

kcontrol/konq/desktopbehavior_impl.cpp

@@ -36,7 +36,7 @@
 #include <kglobalsettings.h>
 #include <kmimetype.h>
 #include <ktrader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcustommenueditor.h>
 #include <dcopclient.h>
 #include <konq_defaults.h> // include default values directly from libkonq

kcontrol/konq/fontopts.cpp

@@ -26,7 +26,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <kdebug.h>

kcontrol/konq/main.cpp

@@ -31,7 +31,7 @@
 #include "desktopbehavior_impl.h"
 
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 static TQCString configname()
 {

kcontrol/konq/previews.cpp

@@ -26,7 +26,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>

kcontrol/konq/rootopts.cpp

@@ -23,7 +23,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcustommenueditor.h>
 #include <kdebug.h>
 #include <tdefileitem.h>

kcontrol/konqhtml/advancedTabDialog.cpp

@@ -24,7 +24,7 @@
 #include <tqradiobutton.h>
 #include <tqslider.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kcolorbutton.h>
 #include <klocale.h>

kcontrol/konqhtml/appearance.cpp

@@ -7,7 +7,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <kdebug.h>

kcontrol/konqhtml/filteropts.cpp

@@ -19,7 +19,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdefiledialog.h>
 #include <dcopclient.h>
 

kcontrol/konqhtml/htmlopts.cpp

@@ -21,7 +21,7 @@
 #include <knuminput.h>
 #include <kseparator.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 

kcontrol/konqhtml/main.cpp

@@ -25,7 +25,7 @@
 
 #include <unistd.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqtabwidget.h>
 #include <tqlayout.h>
@@ -38,7 +38,7 @@
 #include "filteropts.h"
 
 #include "main.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include "main.moc"
 
 extern "C"

kcontrol/konqhtml/pluginopts.cpp

@@ -15,7 +15,7 @@
 #include <tqwhatsthis.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>

kcontrol/konsole/kcmkonsole.cpp

@@ -22,7 +22,7 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefontdialog.h>

kcontrol/konsole/schemaeditor.h

@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 class TQPixmap;
 class TDESharedPixmap;

kcontrol/konsole/sessioneditor.h

@@ -24,7 +24,7 @@
 
 #include <tqptrlist.h>
 #include <tqstringlist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 
 #include "sessiondialog.h"

kcontrol/krdb/krdb.cpp

@@ -29,7 +29,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
@@ -38,7 +38,7 @@
 #include <ksavefile.h>
 #include <ktempfile.h>
 #include <klocale.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 #include "krdb.h"
 

kcontrol/kthememanager/ktheme.cpp

@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <tqdir.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdatastream.h>
 #include <kdebug.h>
@@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 KTheme::KTheme( TQWidget *parent, const TQString & xmlFile )
 	: m_parent(parent)

kcontrol/kthememanager/kthememanager.cpp

@@ -23,8 +23,8 @@
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kemailsettings.h>

kcontrol/launch/kcmlaunch.cpp

@@ -24,7 +24,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>

kcontrol/locale/toplevel.cpp

@@ -28,7 +28,7 @@
 #include <tqtabwidget.h>
 #include <tqvgroupbox.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>

kcontrol/nics/nic.cpp

@@ -30,7 +30,7 @@
 #include <sys/sockio.h>
 #endif
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>

kcontrol/privacy/kprivacymanager.cpp

@@ -19,13 +19,13 @@
  */
 
 #include "kprivacymanager.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kprocess.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tderecentdocument.h>
 #include <kstandarddirs.h>

kcontrol/privacy/privacy.cpp

@@ -26,7 +26,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>

kcontrol/randr/main.cpp

@@ -20,8 +20,8 @@
 #include <kdebug.h>
 
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 
 #include "tderandrapp.h"

kcontrol/randr/tderandrpassivepopup.cpp

@@ -18,7 +18,7 @@
 
 #include "tderandrpassivepopup.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // this class is just like KPassivePopup, but it keeps track of the widget
 // it's supposed to be positioned next to, and adjust its position if that

kcontrol/randr/tderandrtray.cpp

@@ -21,7 +21,7 @@
 #include <tqtooltip.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcmultidialog.h>
 #include <kdebug.h>
 #include <khelpmenu.h>

kcontrol/samba/main.cpp

@@ -19,7 +19,7 @@
 #include <tqlayout.h>
 #include <tqtabwidget.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdecmodule.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>

kcontrol/screensaver/scrnsave.cpp

@@ -30,8 +30,8 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kdialogbase.h>

kcontrol/smartcard/smartcard.cpp

@@ -27,8 +27,8 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcarddb.h>
 #include <kcardfactory.h>
 #include <kcardgsm_impl.h>

kcontrol/smserver/kcmsmserver.cpp

@@ -25,7 +25,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <klineedit.h>

kcontrol/spellchecking/spellchecking.cpp

@@ -20,7 +20,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 #include <tdespell.h>

kcontrol/style/kcmstyle.cpp

@@ -42,17 +42,17 @@
 #include <tqpushbutton.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
 #include <kipc.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdialog.h>
 #include <klibloader.h>
 #include <tdelistview.h>
 #include <kmessagebox.h>
 #include <ksimpleconfig.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <kstandarddirs.h>
 
 #include "../krdb/krdb.h"

kcontrol/taskbar/kcmtaskbar.cpp

@@ -26,8 +26,8 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>

kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp

@@ -40,7 +40,7 @@
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqsettings.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kgenericfactory.h>
 #include <kdiroperator.h>
 #include <kprinter.h>
@@ -53,8 +53,8 @@
 #include <tdestdaccel.h>
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <kdirlister.h>

kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp

@@ -38,7 +38,7 @@
 #include <tqheader.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefileitem.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>

kcontrol/tdefontinst/viewpart/FontPreview.cpp

@@ -27,7 +27,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "FontPreview.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tqpainter.h>
 #include <tqimage.h>

kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp

@@ -29,7 +29,7 @@
 #include "FontViewPartFactory.h"
 #include "FontViewPart.h"
 #include <kdebug.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kinstance.h>
 #include <assert.h>
 

kcontrol/tdefontinst/viewpart/FontViewerApp.cpp

@@ -28,8 +28,8 @@
 
 #include "FontViewerApp.h"
 #include "KfiConstants.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kglobal.h>

kcontrol/tdefontinst/viewpart/FontViewerApp.h

@@ -29,7 +29,7 @@
 // (C) Craig Drummond, 2004
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/part.h>
 #include <tdeparts/mainwindow.h>
 

kcontrol/tdeio/kcookiesmain.cpp

@@ -7,7 +7,7 @@
 #include <tqtabwidget.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <dcopref.h>

kcontrol/tdeio/socks.cpp

@@ -29,10 +29,10 @@
 #include <tdelistview.h>
 #include <kmessagebox.h>
 #include <ksocks.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "socks.h"
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 KSocksConfig::KSocksConfig(TQWidget *parent)
   : TDECModule(parent, "kcmtdeio")

kcontrol/tdm/main.cpp

@@ -25,7 +25,7 @@
 
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kgenericfactory.h>
 #include <kimageio.h>
 #include <kmessagebox.h>

kcontrol/usbview/kcmusb.cpp

@@ -16,7 +16,7 @@
 #include <tqtextview.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
 

kcontrol/xinerama/kcmxinerama.cpp

@@ -21,8 +21,8 @@
 
 #include "kcmxinerama.h"
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobal.h>

kdcop/kdcop.cpp

@@ -3,10 +3,10 @@
  *
  * Licensed under the Artistic License.
  */
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "kdcopwindow.h"
 

kdcop/kdcopwindow.cpp

@@ -13,7 +13,7 @@
 #include <kdatastream.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kdialog.h>
 #include <kglobal.h>

kdebugdialog/kabstractdebugdialog.cpp

@@ -21,7 +21,7 @@
 #include <tdeconfig.h>
 #include <kpushbutton.h>
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstdguiitem.h>
 

kdebugdialog/kdebugdialog.cpp

@@ -35,7 +35,7 @@
 #include <kdialog.h>
 #include <tdeconfig.h>
 #include <kseparator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include "kdebugdialog.h"

kdebugdialog/main.cpp

@@ -19,8 +19,8 @@
 
 #include "kdebugdialog.h"
 #include "tdelistdebugdialog.h"
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstandarddirs.h>
 #include <tqtextstream.h>
 #include <klocale.h>

kdebugdialog/tdelistdebugdialog.cpp

@@ -20,7 +20,7 @@
 
 #include "tdelistdebugdialog.h"
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tqlayout.h>
 #include <tqscrollview.h>

kdepasswd/kcm/main.cpp

@@ -38,7 +38,7 @@
 #include <kdialog.h>
 #include <kimageio.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kgenericfactory.h>
 #include <kmessagebox.h>
 #include <kprocess.h>

kdepasswd/kdepasswd.cpp

@@ -10,8 +10,8 @@
 
 #include <kuniqueapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 #include <kuser.h>
 #include <kdebug.h>

kdesktop/bgmanager.cc

@@ -24,7 +24,7 @@
 #include <kiconloader.h>
 #include <tdeconfig.h>
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kipc.h>
 #include <tdepopupmenu.h>

kdesktop/desktop.cc

@@ -60,7 +60,7 @@
 #include <twin.h>
 #include <kglobalsettings.h>
 #include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirlister.h>
 // Create the equivalent of TDEAccelBase::connectItem
 // and then remove this include and fix reconnects in initRoot() -- ellis

kdesktop/desktop.h

@@ -26,7 +26,7 @@
 #include <tqstringlist.h>
 #include <tqvaluevector.h>
 
-#include <kapplication.h>	// for logout parameters
+#include <tdeapplication.h>	// for logout parameters
 
 class KURL;
 class TQCloseEvent;

kdesktop/init.cc

@@ -22,7 +22,7 @@
 #include <kstandarddirs.h>
 #include <kdesktopfile.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <klocale.h>

kdesktop/kcustommenu.cc

@@ -22,7 +22,7 @@
 
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kcustommenu.h"
 

kdesktop/kdiconview.cc

@@ -24,7 +24,7 @@
 
 #include <tdeio/paste.h>
 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolordrag.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>

kdesktop/krootwm.cc

@@ -35,7 +35,7 @@
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcmultidialog.h>
 #include <kbookmarkmenu.h>

kdesktop/kwebdesktop/kwebdesktop.cpp

@@ -21,12 +21,12 @@
 
 #include <config.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kurifilter.h>
 #include <tdeio/job.h>
 

kdesktop/kxdglauncher.cpp

@@ -25,8 +25,8 @@
 
 #include <krun.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobalsettings.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>

kdesktop/kxdglauncher.h

@@ -20,6 +20,6 @@
 #ifndef _MAIN_H
 #define _MAIN_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #endif

kdesktop/lock/autologout.cc

@@ -7,7 +7,7 @@
 #include "lockprocess.h"
 #include "autologout.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <tdeconfig.h>

kdesktop/lock/infodlg.cc

@@ -10,7 +10,7 @@
 
 #include <dmctl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>

kdesktop/lock/lockdlg.cc

@@ -15,7 +15,7 @@
 #include <kcheckpass.h>
 #include <dmctl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>

kdesktop/lock/lockprocess.cc

@@ -37,7 +37,7 @@
 #include <dcopref.h>
 
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
 #include <kmessagebox.h>

kdesktop/lock/main.cc

@@ -23,7 +23,7 @@
 #include "main.h"
 #include "kdesktopsettings.h"
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kdebug.h>

kdesktop/lock/main.h

@@ -20,7 +20,7 @@
 #ifndef _MAIN_H
 #define _MAIN_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <time.h>
 

kdesktop/lock/querydlg.cc

@@ -10,7 +10,7 @@
 
 #include <dmctl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>

kdesktop/lock/sakdlg.cc

@@ -10,7 +10,7 @@
 
 #include <dmctl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>

kdesktop/lock/securedlg.cc

@@ -10,7 +10,7 @@
 
 #include <dmctl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>

kdesktop/lockeng.cc

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kservicegroup.h>
 #include <kdebug.h>
 #include <klocale.h>

kdesktop/main.cc

@@ -21,8 +21,8 @@
 #include <kuniqueapplication.h>
 #include <klocale.h>
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kopenwith.h>
 #include <kcrash.h>
 #include <kdebug.h>

kdesktop/minicli.cpp

@@ -53,7 +53,7 @@
 #include <kprocess.h>
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kpassdlg.h>
 #include <krun.h>

kdesktop/pixmapserver.cc

@@ -17,7 +17,7 @@
 #include <assert.h>
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <X11/X.h>

kdesktop/startupid.cpp

@@ -24,7 +24,7 @@
 
 #include <kiconloader.h>
 #include <tqcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqimage.h>
 #include <tqbitmap.h>
 #include <tdeconfig.h>

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

kdialog/kdialog.cpp

@@ -30,20 +30,20 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 //#include <ktopwidget.h>
 #include <tdemainwindow.h>
 #include <kpassivepopup.h>
 #include <tderecentdocument.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "widgets.h"
 
 #include <klocale.h>
 #include <tqdialog.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdefiledialog.h>
 #include <kicondialog.h>
 #include <kdirselectdialog.h>

kdialog/widgets.cpp

@@ -28,7 +28,7 @@
 #include <kpassdlg.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqlabel.h>
 #include <ktextedit.h>

kfind/kfinddlg.cpp

@@ -13,7 +13,7 @@
 #include <kstatusbar.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kstandarddirs.h>
 
 #include "kftabdlg.h"

kfind/kfwin.cpp

@@ -23,7 +23,7 @@
 
 #include <tdefiledialog.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <krun.h>
 #include <kprocess.h>
 #include <kpropertiesdialog.h>

kfind/kquery.cpp

@@ -4,7 +4,7 @@
 #include <kdebug.h>
 #include <tdefileitem.h>
 #include <tdefilemetainfo.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kstandarddirs.h>

kfind/main.cpp

@@ -1,10 +1,10 @@
 #include <tqdir.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kopenwith.h>
 
 #include "kfinddlg.h"

khelpcenter/application.cpp

@@ -22,8 +22,8 @@
 #include "mainwindow.h"
 #include "version.h"
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 using namespace KHC;
 

khelpcenter/docentry.cpp

@@ -5,7 +5,7 @@
 #include <kdesktopfile.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "prefs.h"
 

khelpcenter/fontdialog.cpp

@@ -19,7 +19,7 @@
  */
 #include "fontdialog.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>

khelpcenter/glossary.cpp

@@ -20,7 +20,7 @@
 #include "glossary.h"
 #include "view.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>

khelpcenter/history.cpp

@@ -21,7 +21,7 @@
 #include "view.h"
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdemainwindow.h>
 #include <tdepopupmenu.h>

khelpcenter/htmlsearch/htmlsearch.cpp

@@ -2,7 +2,7 @@
 #include <tqdir.h>
 #include <assert.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>

khelpcenter/htmlsearch/index.cpp

@@ -1,8 +1,8 @@
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "htmlsearch.h"
 

khelpcenter/htmlsearch/kcmhtmlsearch.cpp

@@ -22,7 +22,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurllabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
 #include <tdefiledialog.h>

khelpcenter/htmlsearchconfig.cpp

@@ -25,7 +25,7 @@
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kurllabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <kurlrequester.h>
 #include <klineedit.h>

khelpcenter/infotree.cpp

@@ -23,7 +23,7 @@
 #include "navigatoritem.h"
 #include "docentry.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>

khelpcenter/kcmhelpcenter.cpp

@@ -30,11 +30,11 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdialog.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <ktempfile.h>
 #include <kurlrequester.h>

khelpcenter/khc_indexbuilder.cpp

@@ -23,9 +23,9 @@
 
 #include "version.h"
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kuniqueapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>

khelpcenter/mainwindow.cpp

@@ -27,13 +27,13 @@
 #include "fontdialog.h"
 #include "prefs.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <dcopclient.h>
 #include <kiconloader.h>
 #include <kmimemagic.h>
 #include <krun.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdehtmlview.h>
 #include <tdehtml_settings.h>

khelpcenter/navigator.cpp

@@ -38,7 +38,7 @@
 #include <tqtooltip.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>

khelpcenter/plugintraverser.cpp

@@ -23,7 +23,7 @@
 #include "navigatorappitem.h"
 #include "navigatoritem.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>

khelpcenter/scrollkeepertreebuilder.cpp

@@ -23,7 +23,7 @@
 #include "navigatoritem.h"
 #include "docentry.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

khelpcenter/searchengine.cpp

@@ -1,7 +1,7 @@
 #include "stdlib.h"
 
 #include <tqstylesheet.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>

khelpcenter/searchwidget.cpp

@@ -29,7 +29,7 @@
 #include <tqlayout.h>
 
 #include <ksimpleconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>

khelpcenter/testmetainfo.cpp

@@ -1,10 +1,10 @@
 #include <tqstringlist.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "docmetainfo.h"
 #include "docentrytraverser.h"

khelpcenter/view.cpp

@@ -7,7 +7,7 @@
 #include <dom/html_misc.h>
 #include <tdeaction.h>
 #include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdehtml_settings.h>
 #include <tdehtmlview.h>

khotkeys/app/app.cpp

@@ -16,7 +16,7 @@
 
 #include "app.h"
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 

khotkeys/app/kded.cpp

@@ -16,10 +16,10 @@
 
 #include "kded.h"
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <stdio.h>
 #include <stdlib.h>

khotkeys/kcontrol/init.cpp

@@ -15,7 +15,7 @@
 #endif
 
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <stdlib.h>

khotkeys/kcontrol/kcmkhotkeys.cpp

@@ -23,11 +23,11 @@
 #include <tqsplitter.h>
 
 #include <tdecmodule.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kmessagebox.h>

khotkeys/kcontrol/menuedit.cpp

@@ -21,7 +21,7 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>

khotkeys/kcontrol/triggers_tab.cpp

@@ -26,7 +26,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeshortcut.h>
 #include <tdeconfig.h>
 #include <tdeshortcutlist.h>

khotkeys/kcontrol/windowselector.cpp

@@ -20,7 +20,7 @@
 
 #include <tqcursor.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <X11/Xlib.h>
 #include <fixx11h.h>
 

khotkeys/shared/actions.cpp

@@ -22,7 +22,7 @@
 #include <kurifilter.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kdesktopfile.h>
 #include <klocale.h>

khotkeys/shared/gestures.cpp

@@ -28,7 +28,7 @@
 
 #include <X11/Xlib.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kxerrorhandler.h>
 #include <kkeynative.h>

khotkeys/shared/input.cpp

@@ -21,7 +21,7 @@
 
 #include <kglobalaccel.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeversion.h>
 #include <tqtimer.h>
 #include <kkeynative.h>

khotkeys/shared/voices.cpp

@@ -23,7 +23,7 @@
 #include <assert.h>
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kxerrorhandler.h>
 #include <kkeynative.h>

khotkeys/update/update.cpp

@@ -14,8 +14,8 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>

kicker/applets/clock/clock.cpp

@@ -37,12 +37,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqwidgetstack.h>
 #include <tqcombobox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kcolorbutton.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <klocale.h>
 #include <tdepopupmenu.h>

kicker/applets/clock/clockapplet.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>
   <kcfgfile arg="true"/>
   <group name="General">
     <entry name="Type" type="Enum">

kicker/applets/clock/init.cpp

@@ -37,12 +37,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqwidgetstack.h>
 #include <tqcombobox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kcolorbutton.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <klocale.h>
 #include <tdepopupmenu.h>

kicker/applets/launcher/quickbutton.cpp

@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconeffect.h>
 #include <kglobalsettings.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include <kiconloader.h>
 #include <kurldrag.h>

kicker/applets/launcher/quicklauncher.cpp

@@ -30,9 +30,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <dcopclient.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <klocale.h>

kicker/applets/lockout/lockout.cpp

@@ -34,7 +34,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>

kicker/applets/media/mediaapplet.cpp

@@ -20,9 +20,9 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>

kicker/applets/media/mediumbutton.cpp

@@ -34,7 +34,7 @@
 #include <krun.h>
 #include <kglobalsettings.h>
 #include <kcursor.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include <kiconloader.h>
 #include <kurldrag.h>

kicker/applets/menu/menuapplet.cpp

@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 #include <tqvariant.h> // avoid X11 #define's
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

kicker/applets/minipager/pagerapplet.cpp

@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kglobalsettings.h>
 #include <twin.h>
 #include <twinmodule.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>

kicker/applets/naughty/NaughtyApplet.cpp

@@ -29,8 +29,8 @@
 #include <kiconloader.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <tdepopupmenu.h>
 #include <kmessagebox.h>

kicker/applets/run/runapplet.cpp

@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpushbutton.h>
 #include <tqhbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeconfig.h>

kicker/applets/swallow/swallow.cpp

@@ -23,8 +23,8 @@
 #include <tqlayout.h>
 #include <tqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>

kicker/applets/systemtray/systemtrayapplet.cpp

@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpainter.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>

kicker/applets/systemtray/systemtrayapplet.h

@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <qxembed.h>
 
 #include <dcopobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpanelapplet.h>
 
 #include "clock.h"

kicker/applets/taskbar/taskbarapplet.cpp

@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqlayout.h>
 #include <tqpalette.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>

kicker/applets/trash/trashapplet.cpp

@@ -20,9 +20,9 @@
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>

kicker/extensions/dockbar/dockbarextension.cpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <twin.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kglobal.h>
 

kicker/extensions/kasbar/ChangeLog

@@ -634,7 +634,7 @@
 
 2002-05-14 Tuesday 10:31  gioele
 
-	* kapp.h -> kapplication.h
+	* kapp.h -> tdeapplication.h
 
 2002-04-23 Tuesday 14:02  binner
 

kicker/extensions/kasbar/kasbar.cpp

@@ -59,7 +59,7 @@
 #include <tqmemarray.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <krootpixmap.h>
 #include <kpixmapio.h>

kicker/extensions/kasbar/kasbarapp.cpp

@@ -51,8 +51,8 @@
 /*
 ** Bug reports and questions can be sent to kde-devel@kde.org
 */
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <dcopclient.h>

kicker/extensions/kasbar/kasbarextension.cpp

@@ -54,7 +54,7 @@
 #include <tqlayout.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>

kicker/extensions/kasbar/kastaskitem.cpp

@@ -75,7 +75,7 @@
 #include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <taskmanager.h>
 #include <taskrmbmenu.h>

kicker/extensions/taskbar/taskbarextension.cpp

@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqwmatrix.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>

kicker/kicker/buttons/kbutton.cpp

@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqstyle.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "kickerSettings.h"

kicker/kicker/buttons/knewbutton.cpp

@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqeffects_p.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kdebug.h>

kicker/kicker/buttons/nonkdeappbutton.cpp

@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tdeconfig.h>
 #include <kdesktopfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <krun.h>
 #include <kprocess.h>

kicker/kicker/core/applethandle.cpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqimage.h>
 
 #include <kpushbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>

kicker/kicker/core/container_applet.cpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

kicker/kicker/core/container_button.cpp

@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

kicker/kicker/core/container_extension.cpp

@@ -47,7 +47,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <twin.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <netwm.h>
 #include <fixx11h.h>
 #include <twinmodule.h>

kicker/kicker/core/containerarea.cpp

@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtimer.h>
 #include <tqwmatrix.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kurl.h>

kicker/kicker/core/extensionSettings.kcfg

@@ -4,7 +4,7 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
 
-<include>kapplication.h</include>
+<include>tdeapplication.h</include>
 <include>kpanelextension.h</include>
 <include>unhidetrigger.h</include>
 <kcfgfile arg="true"/>

kicker/kicker/core/extensionmanager.cpp

@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <unistd.h>
 #include <stdlib.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

kicker/kicker/core/kicker.cpp

@@ -30,7 +30,7 @@
 
 #include <dcopclient.h>
 #include <tdeconfig.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kcmultidialog.h>
 #include <kcrash.h>
 #include <kdebug.h>

kicker/kicker/core/main.cpp

@@ -23,9 +23,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <config.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <dcopclient.h>

kicker/kicker/core/menumanager.cpp

@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpixmap.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include "client_mnu.h"

kicker/kicker/core/pluginmanager.cpp

@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqfile.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klibloader.h>

kicker/kicker/kicker-3.4-reverseLayout.cpp

@@ -4,8 +4,8 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kprocess.h>

kicker/kicker/plugins/kickoff-beagle-plugin.cpp

@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdesktopfile.h>
 #include <kgenericfactory.h>
 #include <kservice.h>

kicker/kicker/ui/browser_mnu.cpp

@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqdir.h>
 #include <tqpixmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kdirwatch.h>

kicker/kicker/ui/client_mnu.cpp

@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqpixmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 

kicker/kicker/ui/hidebutton.cpp

@@ -22,7 +22,7 @@
 
 #include <tqpainter.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kglobalsettings.h>
 #include <kiconeffect.h>

kicker/kicker/ui/itemview.cpp

@@ -45,8 +45,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqiconview.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutkde.h>
+#include <tdeabouttde.h>
 #include <kpixmapeffect.h>
 #include <tdeaction.h>
 #include <kbookmarkmenu.h>

kicker/kicker/ui/k_mnu.cpp

@@ -36,8 +36,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqeventloop.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutkde.h>
+#include <tdeabouttde.h>
 #include <tdeaction.h>
 #include <kbookmarkmenu.h>
 #include <tdeconfig.h>

kicker/kicker/ui/k_new_mnu.cpp

@@ -44,8 +44,8 @@
 #include <tqtabbar.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutkde.h>
+#include <tdeabouttde.h>
 #include <tdeaction.h>
 #include <kbookmarkmenu.h>
 #include <tdeconfig.h>

kicker/kicker/ui/media_watcher.cpp

@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 
 #include "media_watcher.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <dcopref.h>

kicker/kicker/ui/popupmenutitle.h

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqpainter.h>
 #include <tqmenudata.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 class PopupMenuTitle : public TQCustomMenuItem
 {

kicker/kicker/ui/quickbrowser_mnu.cpp

@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <kiconloader.h>

kicker/kicker/ui/recentapps.cpp

@@ -27,7 +27,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqstringlist.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>

kicker/kicker/ui/service_mnu.cpp

@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqmap.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>

kicker/libkicker/appletinfo.cpp

@@ -23,7 +23,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <tqfileinfo.h>
 #include <kdesktopfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "appletinfo.h"
 

kicker/libkicker/kickerSettings.kcfg

@@ -4,7 +4,7 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
 
-<include>kapplication.h</include>
+<include>tdeapplication.h</include>
 <include>klocale.h</include>
 <kcfgfile arg="true" />
 

kicker/libkicker/menuinfo.cpp

@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqfile.h>
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksimpleconfig.h>
 #include <klibloader.h>
 #include <kstandarddirs.h>

kicker/libkicker/panelbutton.cpp

@@ -32,7 +32,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 #include <tqpixmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdialog.h>

kicker/libkicker/simplebutton.cpp

@@ -23,7 +23,7 @@
 #include <tqpainter.h>
 #include <tqstyle.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdialog.h>
 #include <kglobalsettings.h>

kicker/menuext/find/findmenu.cpp

@@ -21,7 +21,7 @@
     without including the source code for Qt in the source distribution.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>

kicker/menuext/kate/katesessionmenu.cpp

@@ -21,7 +21,7 @@
 #include "katesessionmenu.h"
 #include "katesessionmenu.moc"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kiconloader.h>

kicker/menuext/konq-profiles/konqy_menu.cpp

@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 #include <tdeio/global.h>

kicker/menuext/konsole/konsole_mnu.cpp

@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqdir.h>
 #include <tqfileinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <tdeio/global.h>

kicker/menuext/prefmenu/prefmenu.cpp

@@ -24,7 +24,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqcursor.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>

kicker/menuext/recentdocs/recentdocsmenu.cpp

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kdesktopfile.h>
 #include <kglobalsettings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurldrag.h>
 #include <tderecentdocument.h>
 

kicker/menuext/tdeprint/print_mnu.cpp

@@ -25,7 +25,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <krun.h>
 #include <tdeprint/kmmanager.h>
 #include <tqregexp.h>

kicker/menuext/tom/tom.cc

@@ -34,7 +34,7 @@ using namespace std;
 #include <tqfile.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <kglobal.h>

kicker/proxy/appletproxy.cpp

@@ -28,16 +28,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqobjectlist.h>
 #include <qxembed.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kpanelapplet.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqfileinfo.h>
 #include <dcopclient.h>
 #include <twin.h>

kicker/proxy/extensiondebugger.cpp

@@ -25,15 +25,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kpanelextension.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqfileinfo.h>
 
 #include "appletinfo.h"

kicker/proxy/extensionproxy.cpp

@@ -27,15 +27,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqfile.h>
 #include <qxembed.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kpanelextension.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqfileinfo.h>
 #include <dcopclient.h>
 

kicker/taskbar/taskbar.cpp

@@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqstringlist.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalaccel.h>

kicker/taskbar/taskbarcontainer.cpp

@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqfile.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>

kicker/taskbar/taskcontainer.cpp

@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqtooltip.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <klocale.h>

klipper/applet.cpp

@@ -20,7 +20,7 @@
 */
 #include "applet.h"
 
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <dcopclient.h>

klipper/clipboardpoll.cpp

@@ -22,7 +22,7 @@
 
 #include "clipboardpoll.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqclipboard.h>
 #include <kdebug.h>
 #include <X11/Xatom.h>

klipper/klipperpopup.cpp

@@ -28,7 +28,7 @@
 #include <tdeaction.h>
 #include <kglobalsettings.h>
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
 

klipper/main.cpp

@@ -22,9 +22,9 @@
 #include <stdlib.h>
 
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <twin.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kuniqueapplication.h>
 
 #include "toplevel.h"

klipper/toplevel.cpp

@@ -31,9 +31,9 @@
 #include <tqmime.h>
 #include <tqdragobject.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kipc.h>

klipper/toplevel.h

@@ -21,7 +21,7 @@
 #ifndef _TOPLEVEL_H_
 #define _TOPLEVEL_H_
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalaccel.h>
 #include <tdepopupmenu.h>
 #include <tqmap.h>

klipper/urlgrabber.cpp

@@ -21,7 +21,7 @@
 #include <tqcursor.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialogbase.h>
 #include <ktextedit.h>

kmenuedit/kcontrol_main.cpp

@@ -23,8 +23,8 @@
 
 #include <kuniqueapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstandarddirs.h>
 
 #include "kmenuedit.h"

kmenuedit/kmenuedit.cpp

@@ -21,7 +21,7 @@
 #include <tqsplitter.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>

kmenuedit/main.cpp

@@ -22,8 +22,8 @@
 
 #include <kuniqueapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "kmenuedit.h"
 #include "khotkeys.h"

kmenuedit/treeview.cpp

@@ -43,7 +43,7 @@
 #include <kdesktopfile.h>
 #include <tdeaction.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kservice.h>
 #include <kservicegroup.h>
 #include <tdemultipledrag.h>

knetattach/knetattach.ui

@@ -412,7 +412,7 @@
     <include location="global" impldecl="in implementation">klocale.h</include>
     <include location="global" impldecl="in implementation">kglobalsettings.h</include>
     <include location="global" impldecl="in implementation">ksimpleconfig.h</include>
-    <include location="global" impldecl="in implementation">kapplication.h</include>
+    <include location="global" impldecl="in implementation">tdeapplication.h</include>
     <include location="global" impldecl="in implementation">kstandarddirs.h</include>
     <include location="global" impldecl="in implementation">kdirnotify_stub.h</include>
     <include location="global" impldecl="in implementation">kcombobox.h</include>

knetattach/main.cpp

@@ -17,9 +17,9 @@
    Boston, MA 02110-1301, USA.
  */
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 

konqueror/KonqMainWindowIface.cc

@@ -24,7 +24,7 @@
 
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdcopactionproxy.h>
 #include <kdcoppropertyproxy.h>
 #include <kdebug.h>

konqueror/KonqViewIface.cc

@@ -21,7 +21,7 @@
 #include "KonqViewIface.h"
 #include "konq_view.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 

konqueror/KonquerorIface.cc

@@ -25,7 +25,7 @@
 #include "konq_viewmgr.h"
 #include "konq_view.h"
 #include <konq_settings.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <tqfile.h>

konqueror/about/konq_aboutpage.cc

@@ -2,8 +2,8 @@
 
 #include <tqtextcodec.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>

konqueror/client/kfmclient.cc

@@ -26,7 +26,7 @@
 #include <tqdir.h>
 
 #include <tdeio/job.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kpropertiesdialog.h>
 #include <klocale.h>
 #include <ktrader.h>

konqueror/client/kfmclient.h

@@ -20,7 +20,7 @@
 #ifndef __kfmclient_h
 #define __kfmclient_h
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <krun.h>
 
 class clientApp : public TDEApplication

konqueror/iconview/konq_iconview.cc

@@ -28,7 +28,7 @@
 #include <tqfile.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdirlister.h>
 #include <kglobalsettings.h>

konqueror/keditbookmarks/actionsimpl.cpp

@@ -40,7 +40,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tdeaction.h>
 #include <kstdaction.h>

konqueror/keditbookmarks/bookmarkinfo.cpp

@@ -32,7 +32,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <dcopclient.h>

konqueror/keditbookmarks/dcop.cpp

@@ -34,7 +34,7 @@
 #include <kbookmarkmanager.h>
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 
 KBookmarkEditorIface::KBookmarkEditorIface()

konqueror/keditbookmarks/exporters.cpp

@@ -22,7 +22,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqfile.h>
 

konqueror/keditbookmarks/favicons.cpp

@@ -27,7 +27,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 FavIconsItrHolder *FavIconsItrHolder::s_self = 0;
 

konqueror/keditbookmarks/kbookmarkmerger.cpp

@@ -22,10 +22,10 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbookmarkmanager.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 

konqueror/keditbookmarks/listview.cpp

@@ -38,7 +38,7 @@
 #include <klocale.h>
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tdeaction.h>
 #include <kstdaction.h>

konqueror/keditbookmarks/main.cpp

@@ -30,8 +30,8 @@
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kuniqueapplication.h>
 
 #include <kmessagebox.h>

konqueror/keditbookmarks/toplevel.cpp

@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <dcopclient.h>

konqueror/keditbookmarks/updater.cpp

@@ -28,7 +28,7 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tdeio/job.h>
 

konqueror/konq_actions.cc

@@ -29,7 +29,7 @@
 #include <konq_pixmapprovider.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "konq_view.h"
 #include "konq_settingsxt.h"

konqueror/konq_combo.cc

@@ -19,7 +19,7 @@
 
 #include <tqpainter.h>
 #include <tqstyle.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdecompletionbox.h>
 #include <kdebug.h>

konqueror/konq_factory.cc

@@ -26,7 +26,7 @@
 #include <konq_settings.h>
 #include <konq_mainwindow.h>
 #include <kdebug.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 

konqueror/konq_frame.cc

@@ -27,7 +27,7 @@
 #include <tqpopupmenu.h>
 #include <tqkeysequence.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>

konqueror/konq_main.cc

@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <dcopclient.h>
 #include <kimageio.h>
 #include <tqfile.h>

konqueror/konq_main.h

@@ -1,7 +1,7 @@
 #ifndef __konq_main_h
 #define __konq_main_h
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 // This is used to know if we are being closed by session management
 // or by the user. See KonqMainWindow::~KonqMainWindow.

konqueror/konq_mainwindow.cc

@@ -68,7 +68,7 @@
 #include <tqwhatsthis.h>
 
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kbookmarkbar.h>
 #include <kbookmarkmenu.h>
 #include <kcmultidialog.h>

konqueror/konq_misc.cc

@@ -22,7 +22,7 @@
 #include <tqstyle.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kurifilter.h>

konqueror/konq_view.cc

@@ -20,7 +20,7 @@
 
 
 #include "konq_view.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 #include "KonqViewIface.h"
 #include "konq_settingsxt.h"
 #include "konq_frame.h"

konqueror/konq_viewmgr.cc

@@ -32,7 +32,7 @@
 #include <tdeaccelgen.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <ktempfile.h>
 #include <dcopclient.h>

konqueror/kttsplugin/tdehtmlkttsd.cpp

@@ -29,7 +29,7 @@
 #include <kspeech.h>
 #include <tqbuffer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <ktrader.h>
 

konqueror/listview/konq_listview.cc

@@ -24,7 +24,7 @@
 #include "konq_listviewsettings.h"
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdirlister.h>
 #include <kinputdialog.h>

konqueror/listview/konq_listview.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>
   <kcfgfile name="konquerorrc">
     <parameter name="Protocol" />
   </kcfgfile>

konqueror/preloader/preloader.cc

@@ -22,7 +22,7 @@
 
 #include <tdeconfig.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 

konqueror/shellcmdplugin/kshellcmdplugin.cpp

@@ -21,7 +21,7 @@
 #include <kmessagebox.h>
 #include <konq_dirpart.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kshellcmddialog.h"
 #include <kgenericfactory.h>
 #include <tdeio/netaccess.h>

konqueror/sidebar/konqsidebar.cpp

@@ -77,7 +77,7 @@ void KonqSidebar::customEvent(TQCustomEvent* ev)
 
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kinstance.h>
 

konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp

@@ -22,7 +22,7 @@
 
 #include <tdeaction.h>
 #include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbookmarkdrag.h>
 #include <kiconloader.h>
 #include <klineedit.h>

konqueror/sidebar/trees/history_module/history_module.cpp

@@ -20,7 +20,7 @@
 #include <tqapplication.h>
 #include <tqpopupmenu.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kcursor.h>
 #include <tdeconfig.h>

konqueror/sidebar/trees/history_module/history_settings.cpp

@@ -1,5 +1,5 @@
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <dcopclient.h>

konqueror/sidebar/trees/history_module/kcmhistory.cpp

@@ -28,7 +28,7 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <tdefontdialog.h>

konqueror/sidebar/trees/konq_sidebartree.cpp

@@ -31,7 +31,7 @@
 #include <dcopref.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kdirnotify_stub.h>

konsole/konsole/konsole_part.cpp

@@ -27,7 +27,7 @@
 #include <tqlayout.h>
 #include <tqwmatrix.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kcharsets.h>
 #include <kdebug.h>
 #include <tdefontdialog.h>

konsole/konsole/kwrited.cpp

@@ -36,7 +36,7 @@
 
 // KDE 
 #include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>

konsole/konsole/main.cpp

@@ -33,8 +33,8 @@
 #include <dcopclient.h>
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kimageio.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>

konsole/konsole/schema.cpp

@@ -51,7 +51,7 @@
 #include <stdlib.h>
 
 #include "schema.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include <tqdir.h>
 #include <tqdatetime.h>

konsole/konsole/session.h

@@ -21,7 +21,7 @@
 #ifndef SESSION_H
 #define SESSION_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <tqstrlist.h>
 

kpager/config.cpp

@@ -33,7 +33,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kseparator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "config.h"

kpager/desktop.cpp

@@ -28,7 +28,7 @@
 #include <dcopobject.h>
 #include <dcopclient.h>
 #include <kdatastream.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <twinmodule.h>
 #include <twin.h>

kpager/kpager.cpp

@@ -42,7 +42,7 @@
 #include <tqtooltip.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <tdeaction.h>
 #include <kstdaction.h>

kpager/main.cpp

@@ -23,8 +23,8 @@
 
 #include <kuniqueapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tqcolor.h>
 #include <kdebug.h>
 #include <stdlib.h>

kpersonalizer/kcountrypage.cpp

@@ -19,7 +19,7 @@
 #include <tqlabel.h>
 #include <tqmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksimpleconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
@@ -44,7 +44,7 @@ KCountryPage::KCountryPage(TQWidget *parent, const char *name ) : KCountryPageDl
 	b_savedLanguageChanged = false;
 	b_startedLanguageChanged = false;
 
-	// set appropriate Trinity version (kapplication.h)
+	// set appropriate Trinity version (tdeapplication.h)
 	txt_welcome->setText(i18n("<h3>Welcome to Trinity %1</h3>").arg(TDE_VERSION_STRING));
 
 	flang = new KFindLanguage();

kpersonalizer/keyecandypage.cpp

@@ -30,7 +30,7 @@
 #include <klocale.h>
 #include <dcopclient.h>
 #include <kipc.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdelistview.h>
 #include <krun.h>
 #include <kmessagebox.h>

kpersonalizer/kospage.cpp

@@ -23,7 +23,7 @@
 
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include <kipc.h>

kpersonalizer/kpersonalizer.cpp

@@ -30,7 +30,7 @@
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdelistview.h>
 #include <krun.h>
 #include <kmessagebox.h>

kpersonalizer/kpersonalizer.h

@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kwizard.h>
 
 

kpersonalizer/krefinepage.cpp

@@ -19,7 +19,7 @@
 
 #include <krun.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include "krefinepage.h"

kpersonalizer/kstylepage.cpp

@@ -27,7 +27,7 @@
 
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kdesktopfile.h>
@@ -36,7 +36,7 @@
 #include <kipc.h>
 #include <ksimpleconfig.h>
 #include <dcopclient.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
 

kpersonalizer/main.cpp

@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <dcopclient.h>
 #include <kglobal.h>

kreadconfig/kreadconfig.cpp

@@ -26,10 +26,10 @@
  */
 #include <tdeconfig.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <stdio.h>
 
 static TDECmdLineOptions options[] =

kreadconfig/kwriteconfig.cpp

@@ -8,10 +8,10 @@
  */
 #include <tdeconfig.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <stdio.h>
 
 static TDECmdLineOptions options[] =

krootbacking/krootbacking.cpp

@@ -22,7 +22,7 @@
 #include <tqrect.h>
 #include <tqimage.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kimageeffect.h>
 #include <kpixmapio.h>
 #include <twinmodule.h>

krootbacking/main.cpp

@@ -24,9 +24,9 @@
 #include <tqobject.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kdebug.h>
 

ksmserver/client.h

@@ -19,7 +19,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <tqdict.h>
 #include <tqptrqueue.h>
 #include <tqptrdict.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqtimer.h>
 #include <dcopobject.h>
 

ksmserver/main.cpp

@@ -16,9 +16,9 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <tqmessagebox.h>
 #include <tqdir.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>

ksmserver/server.cpp

@@ -71,7 +71,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <unistd.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstaticdeleter.h>
 #include <ktempfile.h>
 #include <kprocess.h>

ksmserver/server.h

@@ -19,7 +19,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 #include <tqdict.h>
 #include <tqptrqueue.h>
 #include <tqptrdict.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqtimer.h>
 #include <dcopobject.h>
 

ksmserver/shutdown.cpp

@@ -71,7 +71,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <unistd.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstaticdeleter.h>
 #include <ktempfile.h>
 #include <kprocess.h>

ksmserver/shutdowndlg.cpp

@@ -39,7 +39,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>

ksmserver/shutdowndlg.h

@@ -28,7 +28,7 @@ class TQString;
 class TDEAction;
 
 #include "timed.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapio.h>
 
 #include <config.h>

ksmserver/startup.cpp

@@ -70,7 +70,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <unistd.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstaticdeleter.h>
 #include <ktempfile.h>
 #include <kprocess.h>

ksmserver/startupdlg.cpp

@@ -30,7 +30,7 @@ Copyright (C) 2000 Matthias Ettrich <ettrich@kde.org>
 
 #include <klocale.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>

ksmserver/startupdlg.h

@@ -27,7 +27,7 @@ class TQString;
 class TDEAction;
 
 #include "timed.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpixmapio.h>
 
 

ksmserver/test.cpp

@@ -1,7 +1,7 @@
 #include "shutdowndlg.h"
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 int

ksplashml/kcmksplash/main.cpp

@@ -15,7 +15,7 @@
 #include <tqlayout.h>
 #include <tqtabwidget.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdecmodule.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>

ksplashml/main.cpp

@@ -17,9 +17,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>

ksplashml/themeengine/default/themelegacy.cpp

@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>

ksplashml/themeengine/objkstheme.cpp

@@ -9,8 +9,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

ksplashml/themeengine/objkstheme.h

@@ -12,7 +12,7 @@
 #ifndef __OBJKSTHEME_H__
 #define __OBJKSTHEME_H__
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqstring.h>
 #include <tqstringlist.h>

ksplashml/themeengine/redmond/themeredmond.cpp

@@ -13,7 +13,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>

ksplashml/themeengine/standard/themestandard.cpp

@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kglobalsettings.h>

ksplashml/themeengine/standard/wndicon.cpp

@@ -14,7 +14,7 @@
 #include "config.h"
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kdebug.h>

ksplashml/themeengine/standard/wndstatus.cpp

@@ -10,7 +10,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>

ksplashml/themeengine/themeengine.cpp

@@ -13,8 +13,8 @@
 # include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

ksplashml/themeengine/unified/themeunified.cpp

@@ -9,7 +9,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>

ksplashml/wndmain.cpp

@@ -11,7 +11,7 @@
 
 #include <unistd.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcursor.h>
 #include <kdebug.h>

ksplashml/wndmain.h

@@ -12,7 +12,7 @@
 #ifndef __WNDMAIN_H__
 #define __WNDMAIN_H__
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqptrlist.h>
 #include <tqstring.h>

kstart/kstart.cpp

@@ -21,9 +21,9 @@
 #include <klocale.h>
 #include <twin.h>
 #include <twinmodule.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstartupinfo.h>
 #include <kxmessages.h>
 

ksysguard/gui/SensorDisplayLib/ProcessController.cc

@@ -25,7 +25,7 @@
 
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>
@@ -42,7 +42,7 @@
 #include <tqgroupbox.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpushbutton.h>
 
 

ksysguard/gui/SensorDisplayLib/ProcessController.h

@@ -27,7 +27,7 @@
 #include <tqdict.h>
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <SensorDisplay.h>
 

ksysguard/gui/SensorDisplayLib/SensorDisplay.cc

@@ -28,7 +28,7 @@
 #include <tqwhatsthis.h>
 #include <tqbitmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>

ksysguard/gui/SensorDisplayLib/SensorLogger.cc

@@ -18,7 +18,7 @@
 
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 

ksysguard/gui/ksgrd/HostConnector.cc

@@ -18,7 +18,7 @@
 
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaccelmanager.h>
 #include <kcombobox.h>
 #include <klocale.h>

ksysguard/gui/ksgrd/SensorManager.cc

@@ -27,7 +27,7 @@
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 

ksysguard/gui/ksysguard.cc

@@ -34,10 +34,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <kglobal.h>

ksysguard/gui/ksysguard.h

@@ -28,7 +28,7 @@
 
 #include <dcopclient.h>
 #include <dcopobject.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <dnssd/servicebrowser.h>
 

ksystraycmd/ksystraycmd.cpp

@@ -4,7 +4,7 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <klocale.h>

ksystraycmd/main.cpp

@@ -1,8 +1,8 @@
 #include <fcntl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kprocess.h>

ktip/ktipwindow.cpp

@@ -20,8 +20,8 @@
 
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <ktip.h>

kxkb/kcmlayout.cpp

@@ -20,7 +20,7 @@
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 
 #include "extension.h"

kxkb/kcmmisc.cpp

@@ -40,7 +40,7 @@
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>

kxkb/kcmmisc.h

@@ -25,7 +25,7 @@
 #define __KCMMISC_H__
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdecmodule.h>
 
 class KeyboardConfigWidget;

kxkb/kxkb.cpp

@@ -32,8 +32,8 @@ DESCRIPTION
 #include <tqstringlist.h>
 #include <tqimage.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <kglobalaccel.h>
 #include <klocale.h>

libkonq/kivdirectoryoverlay.cc

@@ -25,7 +25,7 @@
 
 #include <tdefileivi.h>
 #include <tdefileitem.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirlister.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>

libkonq/konq_dirpart.cc

@@ -23,7 +23,7 @@
 #include "konq_settings.h"
 
 #include <tdeio/paste.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdatastream.h>
 #include <kdebug.h>

libkonq/konq_faviconmgr.cc

@@ -18,7 +18,7 @@
 */
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kmimetype.h>

libkonq/konq_filetip.cc

@@ -24,7 +24,7 @@
 #include <tdefileitem.h>
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqlabel.h>
 #include <tqtooltip.h>

libkonq/konq_historymgr.cc

@@ -21,7 +21,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <ksavefile.h>
 #include <ksimpleconfig.h>

libkonq/konq_iconviewwidget.cc

@@ -33,7 +33,7 @@
 #include <tqregexp.h>
 #include <tqcursor.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeio/previewjob.h>
 #include <tdefileivi.h>

libkonq/konq_operations.cc

@@ -38,7 +38,7 @@
 // For doDrop
 #include <tqdir.h>//first
 #include <assert.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kipc.h>
 #include <kdebug.h>
 #include <tdefileitem.h>

libkonq/konq_pixmapprovider.cc

@@ -19,7 +19,7 @@
 
 #include <tqbitmap.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <kshell.h>

libkonq/konq_popupmenu.cc

@@ -22,7 +22,7 @@
 #include <tqeventloop.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbookmarkmanager.h>
 #include <kdebug.h>
 #include <krun.h>

libkonq/konq_undo.cc

@@ -29,7 +29,7 @@
 #include <dcopclient.h>
 #include <dcopref.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdatastream.h>
 #include <kdebug.h>
 #include <klocale.h>

libkonq/konq_xmlguiclient.cc

@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 #include "konq_xmlguiclient.h"
 #include <kdebug.h>

libkonq/tests/konqdragtest.cpp

@@ -21,8 +21,8 @@
 #include <kurldrag.h>
 #include <assert.h>
 #include <tqiconview.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <konq_drag.h>
 

nsplugins/kcm_nsplugins.cpp

@@ -32,7 +32,7 @@
 #include <tqvgroupbox.h>
 #include <kdebug.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kprocio.h>
 

nsplugins/nspluginloader.cpp

@@ -27,7 +27,7 @@
 #include <tqdir.h>
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kglobal.h>

nsplugins/plugin_part.cpp

@@ -21,9 +21,9 @@
 */
 
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>

nsplugins/pluginscan.cpp

@@ -40,7 +40,7 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
@@ -50,8 +50,8 @@
 #include <kdesktopfile.h>
 #include <kservicetype.h>
 #include <kmimetype.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 #include "sdk/npupp.h"

nsplugins/test/testnsplugin.cpp

@@ -21,8 +21,8 @@
 #include <stdio.h>
 
 #include <tqstring.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 #include <kstdaction.h>

nsplugins/viewer/kxt.cpp

@@ -47,7 +47,7 @@
 #include <tqglobal.h>
 #if TQT_VERSION < 0x030100
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <tqobjectlist.h>
 #include <tqwidgetlist.h>

nsplugins/viewer/kxt.h

@@ -49,7 +49,7 @@
 #include <tqglobal.h>
 #if TQT_VERSION < 0x030100
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqwidget.h>
 #include <X11/Intrinsic.h>
 

nsplugins/viewer/viewer.cpp

@@ -28,8 +28,8 @@
 #include "nsplugin.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>

tdeinit/displayconfig.cpp

@@ -23,9 +23,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>

tdeinit/phase1.cpp

@@ -23,9 +23,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
 #include <klocale.h>
 #include <kdebug.h>

tdeioslave/cgi/kcmcgi/kcmcgi.cpp

@@ -19,7 +19,7 @@
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kglobal.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdefiledialog.h>
 
 #include <tqlayout.h>

tdeioslave/home/tdeio_home.cpp

@@ -21,9 +21,9 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 
 

tdeioslave/home/testhome.cpp

@@ -22,9 +22,9 @@
 
 #include <config.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <stdlib.h>
 

tdeioslave/man/kmanpart.cpp

@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeversion.h>
 
 extern "C"

tdeioslave/man/tdeio_man_test.cpp

@@ -5,7 +5,7 @@
 #include "tdeio_man.h"
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 

tdeioslave/media/mediaimpl.cpp

@@ -27,7 +27,7 @@
 
 #include <kmimetype.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqeventloop.h>
 
 #include <sys/stat.h>

tdeioslave/media/mediamanager/halbackend.cpp

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <locale.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tqeventloop.h>
 #include <tqfile.h>

tdeioslave/media/mediamanager/tdehardwarebackend.cpp

@@ -31,7 +31,7 @@
 #include <kmimetype.h>
 #include <kmountpoint.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprotocolinfo.h>
 
 #include "dialog.h"

tdeioslave/media/medianotifier/medianotifier.cpp

@@ -26,7 +26,7 @@
 #include <tqdir.h>
 #include <tqcheckbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>

tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp

@@ -19,9 +19,9 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <dcopclient.h>

tdeioslave/media/mounthelper/tdeio_media_mounthelper.h

@@ -22,7 +22,7 @@
 #ifndef _KIO_MEDIA_MOUNTHELPER_H_
 #define _KIO_MEDIA_MOUNTHELPER_H_
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqstring.h>
 #include <tdeio/job.h>
 

tdeioslave/media/tdecmodule/main.cpp

@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdialog.h>
 
 #include <kgenericfactory.h>

tdeioslave/media/tdeio_media.cpp

@@ -21,9 +21,9 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqeventloop.h>
 

tdeioslave/media/testmedia.cpp

@@ -22,9 +22,9 @@
 
 #include <config.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <stdlib.h>
 

tdeioslave/remote/tdeio_remote.cpp

@@ -21,9 +21,9 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 
 

tdeioslave/remote/testremote.cpp

@@ -22,9 +22,9 @@
 
 #include <config.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <stdlib.h>
 

tdeioslave/sftp/tdeio_sftp.cpp

@@ -52,7 +52,7 @@ So we can't connect.
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kuser.h>
 #include <kdebug.h>
 #include <kmessagebox.h>

tdeioslave/system/tdeio_system.cpp

@@ -21,8 +21,8 @@
 
 #include <kdebug.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <dcopclient.h>
 
 #include <tqeventloop.h>

tdeioslave/system/testsystem.cpp

@@ -22,9 +22,9 @@
 
 #include <config.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <stdlib.h>
 

tdeioslave/thumbnail/htmlcreator.cpp

@@ -22,7 +22,7 @@
 #include <tqpixmap.h>
 #include <tqimage.h>
 #include <tqpainter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdehtml_part.h>
 
 #include "htmlcreator.h"

tdeioslave/thumbnail/thumbnail.cpp

@@ -36,7 +36,7 @@
 
 #include <kdatastream.h> // Do not remove, needed for correct bool serialization
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kimageeffect.h>

tdeioslave/trash/ktrash.cpp

@@ -17,10 +17,10 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kdirnotify_stub.h>
 #include <kdebug.h>

tdeioslave/trash/tdeio_trash.cpp

@@ -20,11 +20,11 @@
 #include "tdeio_trash.h"
 #include <tdeio/job.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <klargefile.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmimetype.h>
 #include <kprocess.h>
 

tdeioslave/trash/testtrash.cpp

@@ -28,11 +28,11 @@
 
 #include <kurl.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqdir.h>
 #include <tqfileinfo.h>

tdeprint/kjobviewer/kjobviewer.cpp

@@ -24,8 +24,8 @@
 
 #include <stdlib.h>
 #include <tqpixmap.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <ksystemtray.h>

tdeprint/kjobviewer/main.cpp

@@ -17,9 +17,9 @@
  *  Boston, MA 02110-1301, USA.
  **/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "kjobviewer.h"
 #include <klocale.h>

tdeprint/kprinter/main.cpp

@@ -20,8 +20,8 @@
 #include "printwrapper.h"
 
 #include <tqtimer.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static TDECmdLineOptions options[] =

tdeprint/kprinter/printwrapper.cpp

@@ -32,8 +32,8 @@
 #include <tqregexp.h>
 #include <tqsocketnotifier.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>

tdeprint/printmgr/kcmprintmgr.cpp

@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <klocale.h>
 

tdeprint/slave/tdeio_print.cpp

@@ -34,9 +34,9 @@
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <tdeio/job.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kprocess.h>
 #include <ktempfile.h>
 #include <tqfile.h>

tdeprint/tdeprint_part/printpart.cpp

@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kinstance.h>
 #include <kiconloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdeparts/genericfactory.h>
 #include <tqwidget.h>

tdeprint/tdeprintfax/faxctrl.cpp

@@ -42,7 +42,7 @@
 #include <kdialogbase.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 #include <kemailsettings.h>
 #include <kdebug.h>

tdeprint/tdeprintfax/main.cpp

@@ -21,10 +21,10 @@
 #include "tdeprintfax.h"
 
 #include <tqfile.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 TQString debugFlag;
 int oneShotFlag = false;

tdeprint/tdeprintfax/tdeprintfax.cpp

@@ -33,7 +33,7 @@
 #include <tqcombobox.h>
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstdaction.h>
 #include <kmenubar.h>
 #include <tdetoolbar.h>

tdescreensaver/blankscrn.cpp

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kcolordialog.h>

tdescreensaver/random.cpp

@@ -21,14 +21,14 @@
 #include <tqwidget.h>
 #include <tqfileinfo.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdesktopfile.h>
 #include <krandomsequence.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdialogbase.h>
 #include <tdeconfig.h>
 

tdesu/tdesu/tdesu.cpp

@@ -29,12 +29,12 @@
 
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 #include <krun.h>
 #include <kuser.h>

tdesu/tdesud/tdesud.cpp

@@ -64,9 +64,9 @@
 #include <kinstance.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstandarddirs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdesu/client.h>
 #include <tdesu/defaults.h>
 #include <ksockaddr.h>

tdm/kfrontend/kgapp.cpp

@@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "sakdlg.h"
 
 #include <kprocess.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kcrash.h>
 #include <kstandarddirs.h>
 #include <ksimpleconfig.h>

tdm/kfrontend/kgapp.h

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef KGAPP_H
 #define KGAPP_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdehardwaredevices.h>
 
 class GreeterApp : public TDEApplication {

tdm/kfrontend/kgreeter.cpp

@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "themer/tdmitem.h"
 #include "themer/tdmlabel.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kseparator.h>

tdm/kfrontend/kgverify.cpp

@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "themer/tdmthemer.h"
 #include "themer/tdmitem.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <klibloader.h>
 #include <kseparator.h>

tdm/kfrontend/krootimage.cpp

@@ -21,7 +21,7 @@ Boston, MA 02110-1301, USA.
 
 #include <config.h>
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <ksimpleconfig.h>
 #include <klocale.h>
 

tdm/kfrontend/krootimage.h

@@ -23,7 +23,7 @@ Boston, MA 02110-1301, USA.
 #define __TDMDESKTOP_H__
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqtimer.h>
 
 #include <bgrender.h>

tdm/kfrontend/sakdlg.cc

@@ -10,7 +10,7 @@
 
 #include <dmctl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kpushbutton.h>
 #include <kseparator.h>

tdm/kfrontend/tdmadmindialog.cpp

@@ -28,7 +28,7 @@
 #include "tdm_greet.h"
 #include <stdlib.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kseparator.h>
 #include <klocale.h>
 #include <kpushbutton.h>

tdm/kfrontend/tdmclock.cpp

@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include "tdmclock.h"
 
-//#include <kapplication.h>
+//#include <tdeapplication.h>
 //#include <tdeconfig.h>
 
 #include <tqdatetime.h>

tdm/kfrontend/tdmconfig.cpp

@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "tdmconfig.h"
 #include "tdm_greet.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 #include <stdio.h>

tdm/kfrontend/tdmshutdown.cpp

@@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "tdmshutdown.h"
 #include "tdm_greet.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kseparator.h>
 #include <klocale.h>
 #include <kpushbutton.h>

tdmlib/dmctl.h

@@ -21,7 +21,7 @@
 #ifndef DMCTL_H
 #define DMCTL_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 struct SessEnt {
 	TQString display, from, user, session;

tqt3integration/module/module.cpp

@@ -22,7 +22,7 @@
 
 #include <assert.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kglobalsettings.h>

twin/clients/kwmtheme/cli_installer/main.cpp

@@ -1,11 +1,11 @@
 #include <tqfile.h>
 #include <tqdir.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ksimpleconfig.h>
 #include <kglobal.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =

twin/clients/modernsystem/config/config.cpp

@@ -1,6 +1,6 @@
 // Melchior FRANZ  <mfranz@kde.org>	-- 2001-04-22
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <klocale.h>

twin/geometry.cpp

@@ -19,7 +19,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include "client.h"
 #include "workspace.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <tqpainter.h>
 #include <twin.h>

twin/kcmtwin/twindecoration/preview.cpp

@@ -19,7 +19,7 @@
 
 #include "preview.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kglobal.h>

twin/kcmtwin/twindecoration/twindecoration.cpp

@@ -43,7 +43,7 @@
 #include <tqslider.h>
 #include <tqspinbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 #include <kdebug.h>
@@ -53,7 +53,7 @@
 #include <klocale.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kprocess.h>
 #include <dcopclient.h>
 

twin/kcmtwin/twinoptions/main.cpp

@@ -21,12 +21,12 @@
 
 #include <dcopclient.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdialog.h>
 
 #include "mouse.h"

twin/kcmtwin/twinoptions/mouse.cpp

@@ -30,7 +30,7 @@
 
 #include <dcopclient.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kglobalsettings.h>

twin/kcmtwin/twinoptions/windows.cpp

@@ -39,7 +39,7 @@
 #include <kcolorbutton.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <dcopclient.h>
 #include <kglobal.h>

twin/kcmtwin/twinrules/detectwidget.cpp

@@ -18,7 +18,7 @@
 
 #include "detectwidget.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <twin.h>

twin/kcmtwin/twinrules/kcm.cpp

@@ -21,9 +21,9 @@
 #include <kglobal.h>
 #include <tqlayout.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 #include "ruleslist.h"
 

twin/kcmtwin/twinrules/main.cpp

@@ -16,8 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdeconfig.h>
 #include <klocale.h>

twin/killer/killer.cpp

@@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE.
 
 ****************************************************************************/
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <klocale.h>

twin/lib/kcommondecoration.cpp

@@ -31,7 +31,7 @@
 
 #include <kdebug.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdecorationfactory.h>
 #include <klocale.h>
 

twin/main.cpp

@@ -18,8 +18,8 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <kglobal.h>
 #include <kdebug.h>
 #include <stdlib.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <unistd.h>

twin/main.h

@@ -12,7 +12,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #ifndef MAIN_H
 #define MAIN_H
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "workspace.h"
 #include "utils.h"
 

twin/options.cpp

@@ -15,7 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include <tqpalette.h>
 #include <tqpixmap.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>

twin/resumer/resumer.cpp

@@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE.
 
 ****************************************************************************/
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <klocale.h>

twin/sm.h

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #define KWIN_SM_H
 
 #include <X11/SM/SMlib.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <netwm_def.h>
 
 class TQSocketNotifier;

twin/tools/decobenchmark/main.cpp

@@ -30,9 +30,9 @@
 #include <iostream>
 
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "preview.h"
 #include "main.h"

twin/tools/decobenchmark/preview.cpp

@@ -21,7 +21,7 @@
 
 #include <kdebug.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kglobal.h>

twin/useractions.cpp

@@ -27,7 +27,7 @@ License. See the file "COPYING" for the exact licensing terms.
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kglobalaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqregexp.h>
 
 #include "client.h"

twin/workspace.cpp

@@ -13,7 +13,7 @@ License. See the file "COPYING" for the exact licensing terms.
 
 #include "workspace.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstartupinfo.h>
 #include <fixx11h.h>
 #include <tdeconfig.h>