Rename common header files for consistency with class renaming

akregator/src/aboutdata.h

@@ -25,7 +25,7 @@
 #ifndef ABOUTDATA_H
 #define ABOUTDATA_H
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdepimmacros.h>
 
 #define AKREGATOR_VERSION "1.2.9"

akregator/src/addfeeddialog.cpp

@@ -27,7 +27,7 @@
 
 #include <tqcheckbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <klocale.h>
 #include <klineedit.h>

akregator/src/akregator_options.h

@@ -25,7 +25,7 @@
 #ifndef AKREGATOR_OPTIONS_H
 #define AKREGATOR_OPTIONS_H
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 namespace Akregator {

akregator/src/akregator_part.cpp

@@ -23,11 +23,11 @@
     without including the source code for TQt in the source distribution.
 */
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <tdeactionclasses.h>
 #include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeconfigdialog.h>
 #include <tdefiledialog.h>

akregator/src/akregator_view.cpp

@@ -59,7 +59,7 @@
 #include "notificationmanager.h"
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>

akregator/src/articlefilter.cpp

@@ -28,7 +28,7 @@
 #include "article.h"
 #include "shared.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kurl.h>

akregator/src/articleviewer.cpp

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

akregator/src/feediconmanager.cpp

@@ -27,7 +27,7 @@
 #include "feediconmanager.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>

akregator/src/librss/testlibrss.cpp

@@ -2,9 +2,9 @@
 
 #include "image.h"
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 using namespace RSS;

akregator/src/main.cpp

@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 
 #include <dcopref.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <knotifyclient.h>
 #include <kuniqueapplication.h>

akregator/src/mainwindow.cpp

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

akregator/src/mainwindow.h

@@ -29,7 +29,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/browserinterface.h>
 #include <tdeparts/browserextension.h>

akregator/src/nodelist.cpp

@@ -27,7 +27,7 @@
 #include "treenode.h"
 #include "treenodevisitor.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqmap.h>
 #include <tqstring.h>

akregator/src/pageviewer.cpp

@@ -30,7 +30,7 @@
 #include "viewer.h"
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
 #include <tdeconfig.h>

akregator/src/speechclient.cpp

@@ -27,7 +27,7 @@
 #include "utils.h"
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <klocale.h>
 #include <kdebug.h>

akregator/src/tabwidget.cpp

@@ -34,7 +34,7 @@
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <ktabwidget.h>
 #include <ktabbar.h>

akregator/src/tagaction.cpp

@@ -26,7 +26,7 @@
 #include "tag.h"
 #include "tagaction.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 

akregator/src/tagnodelist.cpp

@@ -35,7 +35,7 @@
 #include <tqstring.h>
 #include <tqvaluelist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 
 namespace Akregator {

akregator/src/trayicon.cpp

@@ -25,7 +25,7 @@
 #include "akregatorconfig.h"
 #include "trayicon.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 #include <kiconeffect.h>
 #include <kdebug.h>

akregator/src/viewer.cpp

@@ -24,7 +24,7 @@
 */
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>

certmanager/aboutdata.h

@@ -33,7 +33,7 @@
 #ifndef __ABOUTDATA_H__
 #define __ABOUTDATA_H__
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 class AboutData : public TDEAboutData {
 public:

certmanager/certificatewizardimpl.cpp

@@ -54,7 +54,7 @@
 
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kurlrequester.h>

certmanager/certmanager.cpp

@@ -74,7 +74,7 @@
 #include <tdefiledialog.h>
 #include <kprocess.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <dcopclient.h>

certmanager/conf/configuredialog.cpp

@@ -34,7 +34,7 @@
 #include "configuredialog.h"
 
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 

certmanager/customactions.cpp

@@ -33,7 +33,7 @@
 #include "customactions.h"
 
 #include <tdetoolbar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqlineedit.h>
 #include <tqlabel.h>

certmanager/kwatchgnupg/aboutdata.h

@@ -33,7 +33,7 @@
 #ifndef ABOUTDATA_H
 #define ABOUTDATA_H
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 
 class AboutData : public TDEAboutData {
 public:

certmanager/kwatchgnupg/kwatchgnupgconfig.cpp

@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <kurlrequester.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqframe.h>
 #include <tqlayout.h>

certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp

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

certmanager/kwatchgnupg/main.cpp

@@ -38,7 +38,7 @@
 #include "kwatchgnupgmainwin.h"
 
 #include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kglobal.h>

certmanager/lib/cryptplugfactory.cpp

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

certmanager/lib/cryptplugwrapper.cpp

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

certmanager/lib/kleo/cryptobackendfactory.cpp

@@ -50,7 +50,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <iterator>
 #include <algorithm>

certmanager/lib/kleo/dn.cpp

@@ -39,7 +39,7 @@
 #include "oidmap.h"
 #include "ui/dnattributeorderconfigwidget.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 

certmanager/lib/tests/test_cryptoconfig.cpp

@@ -31,9 +31,9 @@
 
 #include <backends/qgpgme/qgpgmecryptoconfig.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <iostream>
 using namespace std;
 

certmanager/lib/tests/test_gnupgprocessbase.cpp

@@ -38,9 +38,9 @@
 
 #include <backends/qgpgme/gnupgprocessbase.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 

certmanager/lib/tests/test_jobs.cpp

@@ -43,9 +43,9 @@
 
 #include <kdebug.h>
 #include <assert.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 #include <memory>
 

certmanager/lib/tests/test_keygen.cpp

@@ -43,9 +43,9 @@
 
 #include <gpgmepp/keygenerationresult.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 #include <kdebug.h>
 

certmanager/lib/tests/test_keylister.cpp

@@ -40,9 +40,9 @@
 #include <gpgmepp/keylistresult.h>
 #include <gpgmepp/key.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include <tqmessagebox.h>

certmanager/lib/tests/test_keyselectiondialog.cpp

@@ -34,9 +34,9 @@
 #include <ui/keyselectiondialog.h>
 #include <gpgmepp/key.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>

certmanager/lib/tests/test_verify.cpp

@@ -38,9 +38,9 @@
 #include <gpgmepp/verificationresult.h>
 #include <gpgmepp/key.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 
 #include <tqdir.h>
 #include <tqfile.h>

certmanager/lib/ui/backendconfigwidget.cpp

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

certmanager/lib/ui/dnattributeorderconfigwidget.cpp

@@ -43,7 +43,7 @@
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqtoolbutton.h>
 #include <tqlayout.h>

certmanager/lib/ui/keyselectiondialog.cpp

@@ -53,7 +53,7 @@
 
 // KDE
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>

certmanager/main.cpp

@@ -39,8 +39,8 @@
 
 #include <kleo/cryptobackendfactory.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kglobal.h>

kabc/frontend/main.cpp

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

kabc/kabc2mutt/kabc2mutt.cpp

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

kabc/kabc2mutt/main.cpp

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

kabc/kabcdistlistupdater/kabcdistlistupdater.cpp

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

kaddressbook/addresseditwidget.cpp

@@ -38,7 +38,7 @@
 
 #include <tdeaccelmanager.h>
 #include <kactivelabel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>

kaddressbook/addresseeeditorwidget.cpp

@@ -35,7 +35,7 @@
 #include <kabc/resource.h>
 #include <kabc/stdaddressbook.h>
 #include <tdeaccelmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kdebug.h>

kaddressbook/common/locationmap.cpp

@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kglobal.h>

kaddressbook/contacteditorwidgetmanager.cpp

@@ -23,7 +23,7 @@
 
 #include <tqlayout.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <klibloader.h>
 #include <ktrader.h>

kaddressbook/distributionlisteditor.cpp

@@ -30,7 +30,7 @@
 #include <kabc/addressbook.h>
 #include <kabc/resource.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialogbase.h>
 #include <kglobal.h>
 #include <kiconloader.h>

kaddressbook/distributionlistpicker.cpp

@@ -29,7 +29,7 @@
 
 #include <kabc/addressbook.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <tdelistbox.h>
 #include <klocale.h>

kaddressbook/filtereditdialog.cpp

@@ -33,7 +33,7 @@
 #include <tqtooltip.h>
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <kiconloader.h>

kaddressbook/interfaces/xxport.cpp

@@ -27,7 +27,7 @@
 #include <tdeaction.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "xxport.h"
 
 using namespace KAB;

kaddressbook/kabcore.cpp

@@ -43,12 +43,12 @@
 #include <kabc/stdaddressbook.h>
 #include <kabc/vcardconverter.h>
 #include <kabc/resourcefile.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaccelmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tdeactionclasses.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kcmultidialog.h>
 #include <kdebug.h>
 #include <tdeversion.h>

kaddressbook/kabtools.cpp

@@ -23,7 +23,7 @@
 
 #include <kabc/addressbook.h>
 #include <kabc/vcardconverter.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <ktempdir.h>
 

kaddressbook/kaddressbook_options.h

@@ -24,7 +24,7 @@
 #ifndef KADDRESSBOOK_OPTIONS_H
 #define KADDRESSBOOK_OPTIONS_H
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static TDECmdLineOptions kaddressbook_options[] =

kaddressbook/kaddressbook_part.cpp

@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kinstance.h>

kaddressbook/kaddressbootdemain.h

@@ -27,7 +27,7 @@
 #include <tqptrlist.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 
 #include "kaddressbookiface.h"

kaddressbook/kcmconfigs/kcmkabconfig.cpp

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

kaddressbook/kcmconfigs/kcmkabldapconfig.cpp

@@ -25,7 +25,7 @@
 #include <tqframe.h>
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 #include "ldapoptionswidget.h"

kaddressbook/kcmconfigs/ldapoptionswidget.cpp

@@ -29,7 +29,7 @@
 #include <tqtoolbutton.h>
 #include <tqstring.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>

kaddressbook/keywidget.cpp

@@ -26,7 +26,7 @@
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <tdefiledialog.h>

kaddressbook/ldapsearchdialog.cpp

@@ -30,7 +30,7 @@
 #include <tqpushbutton.h>
 
 #include <addresseelineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>

kaddressbook/main.cpp

@@ -27,8 +27,8 @@
 #include <tqstring.h>
 
 #include <kabc/stdaddressbook.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kcrash.h>
 #include <kdebug.h>
 #include <klocale.h>

kaddressbook/nameeditdialog.cpp

@@ -32,7 +32,7 @@
 #include <tqwhatsthis.h>
 
 #include <tdeaccelmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <tdeconfig.h>
 #include <klineedit.h>

kaddressbook/phoneeditwidget.cpp

@@ -32,7 +32,7 @@
 #include <tqstring.h>
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbuttonbox.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>

kaddressbook/printing/detailledstyle.cpp

@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqcheckbox.h>
 #include <kcolorbutton.h>
 #include <tdeconfig.h>

kaddressbook/printing/mikesstyle.cpp

@@ -26,7 +26,7 @@
 #include <tqpainter.h>
 
 #include <kabc/addressee.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <klocale.h>

kaddressbook/printing/printingwizard.cpp

@@ -32,7 +32,7 @@
 #include <tqradiobutton.h>
 
 #include <kabc/addresseelist.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kdialogbase.h>

kaddressbook/printing/printprogress.cpp

@@ -25,7 +25,7 @@
 #include <tqprogressbar.h>
 #include <tqtextbrowser.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <klocale.h>

kaddressbook/undocmds.cpp

@@ -26,7 +26,7 @@
 #include <tqclipboard.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <kabc/resource.h>
 

kaddressbook/viewconfigurewidget.cpp

@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

kaddressbook/views/contactlistview.cpp

@@ -34,7 +34,7 @@
 #include <kglobalsettings.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kurl.h>
 #include <kabc/addressbook.h>
 #include <kabc/addressee.h>

kaddressbook/views/kaddressbooktableview.cpp

@@ -37,7 +37,7 @@
 #include <tqpixmap.h>
 
 #include <kabc/addressbook.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>

kaddressbook/xxport/csvimportdialog.cpp

@@ -32,7 +32,7 @@
 #include <tqtextcodec.h>
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>

kaddressbook/xxport/vcard_xxport.cpp

@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <libtdepim/addresseeview.h>
 
 #include "config.h" // ??

kaddressbook/xxportmanager.cpp

@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktrader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "core.h"
 #include "kablock.h"

kaddressbook/xxportselectdialog.cpp

@@ -23,7 +23,7 @@
 */
 
 #include <kabc/addressbook.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <klocale.h>
 

kalarm/alarmcalendar.cpp

@@ -32,7 +32,7 @@
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 #include <tdeconfig.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeio/netaccess.h>
 #include <tdefileitem.h>
 #include <ktempfile.h>

kalarm/calendarcompat.cpp

@@ -24,8 +24,8 @@
 #include <tqtextstream.h>
 #include <tqstringlist.h>
 
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 
 #include <libkcal/calendar.h>

kalarm/daemon.cpp

@@ -25,7 +25,7 @@
 
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kmessagebox.h>
 #include <dcopclient.h>
 #include <kdebug.h>

kalarm/kalarmapp.cpp

@@ -29,11 +29,11 @@
 #include <tqregexp.h>
 #include <tqfile.h>
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <dcopclient.h>
 #include <kprocess.h>
 #include <ktempfile.h>

kalarm/kalarmd/adapp.cpp

@@ -22,7 +22,7 @@
 
 #include "kalarmd.h"
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 
 #include "alarmdaemon.h"

kalarm/kalarmd/admain.cpp

@@ -25,8 +25,8 @@
 #include <stdlib.h>
 
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kstartupinfo.h>
 
 #include "adapp.h"

kalarm/kalarmd/alarmdaemon.cpp

@@ -28,7 +28,7 @@
 #include <tqfile.h>
 #include <tqdatetime.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <tdeio/netaccess.h>

kalarm/kamail.cpp

@@ -36,7 +36,7 @@
 #include <kmessagebox.h>
 #include <kprocess.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdefileitem.h>
 #include <tdeio/netaccess.h>
 #include <ktempfile.h>

kalarm/lib/shellprocess.cpp

@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 #include <sys/stat.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 

kalarm/main.cpp

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

kalarm/mainwindow.cpp

@@ -39,7 +39,7 @@
 #include <tdeconfig.h>
 #include <kkeydialog.h>
 #include <kedittoolbar.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <dcopclient.h>
 #include <kdebug.h>
 

kalarm/messagewin.cpp

@@ -37,7 +37,7 @@
 #include <kstandarddirs.h>
 #include <tdeaction.h>
 #include <kstdguiitem.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>

kalarm/prefdlg.cpp

@@ -38,8 +38,8 @@
 #include <kstandarddirs.h>
 #include <kshell.h>
 #include <kmessagebox.h>
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kcolorcombo.h>
 #include <kstdguiitem.h>

kalarm/preferences.cpp

@@ -23,7 +23,7 @@
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kmessagebox.h>
 

kalarm/specialactions.cpp

@@ -25,8 +25,8 @@
 #include <tqwhatsthis.h>
 
 #include <klineedit.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kdebug.h>
 

kalarm/traywindow.cpp

@@ -24,9 +24,9 @@
 
 #include <tqtooltip.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdepopupmenu.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>

kalarm/undo.cpp

@@ -23,7 +23,7 @@
 #include <tqobject.h>
 #include <tqstringlist.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>

kandy/src/kandy.h

@@ -28,7 +28,7 @@
 #include <config.h>
 #endif 
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
  
 #include "kandyview.h"

kandy/src/kandy_client.cpp

@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqdatastream.h>
 #include <tqstring.h>

kandy/src/kandyprefsdialog.cpp

@@ -37,7 +37,7 @@
 #include <tqspinbox.h>
 #include <tqdatetime.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>

kandy/src/main.cpp

@@ -24,10 +24,10 @@
 
 #include <tqfile.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>
 #include <kdebug.h>
 #include <kmessagebox.h>

kandy/src/mobilegui.cpp

@@ -38,7 +38,7 @@
 #include <tdefiledialog.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 
 #include <kabc/stdaddressbook.h>

kandy/src/mobilemain.h

@@ -28,7 +28,7 @@
 #include <config.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 
 #include "kandyprefs.h"

karm/karm_part.cpp

@@ -368,7 +368,7 @@ void karmPart::fileSaveAs()
 
 // It's usually safe to leave the factory code alone.. with the
 // notable exception of the TDEAboutData data
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 
 TDEInstance*  karmPartFactory::s_instance = 0L;

karm/karmstorage.cpp

@@ -35,7 +35,7 @@
 #include <tqstringlist.h>
 
 #include "incidence.h"
-#include "kapplication.h"       // kapp
+#include "tdeapplication.h"       // kapp
 #include <kdebug.h>
 #include <kemailsettings.h>
 #include <klocale.h>            // i18n

karm/main.cpp

@@ -1,8 +1,8 @@
 #include <signal.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include "version.h"
 #include "mainwindow.h"

karm/mainwindow.cpp

@@ -9,7 +9,7 @@
 #include <dcopclient.h>
 #include <tdeaccel.h>
 #include <tdeaction.h>
-#include <kapplication.h>       // kapp
+#include <tdeapplication.h>       // kapp
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

karm/plannerparser.h

@@ -32,7 +32,7 @@ test cases:
 #include "taskview.h"
 #include "task.h"
 #include "karmstorage.h"
-#include "kapplication.h"
+#include "tdeapplication.h"
 
 class PlannerParser : public TQXmlDefaultHandler
 {

karm/preferences.cpp

@@ -5,7 +5,7 @@
 #include <tqspinbox.h>
 #include <tqlayout.h>
 
-#include <kapplication.h>       // kapp
+#include <tdeapplication.h>       // kapp
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kemailsettings.h>

karm/task.cpp

@@ -5,7 +5,7 @@
 
 #include <kiconloader.h>
 
-#include "kapplication.h"       // kapp
+#include "tdeapplication.h"       // kapp
 #include "kdebug.h"
 
 #include "event.h"

karm/taskview.cpp

@@ -10,7 +10,7 @@
 #include <tqtimer.h>
 #include <tqxml.h>
 
-#include "kapplication.h"       // kapp
+#include "tdeapplication.h"       // kapp
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>

karm/test/locking.cpp

@@ -3,8 +3,8 @@
 #include <tqstring.h>
 #include <tqfile.h>
 #include <tqdir.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 
 #include <resourcecalendar.h>
 #include <resourcelocal.h>

kitchensync/src/aboutpage.cpp

@@ -21,8 +21,8 @@
 #include <tqfile.h>
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>

kitchensync/src/groupitem.cpp

@@ -18,7 +18,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>

kitchensync/src/main.cpp

@@ -19,8 +19,8 @@
 */
 
 #include <kdebug.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kuniqueapplication.h>
 #include <stdlib.h>
 

kitchensync/src/mainwidget.cpp

@@ -28,7 +28,7 @@
 
 #include <libqopensync/environment.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kinputdialog.h>

kitchensync/src/part.cpp

@@ -22,7 +22,7 @@
 #include <tqvbox.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kinstance.h>

kmail/aboutdata.h

@@ -32,7 +32,7 @@
 #ifndef __KMAIL_ABOUTDATA_H__
 #define __KMAIL_ABOUTDATA_H__
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdepimmacros.h>
 
 namespace KMail {

kmail/accountdialog.cpp

@@ -42,7 +42,7 @@
 #include <kmessagebox.h>
 #include <knuminput.h>
 #include <kseparator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kprotocolinfo.h>
 #include <kiconloader.h>

kmail/accountmanager.cpp

@@ -23,7 +23,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqregexp.h>
 #include <tqvaluelist.h>

kmail/antispamwizard.cpp

@@ -40,7 +40,7 @@
 #include "folderrequester.h"
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>

kmail/configuredialog.cpp

@@ -83,7 +83,7 @@ using KMime::DateFormatter;
 
 // other KDE headers:
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcharsets.h>
 #include <kasciistringtools.h>
 #include <kdebug.h>

kmail/dcoptest.cpp

@@ -3,9 +3,9 @@
 #endif
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include "aboutdata.h"
 
 #include <kmailIface_stub.h>

kmail/folderIface.cpp

@@ -38,7 +38,7 @@
 #include "kmfoldermgr.h"
 #include "kmfolder.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <stdlib.h>

kmail/htmlstatusbar.cpp

@@ -39,7 +39,7 @@
 #ifndef KMAIL_TESTING
 #include "kmkernel.h"
 #else
-#include <kapplication.h>
+#include <tdeapplication.h>
 #endif
 
 #include <klocale.h>

kmail/imapaccountbase.cpp

@@ -50,7 +50,7 @@ using KPIM::ProgressManager;
 #include "kmfoldermgr.h"
 #include "listjob.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <klocale.h>

kmail/index.cpp

@@ -36,7 +36,7 @@
 #include "kmfoldersearch.h"
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqfile.h>
 #include <tqtimer.h>
 #include <tqvaluestack.h>

kmail/kmaccount.cpp

@@ -24,7 +24,7 @@ using KPIM::ProgressManager;
 
 using KMail::FolderJob;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>

kmail/kmacctcachedimap.cpp

@@ -50,7 +50,7 @@ using KMail::AccountManager;
 #include <tdeio/slave.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 #include <tqstylesheet.h>

kmail/kmacctlocal.cpp

@@ -14,7 +14,7 @@ using KPIM::ProgressManager;
 
 #include "kmfoldermgr.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>

kmail/kmacctmaildir.cpp

@@ -13,7 +13,7 @@ using KPIM::BroadcastStatus;
 #include "progressmanager.h"
 using KPIM::ProgressManager;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kdebug.h>

kmail/kmaddrbook.cpp

@@ -23,7 +23,7 @@
 #include "kmaddrbook.h"
 #include "kcursorsaver.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>

kmail/kmail.kcfg

@@ -4,7 +4,7 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   <include>tqtextcodec.h</include>
-  <include>kapplication.h</include>
+  <include>tdeapplication.h</include>
   <kcfgfile name="kmailrc"/>
     <group name="Behaviour">
       <entry name="DelayedMarkAsRead"  type="Bool">

kmail/kmail_options.h

@@ -2,7 +2,7 @@
 #ifndef KMAIL_OPTIONS_H
 #define KMAIL_OPTIONS_H
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 TDECmdLineOptions kmail_options[] =

kmail/kmail_part.cpp

@@ -43,7 +43,7 @@ using KMail::AccountManager;
 #include "recentaddresses.h"
 using TDERecentAddress::RecentAddresses;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/mainwindow.h>
 #include <tdeparts/genericfactory.h>
 #include <knotifyclient.h>

kmail/kmcommands.cpp

@@ -51,7 +51,7 @@
 #include <mimelib/field.h>
 #include <mimelib/mimepp.h>
 #include <mimelib/string.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <tqtextcodec.h>

kmail/kmcomposewin.cpp

@@ -93,7 +93,7 @@ using TDERecentAddress::RecentAddresses;
 #include <tdeio/scheduler.h>
 #include <ktempfile.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstatusbar.h>
 #include <tdeaction.h>
 #include <kstdaction.h>

kmail/kmedit.cpp

@@ -31,7 +31,7 @@ using KPIM::MailListDrag;
 
 #include <ktempfile.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdirwatch.h>
 #include <kiconloader.h>
 

kmail/kmfilterdlg.cpp

@@ -24,7 +24,7 @@ using KMail::FilterImporterExporter;
 #include <klocale.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 #include <tdeconfig.h>
 #include <kicondialog.h>

kmail/kmfoldercachedimap.cpp

@@ -62,7 +62,7 @@ using KMail::ListJob;
 #include "kmcommands.h"
 #include "kmmainwidget.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <kdebug.h>

kmail/kmfolderindex.cpp

@@ -51,7 +51,7 @@
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
 #endif
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcursor.h>
 #include <kmessagebox.h>
 #include <klocale.h>

kmail/kmfoldermaildir.cpp

@@ -22,7 +22,7 @@ using KMail::MaildirJob;
 #include "kmmsgdict.h"
 #include "util.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstaticdeleter.h>

kmail/kmfoldermgr.cpp

@@ -22,7 +22,7 @@
 #include <kmessagebox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "kmmainwin.h"
 #include "kmfiltermgr.h"

kmail/kmfoldertree.cpp

@@ -30,7 +30,7 @@ using KMail::FolderViewToolTip;
 #include <maillistdrag.h>
 using namespace KPIM;
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>

kmail/kmheaders.cpp

@@ -31,7 +31,7 @@ using KPIM::ProgressItem;
 using namespace KPIM;
 #include "messageactions.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaccelmanager.h>
 #include <kglobalsettings.h>
 #include <kmessagebox.h>

kmail/kmkernel.cpp

@@ -56,7 +56,7 @@ using KMail::FolderIface;
 #include "jobscheduler.h"
 #include "templateparser.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <kstaticdeleter.h>
@@ -89,7 +89,7 @@ using KWallet::Wallet;
 
 #include <X11/Xlib.h>
 #include <fixx11h.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kstartupinfo.h>
 
 KMKernel *KMKernel::mySelf = 0;

kmail/kmmainwidget.cpp

@@ -33,7 +33,7 @@
 #include <kcharsets.h>
 #include <knotifyclient.h>
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <ktip.h>
 #include <knotifydialog.h>

kmail/kmmainwin.cpp

@@ -14,7 +14,7 @@
 #include "accountmanager.h"
 #include "kmtransport.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kedittoolbar.h>
 #include <tdeconfig.h>

kmail/kmmessage.cpp

@@ -34,7 +34,7 @@ using KMail::HeaderStrategy;
 #include <kpgpblock.h>
 #include <kaddrbook.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kdebug.h>
 #include <tdeconfig.h>

kmail/kmmsgpartdlg.cpp

@@ -14,9 +14,9 @@
 
 // other KDE includes:
 #include <kmimetype.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kstringvalidator.h>
 #include <kcombobox.h>
 #include <kdebug.h>

kmail/kmreadermainwin.cpp

@@ -27,7 +27,7 @@
 #endif
 
 #include <tqaccel.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kedittoolbar.h>
 #include <klocale.h>
 #include <tdestdaccel.h>

kmail/kmreaderwin.cpp

@@ -89,7 +89,7 @@ using KMail::TeeHtmlWriter;
 #include <dom/dom_string.h>
 #include <dom/dom_exception.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 // for the click on attachment stuff (dnaber):
 #include <kuserprofile.h>
 #include <kcharsets.h>

kmail/kmsender.cpp

@@ -12,7 +12,7 @@ using namespace KMime::Types;
 
 #include <tdeio/passdlg.h>
 #include <tdeio/scheduler.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <tdeversion.h>
 #include <klocale.h>

kmail/kmservertest.cpp

@@ -38,7 +38,7 @@
 #include <kmessagebox.h>
 #include <kdebug.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/scheduler.h>
 #include <tdeio/slave.h>
 #include <tdeio/job.h>

kmail/kmstartup.cpp

@@ -30,8 +30,8 @@
 #include <dcopclient.h>
 #include <kcrash.h>
 #include <kglobal.h>
-#include <kapplication.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdeaboutdata.h>
 #include <kiconloader.h>
 
 #include <errno.h>

kmail/kmsystemtray.cpp

@@ -28,7 +28,7 @@
 using KMail::AccountManager;
 #include "globalsettings.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>

kmail/korghelper.cpp

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

kmail/maildirjob.cpp

@@ -36,7 +36,7 @@
 #include "kmfoldermaildir.h"
 #include "kmfolder.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <tqtimer.h>

kmail/mailsourceviewer.cpp

@@ -35,7 +35,7 @@
 
 #include "mailsourceviewer.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 
 #include <tqregexp.h>

kmail/managesievescriptsdialog.cpp

@@ -10,7 +10,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kinputdialog.h>
 #include <kglobalsettings.h>
 #include <kmessagebox.h>

kmail/mboxjob.cpp

@@ -37,7 +37,7 @@
 #include "kmfoldermbox.h"
 #include "kmfolder.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tqtimer.h>
 #include <tqdatetime.h>

kmail/objecttreeparser.cpp

@@ -92,7 +92,7 @@
 #include <tdehtml_part.h>
 #include <ktempfile.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kmdcodec.h>
@@ -102,7 +102,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqapplication.h>
-#include <kstyle.h>
+#include <tdestyle.h>
 #include <tqbuffer.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>

kmail/recipientseditor.cpp

@@ -31,7 +31,7 @@
 
 #include <libemailfunctions/email.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdecompletionbox.h>
 #include <kdebug.h>
 #include <kinputdialog.h>

kmail/recipientseditortest.cpp

@@ -26,10 +26,10 @@
 
 #include "recipientseditor.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kmessagebox.h>
 #include "aboutdata.h"
 

kmail/searchwindow.cpp

@@ -35,7 +35,7 @@
 #include "messagecopyhelper.h"
 #include "textsource.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstatusbar.h>
 #include <twin.h>

kmail/secondarywindow.cpp

@@ -33,7 +33,7 @@
 
 #include "kmkernel.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 namespace KMail {
 

kmail/transportmanager.cpp

@@ -20,7 +20,7 @@
 
 #include "kmtransport.h"
 #include "kmkernel.h"
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 
 namespace KMail {

kmail/vacationdialog.cpp

@@ -28,7 +28,7 @@ using KMime::HeaderParsing::parseAddressList;
 #include <klocale.h>
 #include <kdebug.h>
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>

kmailcvt/kimportpage.cpp

@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <tqlabel.h>
 

kmailcvt/kmailcvt.cpp

@@ -15,7 +15,7 @@
  ***************************************************************************/
 
 #include "kmailcvt.h"
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <tqpushbutton.h>
 #include <dcopclient.h>
 #include <dcopref.h>

kmailcvt/kmailcvt.h

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

kmailcvt/main.cpp

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

kmobile/kmobile.h

@@ -5,7 +5,7 @@
 #ifndef _KMOBILE_H_
 #define _KMOBILE_H_
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdemainwindow.h>
 #include <ktrader.h>
 

kmobile/main.cpp

@@ -20,8 +20,8 @@
 #include "kmobile.h"
 #include <kuniqueapplication.h>
 #include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const char description[] =

kmobile/testlibkmobile.cpp

@@ -3,7 +3,7 @@
  * Copyright (C) 2003 Helge Deller <deller@kde.org>
  */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <tqdatastream.h>
 #include <tqstring.h>

knode/aboutdata.h

@@ -14,7 +14,7 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
 */
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdepimmacros.h>
 
 #ifndef KNODE_ABOUTDATA_H

knode/articlewidget.cpp

@@ -29,7 +29,7 @@
 
 #include <tdeaction.h>
 #include <kaddrbook.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbookmarkmanager.h>
 #include <kcharsets.h>
 #include <tdehtml_part.h>

knode/knapplication.cpp

@@ -16,7 +16,7 @@
 
 #include <twin.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 
 #include "knode.h"

knode/knarticlefactory.cpp

@@ -19,7 +19,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <twin.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "knarticlefactory.h"
 #include "knglobals.h"

knode/kncleanup.cpp

@@ -22,7 +22,7 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kseparator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include "knfolder.h"

knode/kncomposer.cpp

@@ -46,7 +46,7 @@ using TDERecentAddress::RecentAddresses;
 #include <kurldrag.h>
 #include <tdecompletionbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include "kngroupselectdialog.h"
 #include "utilities.h"
 #include "knglobals.h"

knode/knconfig.cpp

@@ -21,7 +21,7 @@
 #include <ksimpleconfig.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>

knode/knconvert.cpp

@@ -24,7 +24,7 @@
 #include <kstandarddirs.h>
 #include <klineedit.h>
 #include <kprocess.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kpushbutton.h>
 
 #include <kmime_util.h>

knode/knmainwidget.cpp

@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 #include <kstatusbar.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "broadcaststatus.h"
 #include "krsqueezedtextlabel.h"
@@ -62,7 +62,7 @@ using TDERecentAddress::RecentAddresses;
 #include "knscoring.h"
 #include <kpgp.h>
 #include "knmemorymanager.h"
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tdelistviewsearchline.h>
 

knode/knnetaccess.cpp

@@ -23,7 +23,7 @@
 #include <tdeio/job.h>
 #include <tdeio/passdlg.h>
 #include <ksocks.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "knaccountmanager.h"
 #include "knarticle.h"

knode/knode.cpp

@@ -25,7 +25,7 @@
 #include <kiconloader.h>
 #include <kstatusbar.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "broadcaststatus.h"
 #include "krsqueezedtextlabel.h"

knode/knode_options.h

@@ -17,7 +17,7 @@
 #ifndef KNODE_OPTIONS_H
 #define KNODE_OPTIONS_H
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static TDECmdLineOptions knode_options[] =

knode/knode_part.cpp

@@ -31,7 +31,7 @@
 
 #include "sidebarextension.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/genericfactory.h>
 #include <tdeparts/statusbarextension.h>
 #include <knotifyclient.h>

knode/knsearchdialog.cpp

@@ -18,7 +18,7 @@
 #include <tqcheckbox.h>
 
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>

knode/knsourceviewwindow.cpp

@@ -14,7 +14,7 @@
 
 #include <tqaccel.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include "knsourceviewwindow.h"
 #include "knglobals.h"

knode/main.cpp

@@ -14,8 +14,8 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
 */
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 #include "knapplication.h"

knotes/knote.cpp

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

knotes/knoteconfigdlg.cpp

@@ -25,7 +25,7 @@
 #include <tqhgroupbox.h>
 #include <tqtabwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kiconloader.h>

knotes/knotesapp.h

@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqdom.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kxmlguiclient.h>
 
 #include "KNotesAppIface.h"

knotes/knoteslegacy.cpp

@@ -26,7 +26,7 @@
 #include <tqtextstream.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <kurl.h>
 #include <kstandarddirs.h>

knotes/main.cpp

@@ -19,8 +19,8 @@
 *******************************************************************/
 
 #include <kuniqueapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kxerrorhandler.h>
 

kode/kodemain.cpp

@@ -26,9 +26,9 @@
 
 #include <kabc/stdaddressbook.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
@@ -396,8 +396,8 @@ int create( TDECmdLineArgs *args )
   file.setNameSpace( args->getOption( "namespace" ) );
 
   if ( createMain ) {
-    file.addInclude( "kaboutdata.h" );
-    file.addInclude( "kapplication.h" );
+    file.addInclude( "tdeaboutdata.h" );
+    file.addInclude( "tdeapplication.h" );
     file.addInclude( "kdebug" );
     file.addInclude( "klocale" );
     file.addInclude( "kcmdlineargs" );

kode/kwsdl/kung/main.cpp

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

kode/kwsdl/main.cpp

@@ -21,9 +21,9 @@
 
 #include "compiler.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
 

kode/kwsdl/tests/google/main.cc

@@ -1,6 +1,6 @@
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kmdcodec.h>
 
 #include "googlesearch.hh"

kode/kxml_compiler/creator.cpp

@@ -26,11 +26,11 @@
 #include <kode/typedef.h>
 #include <kode/statemachine.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>

kode/kxml_compiler/creator.h

@@ -28,11 +28,11 @@
 #include <kode/typedef.h>
 #include <kode/file.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>

kode/kxml_compiler/kxml_compiler.cpp

@@ -26,11 +26,11 @@
 #include <kode/printer.h>
 #include <kode/typedef.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>

kode/kxml_compiler/parser.cpp

@@ -25,11 +25,11 @@
 #include <kode/printer.h>
 #include <kode/typedef.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>

kode/kxml_compiler/parser.h

@@ -25,11 +25,11 @@
 #include <kode/printer.h>
 #include <kode/typedef.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>

konsolekalendar/konsolekalendar.h

@@ -30,7 +30,7 @@
 
 #include <tqdatetime.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <libkcal/calendarlocal.h>
 #include <libkcal/resourcecalendar.h>

konsolekalendar/main.cpp

@@ -45,8 +45,8 @@
 # endif
 #endif
 
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <tdeconfig.h>

kontact/interfaces/plugin.cpp

@@ -23,7 +23,7 @@
 #include <tqobjectlist.h>
 
 #include <dcopclient.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kglobal.h>
 #include <tdeparts/componentfactory.h>
 #include <kdebug.h>

kontact/interfaces/uniqueapphandler.cpp

@@ -21,8 +21,8 @@
 
 #include "uniqueapphandler.h"
 #include <kstartupinfo.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include "core.h"
 #include <twin.h>
 #include <dcopclient.h>

kontact/plugins/akregator/akregator_plugin.cpp

@@ -26,10 +26,10 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>

kontact/plugins/kaddressbook/kaddressbook_plugin.cpp

@@ -26,7 +26,7 @@
 #include <tqdragobject.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>

kontact/plugins/kitchensync/kitchensync_plugin.cpp

@@ -24,9 +24,9 @@
 
 #include <tqwidget.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>

kontact/plugins/kmail/kcmkmailsummary.cpp

@@ -26,9 +26,9 @@
 
 #include <dcopref.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaccelmanager.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>

kontact/plugins/kmail/kmail_plugin.cpp

@@ -24,7 +24,7 @@
 #include <tqwidget.h>
 
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>

kontact/plugins/kmail/summarywidget.cpp

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

kontact/plugins/knode/knode_plugin.cpp

@@ -26,10 +26,10 @@
 
 #include "core.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeparts/componentfactory.h>
 #include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kdebug.h>

kontact/plugins/knotes/knotes_part.cpp

@@ -22,7 +22,7 @@
 #include <tqpopupmenu.h>
 #include <tqclipboard.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeaction.h>
 #include <kmessagebox.h>

kontact/plugins/knotes/knotes_plugin.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <dcopref.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>

kontact/plugins/knotes/knotetip.cpp

@@ -33,7 +33,7 @@
 #include <tqlayout.h>
 #include <tqtextedit.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobalsettings.h>
 
 #include "knotetip.h"

kontact/plugins/knotes/summarywidget.cpp

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

kontact/plugins/korganizer/journalplugin.cpp

@@ -24,7 +24,7 @@
 
 #include <tqwidget.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>

kontact/plugins/korganizer/kcmkorgsummary.cpp

@@ -27,8 +27,8 @@
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeaccelmanager.h>
 #include <tdeconfig.h>
 #include <kdebug.h>

kontact/plugins/korganizer/korg_uniqueapp.cpp

@@ -24,7 +24,7 @@
 
 #include "core.h"
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstartupinfo.h>
 #include <twin.h>
 

kontact/plugins/korganizer/korganizerplugin.cpp

@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 #include <tqdragobject.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kabc/vcardconverter.h>
 #include <tdeaction.h>
 #include <dcopref.h>

kontact/plugins/korganizer/todoplugin.cpp

@@ -26,7 +26,7 @@
 #include <tqdragobject.h>
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kabc/vcardconverter.h>
 #include <tdeaction.h>
 #include <kdebug.h>

kontact/plugins/kpilot/kpilot_plugin.cpp

@@ -21,7 +21,7 @@
 
 #include "options.h"
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kgenericfactory.h>
 #include <tdeparts/componentfactory.h>
 

kontact/plugins/kpilot/summarywidget.cpp

@@ -33,7 +33,7 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>

kontact/plugins/newsticker/kcmkontactknt.cpp

@@ -31,8 +31,8 @@
 #include <dcopref.h>
 #include <dcopclient.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeaccelmanager.h>
 #include <tdeconfig.h>
 #include <kdebug.h>

kontact/plugins/newsticker/summarywidget.cpp

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

kontact/plugins/specialdates/kcmsdsummary.cpp

@@ -29,8 +29,8 @@
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <tdeaccelmanager.h>
 #include <tdeconfig.h>
 #include <kdebug.h>

kontact/plugins/specialdates/sdsummarywidget.cpp

@@ -32,7 +32,7 @@
 #include <dcopref.h>
 #include <kabc/stdaddressbook.h>
 #include <korganizer/stdcalendar.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <kglobal.h>
 #include <kiconloader.h>

kontact/plugins/specialdates/specialdates_plugin.cpp

@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <klocale.h>

kontact/plugins/summary/kcmkontactsummary.cpp

@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>

kontact/plugins/summary/summaryview_part.cpp

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

kontact/plugins/summary/summaryview_plugin.cpp

@@ -24,7 +24,7 @@
 #include <dcopref.h>
 #include <kgenericfactory.h>
 #include <tdeparts/componentfactory.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdeaction.h>
 
 #include <tqpopupmenu.h>

kontact/plugins/test/test_part.cpp

@@ -33,7 +33,7 @@
 #include <kmessagebox.h>
 #include <klocale.h>
 #include <tdeaction.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
 #include <kdcopservicestarter.h>

kontact/plugins/weather/summarywidget.cpp

@@ -27,7 +27,7 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>

kontact/plugins/weather/weather_plugin.cpp

@@ -18,7 +18,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kgenericfactory.h>
 #include <tdeparts/componentfactory.h>
 

kontact/src/aboutdialog.cpp

@@ -29,7 +29,7 @@
 
 #include <klocale.h>
 #include <kiconloader.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kactivelabel.h>
 #include <ktextbrowser.h>
 

kontact/src/iconsidepane.cpp

@@ -37,7 +37,7 @@
 #include <tqtooltip.h>
 
 #include <tdepopupmenu.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>

kontact/src/kcmkontact.cpp

@@ -26,7 +26,7 @@
 #include "prefs.h"
 
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdelistview.h>
 #include <klocale.h>

kontact/src/main.cpp

@@ -22,8 +22,8 @@
 #include <iostream>
 
 #include <dcopclient.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>

kontact/src/mainwindow.cpp

@@ -34,7 +34,7 @@
 #include <tqwhatsthis.h>
 
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
@@ -65,7 +65,7 @@
 #include <libtdepim/tdefileio.h>
 #include <kcursor.h>
 #include <krun.h>
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kmenubar.h>
 #include <tdestdaccel.h>
 #include <kcmultidialog.h>

kontact/src/profilemanager.cpp

@@ -26,7 +26,7 @@
 
 #include <tdeio/job.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>

korganizer/aboutdata.h

@@ -24,7 +24,7 @@
 #ifndef KORG_ABOUTDATA_H
 #define KORG_ABOUTDATA_H
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <tdepimmacros.h>
 
 namespace KOrg {

korganizer/actionmanager.cpp

@@ -70,7 +70,7 @@
 #include <kstdguiitem.h>
 #include <tdeversion.h>
 #include <tdeactionclasses.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqapplication.h>
 #include <tqcursor.h>

korganizer/freebusymanager.cpp

@@ -56,7 +56,7 @@
 #include <tdeio/jobclasses.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/scheduler.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <klocale.h>
 #include <kstandarddirs.h>

korganizer/koagendaview.cpp

@@ -39,7 +39,7 @@
 #include <tqcursor.h>
 #include <tqbitarray.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>

korganizer/koapp.cpp

@@ -28,7 +28,7 @@
 #include <iostream>
 
 #include <kglobal.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klocale.h>

korganizer/komailclient.cpp

@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <kprocess.h>
 

korganizer/konewstuff.cpp

@@ -21,7 +21,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <libkcal/calendarlocal.h>

korganizer/korgac/alarmdialog.cpp

@@ -36,7 +36,7 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdcopservicestarter.h>
 #include <kiconloader.h>

korganizer/korgac/alarmdockwindow.cpp

@@ -25,7 +25,7 @@
 #include "alarmdockwindow.h"
 #include "koalarmclient.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <klocale.h>

korganizer/korgac/koalarmclient.cpp

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

korganizer/korgac/koalarmclient.h

@@ -28,7 +28,7 @@
 
 #include "alarmclientiface.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqtimer.h>
 #include <tqdatetime.h>

korganizer/korgac/korgacmain.cpp

@@ -27,8 +27,8 @@
 #include <kglobal.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kuniqueapplication.h>
 
 #include "koalarmclient.h"

korganizer/korgac/testalarmdlg.cpp

@@ -24,11 +24,11 @@
 
 #include <tqwidget.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 

korganizer/korganizer_options.h

@@ -26,7 +26,7 @@
 #ifndef KORGANIZER_OPTIONS_H
 #define KORGANIZER_OPTIONS_H
 
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 static const TDECmdLineOptions korganizer_options[] =

korganizer/korgplugins.cpp

@@ -22,11 +22,11 @@
     with any edition of TQt, and distribute the resulting executable,
     without including the source code for TQt in the source distribution.
 */
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <calendar/plugin.h>
 

korganizer/main.cpp

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

korganizer/plugins/datenums/configdialog.cpp

@@ -25,7 +25,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>

korganizer/plugins/exchange/exchange.cpp

@@ -19,7 +19,7 @@
 
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 

korganizer/plugins/exchange/exchangeconfig.cpp

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

korganizer/plugins/exchange/exchangedialog.cpp

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

korganizer/plugins/hebrew/configdialog.cpp

@@ -20,7 +20,7 @@
 #include "configdialog.moc"
 #include <klocale.h>
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>

korganizer/plugins/projectview/koprojectview.cpp

@@ -28,7 +28,7 @@
 #include <tqstrlist.h>
 #include <tqlistview.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>

korganizer/plugins/projectview/projectview.cpp

@@ -19,7 +19,7 @@
 
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>

korganizer/plugins/timespanview/timespanview.cpp

@@ -19,7 +19,7 @@
 
 #include <tqfile.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <klocale.h>

korganizer/timezone.cpp

@@ -25,11 +25,11 @@
 
 #include <tqdatetime.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 
 #include "koprefs.h"

korganizer/urihandler.cpp

@@ -35,7 +35,7 @@ using namespace KCal;
 #include "kmailIface_stub.h"
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <tdefiledialog.h>

korn/boxcontaineritem.cpp

@@ -20,9 +20,9 @@
 
 #include "mailsubject.h"
 
-#include <kaboutapplication.h>
+#include <tdeaboutapplication.h>
 #include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kbugreport.h>
 #include <tdeconfig.h>
 #include <kdebug.h>

korn/dockeditem.cpp

@@ -20,7 +20,7 @@
 
 #include "systemtray.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>

korn/hvitem.cpp

@@ -21,7 +21,7 @@
 #include "label.h"
 
 #include <tdeactioncollection.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kpassivepopup.h>
 #include <tdepopupmenu.h>

korn/kornshell.cpp

@@ -24,7 +24,7 @@
 #include "hvcontainer.h"
 #include "password.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>

korn/main.cpp

@@ -4,8 +4,8 @@
  */
 
 #include"kornapp.h"
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 #include"kornshell.h"

korn/systemtray.cpp

@@ -18,7 +18,7 @@
 
 #include "systemtray.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 

ktnef/gui/ktnefmain.cpp

@@ -28,7 +28,7 @@
 #include <tqpopupmenu.h>
 #include <tdelistview.h>
 #include <klocale.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tqpixmap.h>
 #include <tdestdaccel.h>

ktnef/gui/ktnefview.cpp

@@ -23,7 +23,7 @@
 #include <tqpixmap.h>
 #include <tqtimer.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdebug.h>

ktnef/gui/main.cpp

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

libemailfunctions/tests/testemail.cpp

@@ -19,8 +19,8 @@
 // Test program for libemailfunctions/email.h
 #include "email.h"
 
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <stdio.h>

libkcal/attachmenthandler.cpp

@@ -34,7 +34,7 @@
 #include "incidence.h"
 #include "scheduler.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdefiledialog.h>
 #include <klocale.h>
 #include <kmessagebox.h>

libkcal/calformat.cpp

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

libkcal/convertqtopia.cpp

@@ -23,11 +23,11 @@
 #include "icalformat.h"
 #include "qtopiaformat.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>

libkcal/incidenceformatter.cpp

@@ -42,7 +42,7 @@
 #include <kabc/vcardconverter.h>
 #include <kabc/stdaddressbook.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kemailsettings.h>
 
 #include <klocale.h>

libkcal/tests/readandwrite.cpp

@@ -25,11 +25,11 @@ extern "C" {
 #include "icaltimezone.h"
 }
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>

libkcal/tests/testcalendar.cpp

@@ -19,11 +19,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "calendarlocal.h"
 

libkcal/tests/testcalselectdialog.cpp

@@ -20,8 +20,8 @@
 #include "calselectdialog.h"
 using namespace KCal;
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 #include <kdebug.h>
 

libkcal/tests/testfields.cpp

@@ -19,11 +19,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "calendarlocal.h"
 

libkcal/tests/testincidence.cpp

@@ -19,11 +19,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "icalformat.h"
 #include "event.h"

libkcal/tests/testrecurprevious.cpp

@@ -26,10 +26,10 @@ extern "C" {
 #include "icaltimezone.h"
 }
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqfile.h>
 

libkcal/tests/testrecurrence.cpp

@@ -26,10 +26,10 @@ extern "C" {
 #include "icaltimezone.h"
 }
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqfile.h>
 

libkcal/tests/testrecurrencetype.cpp

@@ -26,10 +26,10 @@ extern "C" {
 #include "icaltimezone.h"
 }
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqfile.h>
 

libkcal/tests/testrecurson.cpp

@@ -26,10 +26,10 @@ extern "C" {
 #include "icaltimezone.h"
 }
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqfile.h>
 

libkcal/tests/testresource.cpp

@@ -23,11 +23,11 @@
 
 #include <kabc/stdaddressbook.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kinputdialog.h>
 #include <tderesources/factory.h>
 

libkcal/tests/testvcalexport.cpp

@@ -29,11 +29,11 @@ extern "C" {
 #include "icaltimezone.h"
 }
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqfile.h>
 #include <tqfileinfo.h>

libkholidays/kholidays.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <tqfile.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 

libkpgp/kpgpui.cpp

@@ -41,7 +41,7 @@
 #include <tdeconfigbase.h>
 #include <tdeconfig.h>
 #include <kprogress.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <twin.h>
 #if KDE_IS_VERSION( 3, 1, 90 )
 #include <kglobalsettings.h>

libkpimexchange/core/exchangeaccount.cpp

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

libkpimexchange/core/exchangeclient.cpp

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

libkpimexchange/core/exchangedownload.cpp

@@ -24,7 +24,7 @@
 #include <tqcstring.h>
 #include <tqregexp.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <kmessagebox.h>

libkpimexchange/core/exchangeprogress.cpp

@@ -24,7 +24,7 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>

libkpimidentities/identitymanager.cpp

@@ -42,7 +42,7 @@ static const char configKeyDefaultIdentity[] = "Default Identity";
 #include <libemailfunctions/email.h> // for static helper functions
 
 #include <kemailsettings.h> // for IdentityEntry::fromControlCenter()
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>

libtdepim/addresseeview.cpp

@@ -29,7 +29,7 @@
 #include <kabc/phonenumber.h>
 #include <kabc/resource.h>
 #include <tdeactionclasses.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kglobal.h>
 #include <kglobalsettings.h>

libtdepim/addressesdialog.cpp

@@ -39,7 +39,7 @@
 #endif
 
 #include <kabc/stdaddressbook.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kiconloader.h>

libtdepim/alarmclient.cpp

@@ -22,7 +22,7 @@
 
 #include "alarmclient.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 

libtdepim/cfgc/autoexample.cpp

@@ -24,11 +24,11 @@
 
 #include <libtdepim/kprefsdialog.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>

libtdepim/cfgc/example.cpp

@@ -21,11 +21,11 @@
 
 #include "exampleprefs_base.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>

libtdepim/completionordereditor.cpp

@@ -46,7 +46,7 @@
 #include <tqvbox.h>
 #include <tqheader.h>
 #include <tqtoolbutton.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 /*

libtdepim/kaddrbook.cpp

@@ -13,7 +13,7 @@
 #include <kabc/distributionlist.h>
 #endif
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <kmessagebox.h>

libtdepim/kcmdesignerfields.cpp

@@ -34,7 +34,7 @@
 #include <tqregexp.h>
 #include <tqtimer.h>
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kglobal.h>

libtdepim/kimportdialog.cpp

@@ -36,7 +36,7 @@
 #include <tqtextstream.h>
 #include <tqvbox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <kinputdialog.h>

libtdepim/komposer/core/core.cpp

@@ -28,7 +28,7 @@
 
 #include <ksettings/dialog.h>
 #include <kplugininfo.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <ktrader.h>
 #include <klibloader.h>

libtdepim/komposer/core/pluginmanager.cpp

@@ -30,7 +30,7 @@
 #include <tqtimer.h>
 #include <tqvaluestack.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeparts/componentfactory.h>
 #include <kplugininfo.h>

libtdepim/komposer/core/prefsmodule.cpp

@@ -21,7 +21,7 @@
 
 #include "prefsmodule.h"
 
-#include <kaboutdata.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <klocale.h>

libtdepim/komposer/core/tests/main.cpp

@@ -19,11 +19,11 @@
  * 02110-1301  USA
  */
 #include "testfactory.h"
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <unistd.h>
 #include <sys/types.h>

libtdepim/komposer/core/tests/testkomposer.cpp

@@ -1,8 +1,8 @@
 #include "core.h"
 
 #include <kplugininfo.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 int main( int argc, char **argv )

libtdepim/komposer/core/tests/testmanager.cpp

@@ -5,8 +5,8 @@
 #include "plugin.h"
 
 #include <kplugininfo.h>
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 using namespace Komposer;

libtdepim/komposer/plugins/default/defaulteditor.cpp

@@ -22,7 +22,7 @@
 #include "core.h"
 
 #include <kgenericfactory.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
 #include <kdebug.h>

libtdepim/komposer/test/test.cpp

@@ -21,8 +21,8 @@
 
 #include "core.h"
 
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdecmdlineargs.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kuniqueapplication.h>

libtdepim/ksubscription.cpp

@@ -21,7 +21,7 @@
 #include <tqtoolbutton.h>
 
 #include <kseparator.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdebug.h>

libtdepim/ktimeedit.h

@@ -31,7 +31,7 @@
 #include <tqdatetime.h>
 #include <tqcombobox.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepimmacros.h>
 
 /**

libtdepim/ldapclient.cpp

@@ -31,7 +31,7 @@
 
 #include <kabc/ldapurl.h>
 #include <kabc/ldif.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>

libtdepim/ldapsearchdialog.cpp

@@ -32,7 +32,7 @@
 #include <tqpushbutton.h>
 
 #include <kabc/addresslineedit.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
 #include <klineedit.h>

libtdepim/maillistdrag.cpp

@@ -24,7 +24,7 @@
 #include <tqbuffer.h>
 #include <tqdatastream.h>
 #include <tqeventloop.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kprogress.h>
 

libtdepim/tdeconfigwizard.cpp

@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <tdeconfigskeleton.h>
 #include <kmessagebox.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqlistview.h>
 #include <tqlayout.h>

libtdepim/tdepartsdesignerplugin/tdepartsdesignerplugin.cpp

@@ -23,7 +23,7 @@
 #include <tdeparts/part.h>
 #include <kmimetype.h>
 #include <tqlayout.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdepimmacros.h>
 
 KPartsGenericPart::KPartsGenericPart( TQWidget* parentWidget, const char* name )

libtdepim/tests/testaddresseelineedit.cpp

@@ -19,11 +19,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "../addresseelineedit.h"
 

libtdepim/tests/testaddresseeselector.cpp

@@ -19,11 +19,11 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include "../addresseeselector.h"
 #include "../addresseeemailselection.h"

libtdepim/tests/testdateedit.cpp

@@ -21,9 +21,9 @@
 
 #include <tqlayout.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <klocale.h>
 

libtdepim/tests/testdistrlist.cpp

@@ -25,11 +25,11 @@ using KPIM::DistributionList;
 
 #include <kabc/stdaddressbook.h>
 #include <kurl.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqdir.h>
 #include <tqfileinfo.h>

libtdepim/tests/testkincidencechooser.cpp

@@ -17,8 +17,8 @@
   Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <klocale.h>
 
 #include <libkcal/event.h>

libtdepim/tests/testlinklocator.cpp

@@ -19,8 +19,8 @@
 // Test program for libtdepim/linklocator.*
 #include <linklocator.h>
 
-#include <kcmdlineargs.h>
-#include <kapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 
 #include <stdio.h>

libtdepim/tests/testwizard.cpp

@@ -23,11 +23,11 @@
 
 #include <tdeconfigwizard.h>
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqlayout.h>
 #include <tqcheckbox.h>

plugins/kmail/bodypartformatter/text_calendar.cpp

@@ -68,7 +68,7 @@
 #include <kdcopservicestarter.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <ktempfile.h>
 #include <kmdcodec.h>
 #include <kmimetype.h>

plugins/kmail/bodypartformatter/text_vcard.cpp

@@ -32,7 +32,7 @@
 
 #include <tqurl.h>
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kstringhandler.h>

plugins/kmail/bodypartformatter/text_xdiff.cpp

@@ -45,7 +45,7 @@
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 
 #include <tqurl.h>
 #include <tqfile.h>

tderesources/egroupware/synchronizer.cpp

@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <tqeventloop.h>
 
 #include <unistd.h>

tderesources/exchange/resourceexchange.cpp

@@ -27,7 +27,7 @@
 #include <tqwidget.h>
 
 #include <kdebug.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kstringhandler.h>
 #include <kglobal.h>
 #include <klocale.h>

tderesources/featureplan/benchmarkfeaturelist.cpp

@@ -22,9 +22,9 @@
 #include "kde-features.h"
 #include "kde-features_parser.h"
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 
 #include <tqfile.h>

tderesources/featureplan/dumpfeaturelist.cpp

@@ -22,9 +22,9 @@
 #include "kde-features.h"
 #include "kde-features_parser.h"
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
-#include <kaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
+#include <tdeaboutdata.h>
 #include <kdebug.h>
 
 #include <tqfile.h>

tderesources/groupwise/soap/ksslsocket.cpp

@@ -27,7 +27,7 @@
 #include <ksslpeerinfo.h>
 #include <ksslcertchain.h>
 #include <ksslcertificatecache.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kmessagebox.h>
 
 #include "ksslsocket.h"

tderesources/groupwise/soap/soapdebug.cpp

@@ -1,8 +1,8 @@
 #include "groupwiseserver.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <ktempfile.h>

tderesources/kolab/kabc/resourcekolab.cpp

@@ -42,7 +42,7 @@
 #include <tdeio/uiserver_stub.h>
 #include <kabc/vcardconverter.h>
 #include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <tqobject.h>

tderesources/kolab/kcal/resourcekolab.cpp

@@ -39,7 +39,7 @@
 
 #include <tdeio/observer.h>
 #include <tdeio/uiserver_stub.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <libtdepim/kincidencechooser.h>
 #include <kabc/locknull.h>

tderesources/kolab/shared/kmailconnection.cpp

@@ -36,7 +36,7 @@
 
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdcopservicestarter.h>
 #include <klocale.h>
 

tderesources/scalix/kabc/resourcescalix.cpp

@@ -41,7 +41,7 @@
 #include <tdeio/observer.h>
 #include <tdeio/uiserver_stub.h>
 #include <tdemainwindow.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 
 #include <tqobject.h>

tderesources/scalix/kcal/resourcescalix.cpp

@@ -35,7 +35,7 @@
 
 #include <tdeio/observer.h>
 #include <tdeio/uiserver_stub.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <dcopclient.h>
 #include <libkcal/icalformat.h>
 #include <libtdepim/kincidencechooser.h>

tderesources/scalix/scalixadmin/main.cpp

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

tderesources/scalix/shared/kmailconnection.cpp

@@ -35,7 +35,7 @@
 
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <kdcopservicestarter.h>
 #include <klocale.h>
 

tderesources/scalix/tdeioslave/scalix.cpp

@@ -21,8 +21,8 @@
 #include <tqapplication.h>
 #include <tqeventloop.h>
 
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tdeio/global.h>

tderesources/slox/testsloxaccounts.cpp

@@ -20,10 +20,10 @@
 
 #include "sloxaccounts.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 
 #include <tqpushbutton.h>
 

wizards/egroupwaremain.cpp

@@ -20,10 +20,10 @@
 
 #include "egroupwarewizard.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 
 static const TDECmdLineOptions options[] =

wizards/exchangemain.cpp

@@ -20,10 +20,10 @@
 
 #include "exchangewizard.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 

wizards/groupwisemain.cpp

@@ -20,10 +20,10 @@
 
 #include "groupwisewizard.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 

wizards/kmailchanges.cpp

@@ -22,7 +22,7 @@
 
 #include "kmailchanges.h"
 
-#include <kapplication.h>
+#include <tdeapplication.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kemailsettings.h>

wizards/kolabmain.cpp

@@ -21,10 +21,10 @@
 
 #include "kolabwizard.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 

wizards/main.cpp

@@ -1,6 +1,6 @@
-#include <kaboutdata.h>
-#include <kapplication.h>
-#include <kcmdlineargs.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 

wizards/scalixmain.cpp

@@ -21,10 +21,10 @@
 
 #include "scalixwizard.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>
 

wizards/sloxmain.cpp

@@ -20,10 +20,10 @@
 
 #include "sloxwizard.h"
 
-#include <kaboutdata.h>
-#include <kapplication.h>
+#include <tdeaboutdata.h>
+#include <tdeapplication.h>
 #include <kdebug.h>
-#include <kcmdlineargs.h>
+#include <tdecmdlineargs.h>
 #include <kglobal.h>
 #include <klocale.h>