Rename additional header files to avoid conflicts with KDE4

CMakeLists.txt

@@ -953,7 +953,7 @@ add_subdirectory( kinit )
 add_subdirectory( tdeprint )
 add_subdirectory( kab )
 add_subdirectory( tderesources )
-add_subdirectory( kabc )
+add_subdirectory( tdeabc )
 add_subdirectory( arts )
 add_subdirectory( interfaces )
 add_subdirectory( kate )

KDE2PORTING.html

@@ -204,9 +204,9 @@ must have created a TDEApplication object before the methods can be used.<P>
 <TR>
   <TD COLSPAN="2">
     <PRE>
-      #include &lt;kglobal.h&gt;
+      #include &lt;tdeglobal.h&gt;
       #include &lt;tdeconfig.h&gt;      // Needed to use TDEConfig
-      #include &lt;klocale.h&gt;      // Needed to use TDELocale
+      #include &lt;tdelocale.h&gt;      // Needed to use TDELocale
       #include &lt;kiconloader.h&gt;  // Needed to use TDEIconLoader
     </PRE>
   </TD>

Mainpage.dox

@@ -49,8 +49,8 @@
         *   (<a target="_top" href="interfaces/html/classes.html">classes</a>)\n
 	*   <i>Defines interfaces for common components so that new implementations
 	*   can be dropped in.</i>
-	* - <a target="_top" href="kabc/html/index.html"><b>kabc</b></a>
+	* - <a target="_top" href="tdeabc/html/index.html"><b>kabc</b></a>
-        *   (<a target="_top" href="kabc/html/classes.html">classes</a>)\n
+        *   (<a target="_top" href="tdeabc/html/classes.html">classes</a>)\n
 	*   <i>Access to the Trinity address book.</i>
 	* - <a target="_top" href="tderesources/html/index.html"><b>tderesources</b></a>
         *   (<a target="_top" href="tderesources/html/classes.html">classes</a>)\n

Makefile.am.in

@@ -39,7 +39,7 @@ potdir = $(kde_includes)
 pot_DATA = kde.pot
 
 messages:
-	cd kabc/scripts && perl ./makeaddressee
+	cd tdeabc/scripts && perl ./makeaddressee
 	find . -type d | grep -v '\.svn' | sed -e 's,$$,/,' > dirs
 	mfs=`find . -name Makefile.am | xargs egrep -l '^messages:'` ;\
 	for dir in $$mfs; do \

arts/kde/kaudioplaystream.cpp

@@ -26,7 +26,7 @@
 #include <artsflow.h>
 #include <soundserver.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqstring.h>

arts/kde/kaudiorecordstream.cpp

@@ -29,7 +29,7 @@
 #include <artsflow.h>
 #include <soundserver.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqstring.h>

arts/kde/kconverttest.cc

@@ -3,7 +3,7 @@
 #include <tqfile.h>
 #include <tqobject.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>

arts/kde/kiotest.cc

@@ -2,7 +2,7 @@
 #include <kmedia2.h>
 #include <tdecmdlineargs.h>
 #include <connect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include "qiomanager.h"

arts/kde/kiotestslow.cc

@@ -2,7 +2,7 @@
 #include <kmedia2.h>
 #include <tdecmdlineargs.h>
 #include <connect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <stdsynthmodule.h>

arts/kde/kvideowidget.cpp

@@ -27,7 +27,7 @@
 #endif
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kvideowidget.h"
 
 

arts/kde/mcop-dcop/kmcop.cpp

@@ -20,7 +20,7 @@
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 #include <tqvaluelist.h>

arts/knotify/knotify.cpp

@@ -52,9 +52,9 @@
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassivepopup.h>
 #include <kiconloader.h>
 #include <kmacroexpander.h>

arts/message/artsmessage.cc

@@ -31,11 +31,11 @@ Gnome, etc. and used instead.
 
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 
 // command line options

configure.in.in

@@ -249,7 +249,7 @@ AC_SUBST(LIBRESOLV)
 AC_SUBST(LIBICE)
 
 AC_SUBST(LIB_KAB, '$(top_builddir)/kab/libkab.la')
-AC_SUBST(LIB_KABC, '$(top_builddir)/kabc/libkabc.la')
+AC_SUBST(LIB_KABC, '$(top_builddir)/tdeabc/libkabc.la')
 AC_SUBST(LIB_TDECORE, '$(top_builddir)/tdecore/libtdecore.la')
 AC_SUBST(LIB_TDEUI, '$(top_builddir)/tdeui/libtdeui.la')
 AC_SUBST(LIB_KIO, '$(top_builddir)/tdeio/libtdeio.la')

interfaces/tdeimproxy/library/tdeimproxy.cpp

@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <kdcopservicestarter.h> 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <kiconloader.h>
 #include <kservice.h>

interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp

@@ -5,10 +5,10 @@
 #include <tqlayout.h>
 #include <tqvgroupbox.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemediaplayer/player.h>
 #include <kmimetype.h>
 #include <tdeparts/componentfactory.h>

interfaces/tdescript/scriptloader.cpp

@@ -21,8 +21,8 @@
 #include <tdeapplication.h>
 #include <tdeparts/part.h>
 #include <tdeparts/componentfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdesktopfile.h>
 #include <kstandarsdirs.h>

interfaces/tdescript/scriptmanager.cpp

@@ -5,8 +5,8 @@
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 //using namespace KScriptInterface;

interfaces/tdetexteditor/CMakeLists.txt

@@ -90,7 +90,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 0.0.0
-  LINK tdeui-shared kabc-shared tdeparts-shared
+  LINK tdeui-shared tdeabc-shared tdeparts-shared
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${LIB_INSTALL_DIR}
 )

interfaces/tdetexteditor/Makefile.am

@@ -46,7 +46,7 @@ servicetype_DATA = tdetexteditor.desktop tdetexteditoreditor.desktop tdetextedit
 kcm_tdetexteditor_DATA = kcm_tdetexteditor.desktop
 kcm_tdetexteditordir = $(kde_datadir)/kcm_componentchooser
 
-templateinterface.lo: $(top_builddir)/kabc/addressee.h
+templateinterface.lo: $(top_builddir)/tdeabc/addressee.h
 
 include ../../admin/Doxyfile.am
 

interfaces/tdetexteditor/editorchooser.cpp

@@ -6,7 +6,7 @@
 #include <tdeconfig.h>
 #include <tqstringlist.h>
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tdeapplication.h>
 #include <tqlayout.h>

interfaces/tdetexteditor/templateinterface.cpp

@@ -22,11 +22,11 @@
 #include <addressee.h>
 #include <addresseedialog.h>
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqdatetime.h>
 #include <tqregexp.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcalendarsystem.h>
 #include <unistd.h>
 

interfaces/terminal/test/main.cc

@@ -8,7 +8,7 @@
 #include <tdeapplication.h>
 #include <tqdir.h>
 #include <assert.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <cassert>
 #include "main.h"
 #include "main.moc"

kab/addressbook.cc

@@ -22,11 +22,11 @@
 #include <tqstringlist.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 extern "C" {
 #include <sys/stat.h>

kab/kabapi.cc

@@ -18,8 +18,8 @@
 
 #include "kabapi.h"
 #include <tdelistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 

kate/part/kateautoindent.cpp

@@ -27,7 +27,7 @@
 #include "katejscript.h"
 #include "kateview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 

kate/part/katebookmarks.cpp

@@ -23,7 +23,7 @@
 #include "katedocument.h"
 #include "kateview.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdepopupmenu.h>
 #include <kstringhandler.h>

kate/part/katebuffer.cpp

@@ -31,7 +31,7 @@
 #include "kateautoindent.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 
 #include <tqpopupmenu.h>

kate/part/katecmds.cpp

@@ -32,7 +32,7 @@
 #include "../interfaces/katecmd.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kshellcompletion.h>
 

kate/part/kateconfig.cpp

@@ -29,9 +29,9 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcharsets.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kfinddialog.h>
 #include <kreplacedialog.h>
 #include <kinstance.h>

kate/part/katedialogs.cpp

@@ -53,15 +53,15 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdefontdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kkeybutton.h>
 #include <kkeydialog.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmimetypechooser.h>
 #include <knuminput.h>
 #include <tdeparts/componentfactory.h>
@@ -72,7 +72,7 @@
 #include <krun.h>
 #include <kseparator.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>

kate/part/katedocument.cpp

@@ -49,24 +49,24 @@
 
 #include <tdeparts/event.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <tdepopupmenu.h>
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <kiconloader.h>
 #include <kxmlguifactory.h>
 #include <kdialogbase.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <klibloader.h>
 #include <kdirwatch.h>
 #include <twin.h>
 #include <kencodingfiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
 

kate/part/katedocument.h

@@ -38,7 +38,7 @@
 #include <dcopobject.h>
 
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqintdict.h>
 #include <tqmap.h>

kate/part/katedocumenthelpers.cpp

@@ -25,7 +25,7 @@
 #include "kateview.h"
 
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 KateBrowserExtension::KateBrowserExtension( KateDocument* doc )
 : KParts::BrowserExtension( doc, "katepartbrowserextension" ),

kate/part/katefactory.cpp

@@ -34,7 +34,7 @@
 #include "../interfaces/katecmd.h"
 
 #include <kvmallocator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdirwatch.h>
 #include <kstaticdeleter.h>
 

kate/part/katefiletype.cpp

@@ -32,7 +32,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <tqregexp.h>

kate/part/katefont.cpp

@@ -21,7 +21,7 @@
 
 #include "katefont.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqfontinfo.h>
 

kate/part/katehighlight.cpp

@@ -33,16 +33,16 @@
 #include "kateconfig.h"
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kregexp.h>
 #include <tdepopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 #include <tdeapplication.h>
 

kate/part/katejscript.cpp

@@ -35,8 +35,8 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 
 #include <kjs/function_object.h>

kate/part/kateluaindentscript.cpp

@@ -32,8 +32,8 @@
 #include <kstandarddirs.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C" {
 #include <lua.h> 

kate/part/kateprinter.cpp

@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <kdialog.h> // for spacingHint()
 #include <tdefontdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprinter.h>
 #include <kurl.h>
 #include <kuser.h> // for loginName

