summaryrefslogtreecommitdiffstats
path: root/tderesources/egroupware
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:38 -0600
commitcfb328d59024a251690b6e47c9f8d343fd8c241c (patch)
tree7c11070cd07e5e023a26ddcfa41832c208c63732 /tderesources/egroupware
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/egroupware')
-rw-r--r--tderesources/egroupware/debugdialog.cpp2
-rw-r--r--tderesources/egroupware/kabc_resourcexmlrpc.cpp4
-rw-r--r--tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp2
-rw-r--r--tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp4
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpc.cpp4
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp2
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp4
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpc.cpp2
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp2
-rw-r--r--tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp4
-rw-r--r--tderesources/egroupware/xmlrpciface.cpp2
11 files changed, 16 insertions, 16 deletions
diff --git a/tderesources/egroupware/debugdialog.cpp b/tderesources/egroupware/debugdialog.cpp
index 54fe07234..70cc87f57 100644
--- a/tderesources/egroupware/debugdialog.cpp
+++ b/tderesources/egroupware/debugdialog.cpp
@@ -26,7 +26,7 @@
#include <kstaticdeleter.h>
#include <stdlib.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "debugdialog.h"
DebugDialog* DebugDialog::mSelf = 0;
diff --git a/tderesources/egroupware/kabc_resourcexmlrpc.cpp b/tderesources/egroupware/kabc_resourcexmlrpc.cpp
index 39e3aac14..587ebc84d 100644
--- a/tderesources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/kabc_resourcexmlrpc.cpp
@@ -20,11 +20,11 @@
#include <tqapplication.h>
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <kabprefs.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmdcodec.h>
#include <kstandarddirs.h>
#include <kstringhandler.h>
diff --git a/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp b/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp
index ddafbd1f2..03665e75d 100644
--- a/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp
+++ b/tderesources/egroupware/kabc_resourcexmlrpcconfig.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kurlrequester.h>
diff --git a/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp b/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp
index c4c0cc6c0..c14a8f679 100644
--- a/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp
+++ b/tderesources/egroupware/kabc_resourcexmlrpcplugin.cpp
@@ -21,8 +21,8 @@
#include "kabc_resourcexmlrpc.h"
#include "kabc_resourcexmlrpcconfig.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace KABC;
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
index c703fa2b9..7c568e4e6 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
@@ -28,9 +28,9 @@
#include <tqstringlist.h>
#include <tqtimer.h>
-#include <kabc/locknull.h>
+#include <tdeabc/locknull.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tderesources/configwidget.h>
#include <kstandarddirs.h>
#include <kstringhandler.h>
diff --git a/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp b/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp
index 213da26e3..12b1c76d1 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp
+++ b/tderesources/egroupware/kcal_resourcexmlrpcconfig.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <kdialog.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kurlrequester.h>
diff --git a/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp b/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp
index 021389b61..b1d9665a0 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp
+++ b/tderesources/egroupware/kcal_resourcexmlrpcplugin.cpp
@@ -21,8 +21,8 @@
#include "kcal_resourcexmlrpc.h"
#include "kcal_resourcexmlrpcconfig.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace KCal;
diff --git a/tderesources/egroupware/knotes_resourcexmlrpc.cpp b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
index 1b19831bc..15d76b238 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/knotes_resourcexmlrpc.cpp
@@ -23,7 +23,7 @@
#include <tqstringlist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kstringhandler.h>
#include <kurl.h>
diff --git a/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp b/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp
index 8cf2a35c8..c7b43a362 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp
+++ b/tderesources/egroupware/knotes_resourcexmlrpcconfig.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <kdialog.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kurlrequester.h>
diff --git a/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp b/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp
index 276cb6b0f..6d7809207 100644
--- a/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp
+++ b/tderesources/egroupware/knotes_resourcexmlrpcplugin.cpp
@@ -21,8 +21,8 @@
#include "knotes_resourcexmlrpc.h"
#include "knotes_resourcexmlrpcconfig.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace KNotes;
diff --git a/tderesources/egroupware/xmlrpciface.cpp b/tderesources/egroupware/xmlrpciface.cpp
index 7af9814a1..06ad93e06 100644
--- a/tderesources/egroupware/xmlrpciface.cpp
+++ b/tderesources/egroupware/xmlrpciface.cpp
@@ -12,7 +12,7 @@
#include <kdebug.h>
#include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmdcodec.h>
#include "debugdialog.h"