Rename additional header files to avoid conflicts with KDE4

13 files changed, 17 insertions, 17 deletions

diff --git a/tderesources/lib/addressbookadaptor.cpp b/tderesources/lib/addressbookadaptor.cpp
index 230ac3509..722b29477 100644
--- a/tderesources/lib/addressbookadaptor.cpp
+++ b/tderesources/lib/addressbookadaptor.cpp
@@ -23,8 +23,8 @@
 
 #include "addressbookadaptor.h"
 
-#include <kabc/addressee.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/vcardconverter.h>
 #include <libtdepim/kabcresourcecached.h>
 #include <tdeio/job.h>
 
diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h
index b029ff60d..614afc488 100644
--- a/tderesources/lib/addressbookadaptor.h
+++ b/tderesources/lib/addressbookadaptor.h
@@ -25,7 +25,7 @@
 
 #include "groupwaredataadaptor.h"
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <tdepimmacros.h>
 #include <kurl.h>
 
diff --git a/tderesources/lib/davaddressbookadaptor.cpp b/tderesources/lib/davaddressbookadaptor.cpp
index bf4a03476..2d90c7cb5 100644
--- a/tderesources/lib/davaddressbookadaptor.cpp
+++ b/tderesources/lib/davaddressbookadaptor.cpp
@@ -26,8 +26,8 @@
 // #include "davgroupwareglobals.h"
 // #include "webdavhandler.h"
 
-// #include <kabc/addressee.h>
-// #include <kabc/vcardconverter.h>
+// #include <tdeabc/addressee.h>
+// #include <tdeabc/vcardconverter.h>
 // #include <kabcresourcecached.h>
 
 #include <tdeio/davjob.h>
diff --git a/tderesources/lib/folderconfig.cpp b/tderesources/lib/folderconfig.cpp
index 81c65af48..e400c02f8 100644
--- a/tderesources/lib/folderconfig.cpp
+++ b/tderesources/lib/folderconfig.cpp
@@ -28,7 +28,7 @@
 #include "folderlistview.h"
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kdialog.h>
 
diff --git a/tderesources/lib/folderlistview.cpp b/tderesources/lib/folderlistview.cpp
index be719d95a..4659bd46d 100644
--- a/tderesources/lib/folderlistview.cpp
+++ b/tderesources/lib/folderlistview.cpp
@@ -25,7 +25,7 @@
 #include "folderlister.h"
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <kdebug.h>
diff --git a/tderesources/lib/groupwaredownloadjob.cpp b/tderesources/lib/groupwaredownloadjob.cpp
index 63c7e988d..52a01fd47 100644
--- a/tderesources/lib/groupwaredownloadjob.cpp
+++ b/tderesources/lib/groupwaredownloadjob.cpp
@@ -27,7 +27,7 @@
 #include "groupwaredataadaptor.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdeio/job.h>
 #include <libemailfunctions/idmapper.h>
diff --git a/tderesources/lib/groupwareuploadjob.cpp b/tderesources/lib/groupwareuploadjob.cpp
index e896c0dab..51307d836 100644
--- a/tderesources/lib/groupwareuploadjob.cpp
+++ b/tderesources/lib/groupwareuploadjob.cpp
@@ -35,7 +35,7 @@
 
 #include <tqstringlist.h>
 #include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace KPIM;
 
diff --git a/tderesources/lib/kabc_resourcegroupwarebase.cpp b/tderesources/lib/kabc_resourcegroupwarebase.cpp
index 87ca28cec..3ebd175eb 100644
--- a/tderesources/lib/kabc_resourcegroupwarebase.cpp
+++ b/tderesources/lib/kabc_resourcegroupwarebase.cpp
@@ -28,9 +28,9 @@
 #include "groupwaredownloadjob.h"
 #include "groupwareuploadjob.h"
 
-#include <kabc/addressee.h>
-#include <kabc/vcardconverter.h>
-#include <klocale.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/vcardconverter.h>
+#include <tdelocale.h>
 
 using namespace KABC;
 
diff --git a/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp
index 4e4f05275..918dfc52b 100644
--- a/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp
+++ b/tderesources/lib/kabc_resourcegroupwarebaseconfig.cpp
@@ -28,7 +28,7 @@
 
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kurlrequester.h>
 
diff --git a/tderesources/lib/kcal_cachesettingsdlg.cpp b/tderesources/lib/kcal_cachesettingsdlg.cpp
index 3c2dbed17..014249078 100644
--- a/tderesources/lib/kcal_cachesettingsdlg.cpp
+++ b/tderesources/lib/kcal_cachesettingsdlg.cpp
@@ -27,7 +27,7 @@
 
 #include <libkcal/resourcecachedconfig.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kdialog.h>
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp
index 56ffae7d5..8f507fd16 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.cpp
+++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp
@@ -32,7 +32,7 @@
 
 #include <libkcal/icalformat.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqapplication.h>
 
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h
index 8a1033fb2..b0c9af2e9 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.h
+++ b/tderesources/lib/kcal_resourcegroupwarebase.h
@@ -26,7 +26,7 @@
 #include <kurl.h>
 #include <libkcal/resourcecached.h>
 #include <tdepimmacros.h>
-#include <kabc/locknull.h>
+#include <tdeabc/locknull.h>
 
 namespace TDEIO {
 class Job;
diff --git a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp
index b654f8d0e..1ca2570af 100644
--- a/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp
+++ b/tderesources/lib/kcal_resourcegroupwarebaseconfig.cpp
@@ -29,7 +29,7 @@
 
 #include <libkcal/resourcecachedconfig.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <klineedit.h>
 #include <kdialog.h>