diff options
477 files changed, 652 insertions, 652 deletions
diff --git a/doc/ksplashml/index.docbook b/doc/ksplashml/index.docbook index df1c5f884..3dc98adcb 100644 --- a/doc/ksplashml/index.docbook +++ b/doc/ksplashml/index.docbook @@ -1083,7 +1083,7 @@ appropriate plugin.</para> #include <qlabel.h> #include <qwidget.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> diff --git a/drkonqi/crashtest.cpp b/drkonqi/crashtest.cpp index 19fee84b6..2583c1273 100644 --- a/drkonqi/crashtest.cpp +++ b/drkonqi/crashtest.cpp @@ -1,7 +1,7 @@ // Let's crash. -#include <kapplication.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kdebug.h> #include <stdio.h> #include <assert.h> diff --git a/drkonqi/krashconf.cpp b/drkonqi/krashconf.cpp index 0bb6d7fa1..6fcfbaeea 100644 --- a/drkonqi/krashconf.cpp +++ b/drkonqi/krashconf.cpp @@ -27,8 +27,8 @@ #include <tdeconfig.h> #include <kglobal.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <klocale.h> #include <kdebug.h> #include <kstartupinfo.h> diff --git a/drkonqi/krashconf.h b/drkonqi/krashconf.h index f20c395f0..cdde4b58c 100644 --- a/drkonqi/krashconf.h +++ b/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> diff --git a/drkonqi/krashdcopinterface.h b/drkonqi/krashdcopinterface.h index 176756bf7..3c457cd51 100644 --- a/drkonqi/krashdcopinterface.h +++ b/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. diff --git a/drkonqi/main.cpp b/drkonqi/main.cpp index c745381e7..feb6c4ba0 100644 --- a/drkonqi/main.cpp +++ b/drkonqi/main.cpp @@ -30,9 +30,9 @@ #include <stdlib.h> #include <unistd.h> -#include <kapplication.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <klocale.h> #include <dcopclient.h> diff --git a/drkonqi/toplevel.cpp b/drkonqi/toplevel.cpp index f6ddecb94..95f291365 100644 --- a/drkonqi/toplevel.cpp +++ b/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" diff --git a/kappfinder/main.cpp b/kappfinder/main.cpp index 3c73c71bf..bcd83d13e 100644 --- a/kappfinder/main.cpp +++ b/kappfinder/main.cpp @@ -17,9 +17,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include <kaboutdata.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <klocale.h> #include "toplevel.h" diff --git a/kappfinder/main_install.cpp b/kappfinder/main_install.cpp index b6749b191..0195172f5 100644 --- a/kappfinder/main_install.cpp +++ b/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> diff --git a/kappfinder/toplevel.cpp b/kappfinder/toplevel.cpp index 30834cbac..16b8cdbd0 100644 --- a/kappfinder/toplevel.cpp +++ b/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> diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp index d9471db36..c78309fb4 100644 --- a/kate/app/kateapp.cpp +++ b/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> diff --git a/kate/app/kateapp.h b/kate/app/kateapp.h index e18dba866..05d09a7fe 100644 --- a/kate/app/kateapp.h +++ b/kate/app/kateapp.h @@ -22,7 +22,7 @@ #include "katemain.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <tqvaluelist.h> diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp index 9a900e6e8..e91a8df4b 100644 --- a/kate/app/katefilelist.cpp +++ b/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> diff --git a/kate/app/katefileselector.cpp b/kate/app/katefileselector.cpp index 1ff9ef47f..9747a9da0 100644 --- a/kate/app/katefileselector.cpp +++ b/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> diff --git a/kate/app/kategrepdialog.cpp b/kate/app/kategrepdialog.cpp index bb0d7e9f8..aa69f3416 100644 --- a/kate/app/kategrepdialog.cpp +++ b/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> diff --git a/kate/app/katemain.cpp b/kate/app/katemain.cpp index 59d1e0100..38e14f308 100644 --- a/kate/app/katemain.cpp +++ b/kate/app/katemain.cpp @@ -21,8 +21,8 @@ #include <kstandarddirs.h> #include <klocale.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <kglobal.h> #include <tdeconfig.h> #include <kinstance.h> diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp index 9e27e55b8..7584e09da 100644 --- a/kate/app/katemainwindow.cpp +++ b/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> diff --git a/kate/app/katemdi.cpp b/kate/app/katemdi.cpp index 6480d5fd3..1b85215c9 100644 --- a/kate/app/katemdi.cpp +++ b/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> diff --git a/kate/app/kateviewmanager.cpp b/kate/app/kateviewmanager.cpp index 562e41e27..6b3549fd0 100644 --- a/kate/app/kateviewmanager.cpp +++ b/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> diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp index 9af161b93..22e0fc87e 100644 --- a/kate/app/kateviewspacecontainer.cpp +++ b/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> diff --git a/kate/app/kwritemain.cpp b/kate/app/kwritemain.cpp index 8da1e7e20..ce5486699 100644 --- a/kate/app/kwritemain.cpp +++ b/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> diff --git a/kcminit/main.cpp b/kcminit/main.cpp index 62f80cdfc..f1fbf8987 100644 --- a/kcminit/main.cpp +++ b/kcminit/main.cpp @@ -26,9 +26,9 @@ #include <tqfile.h> #include <tqtimer.h> -#include <kapplication.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <kservice.h> #include <klibloader.h> #include <kdebug.h> diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp index 2533cfe52..534dc692c 100644 --- a/kcontrol/access/kcmaccess.cpp +++ b/kcontrol/access/kcmaccess.cpp @@ -27,8 +27,8 @@ #include <kstandarddirs.h> #include <kcolorbutton.h> #include <tdefiledialog.h> -#include <kapplication.h> -#include <kaboutdata.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> #include <tdeshortcut.h> #include <kkeynative.h> #include <knotifydialog.h> diff --git a/kcontrol/access/main.cpp b/kcontrol/access/main.cpp index 9b29f9e6c..e6bb96ca9 100644 --- a/kcontrol/access/main.cpp +++ b/kcontrol/access/main.cpp @@ -1,7 +1,7 @@ #include "kaccess.h" -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kdebug.h> extern "C" KDE_EXPORT int kdemain(int argc, char * argv[] ) diff --git a/kcontrol/accessibility/accessibility.cpp b/kcontrol/accessibility/accessibility.cpp index eb360e85e..c34f7be64 100644 --- a/kcontrol/accessibility/accessibility.cpp +++ b/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> diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index 11002cb7f..1332f60c0 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -36,8 +36,8 @@ #include <dcopref.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <tdecmoduleloader.h> #include <kdebug.h> #include <kdialog.h> diff --git a/kcontrol/arts/arts.h b/kcontrol/arts/arts.h index cd2b4f2ff..6306b2411 100644 --- a/kcontrol/arts/arts.h +++ b/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> diff --git a/kcontrol/background/bgrender.cpp b/kcontrol/background/bgrender.cpp index ce0dac119..4f7a6be2c 100644 --- a/kcontrol/background/bgrender.cpp +++ b/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> diff --git a/kcontrol/background/bgsettings.cpp b/kcontrol/background/bgsettings.cpp index b879d1216..cb6cf956d 100644 --- a/kcontrol/background/bgsettings.cpp +++ b/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> diff --git a/kcontrol/background/main.cpp b/kcontrol/background/main.cpp index fa71af901..2f6832dcc 100644 --- a/kcontrol/background/main.cpp +++ b/kcontrol/background/main.cpp @@ -16,8 +16,8 @@ */ #include <tqlayout.h> -#include <kapplication.h> -#include <kaboutdata.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> #include <tdeconfig.h> #include <kdebug.h> #include <dcopclient.h> diff --git a/kcontrol/bell/bell.cpp b/kcontrol/bell/bell.cpp index 5831c042a..5878f4a68 100644 --- a/kcontrol/bell/bell.cpp +++ b/kcontrol/bell/bell.cpp @@ -25,8 +25,8 @@ #include <tqpushbutton.h> #include <tqwhatsthis.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kdialog.h> #include <kglobal.h> diff --git a/kcontrol/clock/main.cpp b/kcontrol/clock/main.cpp index 1908e8010..5508d91ac 100644 --- a/kcontrol/clock/main.cpp +++ b/kcontrol/clock/main.cpp @@ -25,8 +25,8 @@ #include <dcopclient.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <kdialog.h> #include <kgenericfactory.h> diff --git a/kcontrol/colors/colorscm.cpp b/kcontrol/colors/colorscm.cpp index a8f75975b..1572f4b7b 100644 --- a/kcontrol/colors/colorscm.cpp +++ b/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> diff --git a/kcontrol/colors/widgetcanvas.h b/kcontrol/colors/widgetcanvas.h index 83cb4d6fa..60898622b 100644 --- a/kcontrol/colors/widgetcanvas.h +++ b/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 diff --git a/kcontrol/componentchooser/componentchooser.cpp b/kcontrol/componentchooser/componentchooser.cpp index c66a28b06..b650cff2e 100644 --- a/kcontrol/componentchooser/componentchooser.cpp +++ b/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> diff --git a/kcontrol/componentchooser/kcm_componentchooser.cpp b/kcontrol/componentchooser/kcm_componentchooser.cpp index 84425a7b1..c1c5728e4 100644 --- a/kcontrol/componentchooser/kcm_componentchooser.cpp +++ b/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" diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp index 023799844..8e97a7c4b 100644 --- a/kcontrol/crypto/crypto.cpp +++ b/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> diff --git a/kcontrol/css/kcmcss.cpp b/kcontrol/css/kcmcss.cpp index bf06c3bc5..931c0eb07 100644 --- a/kcontrol/css/kcmcss.cpp +++ b/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> diff --git a/kcontrol/displayconfig/displayconfig.cpp b/kcontrol/displayconfig/displayconfig.cpp index 196a2ec84..11d494bbf 100644 --- a/kcontrol/displayconfig/displayconfig.cpp +++ b/kcontrol/displayconfig/displayconfig.cpp @@ -28,8 +28,8 @@ #include <dcopclient.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kcombobox.h> #include <kdebug.h> diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp index 6ef87a6c0..1f130f468 100644 --- a/kcontrol/dnssd/kcmdnssd.cpp +++ b/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" diff --git a/kcontrol/dnssd/kcmdnssd.h b/kcontrol/dnssd/kcmdnssd.h index 064577283..3568c1088 100644 --- a/kcontrol/dnssd/kcmdnssd.h +++ b/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 diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp index 919adf305..121037bd9 100644 --- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp +++ b/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> diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp index 63c61eaf4..436a3225e 100644 --- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfiltereng.cpp +++ b/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> diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp index f2e7fb20e..543c39634 100644 --- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp +++ b/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> diff --git a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp b/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp index 273534237..9dbe2d759 100644 --- a/kcontrol/ebrowsing/plugins/shorturi/tdeshorturifilter.cpp +++ b/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> diff --git a/kcontrol/filetypes/filetypedetails.cpp b/kcontrol/filetypes/filetypedetails.cpp index 93c294393..92a4f47ac 100644 --- a/kcontrol/filetypes/filetypedetails.cpp +++ b/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> diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index 5dd2cd484..f4011f3bf 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/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> diff --git a/kcontrol/filetypes/keditfiletype.cpp b/kcontrol/filetypes/keditfiletype.cpp index 8bb69e88c..19aa01a59 100644 --- a/kcontrol/filetypes/keditfiletype.cpp +++ b/kcontrol/filetypes/keditfiletype.cpp @@ -22,10 +22,10 @@ #include <tqfile.h> #include <dcopclient.h> -#include <kapplication.h> -#include <kaboutdata.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> #include <kdebug.h> -#include <kcmdlineargs.h> +#include <tdecmdlineargs.h> #include <tdesycoca.h> #include <kstandarddirs.h> diff --git a/kcontrol/filetypes/kservicelistwidget.cpp b/kcontrol/filetypes/kservicelistwidget.cpp index e4363415d..e8193f278 100644 --- a/kcontrol/filetypes/kservicelistwidget.cpp +++ b/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> diff --git a/kcontrol/fonts/fonts.cpp b/kcontrol/fonts/fonts.cpp index 96fbc7d68..3f202c020 100644 --- a/kcontrol/fonts/fonts.cpp +++ b/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> diff --git a/kcontrol/hwmanager/devicepropsdlg.cpp b/kcontrol/hwmanager/devicepropsdlg.cpp index 80a930e02..2eb1dfa3f 100644 --- a/kcontrol/hwmanager/devicepropsdlg.cpp +++ b/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> diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index 0ea803ff5..bc3970e93 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -26,8 +26,8 @@ #include <dcopclient.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kcombobox.h> #include <kdebug.h> diff --git a/kcontrol/iccconfig/iccconfig.cpp b/kcontrol/iccconfig/iccconfig.cpp index 73aaf73b4..4a72e29f7 100644 --- a/kcontrol/iccconfig/iccconfig.cpp +++ b/kcontrol/iccconfig/iccconfig.cpp @@ -26,8 +26,8 @@ #include <dcopclient.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kcombobox.h> #include <kdebug.h> diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index 4287725b3..f98aa270f 100644 --- a/kcontrol/icons/icons.cpp +++ b/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> diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index f1b5ada9e..078224dc2 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/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> diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp index 06108a287..7afaf7df7 100644 --- a/kcontrol/icons/main.cpp +++ b/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" diff --git a/kcontrol/icons/testicons.cpp b/kcontrol/icons/testicons.cpp index 85adb7b35..2eebd0117 100644 --- a/kcontrol/icons/testicons.cpp +++ b/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) diff --git a/kcontrol/info/info.h b/kcontrol/info/info.h index 36503a556..11dcc7539 100644 --- a/kcontrol/info/info.h +++ b/kcontrol/info/info.h @@ -13,7 +13,7 @@ #include <tqevent.h> #include <tdecmodule.h> -#include <kaboutdata.h> +#include <tdeaboutdata.h> #include "config.h" diff --git a/kcontrol/info/info_linux.cpp b/kcontrol/info/info_linux.cpp index dc3872f01..bbda9691d 100644 --- a/kcontrol/info/info_linux.cpp +++ b/kcontrol/info/info_linux.cpp @@ -38,7 +38,7 @@ #include <tqregexp.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kiconloader.h> #include <kstdguiitem.h> diff --git a/kcontrol/info/memory.h b/kcontrol/info/memory.h index 9ffc9956c..6fd2cd093 100644 --- a/kcontrol/info/memory.h +++ b/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 diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 14d5787fa..33409a422 100644 --- a/kcontrol/input/mouse.cpp +++ b/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> diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h index 32c8f6c10..853a4e73a 100644 --- a/kcontrol/input/mouse.h +++ b/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> diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index 71787d793..72a25ce96 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/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> diff --git a/kcontrol/ioslaveinfo/kcmioslaveinfo.h b/kcontrol/ioslaveinfo/kcmioslaveinfo.h index 5149bc940..e233b9463 100644 --- a/kcontrol/ioslaveinfo/kcmioslaveinfo.h +++ b/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> diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index f97fe8e51..853169443 100644 --- a/kcontrol/joystick/joystick.cpp +++ b/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> diff --git a/kcontrol/kcontrol/aboutwidget.cpp b/kcontrol/kcontrol/aboutwidget.cpp index 8068023a5..fbce1e3e3 100644 --- a/kcontrol/kcontrol/aboutwidget.cpp +++ b/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" diff --git a/kcontrol/kcontrol/dockcontainer.cpp b/kcontrol/kcontrol/dockcontainer.cpp index a929df229..9ecd5339c 100644 --- a/kcontrol/kcontrol/dockcontainer.cpp +++ b/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> diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp index 2c7266468..ca80619e5 100644 --- a/kcontrol/kcontrol/global.cpp +++ b/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> diff --git a/kcontrol/kcontrol/helpwidget.cpp b/kcontrol/kcontrol/helpwidget.cpp index 76fc756c4..93c96722c 100644 --- a/kcontrol/kcontrol/helpwidget.cpp +++ b/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" diff --git a/kcontrol/kcontrol/main.cpp b/kcontrol/kcontrol/main.cpp index 60ae5b50b..d9557517b 100644 --- a/kcontrol/kcontrol/main.cpp +++ b/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> diff --git a/kcontrol/kcontrol/modules.cpp b/kcontrol/kcontrol/modules.cpp index 73ed1896e..c4f7b2a87 100644 --- a/kcontrol/kcontrol/modules.cpp +++ b/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> diff --git a/kcontrol/kcontrol/proxywidget.cpp b/kcontrol/kcontrol/proxywidget.cpp index 1d975f4a3..a5b25d20c 100644 --- a/kcontrol/kcontrol/proxywidget.cpp +++ b/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> diff --git a/kcontrol/kcontrol/toplevel.cpp b/kcontrol/kcontrol/toplevel.cpp index 0c30446a6..ff49603da 100644 --- a/kcontrol/kcontrol/toplevel.cpp +++ b/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> diff --git a/kcontrol/kcontrol/version.h b/kcontrol/kcontrol/version.h index 1718a69e9..8612f8240 100644 --- a/kcontrol/kcontrol/version.h +++ b/kcontrol/kcontrol/version.h @@ -1,2 +1,2 @@ -#include <kapplication.h> +#include <tdeapplication.h> #define KCONTROL_VERSION TDE_VERSION_STRING diff --git a/kcontrol/kded/kcmkded.cpp b/kcontrol/kded/kcmkded.cpp index 1d71b58ac..66c7207a5 100644 --- a/kcontrol/kded/kcmkded.cpp +++ b/kcontrol/kded/kcmkded.cpp @@ -27,8 +27,8 @@ #include <dcopclient.h> #include <dcopref.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <kbuttonbox.h> #include <kdebug.h> #include <kdesktopfile.h> diff --git a/kcontrol/keys/commandShortcuts.cpp b/kcontrol/keys/commandShortcuts.cpp index 262aaac69..0ab7f1205 100644 --- a/kcontrol/keys/commandShortcuts.cpp +++ b/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> diff --git a/kcontrol/keys/keyconfig.cpp b/kcontrol/keys/keyconfig.cpp index 1696abf59..74f9d5446 100644 --- a/kcontrol/keys/keyconfig.cpp +++ b/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" diff --git a/kcontrol/keys/modifiers.cpp b/kcontrol/keys/modifiers.cpp index c9a956298..ce39b0bf3 100644 --- a/kcontrol/keys/modifiers.cpp +++ b/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> diff --git a/kcontrol/keys/shortcuts.cpp b/kcontrol/keys/shortcuts.cpp index d28a4ed08..d81fe74ca 100644 --- a/kcontrol/keys/shortcuts.cpp +++ b/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> diff --git a/kcontrol/kicker/lookandfeeltab_kcm.cpp b/kcontrol/kicker/lookandfeeltab_kcm.cpp index 23766ce28..b3c657c14 100644 --- a/kcontrol/kicker/lookandfeeltab_kcm.cpp +++ b/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) diff --git a/kcontrol/kicker/main.cpp b/kcontrol/kicker/main.cpp index 4e4e0d706..c8de607b9 100644 --- a/kcontrol/kicker/main.cpp +++ b/kcontrol/kicker/main.cpp @@ -18,8 +18,8 @@ #include <tqcombobox.h> #include <dcopclient.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <tdecmodulecontainer.h> #include <kdirwatch.h> #include <kimageio.h> diff --git a/kcontrol/kicker/menutab_impl.cpp b/kcontrol/kicker/menutab_impl.cpp index b1b0c8f88..e3fc24ec9 100644 --- a/kcontrol/kicker/menutab_impl.cpp +++ b/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> diff --git a/kcontrol/kicker/positiontab_impl.cpp b/kcontrol/kicker/positiontab_impl.cpp index 8c02821b9..ba392bcb2 100644 --- a/kcontrol/kicker/positiontab_impl.cpp +++ b/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> diff --git a/kcontrol/knotify/knotify.cpp b/kcontrol/knotify/knotify.cpp index 0f4d9fff7..be66690c2 100644 --- a/kcontrol/knotify/knotify.cpp +++ b/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> diff --git a/kcontrol/konq/behaviour.cpp b/kcontrol/konq/behaviour.cpp index 70c6a1d1d..23f0748a9 100644 --- a/kcontrol/konq/behaviour.cpp +++ b/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> diff --git a/kcontrol/konq/desktop.cpp b/kcontrol/konq/desktop.cpp index 93fecee08..5c41bacec 100644 --- a/kcontrol/konq/desktop.cpp +++ b/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> diff --git a/kcontrol/konq/desktopbehavior_impl.cpp b/kcontrol/konq/desktopbehavior_impl.cpp index c7242de26..2825de22f 100644 --- a/kcontrol/konq/desktopbehavior_impl.cpp +++ b/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 diff --git a/kcontrol/konq/fontopts.cpp b/kcontrol/konq/fontopts.cpp index c002c5197..edba20dc6 100644 --- a/kcontrol/konq/fontopts.cpp +++ b/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> diff --git a/kcontrol/konq/main.cpp b/kcontrol/konq/main.cpp index 8e5afa965..5ca7cb4ad 100644 --- a/kcontrol/konq/main.cpp +++ b/kcontrol/konq/main.cpp @@ -31,7 +31,7 @@ #include "desktopbehavior_impl.h" #include <tdeconfig.h> -#include <kapplication.h> +#include <tdeapplication.h> static TQCString configname() { diff --git a/kcontrol/konq/previews.cpp b/kcontrol/konq/previews.cpp index ea1d637a4..90ac4bef8 100644 --- a/kcontrol/konq/previews.cpp +++ b/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> diff --git a/kcontrol/konq/rootopts.cpp b/kcontrol/konq/rootopts.cpp index 4fa7620a8..c1bfa5a48 100644 --- a/kcontrol/konq/rootopts.cpp +++ b/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> diff --git a/kcontrol/konqhtml/advancedTabDialog.cpp b/kcontrol/konqhtml/advancedTabDialog.cpp index e76e6b9b2..ba6e1b452 100644 --- a/kcontrol/konqhtml/advancedTabDialog.cpp +++ b/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> diff --git a/kcontrol/konqhtml/appearance.cpp b/kcontrol/konqhtml/appearance.cpp index bb9db714a..ad584f7e6 100644 --- a/kcontrol/konqhtml/appearance.cpp +++ b/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> diff --git a/kcontrol/konqhtml/filteropts.cpp b/kcontrol/konqhtml/filteropts.cpp index 06eb9bee1..232a3169b 100644 --- a/kcontrol/konqhtml/filteropts.cpp +++ b/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> diff --git a/kcontrol/konqhtml/htmlopts.cpp b/kcontrol/konqhtml/htmlopts.cpp index ada8f31a6..2fe6eb963 100644 --- a/kcontrol/konqhtml/htmlopts.cpp +++ b/kcontrol/konqhtml/htmlopts.cpp @@ -21,7 +21,7 @@ #include <knuminput.h> #include <kseparator.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <dcopclient.h> diff --git a/kcontrol/konqhtml/main.cpp b/kcontrol/konqhtml/main.cpp index 45559809b..7c248ec70 100644 --- a/kcontrol/konqhtml/main.cpp +++ b/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" diff --git a/kcontrol/konqhtml/pluginopts.cpp b/kcontrol/konqhtml/pluginopts.cpp index c02eb1679..d30a67264 100644 --- a/kcontrol/konqhtml/pluginopts.cpp +++ b/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> diff --git a/kcontrol/konsole/kcmkonsole.cpp b/kcontrol/konsole/kcmkonsole.cpp index 56c093226..97eeb6d42 100644 --- a/kcontrol/konsole/kcmkonsole.cpp +++ b/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> diff --git a/kcontrol/konsole/schemaeditor.h b/kcontrol/konsole/schemaeditor.h index d34e7be85..903cc1436 100644 --- a/kcontrol/konsole/schemaeditor.h +++ b/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; diff --git a/kcontrol/konsole/sessioneditor.h b/kcontrol/konsole/sessioneditor.h index 638b6b0e6..be85f8505 100644 --- a/kcontrol/konsole/sessioneditor.h +++ b/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" diff --git a/kcontrol/krdb/krdb.cpp b/kcontrol/krdb/krdb.cpp index ce1bdfc2d..565e0e478 100644 --- a/kcontrol/krdb/krdb.cpp +++ b/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" diff --git a/kcontrol/kthememanager/ktheme.cpp b/kcontrol/kthememanager/ktheme.cpp index 94d9bf7bd..87d17806c 100644 --- a/kcontrol/kthememanager/ktheme.cpp +++ b/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) diff --git a/kcontrol/kthememanager/kthememanager.cpp b/kcontrol/kthememanager/kthememanager.cpp index 23a89ca01..bcd73f186 100644 --- a/kcontrol/kthememanager/kthememanager.cpp +++ b/kcontrol/kthememanager/kthememanager.cpp @@ -23,8 +23,8 @@ #include <tqtoolbutton.h> #include <tqtooltip.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <kdebug.h> #include <kdialog.h> #include <kemailsettings.h> diff --git a/kcontrol/launch/kcmlaunch.cpp b/kcontrol/launch/kcmlaunch.cpp index 6b979ab1f..1b7875e7f 100644 --- a/kcontrol/launch/kcmlaunch.cpp +++ b/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> diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index 8df790ec7..e74330c30 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/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> diff --git a/kcontrol/nics/nic.cpp b/kcontrol/nics/nic.cpp index d51bad54d..53e9ef3d7 100644 --- a/kcontrol/nics/nic.cpp +++ b/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> diff --git a/kcontrol/privacy/kprivacymanager.cpp b/kcontrol/privacy/kprivacymanager.cpp index cfed89e7a..4336b6058 100644 --- a/kcontrol/privacy/kprivacymanager.cpp +++ b/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> diff --git a/kcontrol/privacy/privacy.cpp b/kcontrol/privacy/privacy.cpp index dc2dcacc5..52dac1921 100644 --- a/kcontrol/privacy/privacy.cpp +++ b/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> diff --git a/kcontrol/randr/main.cpp b/kcontrol/randr/main.cpp index dba4ddfba..4cd5967f4 100644 --- a/kcontrol/randr/main.cpp +++ b/kcontrol/randr/main.cpp @@ -20,8 +20,8 @@ #include <kdebug.h> #include <klocale.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <kglobal.h> #include "tderandrapp.h" diff --git a/kcontrol/randr/tderandrpassivepopup.cpp b/kcontrol/randr/tderandrpassivepopup.cpp index 16e3d75ba..5d2010f94 100644 --- a/kcontrol/randr/tderandrpassivepopup.cpp +++ b/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 diff --git a/kcontrol/randr/tderandrtray.cpp b/kcontrol/randr/tderandrtray.cpp index d44600c1d..247f669c4 100644 --- a/kcontrol/randr/tderandrtray.cpp +++ b/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> diff --git a/kcontrol/samba/main.cpp b/kcontrol/samba/main.cpp index 65b5957e1..300b805fe 100644 --- a/kcontrol/samba/main.cpp +++ b/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> diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp index 74d76d652..7219fb7ae 100644 --- a/kcontrol/screensaver/scrnsave.cpp +++ b/kcontrol/screensaver/scrnsave.cpp @@ -30,8 +30,8 @@ #include <dcopclient.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <kdebug.h> #include <kdialog.h> #include <kdialogbase.h> diff --git a/kcontrol/smartcard/smartcard.cpp b/kcontrol/smartcard/smartcard.cpp index 989ef45f4..8c57cb73e 100644 --- a/kcontrol/smartcard/smartcard.cpp +++ b/kcontrol/smartcard/smartcard.cpp @@ -27,8 +27,8 @@ #include <dcopclient.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <kcarddb.h> #include <kcardfactory.h> #include <kcardgsm_impl.h> diff --git a/kcontrol/smserver/kcmsmserver.cpp b/kcontrol/smserver/kcmsmserver.cpp index 38d47fa2c..3aca33508 100644 --- a/kcontrol/smserver/kcmsmserver.cpp +++ b/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> diff --git a/kcontrol/spellchecking/spellchecking.cpp b/kcontrol/spellchecking/spellchecking.cpp index 26a2d1535..805a98d6b 100644 --- a/kcontrol/spellchecking/spellchecking.cpp +++ b/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> diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp index 549e4f57c..1b2477398 100644 --- a/kcontrol/style/kcmstyle.cpp +++ b/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" diff --git a/kcontrol/taskbar/kcmtaskbar.cpp b/kcontrol/taskbar/kcmtaskbar.cpp index 8507cdd30..be897883f 100644 --- a/kcontrol/taskbar/kcmtaskbar.cpp +++ b/kcontrol/taskbar/kcmtaskbar.cpp @@ -26,8 +26,8 @@ #include <dcopclient.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kdialog.h> #include <kgenericfactory.h> diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index 2a46fd2d8..fb2c07163 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/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 <kapplication.h> +#include <tdecmdlineargs.h> +#include <tdeapplication.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> #include <kdirlister.h> diff --git a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp index 7732873de..55143369f 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp +++ b/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> diff --git a/kcontrol/tdefontinst/viewpart/FontPreview.cpp b/kcontrol/tdefontinst/viewpart/FontPreview.cpp index 3679be252..151dfc888 100644 --- a/kcontrol/tdefontinst/viewpart/FontPreview.cpp +++ b/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> diff --git a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp b/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp index 244c223d8..a43f9d1d2 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewPartFactory.cpp +++ b/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> diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp index 3b921d902..45aeffe88 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp +++ b/kcontrol/tdefontinst/viewpart/FontViewerApp.cpp @@ -28,8 +28,8 @@ #include "FontViewerApp.h" #include "KfiConstants.h" -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <klibloader.h> #include <klocale.h> #include <kglobal.h> diff --git a/kcontrol/tdefontinst/viewpart/FontViewerApp.h b/kcontrol/tdefontinst/viewpart/FontViewerApp.h index 61ec7e4b1..cc9a5981b 100644 --- a/kcontrol/tdefontinst/viewpart/FontViewerApp.h +++ b/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> diff --git a/kcontrol/tdeio/kcookiesmain.cpp b/kcontrol/tdeio/kcookiesmain.cpp index a904beb08..24aff4fe0 100644 --- a/kcontrol/tdeio/kcookiesmain.cpp +++ b/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> diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp index 0456aabdd..bf0e6410d 100644 --- a/kcontrol/tdeio/socks.cpp +++ b/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") diff --git a/kcontrol/tdm/main.cpp b/kcontrol/tdm/main.cpp index 13a0af19a..43671c0ee 100644 --- a/kcontrol/tdm/main.cpp +++ b/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> diff --git a/kcontrol/usbview/kcmusb.cpp b/kcontrol/usbview/kcmusb.cpp index 5c4a8983d..b58647a9e 100644 --- a/kcontrol/usbview/kcmusb.cpp +++ b/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> diff --git a/kcontrol/xinerama/kcmxinerama.cpp b/kcontrol/xinerama/kcmxinerama.cpp index e86689f2d..7e43d9e9b 100644 --- a/kcontrol/xinerama/kcmxinerama.cpp +++ b/kcontrol/xinerama/kcmxinerama.cpp @@ -21,8 +21,8 @@ #include "kcmxinerama.h" #include <dcopclient.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kdialog.h> #include <kglobal.h> diff --git a/kdcop/kdcop.cpp b/kdcop/kdcop.cpp index b73905800..102eb4bea 100644 --- a/kdcop/kdcop.cpp +++ b/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 <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include "kdcopwindow.h" diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp index 3ffc2d8b9..12bb5f0c8 100644 --- a/kdcop/kdcopwindow.cpp +++ b/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> diff --git a/kdebugdialog/kabstractdebugdialog.cpp b/kdebugdialog/kabstractdebugdialog.cpp index 6901d8f68..e8d8bdd80 100644 --- a/kdebugdialog/kabstractdebugdialog.cpp +++ b/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> diff --git a/kdebugdialog/kdebugdialog.cpp b/kdebugdialog/kdebugdialog.cpp index cb15c2b98..6d2e17f52 100644 --- a/kdebugdialog/kdebugdialog.cpp +++ b/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" diff --git a/kdebugdialog/main.cpp b/kdebugdialog/main.cpp index 235ac0771..9690955e3 100644 --- a/kdebugdialog/main.cpp +++ b/kdebugdialog/main.cpp @@ -19,8 +19,8 @@ #include "kdebugdialog.h" #include "tdelistdebugdialog.h" -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <kstandarddirs.h> #include <tqtextstream.h> #include <klocale.h> diff --git a/kdebugdialog/tdelistdebugdialog.cpp b/kdebugdialog/tdelistdebugdialog.cpp index 42d0cd8ce..65007e7f7 100644 --- a/kdebugdialog/tdelistdebugdialog.cpp +++ b/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> diff --git a/kdepasswd/kcm/main.cpp b/kdepasswd/kcm/main.cpp index e8135caae..f65a5fefb 100644 --- a/kdepasswd/kcm/main.cpp +++ b/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> diff --git a/kdepasswd/kdepasswd.cpp b/kdepasswd/kdepasswd.cpp index e09725c5b..1f108e2cf 100644 --- a/kdepasswd/kdepasswd.cpp +++ b/kdepasswd/kdepasswd.cpp @@ -10,8 +10,8 @@ #include <kuniqueapplication.h> #include <klocale.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kmessagebox.h> #include <kuser.h> #include <kdebug.h> diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cc index 65e532afc..cadbef85e 100644 --- a/kdesktop/bgmanager.cc +++ b/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> diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cc index 277628e4d..75721c689 100644 --- a/kdesktop/desktop.cc +++ b/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 diff --git a/kdesktop/desktop.h b/kdesktop/desktop.h index 0620dcd4d..6d8015f31 100644 --- a/kdesktop/desktop.h +++ b/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; diff --git a/kdesktop/init.cc b/kdesktop/init.cc index e9c805bfe..be6f0c5d9 100644 --- a/kdesktop/init.cc +++ b/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> diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cc index d114e443f..2e825c0d9 100644 --- a/kdesktop/kcustommenu.cc +++ b/kdesktop/kcustommenu.cc @@ -22,7 +22,7 @@ #include <tdeconfig.h> #include <kiconloader.h> -#include <kapplication.h> +#include <tdeapplication.h> #include "kcustommenu.h" diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc index 8fd04b230..68897eb94 100644 --- a/kdesktop/kdiconview.cc +++ b/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> diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cc index 719987130..38435d0bb 100644 --- a/kdesktop/krootwm.cc +++ b/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> diff --git a/kdesktop/kwebdesktop/kwebdesktop.cpp b/kdesktop/kwebdesktop/kwebdesktop.cpp index 5aae0c465..885f1ce5b 100644 --- a/kdesktop/kwebdesktop/kwebdesktop.cpp +++ b/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 <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <kurifilter.h> #include <tdeio/job.h> diff --git a/kdesktop/kxdglauncher.cpp b/kdesktop/kxdglauncher.cpp index 0848f40a7..a6e45da30 100644 --- a/kdesktop/kxdglauncher.cpp +++ b/kdesktop/kxdglauncher.cpp @@ -25,8 +25,8 @@ #include <krun.h> #include <klocale.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <kglobalsettings.h> #include <kinputdialog.h> #include <kmessagebox.h> diff --git a/kdesktop/kxdglauncher.h b/kdesktop/kxdglauncher.h index 5c6238d6a..8f487e88e 100644 --- a/kdesktop/kxdglauncher.h +++ b/kdesktop/kxdglauncher.h @@ -20,6 +20,6 @@ #ifndef _MAIN_H #define _MAIN_H -#include <kapplication.h> +#include <tdeapplication.h> #endif diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cc index ef683cbcc..41a1946ec 100644 --- a/kdesktop/lock/autologout.cc +++ b/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> diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cc index 56ee83e38..c241a1acd 100644 --- a/kdesktop/lock/infodlg.cc +++ b/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> diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cc index 2684403a5..e8e0f901c 100644 --- a/kdesktop/lock/lockdlg.cc +++ b/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> diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 28e15873f..604b93a84 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/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> diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index ae7500d1d..1d7475a90 100644 --- a/kdesktop/lock/main.cc +++ b/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> diff --git a/kdesktop/lock/main.h b/kdesktop/lock/main.h index 12db9ebca..aabdbdc63 100644 --- a/kdesktop/lock/main.h +++ b/kdesktop/lock/main.h @@ -20,7 +20,7 @@ #ifndef _MAIN_H #define _MAIN_H -#include <kapplication.h> +#include <tdeapplication.h> #include <time.h> diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cc index acac92127..f1f1d5171 100644 --- a/kdesktop/lock/querydlg.cc +++ b/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> diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cc index 4904e71e1..7a77feb0c 100644 --- a/kdesktop/lock/sakdlg.cc +++ b/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> diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cc index 79147ae0a..57e76ed14 100644 --- a/kdesktop/lock/securedlg.cc +++ b/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> diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc index 9caf6f29b..24d950ab5 100644 --- a/kdesktop/lockeng.cc +++ b/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> diff --git a/kdesktop/main.cc b/kdesktop/main.cc index ce4b8115d..93b8d42c7 100644 --- a/kdesktop/main.cc +++ b/kdesktop/main.cc @@ -21,8 +21,8 @@ #include <kuniqueapplication.h> #include <klocale.h> #include <dcopclient.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kopenwith.h> #include <kcrash.h> #include <kdebug.h> diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 8bf9c9752..971b855eb 100644 --- a/kdesktop/minicli.cpp +++ b/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> diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cc index d8cde0562..7a480cdb6 100644 --- a/kdesktop/pixmapserver.cc +++ b/kdesktop/pixmapserver.cc @@ -17,7 +17,7 @@ #include <assert.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <X11/X.h> diff --git a/kdesktop/startupid.cpp b/kdesktop/startupid.cpp index 3111cd881..6dd89b126 100644 --- a/kdesktop/startupid.cpp +++ b/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> diff --git a/kdesktop/xautolock.cc b/kdesktop/xautolock.cc index a2e18a0cd..3c7e62670 100644 --- a/kdesktop/xautolock.cc +++ b/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> diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 14180b208..37226a370 100644 --- a/kdialog/kdialog.cpp +++ b/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 <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <tdefiledialog.h> #include <kicondialog.h> #include <kdirselectdialog.h> diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp index cf1040ed6..ecd7551aa 100644 --- a/kdialog/widgets.cpp +++ b/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> diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp index 7abe4236f..b426050a4 100644 --- a/kfind/kfinddlg.cpp +++ b/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" diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index d9c285f6e..f06b1a2a9 100644 --- a/kfind/kfwin.cpp +++ b/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> diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp index 6ea5e467b..514e6f918 100644 --- a/kfind/kquery.cpp +++ b/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> diff --git a/kfind/main.cpp b/kfind/main.cpp index 54aac4a69..88aa60493 100644 --- a/kfind/main.cpp +++ b/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 <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <kopenwith.h> #include "kfinddlg.h" diff --git a/khelpcenter/application.cpp b/khelpcenter/application.cpp index ba21ad639..7adafeb04 100644 --- a/khelpcenter/application.cpp +++ b/khelpcenter/application.cpp @@ -22,8 +22,8 @@ #include "mainwindow.h" #include "version.h" -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> using namespace KHC; diff --git a/khelpcenter/docentry.cpp b/khelpcenter/docentry.cpp index c198dd75f..05f3ffac0 100644 --- a/khelpcenter/docentry.cpp +++ b/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" diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp index 1f0df4530..e9f5e3789 100644 --- a/khelpcenter/fontdialog.cpp +++ b/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> diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp index 3f8fc50ed..d4e171b04 100644 --- a/khelpcenter/glossary.cpp +++ b/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> diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp index c15ce6811..0f0085a02 100644 --- a/khelpcenter/history.cpp +++ b/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> diff --git a/khelpcenter/htmlsearch/htmlsearch.cpp b/khelpcenter/htmlsearch/htmlsearch.cpp index f6f7528ee..70ba4960a 100644 --- a/khelpcenter/htmlsearch/htmlsearch.cpp +++ b/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> diff --git a/khelpcenter/htmlsearch/index.cpp b/khelpcenter/htmlsearch/index.cpp index 319c94e0d..b4dc93801 100644 --- a/khelpcenter/htmlsearch/index.cpp +++ b/khelpcenter/htmlsearch/index.cpp @@ -1,8 +1,8 @@ -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <kglobal.h> -#include <kapplication.h> +#include <tdeapplication.h> #include "htmlsearch.h" diff --git a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp b/khelpcenter/htmlsearch/kcmhtmlsearch.cpp index 245f3301d..a011a2bc2 100644 --- a/khelpcenter/htmlsearch/kcmhtmlsearch.cpp +++ b/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> diff --git a/khelpcenter/htmlsearchconfig.cpp b/khelpcenter/htmlsearchconfig.cpp index da0de3ae4..85ce883b0 100644 --- a/khelpcenter/htmlsearchconfig.cpp +++ b/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> diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp index 4b9c3087c..ebde13429 100644 --- a/khelpcenter/infotree.cpp +++ b/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> diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp index 303dbfec5..10c94dc43 100644 --- a/khelpcenter/kcmhelpcenter.cpp +++ b/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> diff --git a/khelpcenter/khc_indexbuilder.cpp b/khelpcenter/khc_indexbuilder.cpp index c1ef425e9..3eb04a631 100644 --- a/khelpcenter/khc_indexbuilder.cpp +++ b/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> diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index f8d02f186..ab75d29a7 100644 --- a/khelpcenter/mainwindow.cpp +++ b/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> diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp index 55809904a..743a7d201 100644 --- a/khelpcenter/navigator.cpp +++ b/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> diff --git a/khelpcenter/plugintraverser.cpp b/khelpcenter/plugintraverser.cpp index 8386ba606..1cafba260 100644 --- a/khelpcenter/plugintraverser.cpp +++ b/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> diff --git a/khelpcenter/scrollkeepertreebuilder.cpp b/khelpcenter/scrollkeepertreebuilder.cpp index 6695114c7..377e6691e 100644 --- a/khelpcenter/scrollkeepertreebuilder.cpp +++ b/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> diff --git a/khelpcenter/searchengine.cpp b/khelpcenter/searchengine.cpp index 7c06828dd..76061edc1 100644 --- a/khelpcenter/searchengine.cpp +++ b/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> diff --git a/khelpcenter/searchwidget.cpp b/khelpcenter/searchwidget.cpp index 4930197a0..c8f706b59 100644 --- a/khelpcenter/searchwidget.cpp +++ b/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> diff --git a/khelpcenter/testmetainfo.cpp b/khelpcenter/testmetainfo.cpp index a6fed9e09..d70e2d165 100644 --- a/khelpcenter/testmetainfo.cpp +++ b/khelpcenter/testmetainfo.cpp @@ -1,10 +1,10 @@ #include <tqstringlist.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <kdebug.h> #include <klocale.h> -#include <kcmdlineargs.h> +#include <tdecmdlineargs.h> #include "docmetainfo.h" #include "docentrytraverser.h" diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp index 8be813619..a3554e25b 100644 --- a/khelpcenter/view.cpp +++ b/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> diff --git a/khotkeys/app/app.cpp b/khotkeys/app/app.cpp index 25cf3fda8..0d0fd3395 100644 --- a/khotkeys/app/app.cpp +++ b/khotkeys/app/app.cpp @@ -16,7 +16,7 @@ #include "app.h" -#include <kcmdlineargs.h> +#include <tdecmdlineargs.h> #include <tdeconfig.h> #include <klocale.h> diff --git a/khotkeys/app/kded.cpp b/khotkeys/app/kded.cpp index 88c0fae6b..743e0fb04 100644 --- a/khotkeys/app/kded.cpp +++ b/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> diff --git a/khotkeys/kcontrol/init.cpp b/khotkeys/kcontrol/init.cpp index c1242f17e..9b34b2686 100644 --- a/khotkeys/kcontrol/init.cpp +++ b/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> diff --git a/khotkeys/kcontrol/kcmkhotkeys.cpp b/khotkeys/kcontrol/kcmkhotkeys.cpp index b0ddb16c9..5d6e1aad7 100644 --- a/khotkeys/kcontrol/kcmkhotkeys.cpp +++ b/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> diff --git a/khotkeys/kcontrol/menuedit.cpp b/khotkeys/kcontrol/menuedit.cpp index 56909b0a1..9095cff2c 100644 --- a/khotkeys/kcontrol/menuedit.cpp +++ b/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> diff --git a/khotkeys/kcontrol/triggers_tab.cpp b/khotkeys/kcontrol/triggers_tab.cpp index cbd16edc0..683aad32a 100644 --- a/khotkeys/kcontrol/triggers_tab.cpp +++ b/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> diff --git a/khotkeys/kcontrol/windowselector.cpp b/khotkeys/kcontrol/windowselector.cpp index 8e2c20113..d1cbe8f5f 100644 --- a/khotkeys/kcontrol/windowselector.cpp +++ b/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> diff --git a/khotkeys/shared/actions.cpp b/khotkeys/shared/actions.cpp index 6f87fee19..e95734b73 100644 --- a/khotkeys/shared/actions.cpp +++ b/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> diff --git a/khotkeys/shared/gestures.cpp b/khotkeys/shared/gestures.cpp index f98c44e18..9933ba74f 100644 --- a/khotkeys/shared/gestures.cpp +++ b/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> diff --git a/khotkeys/shared/input.cpp b/khotkeys/shared/input.cpp index 979e31726..7b9696c7e 100644 --- a/khotkeys/shared/input.cpp +++ b/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> diff --git a/khotkeys/shared/voices.cpp b/khotkeys/shared/voices.cpp index fd0c759f4..a31ac8237 100644 --- a/khotkeys/shared/voices.cpp +++ b/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> diff --git a/khotkeys/update/update.cpp b/khotkeys/update/update.cpp index a5abba826..3368ee21e 100644 --- a/khotkeys/update/update.cpp +++ b/khotkeys/update/update.cpp @@ -14,8 +14,8 @@ #include <config.h> #endif -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <kstandarddirs.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kicker/applets/clock/clock.cpp b/kicker/applets/clock/clock.cpp index 5cfd3a308..e4248958e 100644 --- a/kicker/applets/clock/clock.cpp +++ b/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> diff --git a/kicker/applets/clock/clockapplet.kcfg b/kicker/applets/clock/clockapplet.kcfg index 91c043336..e1f41c52e 100644 --- a/kicker/applets/clock/clockapplet.kcfg +++ b/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"> diff --git a/kicker/applets/clock/init.cpp b/kicker/applets/clock/init.cpp index 4285ff749..096b02245 100644 --- a/kicker/applets/clock/init.cpp +++ b/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> diff --git a/kicker/applets/launcher/quickbutton.cpp b/kicker/applets/launcher/quickbutton.cpp index eb5a3b2de..d44dc0537 100644 --- a/kicker/applets/launcher/quickbutton.cpp +++ b/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> diff --git a/kicker/applets/launcher/quicklauncher.cpp b/kicker/applets/launcher/quicklauncher.cpp index 40cbd0715..3d623962c 100644 --- a/kicker/applets/launcher/quicklauncher.cpp +++ b/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 <kaboutapplication.h> -#include <kaboutdata.h> +#include <tdeapplication.h> +#include <tdeaboutapplication.h> +#include <tdeaboutdata.h> #include <kdialogbase.h> #include <kglobal.h> #include <klocale.h> diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp index 26803ddaa..b7b74c43d 100644 --- a/kicker/applets/lockout/lockout.cpp +++ b/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> diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index 12565f07d..af1113f1b 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -20,9 +20,9 @@ #include <kglobal.h> #include <klocale.h> #include <tdeconfig.h> -#include <kapplication.h> -#include <kaboutdata.h> -#include <kaboutapplication.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdeaboutapplication.h> #include <kdebug.h> #include <tdepopupmenu.h> #include <kiconloader.h> diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index 7f4118bf8..c85b50173 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/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> diff --git a/kicker/applets/menu/menuapplet.cpp b/kicker/applets/menu/menuapplet.cpp index ee3bb175c..006722c77 100644 --- a/kicker/applets/menu/menuapplet.cpp +++ b/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> diff --git a/kicker/applets/minipager/pagerapplet.cpp b/kicker/applets/minipager/pagerapplet.cpp index 7ff922ed5..50d9c6d33 100644 --- a/kicker/applets/minipager/pagerapplet.cpp +++ b/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> diff --git a/kicker/applets/naughty/NaughtyApplet.cpp b/kicker/applets/naughty/NaughtyApplet.cpp index c3138e447..c805a46a6 100644 --- a/kicker/applets/naughty/NaughtyApplet.cpp +++ b/kicker/applets/naughty/NaughtyApplet.cpp @@ -29,8 +29,8 @@ #include <kiconloader.h> #include <kglobal.h> #include <tdeconfig.h> -#include <kaboutapplication.h> -#include <kaboutdata.h> +#include <tdeaboutapplication.h> +#include <tdeaboutdata.h> #include <klocale.h> #include <tdepopupmenu.h> #include <kmessagebox.h> diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp index eec48637c..edeb7c2f5 100644 --- a/kicker/applets/run/runapplet.cpp +++ b/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> diff --git a/kicker/applets/swallow/swallow.cpp b/kicker/applets/swallow/swallow.cpp index 2f5000b72..699a51515 100644 --- a/kicker/applets/swallow/swallow.cpp +++ b/kicker/applets/swallow/swallow.cpp @@ -23,8 +23,8 @@ #include <tqlayout.h> #include <tqstringlist.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index c1117fb2d..20386c143 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/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> diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index 332da2f84..9816ac766 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/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" diff --git a/kicker/applets/taskbar/taskbarapplet.cpp b/kicker/applets/taskbar/taskbarapplet.cpp index 2d72e23fe..f46e00405 100644 --- a/kicker/applets/taskbar/taskbarapplet.cpp +++ b/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> diff --git a/kicker/applets/trash/trashapplet.cpp b/kicker/applets/trash/trashapplet.cpp index c0675583e..04fa20735 100644 --- a/kicker/applets/trash/trashapplet.cpp +++ b/kicker/applets/trash/trashapplet.cpp @@ -20,9 +20,9 @@ #include <kglobal.h> #include <klocale.h> #include <tdeconfig.h> -#include <kapplication.h> -#include <kaboutdata.h> -#include <kaboutapplication.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdeaboutapplication.h> #include <kdebug.h> #include <tdepopupmenu.h> #include <kiconloader.h> diff --git a/kicker/extensions/dockbar/dockbarextension.cpp b/kicker/extensions/dockbar/dockbarextension.cpp index 2f26b045f..97a4b4fab 100644 --- a/kicker/extensions/dockbar/dockbarextension.cpp +++ b/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> diff --git a/kicker/extensions/kasbar/ChangeLog b/kicker/extensions/kasbar/ChangeLog index 36aba0a73..e5988717a 100644 --- a/kicker/extensions/kasbar/ChangeLog +++ b/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 diff --git a/kicker/extensions/kasbar/kasbar.cpp b/kicker/extensions/kasbar/kasbar.cpp index 49e7ed15e..2b7554118 100644 --- a/kicker/extensions/kasbar/kasbar.cpp +++ b/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> diff --git a/kicker/extensions/kasbar/kasbarapp.cpp b/kicker/extensions/kasbar/kasbarapp.cpp index 51e0be9b6..e3314ec73 100644 --- a/kicker/extensions/kasbar/kasbarapp.cpp +++ b/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 <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> #include <dcopclient.h> diff --git a/kicker/extensions/kasbar/kasbarextension.cpp b/kicker/extensions/kasbar/kasbarextension.cpp index ff2a7c60d..5c8e55252 100644 --- a/kicker/extensions/kasbar/kasbarextension.cpp +++ b/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> diff --git a/kicker/extensions/kasbar/kastaskitem.cpp b/kicker/extensions/kasbar/kastaskitem.cpp index 86d424f60..ceb847e9f 100644 --- a/kicker/extensions/kasbar/kastaskitem.cpp +++ b/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> diff --git a/kicker/extensions/taskbar/taskbarextension.cpp b/kicker/extensions/taskbar/taskbarextension.cpp index f5b26b94b..531a383a3 100644 --- a/kicker/extensions/taskbar/taskbarextension.cpp +++ b/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> diff --git a/kicker/kicker/buttons/kbutton.cpp b/kicker/kicker/buttons/kbutton.cpp index 5cec2ae22..d45648f9d 100644 --- a/kicker/kicker/buttons/kbutton.cpp +++ b/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" diff --git a/kicker/kicker/buttons/knewbutton.cpp b/kicker/kicker/buttons/knewbutton.cpp index 89a65ea70..ea5c76c10 100644 --- a/kicker/kicker/buttons/knewbutton.cpp +++ b/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> diff --git a/kicker/kicker/buttons/nonkdeappbutton.cpp b/kicker/kicker/buttons/nonkdeappbutton.cpp index 016c75aee..b0028763d 100644 --- a/kicker/kicker/buttons/nonkdeappbutton.cpp +++ b/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> diff --git a/kicker/kicker/core/applethandle.cpp b/kicker/kicker/core/applethandle.cpp index 92be0c00b..a98d2d049 100644 --- a/kicker/kicker/core/applethandle.cpp +++ b/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> diff --git a/kicker/kicker/core/container_applet.cpp b/kicker/kicker/core/container_applet.cpp index 44bad20b9..cbfc2ef2e 100644 --- a/kicker/kicker/core/container_applet.cpp +++ b/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> diff --git a/kicker/kicker/core/container_button.cpp b/kicker/kicker/core/container_button.cpp index 189ab5df5..d501c0aa8 100644 --- a/kicker/kicker/core/container_button.cpp +++ b/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> diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 4b8683bbb..597fd56cd 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/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> diff --git a/kicker/kicker/core/containerarea.cpp b/kicker/kicker/core/containerarea.cpp index d302034de..6939531e8 100644 --- a/kicker/kicker/core/containerarea.cpp +++ b/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> diff --git a/kicker/kicker/core/extensionSettings.kcfg b/kicker/kicker/core/extensionSettings.kcfg index b8fd66100..2c0322b09 100644 --- a/kicker/kicker/core/extensionSettings.kcfg +++ b/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"/> diff --git a/kicker/kicker/core/extensionmanager.cpp b/kicker/kicker/core/extensionmanager.cpp index 022bcd180..7bff10192 100644 --- a/kicker/kicker/core/extensionmanager.cpp +++ b/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> diff --git a/kicker/kicker/core/kicker.cpp b/kicker/kicker/core/kicker.cpp index 713568e68..2678b2106 100644 --- a/kicker/kicker/core/kicker.cpp +++ b/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> diff --git a/kicker/kicker/core/main.cpp b/kicker/kicker/core/main.cpp index e6c5ba842..6815ddd31 100644 --- a/kicker/kicker/core/main.cpp +++ b/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> diff --git a/kicker/kicker/core/menumanager.cpp b/kicker/kicker/core/menumanager.cpp index fd51c9f82..a7326844e 100644 --- a/kicker/kicker/core/menumanager.cpp +++ b/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" diff --git a/kicker/kicker/core/pluginmanager.cpp b/kicker/kicker/core/pluginmanager.cpp index 32eeba076..767192910 100644 --- a/kicker/kicker/core/pluginmanager.cpp +++ b/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> diff --git a/kicker/kicker/kicker-3.4-reverseLayout.cpp b/kicker/kicker/kicker-3.4-reverseLayout.cpp index 9491e7d41..48d82b851 100644 --- a/kicker/kicker/kicker-3.4-reverseLayout.cpp +++ b/kicker/kicker/kicker-3.4-reverseLayout.cpp @@ -4,8 +4,8 @@ #include <tqstring.h> #include <tqtextstream.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <kglobal.h> #include <klocale.h> #include <kprocess.h> diff --git a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp b/kicker/kicker/plugins/kickoff-beagle-plugin.cpp index a3b3f8126..9763419b5 100644 --- a/kicker/kicker/plugins/kickoff-beagle-plugin.cpp +++ b/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> diff --git a/kicker/kicker/ui/browser_mnu.cpp b/kicker/kicker/ui/browser_mnu.cpp index 5ab73edb3..0722c6aef 100644 --- a/kicker/kicker/ui/browser_mnu.cpp +++ b/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> diff --git a/kicker/kicker/ui/client_mnu.cpp b/kicker/kicker/ui/client_mnu.cpp index 959726bfa..0ad2107d1 100644 --- a/kicker/kicker/ui/client_mnu.cpp +++ b/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> diff --git a/kicker/kicker/ui/hidebutton.cpp b/kicker/kicker/ui/hidebutton.cpp index 29b617e3f..c99300990 100644 --- a/kicker/kicker/ui/hidebutton.cpp +++ b/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> diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index a1616f79f..547e051cc 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/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 <kaboutkde.h> +#include <tdeapplication.h> +#include <tdeabouttde.h> #include <kpixmapeffect.h> #include <tdeaction.h> #include <kbookmarkmenu.h> diff --git a/kicker/kicker/ui/k_mnu.cpp b/kicker/kicker/ui/k_mnu.cpp index 123125b21..83262c89d 100644 --- a/kicker/kicker/ui/k_mnu.cpp +++ b/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 <kaboutkde.h> +#include <tdeapplication.h> +#include <tdeabouttde.h> #include <tdeaction.h> #include <kbookmarkmenu.h> #include <tdeconfig.h> diff --git a/kicker/kicker/ui/k_new_mnu.cpp b/kicker/kicker/ui/k_new_mnu.cpp index 623998075..cd600750a 100644 --- a/kicker/kicker/ui/k_new_mnu.cpp +++ b/kicker/kicker/ui/k_new_mnu.cpp @@ -44,8 +44,8 @@ #include <tqtabbar.h> #include <dcopclient.h> -#include <kapplication.h> -#include <kaboutkde.h> +#include <tdeapplication.h> +#include <tdeabouttde.h> #include <tdeaction.h> #include <kbookmarkmenu.h> #include <tdeconfig.h> diff --git a/kicker/kicker/ui/media_watcher.cpp b/kicker/kicker/ui/media_watcher.cpp index 72efc897f..9ff74535c 100644 --- a/kicker/kicker/ui/media_watcher.cpp +++ b/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> diff --git a/kicker/kicker/ui/popupmenutitle.h b/kicker/kicker/ui/popupmenutitle.h index 88450c038..d839a3b84 100644 --- a/kicker/kicker/ui/popupmenutitle.h +++ b/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 { diff --git a/kicker/kicker/ui/quickbrowser_mnu.cpp b/kicker/kicker/ui/quickbrowser_mnu.cpp index 1776f4876..c24365998 100644 --- a/kicker/kicker/ui/quickbrowser_mnu.cpp +++ b/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> diff --git a/kicker/kicker/ui/recentapps.cpp b/kicker/kicker/ui/recentapps.cpp index 6e3802fe0..411a05967 100644 --- a/kicker/kicker/ui/recentapps.cpp +++ b/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> diff --git a/kicker/kicker/ui/service_mnu.cpp b/kicker/kicker/ui/service_mnu.cpp index c6e6639e9..b0503e744 100644 --- a/kicker/kicker/ui/service_mnu.cpp +++ b/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> diff --git a/kicker/libkicker/appletinfo.cpp b/kicker/libkicker/appletinfo.cpp index 1d6549a13..4a851df55 100644 --- a/kicker/libkicker/appletinfo.cpp +++ b/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" diff --git a/kicker/libkicker/kickerSettings.kcfg b/kicker/libkicker/kickerSettings.kcfg index fcc14f71e..129b51d97 100644 --- a/kicker/libkicker/kickerSettings.kcfg +++ b/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" /> diff --git a/kicker/libkicker/menuinfo.cpp b/kicker/libkicker/menuinfo.cpp index fdcbacf8f..a8e4bf1fa 100644 --- a/kicker/libkicker/menuinfo.cpp +++ b/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> diff --git a/kicker/libkicker/panelbutton.cpp b/kicker/libkicker/panelbutton.cpp index c1bd517d8..f7a832974 100644 --- a/kicker/libkicker/panelbutton.cpp +++ b/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> diff --git a/kicker/libkicker/simplebutton.cpp b/kicker/libkicker/simplebutton.cpp index a046ca266..cd4f833e2 100644 --- a/kicker/libkicker/simplebutton.cpp +++ b/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> diff --git a/kicker/menuext/find/findmenu.cpp b/kicker/menuext/find/findmenu.cpp index 90c4cb1e7..a45bdabb5 100644 --- a/kicker/menuext/find/findmenu.cpp +++ b/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> diff --git a/kicker/menuext/kate/katesessionmenu.cpp b/kicker/menuext/kate/katesessionmenu.cpp index e4de35081..73a257388 100644 --- a/kicker/menuext/kate/katesessionmenu.cpp +++ b/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> diff --git a/kicker/menuext/konq-profiles/konqy_menu.cpp b/kicker/menuext/konq-profiles/konqy_menu.cpp index 4ed8c32e1..ec0033282 100644 --- a/kicker/menuext/konq-profiles/konqy_menu.cpp +++ b/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> diff --git a/kicker/menuext/konsole/konsole_mnu.cpp b/kicker/menuext/konsole/konsole_mnu.cpp index 6cdc1dbac..a99ca24e0 100644 --- a/kicker/menuext/konsole/konsole_mnu.cpp +++ b/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> diff --git a/kicker/menuext/prefmenu/prefmenu.cpp b/kicker/menuext/prefmenu/prefmenu.cpp index 977fe87ce..400baba8e 100644 --- a/kicker/menuext/prefmenu/prefmenu.cpp +++ b/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> diff --git a/kicker/menuext/recentdocs/recentdocsmenu.cpp b/kicker/menuext/recentdocs/recentdocsmenu.cpp index c30ff04b4..566543f45 100644 --- a/kicker/menuext/recentdocs/recentdocsmenu.cpp +++ b/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> diff --git a/kicker/menuext/tdeprint/print_mnu.cpp b/kicker/menuext/tdeprint/print_mnu.cpp index e611b039e..a50a293f8 100644 --- a/kicker/menuext/tdeprint/print_mnu.cpp +++ b/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> diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cc index 0e8dfd333..761eebd51 100644 --- a/kicker/menuext/tom/tom.cc +++ b/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> diff --git a/kicker/proxy/appletproxy.cpp b/kicker/proxy/appletproxy.cpp index d9c92a9e0..c55690577 100644 --- a/kicker/proxy/appletproxy.cpp +++ b/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> diff --git a/kicker/proxy/extensiondebugger.cpp b/kicker/proxy/extensiondebugger.cpp index 94998c571..9003e2a78 100644 --- a/kicker/proxy/extensiondebugger.cpp +++ b/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" diff --git a/kicker/proxy/extensionproxy.cpp b/kicker/proxy/extensionproxy.cpp index fb7254d4d..ac99d6287 100644 --- a/kicker/proxy/extensionproxy.cpp +++ b/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> diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index ddeef37a5..ab2b77fff 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/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> diff --git a/kicker/taskbar/taskbarcontainer.cpp b/kicker/taskbar/taskbarcontainer.cpp index 7a96c5f42..aacd22519 100644 --- a/kicker/taskbar/taskbarcontainer.cpp +++ b/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> diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index f0c12e0f3..fce2256dc 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/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> diff --git a/klipper/applet.cpp b/klipper/applet.cpp index 0d30aad3c..804f0a2ec 100644 --- a/klipper/applet.cpp +++ b/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> diff --git a/klipper/clipboardpoll.cpp b/klipper/clipboardpoll.cpp index 75d901446..cc2f3877f 100644 --- a/klipper/clipboardpoll.cpp +++ b/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> diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp index 7b2eed57c..1fa378f7f 100644 --- a/klipper/klipperpopup.cpp +++ b/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> diff --git a/klipper/main.cpp b/klipper/main.cpp index f458f50c2..e32b37cf2 100644 --- a/klipper/main.cpp +++ b/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" diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp index a2777d071..1112fa06b 100644 --- a/klipper/toplevel.cpp +++ b/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> diff --git a/klipper/toplevel.h b/klipper/toplevel.h index cdc5ffa02..b8526e59f 100644 --- a/klipper/toplevel.h +++ b/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> diff --git a/klipper/urlgrabber.cpp b/klipper/urlgrabber.cpp index dd832bf01..a7ccb305a 100644 --- a/klipper/urlgrabber.cpp +++ b/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> diff --git a/kmenuedit/kcontrol_main.cpp b/kmenuedit/kcontrol_main.cpp index bb239f16b..fb50c8ff3 100644 --- a/kmenuedit/kcontrol_main.cpp +++ b/kmenuedit/kcontrol_main.cpp @@ -23,8 +23,8 @@ #include <kuniqueapplication.h> #include <klocale.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <kstandarddirs.h> #include "kmenuedit.h" diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp index 8e7073b69..fc86e6d3b 100644 --- a/kmenuedit/kmenuedit.cpp +++ b/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> diff --git a/kmenuedit/main.cpp b/kmenuedit/main.cpp index 86d9b5760..15b1e9d42 100644 --- a/kmenuedit/main.cpp +++ b/kmenuedit/main.cpp @@ -22,8 +22,8 @@ #include <kuniqueapplication.h> #include <klocale.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include "kmenuedit.h" #include "khotkeys.h" diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp index 70ca66067..2fb6371b6 100644 --- a/kmenuedit/treeview.cpp +++ b/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> diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui index 5b6eb5491..dd7f5d645 100644 --- a/knetattach/knetattach.ui +++ b/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> diff --git a/knetattach/main.cpp b/knetattach/main.cpp index 41fe2975f..5c40741f7 100644 --- a/knetattach/main.cpp +++ b/knetattach/main.cpp @@ -17,9 +17,9 @@ Boston, MA 02110-1301, USA. */ -#include <kaboutdata.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <kglobal.h> #include <klocale.h> diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cc index 6010aa502..ade50e948 100644 --- a/konqueror/KonqMainWindowIface.cc +++ b/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> diff --git a/konqueror/KonqViewIface.cc b/konqueror/KonqViewIface.cc index 8219fc861..77bfbb61c 100644 --- a/konqueror/KonqViewIface.cc +++ b/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> diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cc index 9d62fb1ce..cd3ed7591 100644 --- a/konqueror/KonquerorIface.cc +++ b/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> diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index 809eb2576..f10c0ecb0 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -2,8 +2,8 @@ #include <tqtextcodec.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cc index ca61d80e4..37e7a1502 100644 --- a/konqueror/client/kfmclient.cc +++ b/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> diff --git a/konqueror/client/kfmclient.h b/konqueror/client/kfmclient.h index 54ffcfb53..1e17279c6 100644 --- a/konqueror/client/kfmclient.h +++ b/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 diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index 7d3dc810c..1e495efe3 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/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> diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index ff83c2d28..d191718f9 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/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> diff --git a/konqueror/keditbookmarks/bookmarkinfo.cpp b/konqueror/keditbookmarks/bookmarkinfo.cpp index 31d76edd7..c84ce50de 100644 --- a/konqueror/keditbookmarks/bookmarkinfo.cpp +++ b/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> diff --git a/konqueror/keditbookmarks/dcop.cpp b/konqueror/keditbookmarks/dcop.cpp index a31af0c80..5b7886895 100644 --- a/konqueror/keditbookmarks/dcop.cpp +++ b/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() diff --git a/konqueror/keditbookmarks/exporters.cpp b/konqueror/keditbookmarks/exporters.cpp index 912edcb9a..784802564 100644 --- a/konqueror/keditbookmarks/exporters.cpp +++ b/konqueror/keditbookmarks/exporters.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <klocale.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tqfile.h> diff --git a/konqueror/keditbookmarks/favicons.cpp b/konqueror/keditbookmarks/favicons.cpp index 3ee09fb35..19bdb39db 100644 --- a/konqueror/keditbookmarks/favicons.cpp +++ b/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; diff --git a/konqueror/keditbookmarks/kbookmarkmerger.cpp b/konqueror/keditbookmarks/kbookmarkmerger.cpp index 6d7357bb6..f4cf038fd 100644 --- a/konqueror/keditbookmarks/kbookmarkmerger.cpp +++ b/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 <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <kbookmarkmanager.h> -#include <kcmdlineargs.h> +#include <tdecmdlineargs.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/konqueror/keditbookmarks/listview.cpp b/konqueror/keditbookmarks/listview.cpp index 6efd1440b..e33737956 100644 --- a/konqueror/keditbookmarks/listview.cpp +++ b/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> diff --git a/konqueror/keditbookmarks/main.cpp b/konqueror/keditbookmarks/main.cpp index 956573280..8f6b3695e 100644 --- a/konqueror/keditbookmarks/main.cpp +++ b/konqueror/keditbookmarks/main.cpp @@ -30,8 +30,8 @@ #include <kdebug.h> #include <kstandarddirs.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <kuniqueapplication.h> #include <kmessagebox.h> diff --git a/konqueror/keditbookmarks/toplevel.cpp b/konqueror/keditbookmarks/toplevel.cpp index aafd988ca..737fdd4f7 100644 --- a/konqueror/keditbookmarks/toplevel.cpp +++ b/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> diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp index 56214e3d0..8c8a662f9 100644 --- a/konqueror/keditbookmarks/updater.cpp +++ b/konqueror/keditbookmarks/updater.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <klocale.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeio/job.h> diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc index a8b6640d9..61c433170 100644 --- a/konqueror/konq_actions.cc +++ b/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" diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index 44f5e3fb9..e1bd27173 100644 --- a/konqueror/konq_combo.cc +++ b/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> diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index c730991b5..f6535c97c 100644 --- a/konqueror/konq_factory.cc +++ b/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> diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cc index 99f31dba2..05eb3be10 100644 --- a/konqueror/konq_frame.cc +++ b/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> diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cc index c166315e8..ad3706a36 100644 --- a/konqueror/konq_main.cc +++ b/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> diff --git a/konqueror/konq_main.h b/konqueror/konq_main.h index 21f09f212..c7bdb36b9 100644 --- a/konqueror/konq_main.h +++ b/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. diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index 33fdb3de2..67a907671 100644 --- a/konqueror/konq_mainwindow.cc +++ b/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> diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cc index 2353b4c44..690dd6d1f 100644 --- a/konqueror/konq_misc.cc +++ b/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> diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index 2c4a1a5b5..aec59ef0b 100644 --- a/konqueror/konq_view.cc +++ b/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" diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cc index 136c34093..148d7db1b 100644 --- a/konqueror/konq_viewmgr.cc +++ b/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> diff --git a/konqueror/kttsplugin/tdehtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp index 9502f3388..af2eae5d8 100644 --- a/konqueror/kttsplugin/tdehtmlkttsd.cpp +++ b/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> diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc index a98a6baa9..3d1090e1f 100644 --- a/konqueror/listview/konq_listview.cc +++ b/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> diff --git a/konqueror/listview/konq_listview.kcfg b/konqueror/listview/konq_listview.kcfg index 883bfe2bb..bce9798a6 100644 --- a/konqueror/listview/konq_listview.kcfg +++ b/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> diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cc index aa3d97169..5d87a8b07 100644 --- a/konqueror/preloader/preloader.cc +++ b/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> diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.cpp b/konqueror/shellcmdplugin/kshellcmdplugin.cpp index d55243d6d..d4b3041ab 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.cpp +++ b/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> diff --git a/konqueror/sidebar/konqsidebar.cpp b/konqueror/sidebar/konqsidebar.cpp index bf30ce023..91eb43bf5 100644 --- a/konqueror/sidebar/konqsidebar.cpp +++ b/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> diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp index 9194e8f0c..b190790de 100644 --- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp +++ b/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> diff --git a/konqueror/sidebar/trees/history_module/history_module.cpp b/konqueror/sidebar/trees/history_module/history_module.cpp index ba3428c96..a6c092e0e 100644 --- a/konqueror/sidebar/trees/history_module/history_module.cpp +++ b/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> diff --git a/konqueror/sidebar/trees/history_module/history_settings.cpp b/konqueror/sidebar/trees/history_module/history_settings.cpp index b51c118e2..5614122ca 100644 --- a/konqueror/sidebar/trees/history_module/history_settings.cpp +++ b/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> diff --git a/konqueror/sidebar/trees/history_module/kcmhistory.cpp b/konqueror/sidebar/trees/history_module/kcmhistory.cpp index 6c84fdf37..52005e2b5 100644 --- a/konqueror/sidebar/trees/history_module/kcmhistory.cpp +++ b/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> diff --git a/konqueror/sidebar/trees/konq_sidebartree.cpp b/konqueror/sidebar/trees/konq_sidebartree.cpp index 4d1a7ba93..e690c6000 100644 --- a/konqueror/sidebar/trees/konq_sidebartree.cpp +++ b/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> diff --git a/konsole/konsole/konsole_part.cpp b/konsole/konsole/konsole_part.cpp index 930c951f0..64fe3a7be 100644 --- a/konsole/konsole/konsole_part.cpp +++ b/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> diff --git a/konsole/konsole/kwrited.cpp b/konsole/konsole/kwrited.cpp index 6802db6fa..df771670d 100644 --- a/konsole/konsole/kwrited.cpp +++ b/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> diff --git a/konsole/konsole/main.cpp b/konsole/konsole/main.cpp index e0fbf7662..a0fdd6f3c 100644 --- a/konsole/konsole/main.cpp +++ b/konsole/konsole/main.cpp @@ -33,8 +33,8 @@ #include <dcopclient.h> #include <klocale.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kimageio.h> #include <kdebug.h> #include <kstandarddirs.h> diff --git a/konsole/konsole/schema.cpp b/konsole/konsole/schema.cpp index 638bc498f..7e1084b6a 100644 --- a/konsole/konsole/schema.cpp +++ b/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> diff --git a/konsole/konsole/session.h b/konsole/konsole/session.h index e375ec58d..d15b8b5bd 100644 --- a/konsole/konsole/session.h +++ b/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> diff --git a/kpager/config.cpp b/kpager/config.cpp index d665da9d3..065240516 100644 --- a/kpager/config.cpp +++ b/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" diff --git a/kpager/desktop.cpp b/kpager/desktop.cpp index 717e90491..bfe6bc390 100644 --- a/kpager/desktop.cpp +++ b/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> diff --git a/kpager/kpager.cpp b/kpager/kpager.cpp index dac64ab5a..7c134fe76 100644 --- a/kpager/kpager.cpp +++ b/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> diff --git a/kpager/main.cpp b/kpager/main.cpp index 6210761c2..47f4d1d14 100644 --- a/kpager/main.cpp +++ b/kpager/main.cpp @@ -23,8 +23,8 @@ #include <kuniqueapplication.h> #include <klocale.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <tqcolor.h> #include <kdebug.h> #include <stdlib.h> diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index 4f775f9f3..61be286c1 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/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(); diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index 1cd24c9ce..f2445e5b5 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/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> diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp index ef004823b..ab97a3ffd 100644 --- a/kpersonalizer/kospage.cpp +++ b/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> diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp index 787ea77b9..f06a84b16 100644 --- a/kpersonalizer/kpersonalizer.cpp +++ b/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> diff --git a/kpersonalizer/kpersonalizer.h b/kpersonalizer/kpersonalizer.h index 20b1ffd9e..78ff71ee4 100644 --- a/kpersonalizer/kpersonalizer.h +++ b/kpersonalizer/kpersonalizer.h @@ -22,7 +22,7 @@ #include <config.h> #endif -#include <kapplication.h> +#include <tdeapplication.h> #include <kwizard.h> diff --git a/kpersonalizer/krefinepage.cpp b/kpersonalizer/krefinepage.cpp index b5d2991d7..19b9e0a16 100644 --- a/kpersonalizer/krefinepage.cpp +++ b/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" diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index 1a41ee0bf..de2643bbc 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/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> diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp index 5a07d9bab..79449a015 100644 --- a/kpersonalizer/main.cpp +++ b/kpersonalizer/main.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <klocale.h> #include <dcopclient.h> #include <kglobal.h> diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp index 398b8fe54..db5171b54 100644 --- a/kreadconfig/kreadconfig.cpp +++ b/kreadconfig/kreadconfig.cpp @@ -26,10 +26,10 @@ */ #include <tdeconfig.h> #include <kglobal.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <klocale.h> -#include <kaboutdata.h> +#include <tdeaboutdata.h> #include <stdio.h> static TDECmdLineOptions options[] = diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp index 381589ad0..259c0782b 100644 --- a/kreadconfig/kwriteconfig.cpp +++ b/kreadconfig/kwriteconfig.cpp @@ -8,10 +8,10 @@ */ #include <tdeconfig.h> #include <kglobal.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <klocale.h> -#include <kaboutdata.h> +#include <tdeaboutdata.h> #include <stdio.h> static TDECmdLineOptions options[] = diff --git a/krootbacking/krootbacking.cpp b/krootbacking/krootbacking.cpp index afb8eab32..ab4775508 100644 --- a/krootbacking/krootbacking.cpp +++ b/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> diff --git a/krootbacking/main.cpp b/krootbacking/main.cpp index 012e07936..f94de0011 100644 --- a/krootbacking/main.cpp +++ b/krootbacking/main.cpp @@ -24,9 +24,9 @@ #include <tqobject.h> #include <tqtimer.h> -#include <kapplication.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <klocale.h> #include <kdebug.h> diff --git a/ksmserver/client.h b/ksmserver/client.h index d950275ce..958511a37 100644 --- a/ksmserver/client.h +++ b/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> diff --git a/ksmserver/main.cpp b/ksmserver/main.cpp index 30a9ec1a3..91d45d031 100644 --- a/ksmserver/main.cpp +++ b/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 <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <kdebug.h> #include <klocale.h> #include <kglobal.h> diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp index 4d70b365d..5e2d6b412 100644 --- a/ksmserver/server.cpp +++ b/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> diff --git a/ksmserver/server.h b/ksmserver/server.h index c2207ec95..f90db4ae0 100644 --- a/ksmserver/server.h +++ b/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> diff --git a/ksmserver/shutdown.cpp b/ksmserver/shutdown.cpp index 729090961..0e740daf4 100644 --- a/ksmserver/shutdown.cpp +++ b/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> diff --git a/ksmserver/shutdowndlg.cpp b/ksmserver/shutdowndlg.cpp index f67dda720..4dc8038ce 100644 --- a/ksmserver/shutdowndlg.cpp +++ b/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> diff --git a/ksmserver/shutdowndlg.h b/ksmserver/shutdowndlg.h index c9f2f3fbd..9f030f1e3 100644 --- a/ksmserver/shutdowndlg.h +++ b/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> diff --git a/ksmserver/startup.cpp b/ksmserver/startup.cpp index 98829c419..3df79fc16 100644 --- a/ksmserver/startup.cpp +++ b/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> diff --git a/ksmserver/startupdlg.cpp b/ksmserver/startupdlg.cpp index 383649e88..585d437ad 100644 --- a/ksmserver/startupdlg.cpp +++ b/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> diff --git a/ksmserver/startupdlg.h b/ksmserver/startupdlg.h index 3c895a5c2..a18a121d6 100644 --- a/ksmserver/startupdlg.h +++ b/ksmserver/startupdlg.h @@ -27,7 +27,7 @@ class TQString; class TDEAction; #include "timed.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <kpixmapio.h> diff --git a/ksmserver/test.cpp b/ksmserver/test.cpp index 126164db9..3349809a2 100644 --- a/ksmserver/test.cpp +++ b/ksmserver/test.cpp @@ -1,7 +1,7 @@ #include "shutdowndlg.h" -#include <kcmdlineargs.h> -#include <kaboutdata.h> -#include <kapplication.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> #include <kiconloader.h> int diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp index 04c890fdd..f0b5d1f52 100644 --- a/ksplashml/kcmksplash/main.cpp +++ b/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> diff --git a/ksplashml/main.cpp b/ksplashml/main.cpp index ecbbe9eea..3c364dcfb 100644 --- a/ksplashml/main.cpp +++ b/ksplashml/main.cpp @@ -17,9 +17,9 @@ #include <stdlib.h> #include <unistd.h> -#include <kaboutdata.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index 830516355..064b404b7 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp index ca00f3406..450bef75a 100644 --- a/ksplashml/themeengine/objkstheme.cpp +++ b/ksplashml/themeengine/objkstheme.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> diff --git a/ksplashml/themeengine/objkstheme.h b/ksplashml/themeengine/objkstheme.h index 34ea2fdf1..8959c5537 100644 --- a/ksplashml/themeengine/objkstheme.h +++ b/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> diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp index 95c21b831..38f54b8fe 100644 --- a/ksplashml/themeengine/redmond/themeredmond.cpp +++ b/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> diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp index df8067ace..ee7fefb0d 100644 --- a/ksplashml/themeengine/standard/themestandard.cpp +++ b/ksplashml/themeengine/standard/themestandard.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <kdialogbase.h> #include <kglobalsettings.h> diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp index 7d66bdb6a..9ddf7e6a7 100644 --- a/ksplashml/themeengine/standard/wndicon.cpp +++ b/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> diff --git a/ksplashml/themeengine/standard/wndstatus.cpp b/ksplashml/themeengine/standard/wndstatus.cpp index 07466c56e..a89a8301f 100644 --- a/ksplashml/themeengine/standard/wndstatus.cpp +++ b/ksplashml/themeengine/standard/wndstatus.cpp @@ -10,7 +10,7 @@ * * ***************************************************************************/ -#include <kapplication.h> +#include <tdeapplication.h> #include <kcursor.h> #include <kdebug.h> #include <kglobalsettings.h> diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index ff069803a..45f8bbbcc 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -13,8 +13,8 @@ # include <config.h> #endif -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp index 611ddb345..9d3d2c3e5 100644 --- a/ksplashml/themeengine/unified/themeunified.cpp +++ b/ksplashml/themeengine/unified/themeunified.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp index e889a2f4b..a3d8647a2 100644 --- a/ksplashml/wndmain.cpp +++ b/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> diff --git a/ksplashml/wndmain.h b/ksplashml/wndmain.h index f74f48f32..563598c64 100644 --- a/ksplashml/wndmain.h +++ b/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> diff --git a/kstart/kstart.cpp b/kstart/kstart.cpp index baaed4997..6e5bd277f 100644 --- a/kstart/kstart.cpp +++ b/kstart/kstart.cpp @@ -21,9 +21,9 @@ #include <klocale.h> #include <twin.h> #include <twinmodule.h> -#include <kapplication.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kstartupinfo.h> #include <kxmessages.h> diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cc index 2c31f15ac..3f2bcd107 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc +++ b/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> diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.h b/ksysguard/gui/SensorDisplayLib/ProcessController.h index 9df70cc3b..848d77294 100644 --- a/ksysguard/gui/SensorDisplayLib/ProcessController.h +++ b/ksysguard/gui/SensorDisplayLib/ProcessController.h @@ -27,7 +27,7 @@ #include <tqdict.h> #include <tqwidget.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <SensorDisplay.h> diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc index c6650b77f..7e05c9fd2 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc +++ b/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> diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc index 3d207aa2c..e0483f295 100644 --- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc +++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cc @@ -18,7 +18,7 @@ */ -#include <kapplication.h> +#include <tdeapplication.h> #include <kiconloader.h> #include <klocale.h> diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cc index a025fcf4e..146e1b3ee 100644 --- a/ksysguard/gui/ksgrd/HostConnector.cc +++ b/ksysguard/gui/ksgrd/HostConnector.cc @@ -18,7 +18,7 @@ */ -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeaccelmanager.h> #include <kcombobox.h> #include <klocale.h> diff --git a/ksysguard/gui/ksgrd/SensorManager.cc b/ksysguard/gui/ksgrd/SensorManager.cc index 4cf69d516..c22197faf 100644 --- a/ksysguard/gui/ksgrd/SensorManager.cc +++ b/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> diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cc index 2ab100137..4b5b688d2 100644 --- a/ksysguard/gui/ksysguard.cc +++ b/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 <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <kdebug.h> #include <kedittoolbar.h> #include <kglobal.h> diff --git a/ksysguard/gui/ksysguard.h b/ksysguard/gui/ksysguard.h index 42f53484f..df1c2e0c5 100644 --- a/ksysguard/gui/ksysguard.h +++ b/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> diff --git a/ksystraycmd/ksystraycmd.cpp b/ksystraycmd/ksystraycmd.cpp index 0f10cf540..4da745762 100644 --- a/ksystraycmd/ksystraycmd.cpp +++ b/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> diff --git a/ksystraycmd/main.cpp b/ksystraycmd/main.cpp index 19f7e501d..169a6b2f4 100644 --- a/ksystraycmd/main.cpp +++ b/ksystraycmd/main.cpp @@ -1,8 +1,8 @@ #include <fcntl.h> -#include <kapplication.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kdebug.h> #include <klocale.h> #include <kprocess.h> diff --git a/ktip/ktipwindow.cpp b/ktip/ktipwindow.cpp index 8fa413645..8ca130fc9 100644 --- a/ktip/ktipwindow.cpp +++ b/ktip/ktipwindow.cpp @@ -20,8 +20,8 @@ #include <dcopclient.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <klocale.h> #include <kstandarddirs.h> #include <ktip.h> diff --git a/kxkb/kcmlayout.cpp b/kxkb/kcmlayout.cpp index a87844875..fb323ad28 100644 --- a/kxkb/kcmlayout.cpp +++ b/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" diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp index 780fad7e8..56d517b62 100644 --- a/kxkb/kcmmisc.cpp +++ b/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> diff --git a/kxkb/kcmmisc.h b/kxkb/kcmmisc.h index 603de53bd..d57714295 100644 --- a/kxkb/kcmmisc.h +++ b/kxkb/kcmmisc.h @@ -25,7 +25,7 @@ #define __KCMMISC_H__ -#include <kapplication.h> +#include <tdeapplication.h> #include <tdecmodule.h> class KeyboardConfigWidget; diff --git a/kxkb/kxkb.cpp b/kxkb/kxkb.cpp index c39204ed2..eae45523d 100644 --- a/kxkb/kxkb.cpp +++ b/kxkb/kxkb.cpp @@ -32,8 +32,8 @@ DESCRIPTION #include <tqstringlist.h> #include <tqimage.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kglobal.h> #include <kglobalaccel.h> #include <klocale.h> diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cc index c162a4261..405032ec6 100644 --- a/libkonq/kivdirectoryoverlay.cc +++ b/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> diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cc index ba89f52df..0ada02517 100644 --- a/libkonq/konq_dirpart.cc +++ b/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> diff --git a/libkonq/konq_faviconmgr.cc b/libkonq/konq_faviconmgr.cc index cf7370bc5..5baf83a0f 100644 --- a/libkonq/konq_faviconmgr.cc +++ b/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> diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cc index 6dc470d17..78d2c0e2a 100644 --- a/libkonq/konq_filetip.cc +++ b/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> diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cc index aaac8dfff..25cfef345 100644 --- a/libkonq/konq_historymgr.cc +++ b/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> diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index ef727152c..a0a4dfd4c 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/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> diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cc index b3a499ce3..3e58bde5a 100644 --- a/libkonq/konq_operations.cc +++ b/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> diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cc index 59e58f33a..d5ff0cae1 100644 --- a/libkonq/konq_pixmapprovider.cc +++ b/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> diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cc index 619cc6c54..97b2eb994 100644 --- a/libkonq/konq_popupmenu.cc +++ b/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> diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cc index 4909a3d76..c81313aa8 100644 --- a/libkonq/konq_undo.cc +++ b/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> diff --git a/libkonq/konq_xmlguiclient.cc b/libkonq/konq_xmlguiclient.cc index ec3fed584..c3c7215b9 100644 --- a/libkonq/konq_xmlguiclient.cc +++ b/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> diff --git a/libkonq/tests/konqdragtest.cpp b/libkonq/tests/konqdragtest.cpp index 35932e850..965f1273d 100644 --- a/libkonq/tests/konqdragtest.cpp +++ b/libkonq/tests/konqdragtest.cpp @@ -21,8 +21,8 @@ #include <kurldrag.h> #include <assert.h> #include <tqiconview.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <konq_drag.h> diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp index 4613dc617..84284ae5b 100644 --- a/nsplugins/kcm_nsplugins.cpp +++ b/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> diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 5ef7d83dd..65a7e48a9 100644 --- a/nsplugins/nspluginloader.cpp +++ b/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> diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index a7033d852..f7404b34f 100644 --- a/nsplugins/plugin_part.cpp +++ b/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> diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp index a0a24452e..f8731a6c7 100644 --- a/nsplugins/pluginscan.cpp +++ b/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 <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <klocale.h> #include "sdk/npupp.h" diff --git a/nsplugins/test/testnsplugin.cpp b/nsplugins/test/testnsplugin.cpp index 6e029e87b..daccd1bcf 100644 --- a/nsplugins/test/testnsplugin.cpp +++ b/nsplugins/test/testnsplugin.cpp @@ -21,8 +21,8 @@ #include <stdio.h> #include <tqstring.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <dcopclient.h> #include <kdebug.h> #include <kstdaction.h> diff --git a/nsplugins/viewer/kxt.cpp b/nsplugins/viewer/kxt.cpp index 9147285dc..e2ab625ed 100644 --- a/nsplugins/viewer/kxt.cpp +++ b/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> diff --git a/nsplugins/viewer/kxt.h b/nsplugins/viewer/kxt.h index f4791f114..5a1c4f1ae 100644 --- a/nsplugins/viewer/kxt.h +++ b/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> diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp index 838bfaa31..682a11997 100644 --- a/nsplugins/viewer/viewer.cpp +++ b/nsplugins/viewer/viewer.cpp @@ -28,8 +28,8 @@ #include "nsplugin.h" #include <dcopclient.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp index 1c7f262b6..bc19cbd8a 100644 --- a/tdeinit/displayconfig.cpp +++ b/tdeinit/displayconfig.cpp @@ -23,9 +23,9 @@ #include <stdio.h> #include <stdlib.h> -#include <kapplication.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kstandarddirs.h> #include <klocale.h> #include <kdebug.h> diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp index dee8f2a3a..14767248f 100644 --- a/tdeinit/phase1.cpp +++ b/tdeinit/phase1.cpp @@ -23,9 +23,9 @@ #include <stdio.h> #include <stdlib.h> -#include <kapplication.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kstandarddirs.h> #include <klocale.h> #include <kdebug.h> diff --git a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp b/tdeioslave/cgi/kcmcgi/kcmcgi.cpp index 9f270374a..f20c5d732 100644 --- a/tdeioslave/cgi/kcmcgi/kcmcgi.cpp +++ b/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> diff --git a/tdeioslave/home/tdeio_home.cpp b/tdeioslave/home/tdeio_home.cpp index 4352ad8b0..8ab6bff91 100644 --- a/tdeioslave/home/tdeio_home.cpp +++ b/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> diff --git a/tdeioslave/home/testhome.cpp b/tdeioslave/home/testhome.cpp index 643c21e32..a3321557f 100644 --- a/tdeioslave/home/testhome.cpp +++ b/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> diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp index 6420ef47d..09cc0251e 100644 --- a/tdeioslave/man/kmanpart.cpp +++ b/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" diff --git a/tdeioslave/man/tdeio_man_test.cpp b/tdeioslave/man/tdeio_man_test.cpp index a7f41434e..d409570b4 100644 --- a/tdeioslave/man/tdeio_man_test.cpp +++ b/tdeioslave/man/tdeio_man_test.cpp @@ -5,7 +5,7 @@ #include "tdeio_man.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <klocale.h> diff --git a/tdeioslave/media/mediaimpl.cpp b/tdeioslave/media/mediaimpl.cpp index a6ed957ae..59dba75cf 100644 --- a/tdeioslave/media/mediaimpl.cpp +++ b/tdeioslave/media/mediaimpl.cpp @@ -27,7 +27,7 @@ #include <kmimetype.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tqeventloop.h> #include <sys/stat.h> diff --git a/tdeioslave/media/mediamanager/halbackend.cpp b/tdeioslave/media/mediamanager/halbackend.cpp index 1e168e13f..e3c1b1985 100644 --- a/tdeioslave/media/mediamanager/halbackend.cpp +++ b/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> diff --git a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp b/tdeioslave/media/mediamanager/tdehardwarebackend.cpp index 32ed746cf..6ee284dc1 100644 --- a/tdeioslave/media/mediamanager/tdehardwarebackend.cpp +++ b/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" diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp index 74cf1c08e..ab9d8ad63 100644 --- a/tdeioslave/media/medianotifier/medianotifier.cpp +++ b/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> diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp index 4427f919f..c130d5dcb 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.cpp +++ b/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> diff --git a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h b/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h index 50ea88b3b..0fc6aa697 100644 --- a/tdeioslave/media/mounthelper/tdeio_media_mounthelper.h +++ b/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> diff --git a/tdeioslave/media/tdecmodule/main.cpp b/tdeioslave/media/tdecmodule/main.cpp index 9d8c4cb8f..96d7135b5 100644 --- a/tdeioslave/media/tdecmodule/main.cpp +++ b/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> diff --git a/tdeioslave/media/tdeio_media.cpp b/tdeioslave/media/tdeio_media.cpp index 51467420f..be30ec5d5 100644 --- a/tdeioslave/media/tdeio_media.cpp +++ b/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> diff --git a/tdeioslave/media/testmedia.cpp b/tdeioslave/media/testmedia.cpp index ebd4f6b53..f024db35c 100644 --- a/tdeioslave/media/testmedia.cpp +++ b/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> diff --git a/tdeioslave/remote/tdeio_remote.cpp b/tdeioslave/remote/tdeio_remote.cpp index e1ba451f5..5cbbb8717 100644 --- a/tdeioslave/remote/tdeio_remote.cpp +++ b/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> diff --git a/tdeioslave/remote/testremote.cpp b/tdeioslave/remote/testremote.cpp index 3071772a9..bc777e804 100644 --- a/tdeioslave/remote/testremote.cpp +++ b/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> diff --git a/tdeioslave/sftp/tdeio_sftp.cpp b/tdeioslave/sftp/tdeio_sftp.cpp index f31ad03c6..2af66f04f 100644 --- a/tdeioslave/sftp/tdeio_sftp.cpp +++ b/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> diff --git a/tdeioslave/system/tdeio_system.cpp b/tdeioslave/system/tdeio_system.cpp index 30cacecad..9f2d556ab 100644 --- a/tdeioslave/system/tdeio_system.cpp +++ b/tdeioslave/system/tdeio_system.cpp @@ -21,8 +21,8 @@ #include <kdebug.h> #include <klocale.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <dcopclient.h> #include <tqeventloop.h> diff --git a/tdeioslave/system/testsystem.cpp b/tdeioslave/system/testsystem.cpp index 9310a49b4..8a02f4fc9 100644 --- a/tdeioslave/system/testsystem.cpp +++ b/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> diff --git a/tdeioslave/thumbnail/htmlcreator.cpp b/tdeioslave/thumbnail/htmlcreator.cpp index f4733965b..34742a0e9 100644 --- a/tdeioslave/thumbnail/htmlcreator.cpp +++ b/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" diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp index 3603cf781..63d061d29 100644 --- a/tdeioslave/thumbnail/thumbnail.cpp +++ b/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> diff --git a/tdeioslave/trash/ktrash.cpp b/tdeioslave/trash/ktrash.cpp index 9e020e67c..c355a2fa8 100644 --- a/tdeioslave/trash/ktrash.cpp +++ b/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> diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp index 6840ab10e..1b29aa5b5 100644 --- a/tdeioslave/trash/tdeio_trash.cpp +++ b/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> diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp index 12b1b939d..c2b6283bc 100644 --- a/tdeioslave/trash/testtrash.cpp +++ b/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> diff --git a/tdeprint/kjobviewer/kjobviewer.cpp b/tdeprint/kjobviewer/kjobviewer.cpp index 610dceb7a..73613dfe8 100644 --- a/tdeprint/kjobviewer/kjobviewer.cpp +++ b/tdeprint/kjobviewer/kjobviewer.cpp @@ -24,8 +24,8 @@ #include <stdlib.h> #include <tqpixmap.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <kmessagebox.h> #include <klocale.h> #include <ksystemtray.h> diff --git a/tdeprint/kjobviewer/main.cpp b/tdeprint/kjobviewer/main.cpp index 59bf0e1c0..ed1b4f3bb 100644 --- a/tdeprint/kjobviewer/main.cpp +++ b/tdeprint/kjobviewer/main.cpp @@ -17,9 +17,9 @@ * Boston, MA 02110-1301, USA. **/ -#include <kapplication.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include "kjobviewer.h" #include <klocale.h> diff --git a/tdeprint/kprinter/main.cpp b/tdeprint/kprinter/main.cpp index a7694638e..95ab3bac1 100644 --- a/tdeprint/kprinter/main.cpp +++ b/tdeprint/kprinter/main.cpp @@ -20,8 +20,8 @@ #include "printwrapper.h" #include <tqtimer.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <klocale.h> static TDECmdLineOptions options[] = diff --git a/tdeprint/kprinter/printwrapper.cpp b/tdeprint/kprinter/printwrapper.cpp index 5ee3cdde8..78370ccc6 100644 --- a/tdeprint/kprinter/printwrapper.cpp +++ b/tdeprint/kprinter/printwrapper.cpp @@ -32,8 +32,8 @@ #include <tqregexp.h> #include <tqsocketnotifier.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <klocale.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> diff --git a/tdeprint/printmgr/kcmprintmgr.cpp b/tdeprint/printmgr/kcmprintmgr.cpp index 3a1de59fe..02954e1bf 100644 --- a/tdeprint/printmgr/kcmprintmgr.cpp +++ b/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> diff --git a/tdeprint/slave/tdeio_print.cpp b/tdeprint/slave/tdeio_print.cpp index 29dc2b39c..cfbd0570e 100644 --- a/tdeprint/slave/tdeio_print.cpp +++ b/tdeprint/slave/tdeio_print.cpp @@ -34,9 +34,9 @@ #include <kiconloader.h> #include <kmimetype.h> #include <tdeio/job.h> -#include <kapplication.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <kprocess.h> #include <ktempfile.h> #include <tqfile.h> diff --git a/tdeprint/tdeprint_part/printpart.cpp b/tdeprint/tdeprint_part/printpart.cpp index 64686dde8..2de7b3190 100644 --- a/tdeprint/tdeprint_part/printpart.cpp +++ b/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> diff --git a/tdeprint/tdeprintfax/faxctrl.cpp b/tdeprint/tdeprintfax/faxctrl.cpp index 78f0a119a..e8048d7c6 100644 --- a/tdeprint/tdeprintfax/faxctrl.cpp +++ b/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> diff --git a/tdeprint/tdeprintfax/main.cpp b/tdeprint/tdeprintfax/main.cpp index cdf7607c4..5f69774d6 100644 --- a/tdeprint/tdeprintfax/main.cpp +++ b/tdeprint/tdeprintfax/main.cpp @@ -21,10 +21,10 @@ #include "tdeprintfax.h" #include <tqfile.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <klocale.h> -#include <kapplication.h> +#include <tdeapplication.h> TQString debugFlag; int oneShotFlag = false; diff --git a/tdeprint/tdeprintfax/tdeprintfax.cpp b/tdeprint/tdeprintfax/tdeprintfax.cpp index 5e9293abd..181d0da12 100644 --- a/tdeprint/tdeprintfax/tdeprintfax.cpp +++ b/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> diff --git a/tdescreensaver/blankscrn.cpp b/tdescreensaver/blankscrn.cpp index 13c75a53a..fd6860f58 100644 --- a/tdescreensaver/blankscrn.cpp +++ b/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> diff --git a/tdescreensaver/random.cpp b/tdescreensaver/random.cpp index c214f54c6..a624cff0e 100644 --- a/tdescreensaver/random.cpp +++ b/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> diff --git a/tdesu/tdesu/tdesu.cpp b/tdesu/tdesu/tdesu.cpp index 611c3ab59..24b07cefe 100644 --- a/tdesu/tdesu/tdesu.cpp +++ b/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 <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kmessagebox.h> #include <krun.h> #include <kuser.h> diff --git a/tdesu/tdesud/tdesud.cpp b/tdesu/tdesud/tdesud.cpp index 49eac9952..e6a6e24fb 100644 --- a/tdesu/tdesud/tdesud.cpp +++ b/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> diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp index b3d45d446..190074074 100644 --- a/tdm/kfrontend/kgapp.cpp +++ b/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> diff --git a/tdm/kfrontend/kgapp.h b/tdm/kfrontend/kgapp.h index ed799672d..2c903634b 100644 --- a/tdm/kfrontend/kgapp.h +++ b/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 { diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 998573c52..bc906d6d7 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/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> diff --git a/tdm/kfrontend/kgverify.cpp b/tdm/kfrontend/kgverify.cpp index 5b65a0b5b..6cca08862 100644 --- a/tdm/kfrontend/kgverify.cpp +++ b/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> diff --git a/tdm/kfrontend/krootimage.cpp b/tdm/kfrontend/krootimage.cpp index 92d4de28f..63c7cc41e 100644 --- a/tdm/kfrontend/krootimage.cpp +++ b/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> diff --git a/tdm/kfrontend/krootimage.h b/tdm/kfrontend/krootimage.h index e71ae3b4c..b10480986 100644 --- a/tdm/kfrontend/krootimage.h +++ b/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> diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cc index 8ba04697e..a73d349b3 100644 --- a/tdm/kfrontend/sakdlg.cc +++ b/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> diff --git a/tdm/kfrontend/tdmadmindialog.cpp b/tdm/kfrontend/tdmadmindialog.cpp index 6486eb3dc..5c3c87bcc 100644 --- a/tdm/kfrontend/tdmadmindialog.cpp +++ b/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> diff --git a/tdm/kfrontend/tdmclock.cpp b/tdm/kfrontend/tdmclock.cpp index 3bafc2aaa..fa17456e2 100644 --- a/tdm/kfrontend/tdmclock.cpp +++ b/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> diff --git a/tdm/kfrontend/tdmconfig.cpp b/tdm/kfrontend/tdmconfig.cpp index c50b94f85..2b7b5ab26 100644 --- a/tdm/kfrontend/tdmconfig.cpp +++ b/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> diff --git a/tdm/kfrontend/tdmshutdown.cpp b/tdm/kfrontend/tdmshutdown.cpp index 8b1f61a3c..0e53ffe29 100644 --- a/tdm/kfrontend/tdmshutdown.cpp +++ b/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> diff --git a/tdmlib/dmctl.h b/tdmlib/dmctl.h index 71363f9f4..4fdb8fb5b 100644 --- a/tdmlib/dmctl.h +++ b/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; diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp index fc3327113..6380a081e 100644 --- a/tqt3integration/module/module.cpp +++ b/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> diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp index b69803f21..39bb6d30c 100644 --- a/twin/clients/kwmtheme/cli_installer/main.cpp +++ b/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[] = diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp index 8eefe484d..719362d07 100644 --- a/twin/clients/modernsystem/config/config.cpp +++ b/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> diff --git a/twin/geometry.cpp b/twin/geometry.cpp index 9e99bb749..8123dbae2 100644 --- a/twin/geometry.cpp +++ b/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> diff --git a/twin/kcmtwin/twindecoration/preview.cpp b/twin/kcmtwin/twindecoration/preview.cpp index 3525ac56b..ebdecca86 100644 --- a/twin/kcmtwin/twindecoration/preview.cpp +++ b/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> diff --git a/twin/kcmtwin/twindecoration/twindecoration.cpp b/twin/kcmtwin/twindecoration/twindecoration.cpp index e533ad87f..67115d089 100644 --- a/twin/kcmtwin/twindecoration/twindecoration.cpp +++ b/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> diff --git a/twin/kcmtwin/twinoptions/main.cpp b/twin/kcmtwin/twinoptions/main.cpp index 5e79c6365..6710208d7 100644 --- a/twin/kcmtwin/twinoptions/main.cpp +++ b/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" diff --git a/twin/kcmtwin/twinoptions/mouse.cpp b/twin/kcmtwin/twinoptions/mouse.cpp index a522c3436..9715f4651 100644 --- a/twin/kcmtwin/twinoptions/mouse.cpp +++ b/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> diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index 991b425b6..91a6232d2 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/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> diff --git a/twin/kcmtwin/twinrules/detectwidget.cpp b/twin/kcmtwin/twinrules/detectwidget.cpp index 3eb6cf0aa..b3646312a 100644 --- a/twin/kcmtwin/twinrules/detectwidget.cpp +++ b/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> diff --git a/twin/kcmtwin/twinrules/kcm.cpp b/twin/kcmtwin/twinrules/kcm.cpp index c80869147..033967e6d 100644 --- a/twin/kcmtwin/twinrules/kcm.cpp +++ b/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" diff --git a/twin/kcmtwin/twinrules/main.cpp b/twin/kcmtwin/twinrules/main.cpp index 23806b3ba..cc2b4499b 100644 --- a/twin/kcmtwin/twinrules/main.cpp +++ b/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 <kapplication.h> +#include <tdecmdlineargs.h> +#include <tdeapplication.h> #include <dcopclient.h> #include <tdeconfig.h> #include <klocale.h> diff --git a/twin/killer/killer.cpp b/twin/killer/killer.cpp index 75b80c9e5..7ea38db64 100644 --- a/twin/killer/killer.cpp +++ b/twin/killer/killer.cpp @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include <kcmdlineargs.h> -#include <kapplication.h> +#include <tdecmdlineargs.h> +#include <tdeapplication.h> #include <kmessagebox.h> #include <kprocess.h> #include <klocale.h> diff --git a/twin/lib/kcommondecoration.cpp b/twin/lib/kcommondecoration.cpp index a08d5a209..74bf26dc7 100644 --- a/twin/lib/kcommondecoration.cpp +++ b/twin/lib/kcommondecoration.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdecorationfactory.h> #include <klocale.h> diff --git a/twin/main.cpp b/twin/main.cpp index 4ee1346e2..fe87abdea 100644 --- a/twin/main.cpp +++ b/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 <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <dcopclient.h> #include <dcopref.h> #include <unistd.h> diff --git a/twin/main.h b/twin/main.h index 92823d74a..d1fb59c6e 100644 --- a/twin/main.h +++ b/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" diff --git a/twin/options.cpp b/twin/options.cpp index 25bcb6a33..c09bbde61 100644 --- a/twin/options.cpp +++ b/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> diff --git a/twin/resumer/resumer.cpp b/twin/resumer/resumer.cpp index 7f77e25dc..2693dcf0e 100644 --- a/twin/resumer/resumer.cpp +++ b/twin/resumer/resumer.cpp @@ -22,8 +22,8 @@ DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include <kcmdlineargs.h> -#include <kapplication.h> +#include <tdecmdlineargs.h> +#include <tdeapplication.h> #include <kmessagebox.h> #include <kprocess.h> #include <klocale.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; diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp index 5ef1008b5..32300016d 100644 --- a/twin/tools/decobenchmark/main.cpp +++ b/twin/tools/decobenchmark/main.cpp @@ -30,9 +30,9 @@ #include <iostream> -#include <kaboutdata.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include "preview.h" #include "main.h" diff --git a/twin/tools/decobenchmark/preview.cpp b/twin/tools/decobenchmark/preview.cpp index b6bc6691f..7c14ab038 100644 --- a/twin/tools/decobenchmark/preview.cpp +++ b/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> diff --git a/twin/useractions.cpp b/twin/useractions.cpp index f3bf3ed18..292da2b99 100644 --- a/twin/useractions.cpp +++ b/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" diff --git a/twin/workspace.cpp b/twin/workspace.cpp index 21598fbd2..1bc55d3dd 100644 --- a/twin/workspace.cpp +++ b/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> |