Rename additional header files to avoid conflicts with KDE4

42 files changed, 64 insertions, 64 deletions

diff --git a/libkcal/CMakeLists.txt b/libkcal/CMakeLists.txt
index a4113e36c..af759febd 100644
--- a/libkcal/CMakeLists.txt
+++ b/libkcal/CMakeLists.txt
@@ -99,7 +99,7 @@ tde_add_library( kcal SHARED AUTOMOC
     htmlexportsettings.kcfgc htmlexport.cpp calendarnull.cpp
     freebusyurlstore.cpp confirmsavedialog.cpp
   VERSION 2.0.0
-  LINK versit-static emailfunctions-static ktnef-shared kmime-shared kabc-shared ${LIBICAL_LIBRARIES}
+  LINK versit-static emailfunctions-static ktnef-shared kmime-shared tdeabc-shared ${LIBICAL_LIBRARIES}
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
diff --git a/libkcal/HACKING b/libkcal/HACKING
index fc431906e..ffaef8ac4 100644
--- a/libkcal/HACKING
+++ b/libkcal/HACKING
@@ -1,4 +1,4 @@
-See tdelibs/kabc/HACKING or http://korganizer.kde.org/develop/hacking.html for
+See tdelibs/tdeabc/HACKING or http://korganizer.kde.org/develop/hacking.html for
 general coding style conventions.
 
 Additional conventions for libkcal and KOrganizer:
diff --git a/libkcal/attachmenthandler.cpp b/libkcal/attachmenthandler.cpp
index aff810c10..0ddb5c8d8 100644
--- a/libkcal/attachmenthandler.cpp
+++ b/libkcal/attachmenthandler.cpp
@@ -36,11 +36,11 @@
 
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <krun.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 #include <tqfile.h>
diff --git a/libkcal/attendee.cpp b/libkcal/attendee.cpp
index 9aa3d46f7..7eca77464 100644
--- a/libkcal/attendee.cpp
+++ b/libkcal/attendee.cpp
@@ -22,7 +22,7 @@
 #include <tqstringlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "attendee.h"
 
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index ad5030a15..5918a749b 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "exceptions.h"
 #include "calfilter.h"
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index fd7025f76..297c5104b 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -26,8 +26,8 @@
 #include <tqptrlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "vcaldrag.h"
 #include "vcalformat.h"
diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp
index d39564e9a..b7d73dec1 100644
--- a/libkcal/calendarresources.cpp
+++ b/libkcal/calendarresources.cpp
@@ -34,7 +34,7 @@
 
 #include <kdebug.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "vcaldrag.h"
 #include "vcalformat.h"
@@ -46,7 +46,7 @@
 
 #include <tderesources/manager.h>
 #include <tderesources/selectdialog.h>
-#include <kabc/lock.h>
+#include <tdeabc/lock.h>
 
 #include "resourcecalendar.h"
 #include "resourcelocal.h"
diff --git a/libkcal/calformat.cpp b/libkcal/calformat.cpp
index 6775c9ec9..d6aa22784 100644
--- a/libkcal/calformat.cpp
+++ b/libkcal/calformat.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
 
diff --git a/libkcal/confirmsavedialog.cpp b/libkcal/confirmsavedialog.cpp
index 6ac64e611..61716eaba 100644
--- a/libkcal/confirmsavedialog.cpp
+++ b/libkcal/confirmsavedialog.cpp
@@ -21,7 +21,7 @@
 #include "confirmsavedialog.h"
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqframe.h>
diff --git a/libkcal/convertqtopia.cpp b/libkcal/convertqtopia.cpp
index ef585e633..a626231f4 100644
--- a/libkcal/convertqtopia.cpp
+++ b/libkcal/convertqtopia.cpp
@@ -26,9 +26,9 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 
diff --git a/libkcal/dndfactory.cpp b/libkcal/dndfactory.cpp
index 61818b9d6..0a1d68c08 100644
--- a/libkcal/dndfactory.cpp
+++ b/libkcal/dndfactory.cpp
@@ -27,8 +27,8 @@
 
 #include <kiconloader.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "vcaldrag.h"
 #include "icaldrag.h"
diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index b040d1823..53d094d37 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "event.h"
diff --git a/libkcal/exceptions.cpp b/libkcal/exceptions.cpp
index 99c804ddf..8939248c7 100644
--- a/libkcal/exceptions.cpp
+++ b/libkcal/exceptions.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "calformat.h"
 #include "exceptions.h"
diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp
index 7938c7512..2b538574a 100644
--- a/libkcal/htmlexport.cpp
+++ b/libkcal/htmlexport.cpp
@@ -27,8 +27,8 @@
 #include <tqregexp.h>
 
 #include <kcharsets.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcalendarsystem.h>
 
@@ -38,7 +38,7 @@
 #include <libkcal/todo.h>
 
 #ifndef KORG_NOKABC
- #include <kabc/stdaddressbook.h>
+ #include <tdeabc/stdaddressbook.h>
 #endif
 #include "htmlexport.h"
 #include "htmlexportsettings.h"
diff --git a/libkcal/icalformat.cpp b/libkcal/icalformat.cpp
index deb38a60d..34a4a1a92 100644
--- a/libkcal/icalformat.cpp
+++ b/libkcal/icalformat.cpp
@@ -28,7 +28,7 @@
 #include <tqtextstream.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 extern "C" {
   #include <libical/ical.h>
diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index db3177fd2..599eab3f1 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -27,7 +27,7 @@
 #include <cstdlib>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 
 extern "C" {
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index e509cc05a..99b17e99f 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -20,8 +20,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "calformat.h"
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 74c896f57..da314b639 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -20,8 +20,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "calformat.h"
diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp
index 0a42e2aac..1455a24a0 100644
--- a/libkcal/incidenceformatter.cpp
+++ b/libkcal/incidenceformatter.cpp
@@ -38,15 +38,15 @@
 #include <ktnef/ktnefparser.h>
 #include <ktnef/ktnefmessage.h>
 #include <ktnef/ktnefdefs.h>
-#include <kabc/phonenumber.h>
-#include <kabc/vcardconverter.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/phonenumber.h>
+#include <tdeabc/vcardconverter.h>
+#include <tdeabc/stdaddressbook.h>
 
 #include <tdeapplication.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kcalendarsystem.h>
 #include <kmimetype.h>
diff --git a/libkcal/period.cpp b/libkcal/period.cpp
index ff944ee94..586ba3e7f 100644
--- a/libkcal/period.cpp
+++ b/libkcal/period.cpp
@@ -20,7 +20,7 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "period.h"
 
diff --git a/libkcal/person.cpp b/libkcal/person.cpp
index aad80f68f..d56233bb8 100644
--- a/libkcal/person.cpp
+++ b/libkcal/person.cpp
@@ -23,7 +23,7 @@
 #include "person.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <libemailfunctions/email.h>
 
diff --git a/libkcal/qtopiaformat.cpp b/libkcal/qtopiaformat.cpp
index d417f9ea4..a3f3f6f0c 100644
--- a/libkcal/qtopiaformat.cpp
+++ b/libkcal/qtopiaformat.cpp
@@ -29,7 +29,7 @@
 #include <tqxml.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "calendar.h"
 #include "calendarlocal.h"
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index d4e47a528..1c64ea3d2 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -25,8 +25,8 @@
 #include <limits.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqbitarray.h>
 
 #include "recurrence.h"
diff --git a/libkcal/recurrencerule.cpp b/libkcal/recurrencerule.cpp
index 946141df7..9805784f3 100644
--- a/libkcal/recurrencerule.cpp
+++ b/libkcal/recurrencerule.cpp
@@ -23,7 +23,7 @@
 #include "recurrencerule.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqdatetime.h>
 #include <tqstringlist.h>
 
diff --git a/libkcal/resourcecached.cpp b/libkcal/resourcecached.cpp
index 13d11be04..381104317 100644
--- a/libkcal/resourcecached.cpp
+++ b/libkcal/resourcecached.cpp
@@ -30,7 +30,7 @@
 #include <tqptrlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 
diff --git a/libkcal/resourcecachedconfig.cpp b/libkcal/resourcecachedconfig.cpp
index caa1fddf8..ee43f711d 100644
--- a/libkcal/resourcecachedconfig.cpp
+++ b/libkcal/resourcecachedconfig.cpp
@@ -26,7 +26,7 @@
 #include <tqhbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "resourcecached.h"
diff --git a/libkcal/resourcecalendar.cpp b/libkcal/resourcecalendar.cpp
index 76f12ed13..fb51f0abb 100644
--- a/libkcal/resourcecalendar.cpp
+++ b/libkcal/resourcecalendar.cpp
@@ -24,7 +24,7 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "calendar.h"
 
diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h
index c84554833..80f37f821 100644
--- a/libkcal/resourcecalendar.h
+++ b/libkcal/resourcecalendar.h
@@ -40,7 +40,7 @@
 
 #include <tderesources/resource.h>
 #include <tderesources/manager.h>
-#include <kabc/lock.h>
+#include <tdeabc/lock.h>
 #include <tdepimmacros.h>
 
 namespace KCal {
diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp
index dca20b9ae..aee2ba988 100644
--- a/libkcal/resourcelocal.cpp
+++ b/libkcal/resourcelocal.cpp
@@ -28,7 +28,7 @@
 #include <tqptrlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kstandarddirs.h>
 
diff --git a/libkcal/resourcelocalconfig.cpp b/libkcal/resourcelocalconfig.cpp
index 92c34e294..ccba03284 100644
--- a/libkcal/resourcelocalconfig.cpp
+++ b/libkcal/resourcelocalconfig.cpp
@@ -25,8 +25,8 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 
diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp
index 730f3abd8..f51457351 100644
--- a/libkcal/resourcelocaldir.cpp
+++ b/libkcal/resourcelocaldir.cpp
@@ -28,7 +28,7 @@
 #include <tqptrlist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
diff --git a/libkcal/resourcelocaldirconfig.cpp b/libkcal/resourcelocaldirconfig.cpp
index df2412b3d..afe9c95b1 100644
--- a/libkcal/resourcelocaldirconfig.cpp
+++ b/libkcal/resourcelocaldirconfig.cpp
@@ -24,9 +24,9 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "vcaldrag.h"
diff --git a/libkcal/scheduler.cpp b/libkcal/scheduler.cpp
index 6e3cf3850..c398a77ca 100644
--- a/libkcal/scheduler.cpp
+++ b/libkcal/scheduler.cpp
@@ -20,9 +20,9 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "calhelper.h"
diff --git a/libkcal/tests/readandwrite.cpp b/libkcal/tests/readandwrite.cpp
index 53e082a3d..5f6c3488d 100644
--- a/libkcal/tests/readandwrite.cpp
+++ b/libkcal/tests/readandwrite.cpp
@@ -28,7 +28,7 @@ extern "C" {
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include <tqfile.h>
diff --git a/libkcal/tests/testcalendar.cpp b/libkcal/tests/testcalendar.cpp
index 85f77d78e..b5c15ac45 100644
--- a/libkcal/tests/testcalendar.cpp
+++ b/libkcal/tests/testcalendar.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "calendarlocal.h"
diff --git a/libkcal/tests/testcalselectdialog.cpp b/libkcal/tests/testcalselectdialog.cpp
index 2c3ae7f72..84fe89c8f 100644
--- a/libkcal/tests/testcalselectdialog.cpp
+++ b/libkcal/tests/testcalselectdialog.cpp
@@ -22,7 +22,7 @@ using namespace KCal;
 
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 int main( int argc, char **argv )
diff --git a/libkcal/tests/testfields.cpp b/libkcal/tests/testfields.cpp
index 2d393aa65..05522dfec 100644
--- a/libkcal/tests/testfields.cpp
+++ b/libkcal/tests/testfields.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "calendarlocal.h"
diff --git a/libkcal/tests/testincidence.cpp b/libkcal/tests/testincidence.cpp
index 858ed9ccd..e510cf739 100644
--- a/libkcal/tests/testincidence.cpp
+++ b/libkcal/tests/testincidence.cpp
@@ -22,7 +22,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include "icalformat.h"
diff --git a/libkcal/tests/testresource.cpp b/libkcal/tests/testresource.cpp
index 64ada3b0a..a5f207862 100644
--- a/libkcal/tests/testresource.cpp
+++ b/libkcal/tests/testresource.cpp
@@ -21,7 +21,7 @@
 
 #include <config.h>
 
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <kurl.h>
 #include <tdeapplication.h>
 #include <tdeio/netaccess.h>
diff --git a/libkcal/tests/testvcalexport.cpp b/libkcal/tests/testvcalexport.cpp
index d6997ef49..7cf619d00 100644
--- a/libkcal/tests/testvcalexport.cpp
+++ b/libkcal/tests/testvcalexport.cpp
@@ -32,7 +32,7 @@ extern "C" {
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 #include <tqfile.h>
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 7c4a4df33..d7ba1658a 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -19,8 +19,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "todo.h"
diff --git a/libkcal/vcalformat.cpp b/libkcal/vcalformat.cpp
index 9c7a0f1cd..7733b27dd 100644
--- a/libkcal/vcalformat.cpp
+++ b/libkcal/vcalformat.cpp
@@ -30,9 +30,9 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "vcc.h"
 #include "vobject.h"