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>