kate/part/kateschema.cpp

@@ -27,7 +27,7 @@
 #include "kateview.h"
 #include "katerenderer.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
@@ -35,7 +35,7 @@
 #include <tdefontdialog.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kcolordialog.h>
 #include <tdeapplication.h>

kate/part/katesearch.cpp

@@ -31,9 +31,9 @@
 #include "kateconfig.h"
 #include "katehighlight.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstringhandler.h>
 #include <kdebug.h>
 #include <kfinddialog.h>

kate/part/katespell.cpp

@@ -31,7 +31,7 @@
 #include <tdespell.h>
 #include <ksconfig.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 KateSpell::KateSpell( KateView* view )
   : TQObject( view )

kate/part/katesyntaxdocument.cpp

@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 
 #include <tqfile.h>

kate/part/katetextline.cpp

@@ -23,7 +23,7 @@
 #include "katetextline.h"
 #include "katerenderer.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqregexp.h>
 

kate/part/kateview.cpp

@@ -57,10 +57,10 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kxmlguifactory.h>
@@ -68,7 +68,7 @@
 #include <klibloader.h>
 #include <kencodingfiledialog.h>
 #include <tdemultipledrag.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ksavefile.h>
 
 #include <tqfont.h>

kate/part/kateviewhelpers.cpp

@@ -33,10 +33,10 @@
 #include "kateviewinternal.h"
 
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 #include <tdepopupmenu.h>
 

kate/part/kateviewinternal.cpp

@@ -38,7 +38,7 @@
 #include <kcursor.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
 
 #include <tqstyle.h>

kate/part/test_regression.cpp

@@ -45,7 +45,7 @@
 #include <tdeio/job.h>
 #include <tdemainwindow.h>
 #include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqcolor.h>
 #include <tqcursor.h>

kate/plugins/autobookmarker/autobookmarker.cpp

@@ -34,7 +34,7 @@
 #include <kgenericfactory.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kmimetypechooser.h>
 #include <kprocess.h>

kate/plugins/insertfile/insertfileplugin.cpp

@@ -28,10 +28,10 @@
 #include <tdeaction.h>
 #include <tdefiledialog.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include <tqfile.h>

kate/plugins/isearch/ISearchPlugin.cpp

@@ -21,7 +21,7 @@
 #include <tqstyle.h>
 #include <tqpopupmenu.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>

kate/plugins/kdatatool/kate_kdatatool.cpp

@@ -29,7 +29,7 @@
 #include <tdepopupmenu.h>
 #include <tdetexteditor/viewcursorinterface.h>
 #include <tdetexteditor/editinterface.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 //END includes
 
 

kate/plugins/wordcompletion/docwordcompletion.cpp

@@ -37,7 +37,7 @@
 #include <tdeconfig.h>
 #include <kdialog.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <knotifyclient.h>
 #include <tdeparts/part.h>

kded/kbuildimageiofactory.cpp

@@ -20,10 +20,10 @@
 #include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 #include <kimageiofactory.h>

kded/kbuildprotocolinfofactory.cpp

@@ -21,11 +21,11 @@
 #include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 KBuildProtocolInfoFactory::KBuildProtocolInfoFactory() :

kded/kbuildservicefactory.cpp

@@ -23,10 +23,10 @@
 #include "kresourcelist.h"
 #include "kmimetype.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <assert.h>
 

kded/kbuildservicegroupfactory.cpp

@@ -21,11 +21,11 @@
 #include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 KBuildServiceGroupFactory::KBuildServiceGroupFactory() :

kded/kbuildservicetypefactory.cpp

@@ -21,11 +21,11 @@
 #include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <kdesktopfile.h>
 

kded/kded.cpp

@@ -38,8 +38,8 @@
 #include <kuniqueapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kdirwatch.h>

kded/khostname.cpp

@@ -30,9 +30,9 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <kde_file.h>

kded/tde-menu.cpp

@@ -26,8 +26,8 @@
 #include "tdeaboutdata.h"
 #include "tdeapplication.h"
 #include "tdecmdlineargs.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
-#include "klocale.h"
+#include "tdelocale.h"
 #include "kservice.h"
 #include "kservicegroup.h"
 #include "kstandarddirs.h"

kded/tdebuildsycoca.cpp

@@ -42,12 +42,12 @@
 #include <assert.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <kstandarddirs.h>
 #include <ksavefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kcrash.h>
@@ -55,7 +55,7 @@
 #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build 
                         // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw".
 # include <tqlabel.h>
-# include <kmessagebox.h>
+# include <tdemessagebox.h>
   bool silent;
   bool showprogress;
 #endif

kded/vfolder_menu.cpp

@@ -23,7 +23,7 @@
 #include <stdlib.h> // getenv
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kservice.h>
 #include <kde_file.h>

kdewidgets/CMakeLists.txt

@@ -61,6 +61,6 @@ add_custom_command( OUTPUT kdewidgets.cpp
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer
 )

kdewidgets/kde.widgets

@@ -272,7 +272,7 @@ Group=Display (KDE)
 ConstructorArgs=(parent, 210, 16)
 
 [KABC::LdapConfigWidget]
-IncludeFile=kabc/ldapconfigwidget.h
+IncludeFile=tdeabc/ldapconfigwidget.h
 ToolTip=A widget which allows the user to set up LDAP connection parameters
 Group=Input (KDE)
 ConstructorArgs=(KABC::LdapConfigWidget::W_ALL, parent, name)

kdewidgets/tests/test.widgets

@@ -261,7 +261,7 @@ Group=Display (KDE)
 ConstructorArgs=(parent, 210, 16)
 
 [KABC::AddressLineEdit]
-IncludeFile=kabc/addresslineedit.h
+IncludeFile=tdeabc/addresslineedit.h
 ToolTip=A lineedit with LDAP and kabc completion.
 Group=Input (KDE)
 ConstructorArgs=(parent, true, name)

kdoctools/meinproc.cpp

@@ -19,7 +19,7 @@
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <stdlib.h>
 #include <kdebug.h>

kdoctools/tdeio_help.cpp

@@ -25,8 +25,8 @@
 
 #include <kdebug.h>
 #include <kurl.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 

kdoctools/xslt.cpp

@@ -12,7 +12,7 @@
 #include <xslt.h>
 #include <kinstance.h>
 #include "tdeio_help.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <kfilterbase.h>
 #include <kfilterdev.h>

kimgio/dds.cpp

@@ -24,7 +24,7 @@
 #include <tqimage.h>
 #include <tqdatastream.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <math.h> // sqrtf

kimgio/eps.cpp

@@ -6,7 +6,7 @@
 #include <tqpainter.h>
 #include <tqprinter.h>
 #include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 #include "eps.h"
 

kimgio/exr.cpp

@@ -35,7 +35,7 @@
 
 #include <kurl.h>
 #include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 

kimgio/gimp.h

@@ -21,7 +21,7 @@
  *
  */
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 /*
  * These are the constants and functions I extracted from The GIMP source

kimgio/hdr.cpp

@@ -14,7 +14,7 @@
 #include <tqdatastream.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 typedef TQ_UINT8 uchar;
 

kimgio/jp2.cpp

@@ -12,7 +12,7 @@
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
 #endif
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tqcolor.h>
 #include <tqcstring.h>
 #include <tqfile.h>

kinit/autostart.cpp

@@ -24,7 +24,7 @@
 
 #include <tdeconfig.h>
 #include <kdesktopfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <stdlib.h>

kinit/kinit.cpp

@@ -54,11 +54,11 @@
 #include <tqfont.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <klibloader.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
@@ -68,7 +68,7 @@
 #endif
 
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#include <kstartupinfo.h> // schroder
+#include <tdestartupinfo.h> // schroder
 #endif
 
 #include <tdeversion.h>

kinit/tdelauncher.cpp

@@ -32,16 +32,16 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kprotocolinfo.h>
 #include <krun.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #if defined Q_WS_X11 && ! defined K_WS_QTONLY
-#include <kstartupinfo.h> // schroder
+#include <tdestartupinfo.h> // schroder
 #endif
 
 

kinit/tdelauncher_main.cpp

@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <tqcstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "tdelauncher_cmds.h"
 

knewstuff/downloaddialog.cpp

@@ -21,12 +21,12 @@
 #include "downloaddialog.h"
 #include "downloaddialog.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>

knewstuff/engine.cpp

@@ -25,8 +25,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "knewstuff.h"

knewstuff/entry.cpp

@@ -23,8 +23,8 @@
 #include <tqptrdict.h>
 #include <tqwindowdefs.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KNS;
 

knewstuff/ghns.cpp

@@ -28,7 +28,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kdialog.h>

knewstuff/knewstuff.cpp

@@ -21,7 +21,7 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "engine.h"

knewstuff/knewstuffbutton.cpp

@@ -18,7 +18,7 @@
 */
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "downloaddialog.h"
 #include "knewstuffbutton.h"

knewstuff/knewstuffgeneric.cpp

@@ -24,11 +24,11 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktar.h>
 
 #include "entry.h"

knewstuff/knewstuffsecure.cpp

@@ -18,10 +18,10 @@
 //kde includes
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 #include <ktempdir.h>

knewstuff/provider.cpp

@@ -21,9 +21,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqptrdict.h>
 #include <tqwindowdefs.h>

knewstuff/providerdialog.cpp

@@ -23,8 +23,8 @@
 #include <tqlabel.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "engine.h"
 #include "provider.h"

knewstuff/security.cpp

@@ -22,9 +22,9 @@
  //kde includes
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kprocio.h>
 

knewstuff/tdehotnewstuff.cpp

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

knewstuff/testnewstuff.cpp

@@ -27,7 +27,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kdialog.h>

knewstuff/uploaddialog.cpp

@@ -27,10 +27,10 @@
 #include <ktextedit.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kuser.h>

kstyles/highcontrast/config/highcontrastconfig.cpp

@@ -28,8 +28,8 @@ DEALINGS IN THE SOFTWARE.
 #include <tqlayout.h>
 #include <tqsettings.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "highcontrastconfig.h"
 

kstyles/klegacy/klegacystyle.cpp

@@ -24,7 +24,7 @@
 
 #include "klegacystyle.h"
 #include "klegacystyle.moc"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #define INCLUDE_MENUITEM_DEF

