Rename common header files for consistency with class renaming

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>
 

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>

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>

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>
 

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>

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"
 

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>

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>

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>

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>

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"

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"

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"

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>

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

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

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

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>

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>

kbabel/catalogmanager/catalogmanagerapp.h

@@ -40,7 +40,7 @@
 
 #include "version.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 
 class CatalogManagerInterface : public CatalogManagerIface

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>

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>

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>

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>
 

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>

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>

kbabel/common/msgfmt.cpp

@@ -32,7 +32,7 @@
 **************************************************************************** */
 #include "msgfmt.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kprocess.h>
 
 #include <tqfileinfo.h>

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>

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

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>

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>

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>
 

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>

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>

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>

kbabel/kbabel/kbabelpref.cpp

@@ -45,7 +45,7 @@
 #include "tqcombobox.h"
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 using namespace KBabel;
 

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>

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>

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>

kbabel/kbabeldict/aboutmoduledlg.h

@@ -35,7 +35,7 @@
 #ifndef ABOUTMODULEDLG_H
 #define ABOUTMODULEDLG_H
 
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 
 
 class AboutModuleDlg : public TDEAboutApplication

kbabel/kbabeldict/kbabeldict.cpp

@@ -32,7 +32,7 @@
 **************************************************************************** */
 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>

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>

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>

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"

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>
 

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"

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>

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>
 

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>

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"

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"

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>

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>
 

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"

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>

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"

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>

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>

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>
 
  

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>
 

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>
 

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>

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>

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>
 

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). */

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

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

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"

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"

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>

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"

kompare/kompareurldialog.cpp

@@ -19,7 +19,7 @@
 
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kurlrequester.h>
 

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>

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>

kompare/libdialogpages/filessettings.cpp

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

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>

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>

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"

kspy/spy.h

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

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>
 

kuiviewer/kuiviewer.h

@@ -27,7 +27,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 
 class TDEToggleAction;

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>

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

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"

scheck/scheck.h

@@ -46,7 +46,7 @@
 
 #include <kdrawutil.h>
 #include <kpixmap.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 
 
 class TQPopupMenu;

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

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>'

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)

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>
 

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"

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"

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"

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"

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>
 

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"

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"

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"

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>

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>

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>

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>

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>

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"

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"

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"

umbrello/umbrello/cmdlineexportallviewsevent.cpp

@@ -16,7 +16,7 @@
 #include <tqstringlist.h>
 
 // kde includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 // app includes

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"

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"

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

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>

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

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>

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"

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>

umbrello/umbrello/kstartuplogo.cpp

@@ -13,7 +13,7 @@
  ***************************************************************************/
 
 #include "kstartuplogo.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqtimer.h>
 

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>

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>

umbrello/umbrello/plugin.cpp

@@ -20,7 +20,7 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 // app includes

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>

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>

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>

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>

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"

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

umbrello/umbrello/uniqueid.cpp

@@ -13,7 +13,7 @@
 #include "uniqueid.h"
 
 // system includes
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 namespace UniqueID {