Rename additional header files to avoid conflicts with KDE4

README

@@ -48,7 +48,7 @@ There is also quite an amount of infrastructure in this package:
 * libkcal: C++ api for the iCalendar and vCalendar formats
 * libkcal/libical: a basic iCalendar protocol implementation, see RFCs 2245,2246
 * libkpimexchange: connecting to Exchange2000 servers
-* kabc/frontend: A GUI frontend for libkabc, not intended for end users.
+* tdeabc/frontend: A GUI frontend for libkabc, not intended for end users.
 * kgantt: lib to display and manage Gantt diagrams used by the project view
           plugin of KOrganizer
 * kdgantt: alternative lib for Gantt diagrams, used by the free/busy view of

akregator/src/actionmanagerimpl.cpp

@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 #include <tdeaction.h>
 #include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeshortcut.h>
 #include <kxmlguifactory.h>

akregator/src/addfeeddialog.cpp

@@ -29,13 +29,13 @@
 
 #include <tdeapplication.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
 #include <kdebug.h>
 #include <ksqueezedtextlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace Akregator {
 

akregator/src/akregator_options.h

@@ -26,7 +26,7 @@
 #define AKREGATOR_OPTIONS_H
 
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace Akregator {
 

akregator/src/akregator_part.cpp

@@ -31,18 +31,18 @@
 #include <tdeconfig.h>
 #include <tdeconfigdialog.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdehtmldefaults.h>
 #include <kinstance.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <tdepopupmenu.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktrader.h>
 #include <tdeio/netaccess.h>
 #include <tdeparts/browserinterface.h>

akregator/src/akregator_view.cpp

@@ -73,8 +73,8 @@
 #include <kinputdialog.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kprocess.h>
 #include <krun.h>

akregator/src/articlelistview.cpp

@@ -34,9 +34,9 @@
 
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <kurl.h>
 

akregator/src/articleviewer.cpp

@@ -30,14 +30,14 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdehtmlview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 #include <kshell.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <libtdepim/tdefileio.h>
 

akregator/src/articleviewer.h

@@ -26,7 +26,7 @@
 #ifndef ARTICLEVIEWER_H
 #define ARTICLEVIEWER_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcolor.h>
 #include <tqfont.h>

akregator/src/configdialog.cpp

@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configdialog.h"
 

akregator/src/feed.cpp

@@ -33,7 +33,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "akregatorconfig.h"

akregator/src/feedlist.cpp

@@ -29,7 +29,7 @@
 #include <tqvaluelist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "article.h"
 #include "feed.h"

akregator/src/feedlistview.cpp

@@ -42,7 +42,7 @@
 #include <kdebug.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemultipledrag.h>
 #include <kstringhandler.h>
 #include <kurldrag.h>

akregator/src/frame.cpp

@@ -27,7 +27,7 @@
 
 #include <tdeactioncollection.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/browserextension.h>
 #include <tdeparts/part.h>
 

akregator/src/main.cpp

@@ -26,7 +26,7 @@
 
 #include <dcopref.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kuniqueapplication.h>
 

akregator/src/mainwindow.cpp

@@ -36,11 +36,11 @@
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kkeydialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/partmanager.h>
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>

akregator/src/mk4storage/feedstoragemk4impl.cpp

@@ -35,7 +35,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 namespace Akregator {

akregator/src/mk4storage/mk4confwidget.cpp

@@ -28,8 +28,8 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 
 namespace Akregator {

akregator/src/mk4storage/mk4plugin.cpp

@@ -24,7 +24,7 @@
 
 #include "mk4plugin.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "storagefactorymk4impl.h"
 #include "storagefactoryregistry.h"

akregator/src/mk4storage/storagefactorymk4impl.cpp

@@ -26,7 +26,7 @@
 //#include "mk4confwidget.h"
 //#include "mk4config.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqwidget.h>

akregator/src/notificationmanager.cpp

@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kstaticdeleter.h>
 #include <kurl.h>

akregator/src/pageviewer.cpp

@@ -34,11 +34,11 @@
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdehtml_settings.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <tdestdaccel.h>

akregator/src/pluginmanager.cpp

@@ -23,8 +23,8 @@ email                : markey@web.de
 
 #include <klibloader.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 using std::vector;
 using Akregator::Plugin;

akregator/src/progressmanager.cpp

@@ -25,7 +25,7 @@
 #include <tqmap.h>
 #include <tqstylesheet.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 #include <libtdepim/progressmanager.h>

akregator/src/propertiesdialog.cpp

@@ -29,7 +29,7 @@
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <tqcheckbox.h>

akregator/src/searchbar.cpp

@@ -30,7 +30,7 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqapplication.h>

akregator/src/simplenodeselector.cpp

@@ -29,7 +29,7 @@
 #include "treenodevisitor.h"
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqmap.h>

akregator/src/speechclient.cpp

@@ -29,7 +29,7 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kcharsets.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 #include <ktrader.h>

akregator/src/storagefactorydummyimpl.cpp

@@ -24,7 +24,7 @@
 #include "storagefactorydummyimpl.h"
 #include "storagedummyimpl.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqwidget.h>

akregator/src/tabwidget.cpp

@@ -40,7 +40,7 @@
 #include <ktabbar.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdehtmlview.h>
 #include <tdehtml_part.h>
 #include <kiconloader.h>

akregator/src/tagnodelist.cpp

@@ -36,7 +36,7 @@
 #include <tqvaluelist.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace Akregator {
 

akregator/src/tagpropertiesdialog.cpp

@@ -23,7 +23,7 @@
 */
 
 #include <kicondialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 

akregator/src/trayicon.cpp

@@ -29,8 +29,8 @@
 #include <twin.h>
 #include <kiconeffect.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <tdepopupmenu.h>

akregator/src/viewer.cpp

@@ -28,8 +28,8 @@
 #include <tdefiledialog.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <krun.h>

certmanager/CMakeLists.txt

@@ -50,7 +50,7 @@ tde_add_executable( kleopatra AUTOMOC
     hierarchyanalyser.cpp certificatewizard.ui certificatewizardimpl.cpp
     certificateinfowidget.ui certificateinfowidgetimpl.cpp
     crlview.cpp storedtransferjob.cpp certlistview.cpp
-  LINK conf-static kleopatra-shared tdeutils-shared kabc-shared
+  LINK conf-static kleopatra-shared tdeutils-shared tdeabc-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 

certmanager/aboutdata.cpp

@@ -36,7 +36,7 @@
 
 #include "aboutdata.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char kleopatra_version[] = "0.40";
 static const char description[] = I18N_NOOP("TDE Key Manager");

certmanager/certificateinfowidgetimpl.cpp

@@ -47,12 +47,12 @@
 #include <gpgmepp/keylistresult.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kprocio.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 // TQt
 #include <tqlistview.h>

certmanager/certificatewizardimpl.cpp

@@ -49,11 +49,11 @@
 #include <gpgmepp/keygenerationresult.h>
 
 // KDE
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <kdialog.h>

certmanager/certmanager.cpp

@@ -75,8 +75,8 @@
 #include <kprocess.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
 #include <tdetoolbar.h>
 #include <kstatusbar.h>
@@ -84,7 +84,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kkeydialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <tdestdaccel.h>

certmanager/conf/appearanceconfigpage.cpp

@@ -32,8 +32,8 @@
 #include "appearanceconfigpage.h"
 #include <tqlayout.h>
 #include "appearanceconfigwidget.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tdepimmacros.h>

certmanager/conf/appearanceconfigwidget.cpp

@@ -43,9 +43,9 @@
 #include <tdelistview.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefontdialog.h>
 #include <kcolordialog.h>
 

certmanager/conf/configuredialog.cpp

@@ -36,7 +36,7 @@
 #include <twin.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ConfigureDialog::ConfigureDialog( TQWidget *parent, const char *name, bool modal )
   : KCMultiDialog( KDialogBase::IconList, i18n( "Configure" ), parent, name, modal )

certmanager/conf/dirservconfigpage.cpp

@@ -34,8 +34,8 @@
 
 #include <kleo/cryptobackendfactory.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 #include <knuminput.h>
@@ -62,7 +62,7 @@ public:
   KURL::List readCurrentList() const {
 
     KURL::List lst;
-    // stolen from kabc/ldapclient.cpp
+    // stolen from tdeabc/ldapclient.cpp
     const uint numHosts = mConfig.readUnsignedNumEntry( "NumSelectedHosts" );
     for ( uint j = 0; j < numHosts; j++ ) {
       const TQString num = TQString::number( j );

certmanager/crlview.cpp

@@ -36,12 +36,12 @@
 
 #include "crlview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>

certmanager/kwatchgnupg/aboutdata.cpp

@@ -32,7 +32,7 @@
 
 #include "aboutdata.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char kwatchgnupg_version[] = "1.0";
 static const char description[] = I18N_NOOP("GnuPG log viewer");

certmanager/kwatchgnupg/kwatchgnupgconfig.cpp

@@ -32,7 +32,7 @@
 
 #include "kwatchgnupgconfig.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>

certmanager/kwatchgnupg/kwatchgnupgmainwin.cpp

@@ -38,8 +38,8 @@
 #include <kleo/cryptoconfig.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kstdaction.h>

certmanager/kwatchgnupg/main.cpp

@@ -39,9 +39,9 @@
 
 #include <kuniqueapplication.h>
 #include <tdecmdlineargs.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

certmanager/kwatchgnupg/tray.cpp

@@ -34,8 +34,8 @@
 #include "kwatchgnupgmainwin.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tqtooltip.h>
 

certmanager/lib/backends/chiasmus/chiasmusbackend.cpp

@@ -42,7 +42,7 @@
 
 #include "kleo/cryptoconfig.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kshell.h>
 #include <kdebug.h>

certmanager/lib/backends/chiasmus/chiasmusjob.cpp

@@ -44,9 +44,9 @@
 #include <gpg-error.h>
 
 #include <kshell.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqtimer.h>
 #include <tqfileinfo.h>

certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp

@@ -39,7 +39,7 @@
 
 #include <klibloader.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 

certmanager/lib/backends/chiasmus/obtainkeysjob.cpp

@@ -40,8 +40,8 @@
 
 #include "kleo/cryptoconfig.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kshell.h>
 
 #include <tqdir.h>

certmanager/lib/backends/chiasmus/symcryptrunprocessbase.cpp

@@ -32,7 +32,7 @@
 
 #include "symcryptrunprocessbase.h"
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include <kshell.h>
 

certmanager/lib/backends/kpgp/kpgpbackendbase.cpp

@@ -41,7 +41,7 @@
 #include "pgp6backend.h"
 #include "gpg1backend.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstring.h>
 

certmanager/lib/backends/qgpgme/qgpgmebackend.cpp

@@ -42,7 +42,7 @@
 #include <gpgmepp/context.h>
 #include <gpgmepp/engineinfo.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqfile.h>

certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp

@@ -34,11 +34,11 @@
 #include <kdebug.h>
 #include <kprocio.h>
 #include <errno.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <assert.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqfile.h>
 #include <stdlib.h>
 #include <tqtextcodec.h>

certmanager/lib/backends/qgpgme/qgpgmeencryptjob.cpp

@@ -45,7 +45,7 @@
 #include <gpgmepp/encryptionresult.h>
 #include <gpgmepp/data.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 

certmanager/lib/backends/qgpgme/qgpgmejob.cpp

@@ -46,7 +46,7 @@
 #include <gpgmepp/context.h>
 #include <gpgmepp/data.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqstring.h>

certmanager/lib/backends/qgpgme/qgpgmekeylistjob.cpp

@@ -43,8 +43,8 @@
 #include <gpgmepp/keylistresult.h>
 #include <gpg-error.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqstringlist.h>

certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp

@@ -36,7 +36,7 @@
 
 #include "qgpgmeprogresstokenmapper.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstring.h>
 

certmanager/lib/backends/qgpgme/qgpgmesignencryptjob.cpp

@@ -45,7 +45,7 @@
 #include <gpgmepp/data.h>
 #include <gpgmepp/key.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 

certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp

@@ -46,7 +46,7 @@
 #include <gpgmepp/data.h>
 #include <gpgmepp/key.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <assert.h>
 

certmanager/lib/cryptplugfactory.cpp

@@ -38,9 +38,9 @@
 #include "cryptplugwrapperlist.h"
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 
 #include <assert.h>

certmanager/lib/cryptplugwrapper.cpp

@@ -62,8 +62,8 @@
 // kde
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 // other

certmanager/lib/kleo/cryptobackendfactory.cpp

@@ -47,9 +47,9 @@
 #include <ui/backendconfigwidget.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 
 #include <iterator>

certmanager/lib/kleo/dn.cpp

@@ -41,7 +41,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstringlist.h>
 #include <tqvaluevector.h>

certmanager/lib/kleo/enum.cpp

@@ -32,7 +32,7 @@
 
 #include "enum.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstring.h>
 #include <tqstringlist.h>

certmanager/lib/kleo/hierarchicalkeylistjob.cpp

@@ -38,7 +38,7 @@
 #include "cryptobackend.h"
 #include "keylistjob.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqstringlist.h>
 #include <tqtl.h>

certmanager/lib/kleo/multideletejob.cpp

@@ -38,7 +38,7 @@
 #include "cryptobackend.h"
 #include "deletejob.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <gpgmepp/key.h>
 #include <gpgmepp/context.h>

certmanager/lib/kleo/tdeconfigbasedkeyfilter.cpp

@@ -37,7 +37,7 @@
 #include "tdeconfigbasedkeyfilter.h"
 
 #include <tdeconfigbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const struct {
   const char * name;

certmanager/lib/tests/test_gnupgprocessbase.cpp

@@ -41,7 +41,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <tqstringlist.h>

certmanager/lib/tests/test_keygen.cpp

@@ -46,7 +46,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <tqmessagebox.h>

certmanager/lib/tests/test_keyselectiondialog.cpp

@@ -37,7 +37,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

certmanager/lib/ui/backendconfigwidget.cpp

@@ -43,9 +43,9 @@
 
 #include <tdelistview.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 

certmanager/lib/ui/cryptoconfigdialog.cpp

@@ -31,7 +31,7 @@
 
 #include "cryptoconfigdialog.h"
 #include "cryptoconfigmodule.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaccelmanager.h>
 
 Kleo::CryptoConfigDialog::CryptoConfigDialog( Kleo::CryptoConfig* config, TQWidget *parent, const char* name )

certmanager/lib/ui/cryptoconfigmodule.cpp

@@ -37,12 +37,12 @@
 #include <kleo/cryptoconfig.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kdebug.h>
 #include <knuminput.h>
 #include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kurlrequester.h>
 
 #include <tqgrid.h>

certmanager/lib/ui/dnattributeorderconfigwidget.cpp

@@ -38,7 +38,7 @@
 
 #include "kleo/dn.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>

certmanager/lib/ui/keyapprovaldialog.cpp

@@ -45,8 +45,8 @@
 #include <cryptplugfactory.h>
 #include <kleo/cryptobackend.h>
 
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kseparator.h>
 
 #include <tqstringlist.h>

certmanager/lib/ui/keyrequester.cpp

@@ -63,11 +63,11 @@
 #include <gpgmepp/keylistresult.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdialog.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 
 // TQt

certmanager/lib/ui/keyselectiondialog.cpp

@@ -52,14 +52,14 @@
 #include <gpgmepp/keylistresult.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 #include <twin.h>
 #include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kactivelabel.h>
 #include <kurl.h>

certmanager/lib/ui/messagebox.cpp

@@ -43,7 +43,7 @@
 
 #include <tdefiledialog.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksavefile.h>
 #include <kguiitem.h>
 #include <kdebug.h>

certmanager/lib/ui/messagebox.h

@@ -33,7 +33,7 @@
 #ifndef __KLEO_UI_MESSAGEBOX_H__
 #define __KLEO_UI_MESSAGEBOX_H__
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace GpgME {
     class SigningResult;

certmanager/lib/ui/passphrasedialog.cpp

@@ -54,7 +54,7 @@
 
 #include <kpassdlg.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>

certmanager/lib/ui/progressdialog.cpp

@@ -37,7 +37,7 @@
 #include <kleo/job.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqtimer.h>
 

certmanager/main.cpp

@@ -41,9 +41,9 @@
 
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 int main( int argc, char** argv )

doc/kaddressbook/index.docbook

@@ -111,7 +111,7 @@ will be displayed:</para>
 <para>&kaddressbook; can use multiple resources for loading and storing
 its contacts. After starting &kaddressbook; for the first time you will have
 a default resource installed that saves all contacts in a vCard file
-under $HOME/.trinity/share/apps/kabc/std.vcf; you can add more resources
+under $HOME/.trinity/share/apps/tdeabc/std.vcf; you can add more resources
 by using the Resource Configuration dialog, which is available in
 <application>kcontrol</application> under
 <guilabel>TDE Components</guilabel>-><guilabel>TDE Resources Configuration</guilabel>:</para>

doc/kpilot/configuration.docbook

@@ -1402,7 +1402,7 @@ filename of the
 vCard file (this will usually be a file that ends in <literal
 role="extension">.vcf</literal>) to sync with, of if it uses the standard
 &kde; address book file, it will be under the
-<filename class="directory">$TDEHOME/share/apps/kabc/</filename>
+<filename class="directory">$TDEHOME/share/apps/tdeabc/</filename>
 folder, where the <filename class="directory">$TDEHOME</filename> environment
 variable (typically <filename class="directory">/home/Login Name/.trinity/</filename>)
 points to the folder that contains your configuration and data for the &kde;

kabc/frontend/main.cpp

@@ -1,7 +1,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "mainWindow.h"

kabc/frontend/mainWindow.ui.h

@@ -10,10 +10,10 @@
 #include <kinputdialog.h>
 #include <tqmessagebox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 using namespace KABC;
 

kabc/kabc2mutt/CMakeLists.txt

@@ -24,6 +24,6 @@ link_directories(
 
 tde_add_executable( kabc2mutt AUTOMOC
   SOURCES kabc2mutt.cpp main.cpp
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )

kabc/kabc2mutt/kabc2mutt.cpp

@@ -17,9 +17,9 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <kabc/distributionlist.h>
+#include <tdeabc/distributionlist.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqregexp.h>
 

kabc/kabc2mutt/kabc2mutt.h

@@ -20,7 +20,7 @@
 #ifndef KABC2MUTT_H
 #define KABC2MUTT_H
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 class KABC2Mutt : public TQObject
 {

kabc/kabc2mutt/main.cpp

@@ -19,7 +19,7 @@
 
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <iostream>
 

kabc/kabcdistlistupdater/kabcdistlistupdater.cpp

@@ -23,11 +23,11 @@
 #include <tdecmdlineargs.h>
 #include <ksimpleconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <libtdepim/distributionlist.h>
 
 static const TDECmdLineOptions options[] =
@@ -38,7 +38,7 @@ static const TDECmdLineOptions options[] =
 
 void convertDistributionLists()
 {
-  KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+  KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
   const TQMap<TQString, TQString> entryMap = cfg.entryMap( "DistributionLists" );
 
   if ( entryMap.isEmpty() ) // nothing to convert

kaddressbook/addresseditwidget.cpp

@@ -48,8 +48,8 @@
 #include <kinputdialog.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kseparator.h>
 
 #include "addresseditwidget.h"

kaddressbook/addresseditwidget.h

@@ -27,8 +27,8 @@
 #include <tqwidget.h>
 
 #include <kdialogbase.h>
-#include <kabc/address.h>
-#include <kabc/addressee.h>
+#include <tdeabc/address.h>
+#include <tdeabc/addressee.h>
 
 #include "addresseeconfig.h"
 #include "typecombo.h"

kaddressbook/addresseeconfig.h

@@ -24,7 +24,7 @@
 #ifndef ADDRESSEECONFIG_H
 #define ADDRESSEECONFIG_H
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <tdeconfig.h>
 
 using namespace KABC;

kaddressbook/addresseeeditorbase.h

@@ -24,7 +24,7 @@
 #ifndef ADDRESSEEEDITORBASE_H
 #define ADDRESSEEEDITORBASE_H
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include <tqwidget.h>
 

kaddressbook/addresseeeditordialog.cpp

@@ -25,7 +25,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "core.h"
 #include "addresseeeditorwidget.h"