kstyles/klegacy/plugin.cpp

@@ -1,5 +1,5 @@
 #include "klegacystyle.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C" {
     TDEStyle* allocate();

kstyles/kthemestyle/kthemestyle.cpp

@@ -53,7 +53,7 @@ Port version 0.9.7
 #include <tqpalette.h>
 #include <tqtabbar.h>
 #include <tqtoolbutton.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdrawutil.h>
 #include <tqdrawutil.h>
 #include <tqprogressbar.h>

kstyles/plastik/config/plastitdeconf.cpp

@@ -30,8 +30,8 @@ DEALINGS IN THE SOFTWARE.
 #include <tqsettings.h>
 #include <tqcolor.h>
 #include <tqgroupbox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolorbutton.h>
 #include <kdemacros.h>
 

kstyles/utils/installtheme/main.cpp

@@ -27,8 +27,8 @@
 
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 

kstyles/web/plugin.cpp

@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include "webstyle.h"
 
 extern "C"

kstyles/web/webstyle.cpp

@@ -34,7 +34,7 @@
 
 #include <tdeapplication.h>
 #include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

libtdemid/deviceman.cc

@@ -67,7 +67,7 @@
 
 #if 1
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #endif
 

libtdescreensaver/main.cpp

@@ -24,8 +24,8 @@
 #include <signal.h>
 
 #include <tqdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>

networkstatus/connectionmanager.cpp

@@ -20,8 +20,8 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 
 #include "clientiface_stub.h"

networkstatus/networkstatusindicator.cpp

@@ -23,7 +23,7 @@
 #include <tqlabel.h>
 #include <tqtooltip.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "connectionmanager.h"
 

tdeabc/CMakeLists.txt

@@ -53,14 +53,14 @@ install( FILES
     ldapclient.h addresseelist.h locknull.h ldif.h
     ldapurl.h ldapconfigwidget.h sortmode.h
     ${CMAKE_CURRENT_BINARY_DIR}/addressee.h
-  DESTINATION ${INCLUDE_INSTALL_DIR}/kabc )
+  DESTINATION ${INCLUDE_INSTALL_DIR}/tdeabc )
 
 
 ##### other data ################################
 
 install( FILES tdeab2tdeabc.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
 install( FILES kabc_manager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources )
-install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/kabc )
+install( FILES countrytransl.map DESTINATION ${DATA_INSTALL_DIR}/tdeabc )
 
 
 ##### generated files ###########################
@@ -80,9 +80,9 @@ add_custom_command(
 )
 
 
-##### kabc ######################################
+##### tdeabc ######################################
 
-set( target kabc )
+set( target tdeabc )
 
 set( ${target}_SRCS
   address.cpp addressbook.cpp addressee.cpp addresseedialog.cpp
@@ -118,6 +118,6 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK kab-static kabc-shared
+  LINK kab-static tdeabc-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )

tdeabc/HOWTO

@@ -96,7 +96,7 @@ a special class KABC::StdAddressBook, which loads all resources of the standard
 address book of the user automatically. You can use it the following way:
 
 
-     #include <kabc/stdaddressbook.h>
+     #include <tdeabc/stdaddressbook.h>
 
  1:  KABC::AddressBook *ab = KABC::StdAddressBook::self();
  2:  KABC::AddressBook::Iterator it;
@@ -125,8 +125,8 @@ class KABC::AddressBook and handle the resource stuff manually.
 The following code will create a file resource and save a contact into it:
 
 
-     #include <kabc/addressbook.h>
+     #include <tdeabc/addressbook.h>
-     #include <kabc/resourcefile.h>
+     #include <tdeabc/resourcefile.h>
 
  1:  KABC::AddressBook ab;
  2:
@@ -320,8 +320,8 @@ track of all available distribution lists and the latter one is the
 representation of one list.
 
 
-     #include <kabc/distributionlist.h>
+     #include <tdeabc/distributionlist.h>
-     #include <kabc/stdaddressbook.h>
+     #include <tdeabc/stdaddressbook.h>
 
  1:  KABC::DistributionListManager manager( KABC::StdAddressBook::self() );
  2:
@@ -344,7 +344,7 @@ In the first line a KABC::DistributionListManager is created. The manager takes
 a pointer to a KABC::AddressBook, because he has to resolve the stored uids to
 currently available email addresses.
 In line 4 the manager loads all distribution lists from the central config file
-$HOME/.trinity/share/apps/kabc/distlists.
+$HOME/.trinity/share/apps/tdeabc/distlists.
 The next line queries the names of all available distribution lists, which are
 used in line 9 to retrieve a pointer to the specific list.
 Now that you have a KABC::DistributionList object, you can performe the
@@ -357,13 +357,13 @@ following actions on it:
 
 In line 12 we query all email addresses of every resource and print them out.
 
-<kabc/distributionlist.h> contains also the declaration for the class
+<tdeabc/distributionlist.h> contains also the declaration for the class
 KABC::DistributionListWatcher. This class exists only once per application and
 its only job is to emit a signal as soon as the distribution list file has
 changed. So to make your application aware of changes use the following code:
 
 
-     #include <kabc/distributionlist.h>
+     #include <tdeabc/distributionlist.h>
 
  1:  connect( KABC::DistributionListWatcher::self(), SIGNAL( changed() ),
  2:           this, SLOT( slotDistributionListChanged() ) );

tdeabc/address.cpp

