diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-14 17:19:07 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-14 17:19:07 -0600 |
| commit | 19cea58302be2d15b10b106c80ff82f7b5a2fa79 (patch) | |
| tree | a3e30cb6598f0306bc1974b673c843b992ae6aec | |
| parent | d5f82ed01c915a5480e07f2e9055013a266d82bb (diff) | |
| download | tdesdk-19cea58302be2d15b10b106c80ff82f7b5a2fa79.tar.gz tdesdk-19cea58302be2d15b10b106c80ff82f7b5a2fa79.zip | |
Rename common header files for consistency with class renaming
125 files changed, 167 insertions, 167 deletions
diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp index 39a9eb9e..d3f38640 100644 --- a/cervisia/addremovedlg.cpp +++ b/cervisia/addremovedlg.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <tqlistbox.h> #include <tqstringlist.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kiconloader.h> #include <klocale.h> diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp index dac218ba..b67225df 100644 --- a/cervisia/cervisiapart.cpp +++ b/cervisia/cervisiapart.cpp @@ -24,9 +24,9 @@ #include <tqpopupmenu.h> #include <tqtextstream.h> #include <tqtooltip.h> -#include <kaboutdata.h> +#include <tdeaboutdata.h> #include <tdeaction.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdefiledialog.h> #include <kinputdialog.h> #include <kinstance.h> diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp index fe435fbe..ff4cec23 100644 --- a/cervisia/cervisiashell.cpp +++ b/cervisia/cervisiashell.cpp @@ -21,7 +21,7 @@ #include "cervisiashell.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kedittoolbar.h> #include <khelpmenu.h> diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp index bc946125..9196b9c6 100644 --- a/cervisia/cvsservice/cvsaskpass.cpp +++ b/cervisia/cvsservice/cvsaskpass.cpp @@ -19,9 +19,9 @@ */ #include <tqregexp.h> -#include <kaboutdata.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <klocale.h> #include <kpassdlg.h> diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp index 8aa5c2a6..9efbd86e 100644 --- a/cervisia/cvsservice/cvsservice.cpp +++ b/cervisia/cvsservice/cvsservice.cpp @@ -25,7 +25,7 @@ #include <dcopref.h> #include <dcopclient.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/cervisia/cvsservice/main.cpp b/cervisia/cvsservice/main.cpp index 7b4ab31e..d0180b6f 100644 --- a/cervisia/cvsservice/main.cpp +++ b/cervisia/cvsservice/main.cpp @@ -18,9 +18,9 @@ * */ -#include <kaboutdata.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <klocale.h> #include "cvsservice.h" diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp index 7f5d54ee..74635a84 100644 --- a/cervisia/cvsservice/repository.cpp +++ b/cervisia/cvsservice/repository.cpp @@ -24,7 +24,7 @@ #include <tqfile.h> #include <tqstring.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kdirwatch.h> #include <kstandarddirs.h> diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp index 7590b757..6fbf0cb1 100644 --- a/cervisia/cvsservice/sshagent.cpp +++ b/cervisia/cvsservice/sshagent.cpp @@ -21,7 +21,7 @@ #include "sshagent.h" #include <tqregexp.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <tdeversion.h> #include <kprocess.h> diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp index 84863bf8..83f5a1cf 100644 --- a/cervisia/diffview.cpp +++ b/cervisia/diffview.cpp @@ -26,7 +26,7 @@ #include <tqregexp.h> #include <tqstyle.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> #include <kglobalsettings.h> diff --git a/cervisia/main.cpp b/cervisia/main.cpp index 749d2a6d..6c13ba95 100644 --- a/cervisia/main.cpp +++ b/cervisia/main.cpp @@ -21,9 +21,9 @@ #include <iostream> #include <tqfileinfo.h> -#include <kaboutdata.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <tdeconfig.h> #include <klocale.h> #include <kurl.h> diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp index d3d1d7dc..42783adc 100644 --- a/cervisia/progressdlg.cpp +++ b/cervisia/progressdlg.cpp @@ -29,7 +29,7 @@ #include <cvsjob_stub.h> #include <dcopref.h> #include <kanimwidget.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include "cervisiasettings.h" diff --git a/cervisia/repositories.cpp b/cervisia/repositories.cpp index 820d468b..2ccbc521 100644 --- a/cervisia/repositories.cpp +++ b/cervisia/repositories.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <tqdir.h> #include <tqtextstream.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include "repositories.h" diff --git a/kapptemplate/kapp/app.h b/kapptemplate/kapp/app.h index 40b3241a..e1964d4f 100644 --- a/kapptemplate/kapp/app.h +++ b/kapptemplate/kapp/app.h @@ -7,7 +7,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/${APP_NAME_LC}.h #include <config.h> #endif -#include <kapplication.h> +#include <tdeapplication.h> #include <tdemainwindow.h> #include "${APP_NAME_LC}view.h" diff --git a/kapptemplate/kapp/app_client.cpp b/kapptemplate/kapp/app_client.cpp index 9694e457..bfc20ac5 100644 --- a/kapptemplate/kapp/app_client.cpp +++ b/kapptemplate/kapp/app_client.cpp @@ -1,6 +1,6 @@ echo "Creating $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_client.cpp..."; cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_client.cpp -#include <kapplication.h> +#include <tdeapplication.h> #include <dcopclient.h> #include <tqdatastream.h> #include <tqstring.h> diff --git a/kapptemplate/kapp/main.cpp b/kapptemplate/kapp/main.cpp index f873d2a5..8f030437 100644 --- a/kapptemplate/kapp/main.cpp +++ b/kapptemplate/kapp/main.cpp @@ -1,10 +1,10 @@ echo "Creating $LOCATION_ROOT/${APP_NAME_LC}/main.cpp..."; cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/main.cpp #include "${APP_NAME_LC}.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <dcopclient.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <klocale.h> static const char description[] = diff --git a/kapptemplate/kpartapp/app.h b/kapptemplate/kpartapp/app.h index b0b571b6..a33950d1 100644 --- a/kapptemplate/kpartapp/app.h +++ b/kapptemplate/kpartapp/app.h @@ -7,7 +7,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/${APP_NAME_LC}.h #include <config.h> #endif -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeparts/mainwindow.h> /** diff --git a/kapptemplate/kpartapp/main.cpp b/kapptemplate/kpartapp/main.cpp index 370815e7..c6b61d1d 100644 --- a/kapptemplate/kpartapp/main.cpp +++ b/kapptemplate/kpartapp/main.cpp @@ -1,9 +1,9 @@ echo "Creating $LOCATION_ROOT/${APP_NAME_LC}/main.cpp..."; cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/main.cpp #include "${APP_NAME_LC}.h" -#include <kapplication.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <klocale.h> static const char description[] = diff --git a/kbabel/addons/preview/pothumbcreator.cpp b/kbabel/addons/preview/pothumbcreator.cpp index f48506e8..7853a25e 100644 --- a/kbabel/addons/preview/pothumbcreator.cpp +++ b/kbabel/addons/preview/pothumbcreator.cpp @@ -37,7 +37,7 @@ #include <tqpixmap.h> #include <tqimage.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kglobal.h> #include <kiconloader.h> #include <kstandarddirs.h> diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp index b63fdca3..b9ff166b 100644 --- a/kbabel/catalogmanager/catalogmanager.cpp +++ b/kbabel/catalogmanager/catalogmanager.cpp @@ -49,7 +49,7 @@ #include <tqpainter.h> #include <dcopclient.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeaction.h> #include <kcmenumngr.h> #include <tdeconfig.h> diff --git a/kbabel/catalogmanager/catalogmanagerapp.h b/kbabel/catalogmanager/catalogmanagerapp.h index 99e3e97e..cc9a55ca 100644 --- a/kbabel/catalogmanager/catalogmanagerapp.h +++ b/kbabel/catalogmanager/catalogmanagerapp.h @@ -40,7 +40,7 @@ #include "version.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <twin.h> class CatalogManagerInterface : public CatalogManagerIface diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp index 6d7e33f2..daba1fc8 100644 --- a/kbabel/catalogmanager/catalogmanagerview.cpp +++ b/kbabel/catalogmanager/catalogmanagerview.cpp @@ -64,7 +64,7 @@ #include <kdatatool.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeaction.h> #include <tdefiledialog.h> #include <tdeio/netaccess.h> diff --git a/kbabel/catalogmanager/libcvs/cvshandler.cpp b/kbabel/catalogmanager/libcvs/cvshandler.cpp index 3b1c4b01..45131583 100644 --- a/kbabel/catalogmanager/libcvs/cvshandler.cpp +++ b/kbabel/catalogmanager/libcvs/cvshandler.cpp @@ -44,7 +44,7 @@ #include <tqstring.h> #include <tqstringlist.h> // KDE include files -#include <kapplication.h> +#include <tdeapplication.h> #include <klocale.h> #include <kmessagebox.h> #include <ktempfile.h> diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp index 18c08580..b7e0fd4e 100644 --- a/kbabel/catalogmanager/libsvn/svnhandler.cpp +++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp @@ -45,7 +45,7 @@ #include <tqstringlist.h> #include <tqdom.h> // KDE include files -#include <kapplication.h> +#include <tdeapplication.h> #include <klocale.h> #include <kmessagebox.h> #include <ktempfile.h> diff --git a/kbabel/catalogmanager/main.cpp b/kbabel/catalogmanager/main.cpp index a867c07e..306fecec 100644 --- a/kbabel/catalogmanager/main.cpp +++ b/kbabel/catalogmanager/main.cpp @@ -43,13 +43,13 @@ #include "resources.h" #include <dcopclient.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kcursor.h> #include <klocale.h> #include <kiconloader.h> #include <kmessagebox.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <twin.h> #include <tdemainwindow.h> diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp index 3f288826..e58ffd87 100644 --- a/kbabel/common/catalog.cpp +++ b/kbabel/common/catalog.cpp @@ -47,7 +47,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kmimetype.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeio/netaccess.h> #include <krfcdate.h> #include <ktrader.h> diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp index 3fbc12c2..418c1dea 100644 --- a/kbabel/common/kbmailer.cpp +++ b/kbabel/common/kbmailer.cpp @@ -39,7 +39,7 @@ #include <tqstringlist.h> #include <tqwidget.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeio/netaccess.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp index 3a191a59..5e359a91 100644 --- a/kbabel/common/msgfmt.cpp +++ b/kbabel/common/msgfmt.cpp @@ -32,7 +32,7 @@ **************************************************************************** */ #include "msgfmt.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <kprocess.h> #include <tqfileinfo.h> diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp index 6fc27b55..da484d6b 100644 --- a/kbabel/common/poinfo.cpp +++ b/kbabel/common/poinfo.cpp @@ -37,7 +37,7 @@ #include "msgfmt.h" #include "resources.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <ksavefile.h> diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp index 0899fa34..34f5223b 100644 --- a/kbabel/commonui/projectpref.cpp +++ b/kbabel/commonui/projectpref.cpp @@ -44,7 +44,7 @@ #include <kdebug.h> #include <klocale.h> #include <kiconloader.h> -#include <kapplication.h> +#include <tdeapplication.h> #define PAGE_IDENTITY 0 diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp index c9108f3f..8365d038 100644 --- a/kbabel/commonui/projectwizard.cpp +++ b/kbabel/commonui/projectwizard.cpp @@ -39,7 +39,7 @@ #include <tqcombobox.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kmessagebox.h> #include <klineedit.h> #include <klocale.h> diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp index bc251a93..7ed5d604 100644 --- a/kbabel/commonui/roughtransdlg.cpp +++ b/kbabel/commonui/roughtransdlg.cpp @@ -51,7 +51,7 @@ #include <tqvbox.h> #include <tqwhatsthis.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp index 7e352502..9b08bfd2 100644 --- a/kbabel/filters/gettext/gettextexport.cpp +++ b/kbabel/filters/gettext/gettextexport.cpp @@ -43,7 +43,7 @@ #include <tqfile.h> #include <tqtextcodec.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <kgenericfactory.h> diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp index 8c361763..4adf1eb2 100644 --- a/kbabel/filters/gettext/gettextimport.cpp +++ b/kbabel/filters/gettext/gettextimport.cpp @@ -44,7 +44,7 @@ #include <tqregexp.h> #include <tqtextcodec.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <kgenericfactory.h> #include <klocale.h> diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp index 9a32da70..e003ff57 100644 --- a/kbabel/kbabel/commentview.cpp +++ b/kbabel/kbabel/commentview.cpp @@ -41,7 +41,7 @@ #include <tqdragobject.h> #include <tqtextview.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kcursor.h> #include <kdialog.h> diff --git a/kbabel/kbabel/kbabel.h b/kbabel/kbabel/kbabel.h index 9d6b6bd4..4d955ffe 100644 --- a/kbabel/kbabel/kbabel.h +++ b/kbabel/kbabel/kbabel.h @@ -39,7 +39,7 @@ #include <config.h> #endif -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeversion.h> #include <kdockwidget.h> #include <tqstringlist.h> diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp index a241b119..a3841c81 100644 --- a/kbabel/kbabel/kbabelpref.cpp +++ b/kbabel/kbabel/kbabelpref.cpp @@ -45,7 +45,7 @@ #include "tqcombobox.h" #include <klocale.h> -#include <kapplication.h> +#include <tdeapplication.h> using namespace KBabel; diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index 49247256..e415f06a 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -67,7 +67,7 @@ #include <kcursor.h> #include <tdefiledialog.h> #include <tdeconfig.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kled.h> #include <tdelistbox.h> #include <tdeio/netaccess.h> diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index 957d7bd8..d75de27f 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.cpp @@ -39,7 +39,7 @@ #include <tqstring.h> #include <tqtextedit.h> -#include "kapplication.h" +#include "tdeapplication.h" #include <tdeconfig.h> #include <kglobal.h> #include <kglobalsettings.h> diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index ee8e02a1..15dd9320 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -41,8 +41,8 @@ #include "version.h" #include <dcopclient.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kcursor.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kbabel/kbabeldict/aboutmoduledlg.h b/kbabel/kbabeldict/aboutmoduledlg.h index 42fbb117..673f60b7 100644 --- a/kbabel/kbabeldict/aboutmoduledlg.h +++ b/kbabel/kbabeldict/aboutmoduledlg.h @@ -35,7 +35,7 @@ #ifndef ABOUTMODULEDLG_H #define ABOUTMODULEDLG_H -#include <kaboutapplication.h> +#include <tdeaboutapplication.h> class AboutModuleDlg : public TDEAboutApplication diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp index 7453bcaf..09a98fb6 100644 --- a/kbabel/kbabeldict/kbabeldict.cpp +++ b/kbabel/kbabeldict/kbabeldict.cpp @@ -32,7 +32,7 @@ **************************************************************************** */ -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kglobal.h> #include <klocale.h> diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index 15d421b5..e0e631a3 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -35,16 +35,16 @@ #include <dcopclient.h> -#include <kaboutapplication.h> +#include <tdeaboutapplication.h> #include "aboutmoduledlg.h" #include "kbabeldictbox.h" #include <version.h> #include <resources.h> -#include <kaboutdata.h> -#include <kaboutdialog.h> -#include <kapplication.h> +#include <tdeaboutdata.h> +#include <tdeaboutdialog.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kcmenumngr.h> #include <kdialogbase.h> diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp index 6a20d7cc..f863a4c5 100644 --- a/kbabel/kbabeldict/main.cpp +++ b/kbabel/kbabeldict/main.cpp @@ -34,11 +34,11 @@ **************************************************************************** */ #include <dcopclient.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kcursor.h> #include <klocale.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <twin.h> #include <tqtimer.h> diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 6c05904c..a560ae45 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -41,7 +41,7 @@ #include <kurlrequester.h> #include <kstandarddirs.h> -#include "kapplication.h" +#include "tdeapplication.h" #include "KDBSearchEngine.h" #include "dbscan.h" diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp index 47bc8fa9..183b1e4d 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp @@ -32,7 +32,7 @@ #include <tqdir.h> #include <tqfile.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kurl.h> #include <kdebug.h> diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp index d18fd691..71b8e1a8 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp @@ -1,7 +1,7 @@ #include <klocale.h> #include <kinstance.h> -#include <kaboutdata.h> +#include <tdeaboutdata.h> #include <kdebug.h> #include "dbse_factory.h" diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp index 21e8d641..a3309a26 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp @@ -34,7 +34,7 @@ #include "KDBSearchEngine2.h" #include "dbscan.h" #include <klineedit.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tqpushbutton.h> #include <kurlrequester.h> #include <tqcheckbox.h> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp index 779ad01e..b880cd50 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp @@ -10,7 +10,7 @@ License: GPLv2 #include <tqregexp.h> #include <tqdict.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp index b5b20967..2fe4ae98 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp @@ -20,7 +20,7 @@ #include <tdeconfig.h> #include <tqdir.h> #include <tqfile.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kurl.h> #include <kdebug.h> #include <klineedit.h> diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp index b82528b9..c4091e41 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp @@ -1,7 +1,7 @@ #include <klocale.h> #include <kinstance.h> -#include <kaboutdata.h> +#include <tdeaboutdata.h> #include <kdebug.h> #include "dbse2_factory.h" diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp index 9d658220..436dced6 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp @@ -34,7 +34,7 @@ #include <klocale.h> #include <kinstance.h> -#include <kaboutdata.h> +#include <tdeaboutdata.h> #include <kdebug.h> #include "pa_factory.h" diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index 8101c377..7972b0b5 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp @@ -31,8 +31,8 @@ **************************************************************************** */ #include <klocale.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <kdebug.h> #include <kglobal.h> #include <kinstance.h> diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp index d346bcf5..eaa0a93b 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp @@ -36,7 +36,7 @@ #include <catalog.h> #include <tagextractor.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <klocale.h> diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp index 16101750..0d604c85 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp @@ -34,7 +34,7 @@ #include <klocale.h> #include <kinstance.h> -#include <kaboutdata.h> +#include <tdeaboutdata.h> #include <kdebug.h> #include "pc_factory.h" diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index 57be4624..3c202429 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -33,8 +33,8 @@ **************************************************************************** */ #include <klocale.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <kstaticdeleter.h> #include <kdebug.h> #include <kglobal.h> diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp index 4847283d..3e3a0d9c 100644 --- a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp @@ -34,7 +34,7 @@ #include <klocale.h> #include <kinstance.h> -#include <kaboutdata.h> +#include <tdeaboutdata.h> #include <kdebug.h> #include "pc_factory.h" diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index e97d1430..46232e43 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -33,8 +33,8 @@ **************************************************************************** */ #include <klocale.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <kstaticdeleter.h> #include <kdebug.h> #include <kglobal.h> diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp index bc4001fb..11596183 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp @@ -40,7 +40,7 @@ #include <tagextractor.h> #include <resources.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <klocale.h> #include <tdeio/netaccess.h> diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h index 5d823cc0..97c26162 100644 --- a/kbabel/kbabeldict/searchengine.h +++ b/kbabel/kbabeldict/searchengine.h @@ -39,7 +39,7 @@ #include <tqobject.h> #include <tqstring.h> #include <tqwidget.h> -#include <kaboutdata.h> +#include <tdeaboutdata.h> #include <tdeconfigbase.h> diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp index 9c94d669..239b9dab 100644 --- a/kbugbuster/backend/mailsender.cpp +++ b/kbugbuster/backend/mailsender.cpp @@ -12,7 +12,7 @@ #include <kdebug.h> #include <kmessagebox.h> #include <kurl.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <dcopclient.h> #include <kprocess.h> diff --git a/kbugbuster/backend/smtp.cpp b/kbugbuster/backend/smtp.cpp index b9211cbb..438a03e5 100644 --- a/kbugbuster/backend/smtp.cpp +++ b/kbugbuster/backend/smtp.cpp @@ -12,7 +12,7 @@ #include <tqtextstream.h> #include <tqsocket.h> #include <tqtimer.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kmessagebox.h> #include <klocale.h> diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp index 1b3ff878..199b01d5 100644 --- a/kbugbuster/gui/cwbuglistcontainer.cpp +++ b/kbugbuster/gui/cwbuglistcontainer.cpp @@ -19,7 +19,7 @@ #include <tqlayout.h> #include <tqwidgetstack.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kiconloader.h> #include <tdelistview.h> #include <klocale.h> diff --git a/kbugbuster/gui/kbbmainwindow.h b/kbugbuster/gui/kbbmainwindow.h index 2c99effe..4bf958d7 100644 --- a/kbugbuster/gui/kbbmainwindow.h +++ b/kbugbuster/gui/kbbmainwindow.h @@ -16,7 +16,7 @@ #ifndef KBBMAINWINDOW_H #define KBBMAINWINDOW_H -#include <kapplication.h> +#include <tdeapplication.h> #include <kbookmarkmanager.h> #include <tdemainwindow.h> #include <tqmap.h> diff --git a/kbugbuster/main.cpp b/kbugbuster/main.cpp index f3791570..0c1182b4 100644 --- a/kbugbuster/main.cpp +++ b/kbugbuster/main.cpp @@ -19,8 +19,8 @@ #include <config.h> #endif -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <klocale.h> #include <dcopclient.h> diff --git a/kmtrace/demangle.cpp b/kmtrace/demangle.cpp index 8c10c4a2..509eceed 100644 --- a/kmtrace/demangle.cpp +++ b/kmtrace/demangle.cpp @@ -11,7 +11,7 @@ #include <ktempfile.h> #include <kinstance.h> #include <kstandarddirs.h> -#include <kcmdlineargs.h> +#include <tdecmdlineargs.h> extern "C" { /* Options passed to cplus_demangle (in 2nd parameter). */ diff --git a/kmtrace/kmtrace.cpp b/kmtrace/kmtrace.cpp index 97513fca..60e63b94 100644 --- a/kmtrace/kmtrace.cpp +++ b/kmtrace/kmtrace.cpp @@ -11,7 +11,7 @@ #include <ktempfile.h> #include <kinstance.h> #include <kstandarddirs.h> -#include <kcmdlineargs.h> +#include <tdecmdlineargs.h> #include <kprocess.h> extern "C" { diff --git a/kmtrace/match.cpp b/kmtrace/match.cpp index 47f25ab6..cc6e330f 100644 --- a/kmtrace/match.cpp +++ b/kmtrace/match.cpp @@ -11,7 +11,7 @@ #include <ktempfile.h> #include <kinstance.h> #include <kstandarddirs.h> -#include <kcmdlineargs.h> +#include <tdecmdlineargs.h> int main(int argc, char **argv) { diff --git a/kompare/kompare_shell.h b/kompare/kompare_shell.h index 84f8887f..f4323e4e 100644 --- a/kompare/kompare_shell.h +++ b/kompare/kompare_shell.h @@ -20,7 +20,7 @@ #ifndef KOMPARESHELL_H #define KOMPARESHELL_H -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeparts/dockmainwindow.h> #include "kompare.h" diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index 6213ee2e..d02644d7 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.cpp +++ b/kompare/komparenavtreepart/komparenavtreepart.cpp @@ -22,7 +22,7 @@ #include <kiconloader.h> #include <kmimetype.h> #include <tdelistview.h> -#include <kaboutdata.h> +#include <tdeaboutdata.h> #include "difference.h" #include "diffmodel.h" diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index 1dfac530..8443a37a 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -25,7 +25,7 @@ #include <tqwidget.h> #include <tdeaction.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <tdefiletreeview.h> #include <tdefiledialog.h> diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp index 14fd6e96..0f4e1a7b 100644 --- a/kompare/komparepart/komparesplitter.cpp +++ b/kompare/komparepart/komparesplitter.cpp @@ -22,7 +22,7 @@ #include <tqtimer.h> #include <kdebug.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kglobalsettings.h> #include "diffmodel.h" diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp index 06f7e4bc..5c541c7c 100644 --- a/kompare/kompareurldialog.cpp +++ b/kompare/kompareurldialog.cpp @@ -19,7 +19,7 @@ #include <tqvbox.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <klocale.h> #include <kurlrequester.h> diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp index 2748b573..b5f4f2df 100644 --- a/kompare/libdialogpages/diffpage.cpp +++ b/kompare/libdialogpages/diffpage.cpp @@ -25,7 +25,7 @@ #include <tqvbuttongroup.h> #include <tqwhatsthis.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kcombobox.h> #include <kdialog.h> #include <keditlistbox.h> diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp index f1981c9a..041cff46 100644 --- a/kompare/libdialogpages/filespage.cpp +++ b/kompare/libdialogpages/filespage.cpp @@ -19,7 +19,7 @@ #include <tqlayout.h> #include <tqgroupbox.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kcharsets.h> #include <tdeconfig.h> #include <kdebug.h> diff --git a/kompare/libdialogpages/filessettings.cpp b/kompare/libdialogpages/filessettings.cpp index 3808edb0..ac4e6b09 100644 --- a/kompare/libdialogpages/filessettings.cpp +++ b/kompare/libdialogpages/filessettings.cpp @@ -16,7 +16,7 @@ ** ****************************************************************************/ -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include "filessettings.h" diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp index 942760de..cf8ef75f 100644 --- a/kompare/libdialogpages/viewpage.cpp +++ b/kompare/libdialogpages/viewpage.cpp @@ -24,7 +24,7 @@ #include <tqlayout.h> #include <tqspinbox.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kcolorbutton.h> #include <kdialog.h> #include <tdefontcombo.h> diff --git a/kompare/main.cpp b/kompare/main.cpp index 90af6c4e..a866fd3b 100644 --- a/kompare/main.cpp +++ b/kompare/main.cpp @@ -18,8 +18,8 @@ ***************************************************************************/ -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <kdebug.h> #include <tdefile.h> #include <klocale.h> diff --git a/kspy/main.cpp b/kspy/main.cpp index c191c0ee..9a1515bb 100644 --- a/kspy/main.cpp +++ b/kspy/main.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <klocale.h> #include "spy.h" @@ -22,7 +22,7 @@ #include <config.h> #endif -#include <kapplication.h> +#include <tdeapplication.h> #include <tqwidget.h> class NavView; diff --git a/kstartperf/kstartperf.cpp b/kstartperf/kstartperf.cpp index 9938500e..f54a45c9 100644 --- a/kstartperf/kstartperf.cpp +++ b/kstartperf/kstartperf.cpp @@ -19,9 +19,9 @@ #include <tqtextstream.h> #include <tqfile.h> -#include <kapplication.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/kuiviewer/kuiviewer.h b/kuiviewer/kuiviewer.h index bc0f362a..f204728c 100644 --- a/kuiviewer/kuiviewer.h +++ b/kuiviewer/kuiviewer.h @@ -27,7 +27,7 @@ #include <config.h> #endif -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeparts/mainwindow.h> class TDEToggleAction; diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp index 03d272bb..487a54c6 100644 --- a/kuiviewer/kuiviewer_part.cpp +++ b/kuiviewer/kuiviewer_part.cpp @@ -23,7 +23,7 @@ #include "kuiviewer_part.moc" #include <tdeaction.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> @@ -33,7 +33,7 @@ #include <tdelistview.h> #include <tdeparts/genericfactory.h> #include <kstdaction.h> -#include <kstyle.h> +#include <tdestyle.h> #include <tqmetaobject.h> #include <tqclipboard.h> diff --git a/kuiviewer/main.cpp b/kuiviewer/main.cpp index 3650a600..d0895276 100644 --- a/kuiviewer/main.cpp +++ b/kuiviewer/main.cpp @@ -21,9 +21,9 @@ **/ #include "kuiviewer.h" -#include <kapplication.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <klocale.h> static TDECmdLineOptions options[] = diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp index a861cb70..a80f908b 100644 --- a/scheck/scheck.cpp +++ b/scheck/scheck.cpp @@ -66,8 +66,8 @@ #include <kdrawutil.h> #include <tdeaccelmanager.h> #include <kpixmapeffect.h> -#include <kapplication.h> -#include <kaboutdata.h> +#include <tdeapplication.h> +#include <tdeaboutdata.h> #include "scheck.h" #include "scheck.moc" diff --git a/scheck/scheck.h b/scheck/scheck.h index 880913b6..06ab3599 100644 --- a/scheck/scheck.h +++ b/scheck/scheck.h @@ -46,7 +46,7 @@ #include <kdrawutil.h> #include <kpixmap.h> -#include <kstyle.h> +#include <tdestyle.h> class TQPopupMenu; diff --git a/scripts/fixkdeincludes b/scripts/fixkdeincludes index 0585b735..4d4b7d56 100644 --- a/scripts/fixkdeincludes +++ b/scripts/fixkdeincludes @@ -115,7 +115,7 @@ $hExt = "(h|H|hh|hxx|hpp|h\\+\\+)"; 'qwindefs.h' => "qwindowdefs.h", # and now the KDE specific compat includes - 'kapp.h' => "kapplication.h", + 'kapp.h' => "tdeapplication.h", 'kstddirs.h' => "kstandarddirs.h", 'kuniqueapp.h' => "kuniqueapplication.h", 'ktmainwindow.h'=> "tdemainwindow.h", diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim index 62b84378..9ae11612 100644 --- a/scripts/kde-devel-vim.vim +++ b/scripts/kde-devel-vim.vim @@ -241,7 +241,7 @@ function! MapIdentHeader( ident ) elseif a:ident =~ 'kd\(Debug\|Warning\|Error\|Fatal\|Backtrace\)' return '<kdebug.h>' elseif a:ident == 'kapp' - return '<kapplication.h>' + return '<tdeapplication.h>' elseif a:ident == 'i18n' || \a:ident == 'I18N_NOOP' return '<klocale.h>' diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el index cafbb000..6bfdd858 100644 --- a/scripts/kde-emacs/klaralv.el +++ b/scripts/kde-emacs/klaralv.el @@ -173,7 +173,7 @@ ; Useful fake entries (qapplication.h tqApp) - (kapplication.h kapp) + (tdeapplication.h kapp) (klocale.h i18n I18N_NOOP) (kstandarddirs.h locate locateLocal) (stdlib.h getenv) diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp index 7936c9f6..32ee92b5 100644 --- a/tdecachegrind/tdecachegrind/callgraphview.cpp +++ b/tdecachegrind/tdecachegrind/callgraphview.cpp @@ -39,7 +39,7 @@ #include <klocale.h> #include <tdeconfig.h> #include <ktempfile.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kiconloader.h> #include <tdefiledialog.h> diff --git a/tdecachegrind/tdecachegrind/callitem.cpp b/tdecachegrind/tdecachegrind/callitem.cpp index 449ed520..6d984ca6 100644 --- a/tdecachegrind/tdecachegrind/callitem.cpp +++ b/tdecachegrind/tdecachegrind/callitem.cpp @@ -22,7 +22,7 @@ #include <tqpixmap.h> #include <klocale.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kiconloader.h> #include "configuration.h" diff --git a/tdecachegrind/tdecachegrind/callmapview.cpp b/tdecachegrind/tdecachegrind/callmapview.cpp index 7f5eff57..8f3d9bff 100644 --- a/tdecachegrind/tdecachegrind/callmapview.cpp +++ b/tdecachegrind/tdecachegrind/callmapview.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include "callmapview.h" diff --git a/tdecachegrind/tdecachegrind/costlistitem.cpp b/tdecachegrind/tdecachegrind/costlistitem.cpp index 1e777b05..d461d0d3 100644 --- a/tdecachegrind/tdecachegrind/costlistitem.cpp +++ b/tdecachegrind/tdecachegrind/costlistitem.cpp @@ -23,7 +23,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kapplication.h> +#include <tdeapplication.h> #include "listutils.h" #include "costlistitem.h" diff --git a/tdecachegrind/tdecachegrind/functionitem.cpp b/tdecachegrind/tdecachegrind/functionitem.cpp index 3b694ddf..17716e14 100644 --- a/tdecachegrind/tdecachegrind/functionitem.cpp +++ b/tdecachegrind/tdecachegrind/functionitem.cpp @@ -28,7 +28,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kapplication.h> +#include <tdeapplication.h> #include "listutils.h" #include "functionitem.h" diff --git a/tdecachegrind/tdecachegrind/instritem.cpp b/tdecachegrind/tdecachegrind/instritem.cpp index 2c1a18a1..3051b171 100644 --- a/tdecachegrind/tdecachegrind/instritem.cpp +++ b/tdecachegrind/tdecachegrind/instritem.cpp @@ -24,7 +24,7 @@ #include <tqpainter.h> #include <klocale.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kiconloader.h> #include <kdebug.h> diff --git a/tdecachegrind/tdecachegrind/main.cpp b/tdecachegrind/tdecachegrind/main.cpp index 3deb3bc3..75ca0b50 100644 --- a/tdecachegrind/tdecachegrind/main.cpp +++ b/tdecachegrind/tdecachegrind/main.cpp @@ -24,9 +24,9 @@ #include "../version.h" #include <tqfile.h> -#include <kapplication.h> -#include <kcmdlineargs.h> -#include <kaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> +#include <tdeaboutdata.h> #include <klocale.h> #include "toplevel.h" diff --git a/tdecachegrind/tdecachegrind/partlistitem.cpp b/tdecachegrind/tdecachegrind/partlistitem.cpp index 40c2db36..339189d7 100644 --- a/tdecachegrind/tdecachegrind/partlistitem.cpp +++ b/tdecachegrind/tdecachegrind/partlistitem.cpp @@ -23,7 +23,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kapplication.h> +#include <tdeapplication.h> #include "listutils.h" #include "partlistitem.h" diff --git a/tdecachegrind/tdecachegrind/sourceitem.cpp b/tdecachegrind/tdecachegrind/sourceitem.cpp index 6a121868..b8703e89 100644 --- a/tdecachegrind/tdecachegrind/sourceitem.cpp +++ b/tdecachegrind/tdecachegrind/sourceitem.cpp @@ -26,7 +26,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kapplication.h> +#include <tdeapplication.h> #include "configuration.h" #include "listutils.h" diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp index 5c1bd609..75598f02 100644 --- a/tdecachegrind/tdecachegrind/toplevel.cpp +++ b/tdecachegrind/tdecachegrind/toplevel.cpp @@ -35,7 +35,7 @@ #include <tqfile.h> #include <tqeventloop.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <klocale.h> #include <kstatusbar.h> #include <tdestdaccel.h> diff --git a/tdeioslave/svn/ksvnd/ksvnd.cpp b/tdeioslave/svn/ksvnd/ksvnd.cpp index ddc7fb3e..e4c2454e 100644 --- a/tdeioslave/svn/ksvnd/ksvnd.cpp +++ b/tdeioslave/svn/ksvnd/ksvnd.cpp @@ -18,7 +18,7 @@ Boston, MA 02110-1301, USA. */ -#include <kapplication.h> +#include <tdeapplication.h> #include <klocale.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/tdeioslave/svn/svn.cpp b/tdeioslave/svn/svn.cpp index a1a8b1c2..be3e1160 100644 --- a/tdeioslave/svn/svn.cpp +++ b/tdeioslave/svn/svn.cpp @@ -29,7 +29,7 @@ #include <netinet/in.h> #include <netdb.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <kmessagebox.h> #include <kinstance.h> diff --git a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp index 55d727c6..6c939441 100644 --- a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp +++ b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp @@ -17,9 +17,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/svn/svnhelper/tdeio_svn_helper.h b/tdeioslave/svn/svnhelper/tdeio_svn_helper.h index 197d7c81..46f8fcb6 100644 --- a/tdeioslave/svn/svnhelper/tdeio_svn_helper.h +++ b/tdeioslave/svn/svnhelper/tdeio_svn_helper.h @@ -20,7 +20,7 @@ #ifndef _KIO_SVN_HELPER_H_ #define _KIO_SVN_HELPER_H_ -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeio/job.h> #include <twinmodule.h> #include <tqstringlist.h> diff --git a/tdeunittest/example/simple/maingui.cpp b/tdeunittest/example/simple/maingui.cpp index 530ae0d9..183d7492 100644 --- a/tdeunittest/example/simple/maingui.cpp +++ b/tdeunittest/example/simple/maingui.cpp @@ -23,9 +23,9 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <kaboutdata.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <klocale.h> #include "tdeunittest/runnergui.h" diff --git a/tdeunittest/guimodrunner.cpp b/tdeunittest/guimodrunner.cpp index 0f6febbd..0a9377e7 100644 --- a/tdeunittest/guimodrunner.cpp +++ b/tdeunittest/guimodrunner.cpp @@ -24,11 +24,11 @@ */ #include <kdebug.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kglobal.h> #include <kinstance.h> -#include <kaboutdata.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdecmdlineargs.h> #include <klocale.h> #include "runnergui.h" diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp index e0c6a982..187368ce 100644 --- a/umbrello/umbrello/associationwidget.cpp +++ b/umbrello/umbrello/associationwidget.cpp @@ -21,7 +21,7 @@ #include <klocale.h> #include <kinputdialog.h> #include <kcolordialog.h> -#include <kapplication.h> +#include <tdeapplication.h> // app includes #include "activitywidget.h" #include "uml.h" diff --git a/umbrello/umbrello/cmdlineexportallviewsevent.cpp b/umbrello/umbrello/cmdlineexportallviewsevent.cpp index a4295a20..60cbee23 100644 --- a/umbrello/umbrello/cmdlineexportallviewsevent.cpp +++ b/umbrello/umbrello/cmdlineexportallviewsevent.cpp @@ -16,7 +16,7 @@ #include <tqstringlist.h> // kde includes -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> // app includes diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp index 41ac6ed2..41ca5d12 100644 --- a/umbrello/umbrello/codegenerator.cpp +++ b/umbrello/umbrello/codegenerator.cpp @@ -31,7 +31,7 @@ #include <klocale.h> #include <kmessagebox.h> #include <kdialogbase.h> -#include <kapplication.h> +#include <tdeapplication.h> // app includes #include "dialogs/overwritedialogue.h" diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp index 6b7ac992..8463babc 100644 --- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp @@ -27,7 +27,7 @@ #include <kdebug.h> #include <kmessagebox.h> #include <kdialog.h> -#include <kapplication.h> +#include <tdeapplication.h> // app includes #include "../dialogs/overwritedialogue.h" #include "../model_utils.h" diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp index 44c10f82..d610520b 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast_utils.cpp @@ -17,7 +17,7 @@ #include <klocale.h> #include <kdebug.h> -#include <kapplication.h> +#include <tdeapplication.h> AST* findNodeAt( AST* node, int line, int column ) { diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp index 2efff9cb..e991d1e0 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.cpp +++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp @@ -21,7 +21,7 @@ #include "../enumliteral.h" #include "../entityattribute.h" #include "../object_factory.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <kbuttonbox.h> #include <kdebug.h> #include <klocale.h> diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp index 5b92b043..b0531457 100644 --- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp @@ -26,7 +26,7 @@ #include <kcompletion.h> #include <klocale.h> #include <kmessagebox.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> // app includes diff --git a/umbrello/umbrello/docgenerators/main.cpp b/umbrello/umbrello/docgenerators/main.cpp index c57520bd..b6d70ef9 100644 --- a/umbrello/umbrello/docgenerators/main.cpp +++ b/umbrello/umbrello/docgenerators/main.cpp @@ -24,9 +24,9 @@ #include <libxslt/xsltutils.h> // kde includes -#include <kaboutdata.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <tdeconfig.h> #include <klocale.h> #include <ktip.h> diff --git a/umbrello/umbrello/import_rose.cpp b/umbrello/umbrello/import_rose.cpp index 3968e72a..ff26e653 100644 --- a/umbrello/umbrello/import_rose.cpp +++ b/umbrello/umbrello/import_rose.cpp @@ -20,7 +20,7 @@ #include <tqregexp.h> #include <tqmessagebox.h> #include <klocale.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> // app includes #include "petalnode.h" diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index 1f87e732..23c90b41 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -17,7 +17,7 @@ * Changes from kplayer original marked by CHANGED */ -#include <kapplication.h> +#include <tdeapplication.h> #include <tdetoolbar.h> #include <tdetoolbarbutton.h> #include <tqtooltip.h> diff --git a/umbrello/umbrello/kstartuplogo.cpp b/umbrello/umbrello/kstartuplogo.cpp index 98420151..49d4d0f2 100644 --- a/umbrello/umbrello/kstartuplogo.cpp +++ b/umbrello/umbrello/kstartuplogo.cpp @@ -13,7 +13,7 @@ ***************************************************************************/ #include "kstartuplogo.h" -#include <kapplication.h> +#include <tdeapplication.h> #include <kstandarddirs.h> #include <tqtimer.h> diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp index e35d9ff7..ffbf3e9f 100644 --- a/umbrello/umbrello/main.cpp +++ b/umbrello/umbrello/main.cpp @@ -12,9 +12,9 @@ #include <unistd.h> // kde includes -#include <kaboutdata.h> -#include <kapplication.h> -#include <kcmdlineargs.h> +#include <tdeaboutdata.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> #include <tdeconfig.h> #include <klocale.h> #include <ktip.h> diff --git a/umbrello/umbrello/object_factory.cpp b/umbrello/umbrello/object_factory.cpp index 327cb54b..925909f2 100644 --- a/umbrello/umbrello/object_factory.cpp +++ b/umbrello/umbrello/object_factory.cpp @@ -15,7 +15,7 @@ // qt/kde includes #include <tqregexp.h> #include <tqstringlist.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <klocale.h> #include <kmessagebox.h> #include <kdebug.h> diff --git a/umbrello/umbrello/plugin.cpp b/umbrello/umbrello/plugin.cpp index c4d9913a..4dfca79c 100644 --- a/umbrello/umbrello/plugin.cpp +++ b/umbrello/umbrello/plugin.cpp @@ -20,7 +20,7 @@ // KDE includes #include <kdebug.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> // app includes diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index 1cc01c01..778b6d31 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -23,7 +23,7 @@ // kde includes #include <tdeaction.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeconfig.h> #include <kcursor.h> #include <kdebug.h> diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index f82eb39e..2ed3aae8 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -22,7 +22,7 @@ #include <tqlabel.h> // kde includes -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeversion.h> #include <kdebug.h> #include <tdeio/job.h> diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp index 5bd20125..b7a81796 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -20,7 +20,7 @@ #include <tqheader.h> #include <tqtooltip.h> #include <kiconloader.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdebug.h> #include <tdefiledialog.h> #include <klocale.h> diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp index 89bb581c..8e451294 100644 --- a/umbrello/umbrello/umllistviewitem.cpp +++ b/umbrello/umbrello/umllistviewitem.cpp @@ -18,7 +18,7 @@ // qt/kde includes #include <tqfile.h> #include <tqregexp.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <klocale.h> #include <kmessagebox.h> #include <kdebug.h> diff --git a/umbrello/umbrello/umlobject.cpp b/umbrello/umbrello/umlobject.cpp index 85de579f..9eb12766 100644 --- a/umbrello/umbrello/umlobject.cpp +++ b/umbrello/umbrello/umlobject.cpp @@ -14,7 +14,7 @@ // qt/kde includes #include <tqregexp.h> #include <kdebug.h> -#include <kapplication.h> +#include <tdeapplication.h> // app includes #include "uniqueid.h" #include "uml.h" diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp index a56aa85c..379e5f77 100644 --- a/umbrello/umbrello/umlviewimageexportermodel.cpp +++ b/umbrello/umbrello/umlviewimageexportermodel.cpp @@ -29,7 +29,7 @@ #include <kdebug.h> #include <klocale.h> #include <ktempfile.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <tdeio/netaccess.h> // application specific includes diff --git a/umbrello/umbrello/uniqueid.cpp b/umbrello/umbrello/uniqueid.cpp index d1f08341..98685229 100644 --- a/umbrello/umbrello/uniqueid.cpp +++ b/umbrello/umbrello/uniqueid.cpp @@ -13,7 +13,7 @@ #include "uniqueid.h" // system includes -#include <kapplication.h> +#include <tdeapplication.h> namespace UniqueID { |