diff options
Diffstat (limited to 'kcontrol')
107 files changed, 138 insertions, 138 deletions
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> |