@@ -22,7 +22,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
@@ -521,7 +521,7 @@ TQString Address::countryToISO( const TQString &cname )
     return it.data();
 
   TQString mapfile = TDEGlobal::dirs()->findResource( "data", 
-          TQString::fromLatin1( "kabc/countrytransl.map" ) );
+          TQString::fromLatin1( "tdeabc/countrytransl.map" ) );
 
   TQFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {
@@ -551,7 +551,7 @@ TQString Address::ISOtoCountry( const TQString &ISOname )
     return TQString::null;
 
   TQString mapfile = TDEGlobal::dirs()->findResource( "data", 
-          TQString::fromLatin1( "kabc/countrytransl.map" ) );
+          TQString::fromLatin1( "tdeabc/countrytransl.map" ) );
 
   TQFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {

tdeabc/addressbook.cpp

@@ -24,9 +24,9 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "errorhandler.h"

tdeabc/addresseedialog.cpp

@@ -23,7 +23,7 @@
 #include <tqgroupbox.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "stdaddressbook.h"

tdeabc/addresseehelper.cpp

@@ -20,7 +20,7 @@
 #include <tqapplication.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "addresseehelper.h"
 

tdeabc/addresslineedit.cpp

@@ -40,8 +40,8 @@
 #include <tdestdaccel.h>
 #include <kurldrag.h>
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
-#include <kabc/distributionlist.h>
+#include <tdeabc/distributionlist.h>
 #include "ldapclient.h"
 
 #include <kdebug.h>

tdeabc/distributionlist.cpp

@@ -185,7 +185,7 @@ TQStringList DistributionListManager::listNames()
 
 bool DistributionListManager::load()
 {
-  KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+  KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
 
   TQMap<TQString,TQString> entryMap = cfg.entryMap( "DistributionLists" );
   cfg.setGroup( "DistributionLists" );
@@ -233,7 +233,7 @@ bool DistributionListManager::save()
 {
   kdDebug(5700) << "DistListManager::save()" << endl;
 
-  KSimpleConfig cfg( locateLocal( "data", "kabc/distlists" ) );
+  KSimpleConfig cfg( locateLocal( "data", "tdeabc/distlists" ) );
 
   cfg.deleteGroup( "DistributionLists" );
   cfg.setGroup( "DistributionLists" );
@@ -273,7 +273,7 @@ DistributionListWatcher::DistributionListWatcher()
  : TQObject( tqApp, "DistributionListWatcher" )
 {
   mDirWatch = new KDirWatch;
-  mDirWatch->addFile( locateLocal( "data", "kabc/distlists" ) );
+  mDirWatch->addFile( locateLocal( "data", "tdeabc/distlists" ) );
   
   connect( mDirWatch, TQT_SIGNAL( dirty( const TQString& ) ), TQT_SIGNAL( changed() ) );
   mDirWatch->startScan();

tdeabc/distributionlistdialog.cpp

@@ -27,9 +27,9 @@
 #include <tqbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "addressbook.h"
 #include "addresseedialog.h"

tdeabc/distributionlisteditor.cpp

@@ -26,7 +26,7 @@
 #include <tqradiobutton.h>
 
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "addressbook.h"

tdeabc/errorhandler.cpp

@@ -21,8 +21,8 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqapplication.h>
 

tdeabc/formatfactory.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
@@ -56,7 +56,7 @@ FormatFactory::FormatFactory()
   info->descriptionLabel = i18n( "vCard Format" );
   mFormatList.insert( "vcard", info );
 
-  const TQStringList list = TDEGlobal::dirs()->findAllResources( "data" ,"kabc/formats/*.desktop", true, true );
+  const TQStringList list = TDEGlobal::dirs()->findAllResources( "data" ,"tdeabc/formats/*.desktop", true, true );
   for ( TQStringList::ConstIterator it = list.begin(); it != list.end(); ++it )
   {
     KSimpleConfig config( *it, true );

tdeabc/formats/CMakeLists.txt

@@ -29,7 +29,7 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES binary.desktop DESTINATION ${DATA_INSTALL_DIR}/kabc/formats )
+install( FILES binary.desktop DESTINATION ${DATA_INSTALL_DIR}/tdeabc/formats )
 
 
 ##### kabcformat_binary #########################
@@ -42,6 +42,6 @@ set( ${target}_SRCS
 
 tde_add_kpart( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )

tdeabc/formats/Makefile.am

@@ -6,7 +6,7 @@ kabcformat_binary_la_SOURCES = binaryformat.cpp
 kabcformat_binary_la_LDFLAGS =  -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \
                                 -no-undefined
 kabcformat_binary_la_LIBADD  = $(LIB_KABC) $(LIB_QT) $(LIB_TDECORE)
-kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+kabcformat_binary_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 # these are the headers for your project
 noinst_HEADERS = binaryformat.h
@@ -17,6 +17,6 @@ METASOURCES = AUTO
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kabcformat_binary.pot
 
-linkdir = $(kde_datadir)/kabc/formats
+linkdir = $(kde_datadir)/tdeabc/formats
 link_DATA = binary.desktop
 EXTRA_DIST = $(link_DATA)

tdeabc/formats/binaryformat.cpp

@@ -22,7 +22,7 @@
 #include <tqimage.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "addressbook.h"
@@ -172,7 +172,7 @@ void BinaryFormat::loadAddressee( Addressee &addressee, TQDataStream &stream )
 
   if ( photo.isIntern() ) {
     TQImage img;
-    if ( !img.load( locateLocal( "data", "kabc/photos/" ) + addressee.uid() ) )
+    if ( !img.load( locateLocal( "data", "tdeabc/photos/" ) + addressee.uid() ) )
       kdDebug(5700) << "No photo available for '" << addressee.uid() << "'." << endl;
 
     addressee.setPhoto( img );
@@ -180,7 +180,7 @@ void BinaryFormat::loadAddressee( Addressee &addressee, TQDataStream &stream )
 
   if ( logo.isIntern() ) {
     TQImage img;
-    if ( !img.load( locateLocal( "data", "kabc/logos/" ) + addressee.uid() ) )
+    if ( !img.load( locateLocal( "data", "tdeabc/logos/" ) + addressee.uid() ) )
       kdDebug(5700) << "No logo available for '" << addressee.uid() << "'." << endl;
 
     addressee.setLogo( img );
@@ -201,7 +201,7 @@ void BinaryFormat::saveAddressee( const Addressee &addressee, TQDataStream &stre
 
   if ( photo.isIntern() ) {
     TQImage img = photo.data();
-    TQString fileName = locateLocal( "data", "kabc/photos/" ) + addressee.uid();
+    TQString fileName = locateLocal( "data", "tdeabc/photos/" ) + addressee.uid();
 
     if ( !img.save( fileName, "PNG" ) )
       kdDebug(5700) << "Unable to save photo for '" << addressee.uid() << "'." << endl;
@@ -209,7 +209,7 @@ void BinaryFormat::saveAddressee( const Addressee &addressee, TQDataStream &stre
 
   if ( logo.isIntern() ) {
     TQImage img = logo.data();
-    TQString fileName = locateLocal( "data", "kabc/logos/" ) + addressee.uid();
+    TQString fileName = locateLocal( "data", "tdeabc/logos/" ) + addressee.uid();
 
     if ( !img.save( fileName, "PNG" ) )
       kdDebug(5700) << "Unable to save logo for '" << addressee.uid() << "'." << endl;

tdeabc/key.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "key.h"
 

tdeabc/ldapconfigwidget.cpp

@@ -29,10 +29,10 @@
 #include <tqhbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaccelmanager.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kprogress.h>

tdeabc/ldapconfigwidget.h

@@ -25,8 +25,8 @@
 #include <tqmap.h>
 #include <tqstring.h>
 
-#include <kabc/ldapurl.h>
+#include <tdeabc/ldapurl.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldif.h>
 #include <tdeio/job.h>
 
 class TQGridLayout;

tdeabc/ldifconverter.cpp

@@ -38,7 +38,7 @@
 #include <tqregexp.h>
 #include <tqtextstream.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kmdcodec.h>
 

tdeabc/lock.cpp

@@ -22,9 +22,9 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqfile.h>
 
@@ -48,7 +48,7 @@ Lock::~Lock()
 
 TQString Lock::locksDir()
 {
-  return locateLocal( "data", "kabc/lock/" );
+  return locateLocal( "data", "tdeabc/lock/" );
 }
 
 bool Lock::readLockFile( const TQString &filename, int &pid, TQString &app )
@@ -104,14 +104,14 @@ bool Lock::lock()
       identifier.replace( '_', '/' );
 
       mError = i18n("The address book '%1' is locked by application '%2'.\nIf you believe this is incorrect, just remove the lock file from '%3'")
-               .arg( identifier ).arg( app ).arg( locateLocal( "data", "kabc/lock/*.lock" ) );
+               .arg( identifier ).arg( app ).arg( locateLocal( "data", "tdeabc/lock/*.lock" ) );
       return false;
     }
   }
 
   TQString lockUniqueName;
   lockUniqueName = mIdentifier + kapp->randomString( 8 );
-  mLockUniqueName = locateLocal( "data", "kabc/lock/" + lockUniqueName );
+  mLockUniqueName = locateLocal( "data", "tdeabc/lock/" + lockUniqueName );
   kdDebug(5700) << "-- lock unique name: " << mLockUniqueName << endl;
 
   // Create unique file

tdeabc/locknull.cpp

@@ -21,7 +21,7 @@
 
 #include "locknull.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 using namespace KABC;

tdeabc/phonenumber.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "phonenumber.h"
 

tdeabc/plugins/dir/CMakeLists.txt

@@ -53,7 +53,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 

tdeabc/plugins/dir/Makefile.am

@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libkabc_dir.la
 libkabc_dir_la_SOURCES = resourcedir.cpp resourcedirconfig.cpp
 libkabc_dir_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined 
 libkabc_dir_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_TDEUI)
-libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+libkabc_dir_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 kde_module_LTLIBRARIES = kabc_dir.la
 kabc_dir_la_SOURCES = resourcedirplugin.cpp

tdeabc/plugins/dir/resourcedir.cpp

@@ -32,8 +32,8 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 

tdeabc/plugins/dir/resourcedir.h

@@ -26,7 +26,7 @@
 
 #include <sys/types.h>
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 
 class TQTimer;
 

tdeabc/plugins/dir/resourcedirconfig.cpp

@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 

tdeabc/plugins/evolution/Makefile.am

@@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kabc_evo.la
 kabc_evo_la_SOURCES = dbwrapper.cpp resourceevo.cpp
 
 kabc_evo_la_LDFLAGS	= $(all_libraries) -module $(KDE_PLUGIN)
-kabc_evo_la_LIBADD	= ../../../kabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../kabc/vcardparser/libvcards.la
+kabc_evo_la_LIBADD	= ../../../tdeabc/libkabc.la ../../../tdeui/libtdeui.la -ldb ../../../tdeabc/vcardparser/libvcards.la
 
 METASOURCES = AUTO
 

tdeabc/plugins/evolution/resourceevo.cpp

@@ -1,12 +1,12 @@
 #include <tqdir.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <stdio.h>
 
-#include <kabc/vcardparser/vcardtool.h>
+#include <tdeabc/vcardparser/vcardtool.h>
 
 #include "dbwrapper.h"
 #include "resourceevo.h"

tdeabc/plugins/file/CMakeLists.txt

@@ -53,7 +53,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 

tdeabc/plugins/file/Makefile.am

@@ -7,14 +7,14 @@ lib_LTLIBRARIES = libkabc_file.la
 libkabc_file_la_SOURCES = resourcefile.cpp resourcefileconfig.cpp
 libkabc_file_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
 libkabc_file_la_LIBADD = $(LIB_KABC) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEFILE) $(LIB_TDECORE) $(LIB_TDEUI)
-libkabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+libkabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 
 kde_module_LTLIBRARIES = kabc_file.la
 kabc_file_la_SOURCES = resourcefileplugin.cpp
 kabc_file_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined
 kabc_file_la_LIBADD = libkabc_file.la $(LIB_QT) $(LIB_TDECORE)
-kabc_file_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+kabc_file_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 METASOURCES = AUTO
 

tdeabc/plugins/file/resourcefile.cpp

@@ -33,7 +33,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeio/scheduler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksavefile.h>
 #include <kstandarddirs.h>
 
@@ -365,9 +365,9 @@ void ResourceFile::fileChanged()
 
 void ResourceFile::removeAddressee( const Addressee &addr )
 {
-  TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/photos/" ) + addr.uid() ) );
+  TQFile::remove( TQFile::encodeName( locateLocal( "data", "tdeabc/photos/" ) + addr.uid() ) );
-  TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/logos/" ) + addr.uid() ) );
+  TQFile::remove( TQFile::encodeName( locateLocal( "data", "tdeabc/logos/" ) + addr.uid() ) );
-  TQFile::remove( TQFile::encodeName( locateLocal( "data", "kabc/sounds/" ) + addr.uid() ) );
+  TQFile::remove( TQFile::encodeName( locateLocal( "data", "tdeabc/sounds/" ) + addr.uid() ) );
 
   mAddrMap.erase( addr.uid() );
 }

tdeabc/plugins/file/resourcefile.h

@@ -26,7 +26,7 @@
 
 #include <sys/types.h>
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 
 namespace KABC {
 

tdeabc/plugins/file/resourcefileconfig.cpp

@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdialog.h>
 

tdeabc/plugins/ldaptdeio/CMakeLists.txt

@@ -53,7 +53,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 

tdeabc/plugins/ldaptdeio/Makefile.am

@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libkabc_ldaptdeio.la
 libkabc_ldaptdeio_la_SOURCES = resourceldaptdeio.cpp resourceldaptdeioconfig.cpp
 libkabc_ldaptdeio_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
 libkabc_ldaptdeio_la_LIBADD	= $(LIB_KABC) $(LIB_KIO) $(LIB_QT) $(top_builddir)/tderesources/libtderesources.la $(LIB_TDEUI) $(LIB_TDECORE)
-libkabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+libkabc_ldaptdeio_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 kde_module_LTLIBRARIES = kabc_ldaptdeio.la
 kabc_ldaptdeio_la_SOURCES = resourceldaptdeioplugin.cpp

tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp

@@ -25,18 +25,18 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <stdlib.h>
 #include <tdeio/netaccess.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldif.h>
-#include <kabc/ldapurl.h>
+#include <tdeabc/ldapurl.h>
 
 #include "resourceldaptdeio.h"
 #include "resourceldaptdeioconfig.h"

tdeabc/plugins/ldaptdeio/resourceldaptdeio.h

@@ -22,8 +22,8 @@
 #ifndef KABC_RESOURCELDAP_H
 #define KABC_RESOURCELDAP_H
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldif.h>
 #include <tdeio/job.h>
 
 class TDEConfig;

tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp

@@ -33,9 +33,9 @@
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 
 #include "resourceldaptdeio.h"

tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h

@@ -28,8 +28,8 @@
 
 #include <kdialogbase.h>
 #include <tderesources/configwidget.h>
-#include <kabc/ldif.h>
+#include <tdeabc/ldif.h>
-#include <kabc/ldapconfigwidget.h>
+#include <tdeabc/ldapconfigwidget.h>
 
 
 class TQCheckBox;

tdeabc/plugins/ldaptdeio/resourceldaptdeioplugin.cpp

@@ -21,8 +21,8 @@
 #include "resourceldaptdeio.h"
 #include "resourceldaptdeioconfig.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KABC;
 

tdeabc/plugins/net/CMakeLists.txt

@@ -53,7 +53,7 @@ set( ${target}_SRCS
 tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 1.0.0
-  LINK kabc-shared
+  LINK tdeabc-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
 

tdeabc/plugins/net/Makefile.am

@@ -6,8 +6,8 @@ noinst_HEADERS = resourcenetconfig.h
 lib_LTLIBRARIES = libkabc_net.la
 libkabc_net_la_SOURCES = resourcenet.cpp resourcenetconfig.cpp
 libkabc_net_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0:0 -no-undefined
-libkabc_net_la_LIBADD	= $(top_builddir)/kabc/libkabc.la $(LIB_KIO)
+libkabc_net_la_LIBADD	= $(top_builddir)/tdeabc/libkabc.la $(LIB_KIO)
-libkabc_net_la_COMPILE_FIRST = $(top_builddir)/kabc/addressee.h
+libkabc_net_la_COMPILE_FIRST = $(top_builddir)/tdeabc/addressee.h
 
 kde_module_LTLIBRARIES = kabc_net.la
 kabc_net_la_SOURCES = resourcenetplugin.cpp

tdeabc/plugins/net/resourcenet.cpp

@@ -23,9 +23,9 @@
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/scheduler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksavefile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurlrequester.h>
 
 #include "addressbook.h"

tdeabc/plugins/net/resourcenet.h

@@ -25,7 +25,7 @@
 
 #include <sys/types.h>
 
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 
 class TQFile;
 class TQTimer;

tdeabc/plugins/net/resourcenetconfig.cpp

@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include "formatfactory.h"

tdeabc/plugins/sql/resourcesql.cpp

@@ -22,9 +22,9 @@
 #include <tqsqlcursor.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resourcesql.h"
 #include "resourcesqlconfig.h"

tdeabc/plugins/sql/resourcesqlconfig.cpp

@@ -24,7 +24,7 @@
 #include <tqvbox.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resource.h"
 #include "resourcesqlconfig.h"

tdeabc/resource.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "resource.h"
 

tdeabc/resourceselectdialog.cpp

@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kbuttonbox.h>
 #include <tdelistbox.h>
 #include <kstdguiitem.h>

tdeabc/scripts/addressee.src.cpp

@@ -25,7 +25,7 @@
 #include <ksharedptr.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "addresseehelper.h"
 #include "field.h"

tdeabc/scripts/field.src.cpp

@@ -18,9 +18,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "field.h"
 #include "address.h"

tdeabc/secrecy.cpp

@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "secrecy.h"
 

tdeabc/sortmode.cpp

@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kabc/field.h>
+#include <tdeabc/field.h>
 
 #include "sortmode.h"
 

tdeabc/sortmode.h

@@ -23,7 +23,7 @@
 
 #include <tdelibs_export.h>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 namespace KABC {
 

tdeabc/stdaddressbook.cpp

@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <kcrash.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tderesources/manager.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
@@ -42,12 +42,12 @@ static KStaticDeleter<StdAddressBook> addressBookDeleter;
 
 TQString StdAddressBook::fileName()
 {
-  return locateLocal( "data", "kabc/std.vcf" );
+  return locateLocal( "data", "tdeabc/std.vcf" );
 }
 
 TQString StdAddressBook::directoryName()
 {
-  return locateLocal( "data", "kabc/stdvcf" );
+  return locateLocal( "data", "tdeabc/stdvcf" );
 }
 
 void StdAddressBook::handleCrash()

tdeabc/tdeab2tdeabc.cpp

@@ -27,9 +27,9 @@
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "addressbook.h"

tdeabc/tdeab2tdeabc.desktop

@@ -23,19 +23,19 @@ Comment[ar]=أداة تحويل libkab إلى libkabc.
 Comment[az]=libkab - libkabc dönüşdürmə vasitəsi.
 Comment[be]=Інструмент пераўтварэння libkab у libkabc.
 Comment[bg]=Програма за конвертиране на libkab до libkabc.
-Comment[bn]=libkab থেকে libkabc-তে পরিবর্তন করার প্রোগ্রাম।
+Comment[bn]=libkab থেকে libtdeabc-তে পরিবর্তন করার প্রোগ্রাম।
 Comment[bs]=alat za pretvaranje libkab u libkabc.
 Comment[ca]=Eina de conversió de libkab a libkabc.
 Comment[cs]=Převod dat z libkab do libkabc.
 Comment[csb]=Nôrzãdze do kònwersëji z libkab do libkabc.
 Comment[cy]=erfyn trosi libkab i libkabc
-Comment[da]=libkab-til-libkabc-konverteringsværktøj.
+Comment[da]=libkab-til-libtdeabc-konverteringsværktøj.
 Comment[de]=Konvertierung von libkab in libkabc
 Comment[el]=Εργαλείο μετατροπής από το libkab στο libkabc.
 Comment[eo]=Konvertilo de "libkab" al "libkabc"
 Comment[es]=Conversor libkab a libkabc.
 Comment[et]=libkab -> libkabc teisendamine
-Comment[eu]=libkab-etik libkabc-era bihurtzeko tresna.
+Comment[eu]=libkab-etik libtdeabc-era bihurtzeko tresna.
 Comment[fa]=ابزار تبدیل libkab به libcabc.
 Comment[fi]=libkab-libkabc -muunnin
 Comment[fr]=Outil de conversion de libkab vers libkabc.
@@ -59,7 +59,7 @@ Comment[lb]=libkab op libkabc Konvertéierungs-Hëllefsmëttel.
 Comment[lt]=libkab į libkabc konvertavimo įrankis.
 Comment[lv]=libkab uz libkabc kovertēšanas rīks.
 Comment[mk]=алатка за претворање од libkab во libkabc.
-Comment[mn]=libkab-аас libkabc-руу хөрвүүлэгч
+Comment[mn]=libkab-аас libtdeabc-руу хөрвүүлэгч
 Comment[ms]=perkakasan penukaran libkab to libkabc.
 Comment[mt]=Għodda għall-konverżjoni libkab għal libkabc
 Comment[nb]=libkab til libkabc konverteringsverktøy.

tdeabc/tests/Makefile.am

@@ -40,11 +40,11 @@ testaddresslineedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(L
 testaddresslineedit_SOURCES = testaddresslineedit.cpp
 
 bigread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-bigread_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
+bigread_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libkabc_file.la
 bigread_SOURCES = bigread.cpp
 
 bigwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-bigwrite_LDADD = ../libkabc.la $(top_builddir)/kabc/plugins/file/libkabc_file.la
+bigwrite_LDADD = ../libkabc.la $(top_builddir)/tdeabc/plugins/file/libkabc_file.la
 bigwrite_SOURCES = bigwrite.cpp
 
 testdb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor

tdeabc/tests/bigread.cpp

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

tdeabc/tests/bigwrite.cpp

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

tdeabc/tests/kabcargl.cpp

@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "stdaddressbook.h"

tdeabc/tests/testaddressee.cpp

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

tdeabc/tests/testaddresseelist.cpp

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

tdeabc/tests/testaddressfmt.cpp

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

tdeabc/tests/testaddresslineedit.cpp

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

tdeabc/tests/testdb.cpp

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

tdeabc/tests/testdistlist.cpp

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

tdeabc/tests/testkabc.cpp

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

tdeabc/tests/testkabcdlg.cpp

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

tdeabc/tests/testlock.cpp

@@ -26,11 +26,11 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kdirwatch.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdialog.h>
 
 #include <tqwidget.h>

tdeabc/vcard/testwrite.cpp

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

tdeabc/vcardformatimpl.cpp

@@ -23,7 +23,7 @@
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <VCard.h>
 
@@ -849,7 +849,7 @@ void VCardFormatImpl::addPictureValue( VCARD::VCard *vcard, VCARD::EntityType ty
       if ( type == EntityLogo )
         dir = "logos";
 
-      img.save( locateLocal( "data", "kabc/" + dir + "/" + addr.uid() ), pic.type().utf8() );
+      img.save( locateLocal( "data", "tdeabc/" + dir + "/" + addr.uid() ), pic.type().utf8() );
       cl.setValue( new TextValue( "<dummy>" ) );
     }
     params.append( new Param( "ENCODING", "b" ) );
@@ -889,7 +889,7 @@ Picture VCardFormatImpl::readPictureValue( VCARD::ContentLine *cl, VCARD::Entity
       if ( type == EntityLogo )
         dir = "logos";
 
-      img.load( locateLocal( "data", "kabc/" + dir + "/" + addr.uid() ) );
+      img.load( locateLocal( "data", "tdeabc/" + dir + "/" + addr.uid() ) );
     } else {
       TQByteArray data;
       KCodecs::base64Decode( v->asString(), data );
@@ -921,7 +921,7 @@ void VCardFormatImpl::addSoundValue( VCARD::VCard *vcard, const Sound &sound, co
     if ( intern ) { // only for vCard export we really write the data inline
         cl.setValue( new TextValue( KCodecs::base64Encode( data ) ) );
     } else { // save sound in cache
-      TQFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
+      TQFile file( locateLocal( "data", "tdeabc/sounds/" + addr.uid() ) );
       if ( file.open( IO_WriteOnly ) ) {
         file.writeBlock( data );
       }
@@ -953,7 +953,7 @@ Sound VCardFormatImpl::readSoundValue( VCARD::ContentLine *cl, const Addressee &
   if ( isInline ) {
     TQByteArray data;
     if ( v->asString() == "<dummy>" ) { // no sound inline stored => sound is in cache
-      TQFile file( locateLocal( "data", "kabc/sounds/" + addr.uid() ) );
+      TQFile file( locateLocal( "data", "tdeabc/sounds/" + addr.uid() ) );
       if ( file.open( IO_ReadOnly ) ) {
         data = file.readAll();
         file.close();

tdeabc/vcardparser/Makefile.am

@@ -9,15 +9,15 @@ vcardsinclude_HEADERS = vcard.h vcardline.h vcardparser.h
 check_PROGRAMS = testread testwrite testread2
 
 testread_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-testread_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
+testread_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
 testread_SOURCES = testread.cpp
 
 testread2_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-testread2_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
+testread2_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
 testread2_SOURCES = testread2.cpp testutils.cpp
 
 testwrite_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-testwrite_LDADD = libvcards.la $(top_builddir)/kabc/libkabc.la
+testwrite_LDADD = libvcards.la $(top_builddir)/tdeabc/libkabc.la
 testwrite_SOURCES = testwrite.cpp
 
 TESTFILES = vcard1.vcf vcard2.vcf vcard3.vcf vcard4.vcf vcard6.vcf vcard7.vcf
@@ -25,7 +25,7 @@ TESTFILES = vcard1.vcf vcard2.vcf vcard3.vcf vcard4.vcf vcard6.vcf vcard7.vcf
 check-local: testread
 	rm -f FAILED; \
 	for i in $(TESTFILES); \
-	  do perl $(top_srcdir)/kabc/vcardparser/checkvcard.pl \
+	  do perl $(top_srcdir)/tdeabc/vcardparser/checkvcard.pl \
-	    $(top_srcdir)/kabc/vcardparser/tests/$$i; \
+	    $(top_srcdir)/tdeabc/vcardparser/tests/$$i; \
 	done; \
 	[ ! -e FAILED ]

tdeabc/vcardparser/testread.cpp

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

tdeabc/vcardparser/testread2.cpp

@@ -1,5 +1,5 @@
 #include "testutils.h"
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <vcardconverter.h>
 #include <kdebug.h>
 

tdeabc/vcardparser/testutils.cpp

@@ -1,5 +1,5 @@
 #include <vcardparser.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <tqfile.h>
 
 using namespace KABC;

tdeabc/vcardparser/testutils.h

@@ -1,7 +1,7 @@
 #ifndef TESTUTILS_H
 #define TESTUTILS_H
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <tqstring.h>
 
 KABC::Addressee vcard1();

tdeabc/vcardparser/testwrite.cpp

@@ -17,13 +17,13 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
-#include <kabc/phonenumber.h>
+#include <tdeabc/phonenumber.h>
-#include <kabc/address.h>
+#include <tdeabc/address.h>
-#include <kabc/key.h>
+#include <tdeabc/key.h>
-#include <kabc/picture.h>
+#include <tdeabc/picture.h>
-#include <kabc/sound.h>
+#include <tdeabc/sound.h>
-#include <kabc/secrecy.h>
+#include <tdeabc/secrecy.h>
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>

tdecert/tdecertpart.cc

@@ -24,14 +24,14 @@
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <tqframe.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqbutton.h>
 #include <tqpushbutton.h>
 #include <tqcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <ksslall.h>
 #include <kopenssl.h>

tdecmshell/main.cpp

@@ -37,12 +37,12 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kservice.h>
 #include <kservicegroup.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <twin.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "main.h"
 #include "main.moc"

tdeconf_update/tdeconf_update.cpp

@@ -30,13 +30,13 @@
 
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeaboutdata.h>
 #include <kinstance.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 static TDECmdLineOptions options[] =
 {

tdecore/CMakeLists.txt

@@ -74,19 +74,19 @@ install( FILES
     kurl.h ksock.h tdeaboutdata.h tdecmdlineargs.h tdeconfigbackend.h
     kapp.h tdeapplication.h kuniqueapp.h kuniqueapplication.h
     kcharsets.h tdeversion.h kpty.h kprocess.h kprocctrl.h
-    klocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
+    tdelocale.h kicontheme.h kiconloader.h kdebug.h twinmodule.h
     twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h
     kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h
     kregexp.h kcompletion.h kstringhandler.h kstddirs.h
-    kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h
+    kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h
     kallocator.h kvmallocator.h kcrash.h krfcdate.h kinstance.h
-    kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h
+    kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h
     krandomsequence.h knotifyclient.h kiconeffect.h kaudioplayer.h
     kdcoppropertyproxy.h netwm.h tdeaccelmanager.h netwm_def.h
     kpixmapprovider.h kunload.h kstaticdeleter.h kextsock.h
     kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h kbufferedio.h
     kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h tdesycoca.h
-    tdesycocaentry.h tdesycocatype.h kxmessages.h kstartupinfo.h
+    tdesycocaentry.h tdesycocatype.h kxmessages.h tdestartupinfo.h
     klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc
     ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h
     kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h
@@ -123,15 +123,15 @@ set( ${target}_SRCS
   libintl.cpp tdeapplication.cpp kdebug.cpp netwm.cpp
   tdeconfigbase.cpp tdeconfig.cpp ksimpleconfig.cpp tdeconfigbackend.cpp
   kmanagerselection.cpp kdesktopfile.cpp kstandarddirs.cpp
-  ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp klocale.cpp
+  ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp tdelocale.cpp
   krfcdate.cpp kiconeffect.cpp kicontheme.cpp kiconloader.cpp
   twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp
   kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp
   tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp
   kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp
-  kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp
+  kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp
   kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp
-  kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp
+  kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp
   kuniqueapplication.cpp tdeaccelmanager.cpp ksavefile.cpp
   krandomsequence.cpp kstringhandler.cpp kcompletion.cpp
   tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp
@@ -139,7 +139,7 @@ set( ${target}_SRCS
   kextsock.cpp netsupp.cpp kprocio.cpp kbufferedio.cpp
   kpixmapprovider.cpp kurldrag.cpp kmdcodec.cpp ksocks.cpp
   fakes.c vsnprintf.c tdesycoca.cpp tdesycocadict.cpp tdesycoca.skel
-  tdesycocafactory.cpp kxmessages.cpp kstartupinfo.cpp
+  tdesycocafactory.cpp kxmessages.cpp tdestartupinfo.cpp
   kcatalogue.cpp kasyncio.cpp tdemultipledrag.cpp kstaticdeleter.cpp
   kappdcopiface.cpp kappdcopiface.skel kclipboard.cpp
   kcheckaccelerators.cpp tdeversion.cpp kdebugdcopiface.cpp

tdecore/MAINTAINERS

@@ -27,10 +27,10 @@ kcrash.cpp		Waldo Bastian <bastian@kde.org>
 kdcoppropertyproxy.cpp
 kdebug.cpp		Stephan Kulow <coolo@kde.org>
 kdesktopfile.cpp
-kglobal.cpp		Stephan Kulow <coolo@kde.org>
+tdeglobal.cpp		Stephan Kulow <coolo@kde.org>
 kglobalaccel.cpp	Ellis Whitehead <ellis@kde.org>
 kglobalaccel_x11.cpp	Ellis Whitehead <ellis@kde.org>
-kglobalsettings.cpp	David Faure <faure@kde.org>
+tdeglobalsettings.cpp	David Faure <faure@kde.org>
 kiconeffect.cpp
 kiconloader.cpp
 kicontheme.cpp
@@ -41,7 +41,7 @@ kkeynative_x11.cpp	Ellis Whitehead <ellis@kde.org>
 kkeysequence.cpp	Ellis Whitehead <ellis@kde.org>
 kkeysequence_emb.cpp	Ellis Whitehead <ellis@kde.org>
 klibloader.cpp
-klocale.cpp		Hans Petter Bieker <bieker@kde.org>
+tdelocale.cpp		Hans Petter Bieker <bieker@kde.org>
 kmdcodec.cpp
 kmimesourcefactory.cpp
 tdemultipledrag.cpp	David Faure <faure@kde.org>
@@ -60,14 +60,14 @@ tdeshortcut.cpp		Ellis Whitehead <ellis@kde.org>
 ksimpleconfig.cpp	Waldo Bastian <bastian@kde.org>
 ksocks.cpp
 kstandarddirs.cpp	Waldo Bastian <bastian@kde.org>
-kstartupinfo.cpp	Lubos Lunak <l.lunak@kde.org>
+tdestartupinfo.cpp	Lubos Lunak <l.lunak@kde.org>
 kstaticdeleter.cpp	Stephan Kulow <coolo@kde.org>
 tdestdaccel.cpp		Ellis Whitehead <ellis@kde.org>
 kstringhandler.cpp
 tdesycoca.cpp		Waldo Bastian <bastian@kde.org>
 tdesycocadict.cpp		Waldo Bastian <bastian@kde.org>
 tdesycocafactory.cpp	Waldo Bastian <bastian@kde.org>
-ktempfile.cpp		Waldo Bastian <bastian@kde.org>
+tdetempfile.cpp		Waldo Bastian <bastian@kde.org>
 kuniqueapplication.cpp	Waldo Bastian <bastian@kde.org>
 kurl.cpp		Waldo Bastian <bastian@kde.org>
 kurldrag.cpp		David Faure <faure@kde.org>

tdecore/Makefile.am

@@ -41,19 +41,19 @@ include_HEADERS = tdeconfig.h tdeconfigskeleton.h \
 	tdeconfigbase.h kdesktopfile.h kurl.h ksock.h tdeaboutdata.h \
 	tdecmdlineargs.h tdeconfigbackend.h kapp.h tdeapplication.h kuniqueapp.h \
 	kuniqueapplication.h kcharsets.h tdeversion.h kpty.h kprocess.h \
-	kprocctrl.h klocale.h kicontheme.h kiconloader.h kdebug.h \
+	kprocctrl.h tdelocale.h kicontheme.h kiconloader.h kdebug.h \
 	twinmodule.h twin.h krootprop.h tdeshortcut.h kkeynative.h tdeaccel.h \
 	kglobalaccel.h tdestdaccel.h tdeshortcutlist.h kcatalogue.h \
 	kregexp.h kcompletion.h kstringhandler.h \
-	kstddirs.h kstandarddirs.h kglobal.h kglobalsettings.h ksharedptr.h \
+	kstddirs.h kstandarddirs.h tdeglobal.h tdeglobalsettings.h ksharedptr.h \
 	kallocator.h kvmallocator.h kcrash.h krfcdate.h \
-	kinstance.h kpalette.h kipc.h klibloader.h ktempfile.h ksavefile.h \
+	kinstance.h kpalette.h kipc.h klibloader.h tdetempfile.h ksavefile.h \
 	krandomsequence.h knotifyclient.h kiconeffect.h \
 	kaudioplayer.h kdcoppropertyproxy.h netwm.h tdeaccelmanager.h \
 	netwm_def.h kpixmapprovider.h kunload.h kstaticdeleter.h \
 	kextsock.h kextendedsocket.h ksockaddr.h kprocio.h kasyncio.h \
 	kbufferedio.h kurldrag.h kmimesourcefactory.h kmdcodec.h ksocks.h \
-	tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h kstartupinfo.h \
+	tdesycoca.h tdesycocaentry.h tdesycocatype.h kxmessages.h tdestartupinfo.h \
 	klargefile.h tdemultipledrag.h kgenericfactory.h kgenericfactory.tcc \
 	ktypelist.h ksortablevaluelist.h kdebugclasses.h kclipboard.h \
 	kcalendarsystem.h kcalendarsystemfactory.h kmacroexpander.h \
@@ -93,14 +93,14 @@ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
 	kdebug.cpp netwm.cpp tdeconfigbase.cpp tdeconfig.cpp  ksimpleconfig.cpp \
 	tdeconfigbackend.cpp kmanagerselection.cpp kdesktopfile.cpp \
 	kstandarddirs.cpp ksock.cpp kpty.cpp kprocess.cpp kprocctrl.cpp \
-	klocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
+	tdelocale.cpp krfcdate.cpp kiconeffect.cpp kicontheme.cpp \
 	kiconloader.cpp twin.cpp twinmodule.cpp krootprop.cpp kcharsets.cpp \
 	kckey.cpp tdeshortcut.cpp kkeynative_x11.cpp kkeyserver_x11.cpp \
 	tdeaccelaction.cpp tdeshortcutmenu.cpp tdeaccelbase.cpp tdeaccel.cpp \
 	kglobalaccel_x11.cpp kglobalaccel.cpp tdestdaccel.cpp tdeshortcutlist.cpp \
-	kcrash.cpp kurl.cpp kregexp.cpp kglobal.cpp kglobalsettings.cpp \
+	kcrash.cpp kurl.cpp kregexp.cpp tdeglobal.cpp tdeglobalsettings.cpp \
 	kallocator.cpp kvmallocator.cpp kmimesourcefactory.cpp \
-	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp ktempfile.cpp \
+	kinstance.cpp kpalette.cpp kipc.cpp klibloader.cpp tdetempfile.cpp \
 	kuniqueapplication.cpp tdeaccelmanager.cpp \
 	ksavefile.cpp krandomsequence.cpp kstringhandler.cpp kcompletion.cpp \
 	tdecmdlineargs.cpp tdeaboutdata.cpp kcompletionbase.cpp knotifyclient.cpp \
@@ -109,7 +109,7 @@ libtdecore_la_SOURCES = libintl.cpp tdeapplication.cpp \
 	kpixmapprovider.cpp kurldrag.cpp \
 	kmdcodec.cpp ksocks.cpp fakes.c vsnprintf.c \
 	tdesycoca.cpp tdesycocadict.cpp tdesycocafactory.cpp tdesycoca.skel \
-	kxmessages.cpp kstartupinfo.cpp kcatalogue.cpp kasyncio.cpp \
+	kxmessages.cpp tdestartupinfo.cpp kcatalogue.cpp kasyncio.cpp \
 	tdemultipledrag.cpp kstaticdeleter.cpp kappdcopiface.cpp \
 	kappdcopiface.skel kclipboard.cpp kcheckaccelerators.cpp \
 	tdeversion.cpp kdebugdcopiface.cpp kdebugdcopiface.skel \

tdecore/kappdcopiface.cpp

@@ -20,7 +20,7 @@
 #include "kappdcopiface.h"
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 

tdecore/kapplication_win.cpp

@@ -19,7 +19,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include "kcheckaccelerators.h"

tdecore/kcalendarsystem.cpp

@@ -22,10 +22,10 @@
 // systems.
 // Also default gregorian and factory classes
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kcalendarsystem.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 class KCalendarSystemPrivate
 {

tdecore/kcalendarsystemgregorian.cpp

@@ -24,7 +24,7 @@
 #include <tqdatetime.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kcalendarsystemgregorian.h"

tdecore/kcalendarsystemhebrew.cpp

@@ -21,7 +21,7 @@
 
 // Derived hebrew kde calendar class
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kcalendarsystemhebrew.h"

tdecore/kcalendarsystemhijri.cpp

@@ -23,7 +23,7 @@
 #include <tqdatetime.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kcalendarsystemhijri.h"

tdecore/kcalendarsystemjalali.cpp

@@ -26,8 +26,8 @@
 #include <tqstringlist.h>
 #include <math.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <stdio.h>
 

tdecore/kcharsets.cpp

@@ -22,8 +22,8 @@
 #include "kentities.c"
 
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include <tqfontinfo.h>

tdecore/kcheckaccelerators.cpp

@@ -41,9 +41,9 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeshortcut.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /*
 

tdecore/kclipboard.cpp

@@ -18,7 +18,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kclipboard.h"
 

tdecore/kcompletion.cpp

@@ -20,9 +20,9 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqptrvector.h>
 

tdecore/kcompletion.h

@@ -28,7 +28,7 @@
 #include <tqguardedptr.h>
 
 #include "tdelibs_export.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ksortablevaluelist.h>
 #include <tdeshortcut.h>
 

tdecore/kcrash.cpp

@@ -44,7 +44,7 @@
 #include <errno.h>
 
 #include <tqwindowdefs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>

tdecore/kdebug.areas

@@ -184,7 +184,7 @@
 5602        kontact (plugins)
 5650        tderesources
 5700        kabc
-5710        kabc/vcard
+5710        tdeabc/vcard
 5720        kaddressbook
 5800        libkcal
 5850        korganizer

tdecore/kdebug.cpp

@@ -28,12 +28,12 @@
 #include "kdebugdcopiface.h"
 
 #include "tdeapplication.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kinstance.h"
 #include "kstandarddirs.h"
 
 #include <tqmessagebox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfile.h>
 #include <tqintdict.h>
 #include <tqstring.h>

tdecore/kdebugrc

@@ -96,7 +96,7 @@ InfoOutput=4
 [5400]
 InfoOutput=4
 
-# kabc/vcard
+# tdeabc/vcard
 [5710]
 InfoOutput=4
 

tdecore/kdesktopfile.cpp

@@ -35,7 +35,7 @@
 #include "kstandarddirs.h"
 #include "kmountpoint.h"
 #include "kcatalogue.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 #include "kdesktopfile.h"
 #include "kdesktopfile.moc"

tdecore/kdetcompmgr.cpp

@@ -24,7 +24,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
 

tdecore/kgenericfactory.h

@@ -23,8 +23,8 @@
 #include <ktypelist.h>
 #include <kinstance.h>
 #include <kgenericfactory.tcc>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 /* @internal */

tdecore/kglobal.cpp

@@ -16,7 +16,7 @@
    Boston, MA 02110-1301, USA.
 */
 /*
-* kglobal.cpp -- Implementation of class TDEGlobal.
+* tdeglobal.cpp -- Implementation of class TDEGlobal.
 * Author:	Sirtaj Singh Kang
 * Version:	$Id$
 * Generated:	Sat May  1 02:08:43 EST 1999
@@ -25,13 +25,13 @@
 #include <tqglobal.h>
 #include <tqdict.h>
 #include <tqptrlist.h>
-#include "kglobal.h"
+#include "tdeglobal.h"
 
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <kiconloader.h>
 #include <tdehardwaredevices.h>

tdecore/kglobalaccel.cpp

@@ -32,7 +32,7 @@
 #include "tdeaccelbase.h"
 #include <kdebug.h>
 #include <tdeshortcut.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //----------------------------------------------------
 

tdecore/kglobalsettings.cpp

@@ -16,7 +16,7 @@
    Boston, MA 02110-1301, USA.
 */
 #include "config.h"
-#include "kglobalsettings.h"
+#include "tdeglobalsettings.h"
 
 #include <tqdir.h>
 #include <tqpixmap.h>
@@ -40,12 +40,12 @@ static QRgb qt_colorref2qrgb(COLORREF col)
 #endif
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeshortcut.h>
 #include <kstandarddirs.h>
 #include <kcharsets.h>
 #include <tdeaccel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqfontinfo.h>
 #include <stdlib.h>
 #include <kprotocolinfo.h>

tdecore/kiconeffect.cpp

@@ -29,9 +29,9 @@
 #include <tqrect.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kicontheme.h>
 #include "kiconeffect.h"
 

tdecore/kiconloader.cpp

@@ -30,7 +30,7 @@
 #include <kipc.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kinstance.h>

tdecore/kiconloader.h

@@ -27,7 +27,7 @@
 #undef TDEIconLoaderXStatus
 #endif
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <kicontheme.h>
 

tdecore/kicontheme.cpp

@@ -30,7 +30,7 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
 #include <kinstance.h>

tdecore/kinstance.cpp

@@ -21,7 +21,7 @@
 #include <unistd.h>
 
 #include "tdeconfig.h"
-#include "klocale.h"
+#include "tdelocale.h"
 #include "kcharsets.h"
 #include "kiconloader.h"
 #include "tdehardwaredevices.h"
@@ -29,7 +29,7 @@
 #include "tdeaboutdata.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kmimesourcefactory.h"
 
 #include <tqfont.h>

tdecore/kkeynative_x11.cpp

@@ -32,7 +32,7 @@
 #include <tqstringlist.h>
 #include "kckey.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifdef Q_WS_X11
 #define XK_MISCELLANY

tdecore/kkeyserver_x11.cpp

@@ -33,8 +33,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifdef Q_WS_X11
 # define XK_MISCELLANY

tdecore/klibloader.cpp

@@ -29,7 +29,7 @@
 #include "klibloader.h"
 #include "kstandarddirs.h"
 #include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 #include "ltdl.h"
 

tdecore/klibloader.h

@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 #include <tqasciidict.h>
 #include <tqptrlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <stdlib.h> // For backwards compatibility
 

tdecore/klocale.cpp

@@ -33,7 +33,7 @@
 #include <tqregexp.h>
 
 #include "kcatalogue.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kstandarddirs.h"
 #include "ksimpleconfig.h"
 #include "kinstance.h"
@@ -41,7 +41,7 @@
 #include "kdebug.h"
 #include "kcalendarsystem.h"
 #include "kcalendarsystemfactory.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 #ifdef Q_WS_WIN
 #include <windows.h>

tdecore/klocale.h

@@ -39,7 +39,7 @@ class KCatalogue;
 class KCalendarSystem;
 
 /**
- * \file klocale.h
+ * \file tdelocale.h
  */
 
 #ifndef I18N_NOOP

tdecore/klockfile.cpp

@@ -39,8 +39,8 @@
 #include <kde_file.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // TODO: http://www.spinnaker.de/linux/nfs-locking.html
 // TODO: Make regression test

tdecore/kmimesourcefactory.cpp

@@ -19,7 +19,7 @@
 */
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kinstance.h>
 #include <kiconloader.h>
 

tdecore/kmimesourcefactory.h

@@ -23,7 +23,7 @@
 #define KMIMESOURCEFACTORY_H
 
 #include <tqmime.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class KMimeSourceFactoryPrivate;
 class TDEInstance;

tdecore/kpalette.cpp

@@ -24,7 +24,7 @@
 #include <tqfile.h>
 #include <tqtextstream.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <ksavefile.h>
 #include <kstringhandler.h>
 

tdecore/kprotocolinfo_tdecore.cpp

@@ -26,7 +26,7 @@
 #include "kprotocolinfofactory.h"
 
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <ksimpleconfig.h>

tdecore/kprotocolinfofactory.cpp

@@ -18,7 +18,7 @@
 */
 
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdesycoca.h>

tdecore/krootprop.cpp

@@ -23,8 +23,8 @@
 #ifdef Q_WS_X11 // not needed anyway :-)
 
 #include "krootprop.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
-#include "klocale.h"
+#include "tdelocale.h"
 #include "kcharsets.h"
 #include "tdeapplication.h"
 #include <tqtextstream.h>

tdecore/ksavefile.h

@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <stdio.h>
 #include <errno.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 class KSaveFilePrivate;
 

tdecore/ksimpleconfig.cpp

@@ -31,7 +31,7 @@
 #include <tqfileinfo.h>
 #include <tqdir.h>
 
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kstandarddirs.h"
 #include "tdeconfigbackend.h"
 

tdecore/ksimpledirwatch.cpp

@@ -46,7 +46,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstaticdeleter.h>
 #include <kde_file.h>
 

tdecore/ksockaddr.cpp

@@ -38,7 +38,7 @@
 #include <tqfile.h>
 
 #include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
 //#include "kextsock.h"
 
 #ifndef HAVE_STRUCT_SOCKADDR_IN6

tdecore/ksocks.cpp

@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqmap.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "klibloader.h"
 #include <tdeconfig.h>

tdecore/kstandarddirs.h

@@ -26,7 +26,7 @@
 #include <tqstring.h>
 #include <tqdict.h>
 #include <tqstringlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEConfig;
 class TDEStandardDirsPrivate;

tdecore/kstartupinfo.cpp

@@ -45,7 +45,7 @@ DEALINGS IN THE SOFTWARE.
 #define QT_CLEAN_NAMESPACE
 #endif
 
-#include "kstartupinfo.h"
+#include "tdestartupinfo.h"
 
 #include <unistd.h>
 #include <sys/time.h>
@@ -1525,5 +1525,5 @@ static TQString escape_str( const TQString& str_P )
     return ret;
     }
 
-#include "kstartupinfo.moc"
+#include "tdestartupinfo.moc"
 #endif

tdecore/kstartupinfo.h

@@ -49,7 +49,7 @@ class TDEStartupInfoPrivate;
  *
  * This class can be used to send information about started application,
  * change the information and receive this information. For detailed
- * description, see tdelibs/tdecore/README.kstartupinfo.
+ * description, see tdelibs/tdecore/README.tdestartupinfo.
  *
  * You usually don't need to use this class for sending the notification
  * information, as KDE libraries should do this when an application is

tdecore/kstaticdeleter.h

@@ -23,7 +23,7 @@
 #ifndef _KSTATIC_DELETER_H_
 #define _KSTATIC_DELETER_H_
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 /**
  * Static deleters are used to manage static resources. They can register

tdecore/kstringhandler.cpp

@@ -18,7 +18,7 @@
 */
 
 #include "kstringhandler.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 
 static void parsePythonRange( const TQCString &range, uint &start, uint &end )
 {

tdecore/ktempdir.cpp

@@ -47,7 +47,7 @@
 #include <tqdatetime.h>
 #include <tqdir.h>
 
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "tdeapplication.h"
 #include "kinstance.h"
 #include "ktempdir.h"

tdecore/ktempfile.cpp

@@ -48,10 +48,10 @@
 #include <tqdatastream.h>
 #include <tqtextstream.h>
 
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "tdeapplication.h"
 #include "kinstance.h"
-#include "ktempfile.h"
+#include "tdetempfile.h"
 #include "kstandarddirs.h"
 #include "kde_file.h"
 #include "kdebug.h"

tdecore/ktimezones.cpp

@@ -24,7 +24,7 @@
 #include <kmdcodec.h>
 #include <kprocess.h>
 #include <kstringhandler.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <tqdatetime.h>
 #include <tqfile.h>

tdecore/kuniqueapplication.cpp

@@ -40,7 +40,7 @@
 
 #if defined Q_WS_X11
 #include <twin.h> 
-#include <kstartupinfo.h> 
+#include <tdestartupinfo.h> 
 #endif
 
 #include <tdeconfig.h>

tdecore/kurl.cpp

@@ -27,7 +27,7 @@
 // KDE_QT_ONLY is first used for dcop/client (e.g. marshalling)
 #ifndef KDE_QT_ONLY
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kidna.h>
 #include <kprotocolinfo.h>
 #endif

tdecore/kurldrag.cpp

@@ -24,8 +24,8 @@
 #include <unistd.h>
 
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 class KURLDragPrivate

tdecore/kvmallocator.cpp

@@ -31,7 +31,7 @@
 #include <tqintdict.h>
 #include <tqmap.h>
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
 
 #include "kvmallocator.h"

tdecore/netsupp.cpp

@@ -37,7 +37,7 @@
 
 #include "config.h"
 #include "kdebug.h"
-#include "klocale.h"
+#include "tdelocale.h"
 
 #ifndef IN6_IS_ADDR_V4MAPPED
 #define NEED_IN6_TESTS

tdecore/network/kresolver.cpp

@@ -54,7 +54,7 @@
 #endif
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Us
 #include "kresolver.h"

tdecore/network/kresolverstandardworkers.cpp

@@ -44,7 +44,7 @@
 #include <tqfile.h>
 
 #include "kdebug.h"
-#include "kglobal.h"
+#include "tdeglobal.h"
 #include "kstandarddirs.h"
 #include "tdeapplication.h"
 

tdecore/network/tdesocketaddress.cpp

@@ -36,7 +36,7 @@
 #include <tqfile.h>
 #include <tqobject.h>
 
-#include "klocale.h"
+#include "tdelocale.h"
 #include "tdesocketaddress.h"
 
 #include "netsupp.h"

tdecore/network/tdesocketbase.cpp

@@ -24,7 +24,7 @@
 
 #include <config.h>
 #include <tqmutex.h>
-#include "klocale.h"
+#include "tdelocale.h"
 
 #include "tdesocketbase.h"
 #include "tdesocketdevice.h"

tdecore/networkbackends/network-manager/network-manager_p.h

@@ -27,7 +27,7 @@
 
 /* TDE headers */
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /* TQDbus headers */
 #include <tqdbusconnection.h>

tdecore/tde-config.cpp.cmake

@@ -1,11 +1,11 @@
 // -*- c++ -*-
 
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <stdio.h>
 #include <tdeaboutdata.h>
 #include <config.h>

tdecore/tde-config.cpp.in

@@ -1,11 +1,11 @@
 // -*- c++ -*-
 
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <stdio.h>
 #include <tdeaboutdata.h>
 #include <config.h>

tdecore/tdeaboutdata.h

@@ -22,7 +22,7 @@
 #include <tqvaluelist.h>
 #include <tqstring.h>
 #include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifndef _KABOUTDATA_H_
 #define _KABOUTDATA_H_

tdecore/tdeaccel.cpp

@@ -29,7 +29,7 @@
 #include "tdeaccelbase.h"
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeshortcut.h>
 
 #include "tdeaccelprivate.h"

tdecore/tdeaccelaction.cpp

@@ -28,9 +28,9 @@
 #include <tdeconfig.h>
 #include "kckey.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kkeynative.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeshortcutlist.h>
 
 //---------------------------------------------------------------------

tdecore/tdeaccelbase.cpp

@@ -29,10 +29,10 @@
 #include <tdeconfig.h>
 #include "kckey.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kkeynative.h>
 #include "kkeyserver.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "tdeshortcutmenu.h"
 
 //---------------------------------------------------------------------

tdecore/tdeapplication.cpp

@@ -61,10 +61,10 @@
 #include <tqsqlpropertymap.h>
 #endif
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdestyle.h>
 #include <kiconloader.h>
 #include <kclipboard.h>
@@ -72,7 +72,7 @@
 #include <ksimpleconfig.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kcrash.h>
 #include <kdatastream.h>
 #include <klibloader.h>
@@ -89,7 +89,7 @@
 #include <kglobalaccel.h>
 
 #if defined Q_WS_X11
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #endif
 
 #include <dcopclient.h>

tdecore/tdecmdlineargs.cpp

@@ -37,9 +37,9 @@
 
 #include "tdecmdlineargs.h"
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstringhandler.h>
 #include <kstaticdeleter.h>