summaryrefslogtreecommitdiffstats
path: root/tderesources/kolab/shared
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/kolab/shared
parent38b7daf1afffa515cf4880847c0d985f3c6ee753 (diff)
downloadtdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.tar.gz
tdepim-cfb328d59024a251690b6e47c9f8d343fd8c241c.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/kolab/shared')
-rw-r--r--tderesources/kolab/shared/kmailconnection.cpp2
-rw-r--r--tderesources/kolab/shared/kolabbase.cpp2
-rw-r--r--tderesources/kolab/shared/resourcekolabbase.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/tderesources/kolab/shared/kmailconnection.cpp b/tderesources/kolab/shared/kmailconnection.cpp
index d05b64a7b..8011c15d3 100644
--- a/tderesources/kolab/shared/kmailconnection.cpp
+++ b/tderesources/kolab/shared/kmailconnection.cpp
@@ -38,7 +38,7 @@
#include <dcopclient.h>
#include <tdeapplication.h>
#include <kdcopservicestarter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kmailicalIface_stub.h"
diff --git a/tderesources/kolab/shared/kolabbase.cpp b/tderesources/kolab/shared/kolabbase.cpp
index 167f2566a..35ca5b2b8 100644
--- a/tderesources/kolab/shared/kolabbase.cpp
+++ b/tderesources/kolab/shared/kolabbase.cpp
@@ -33,7 +33,7 @@
#include "kolabbase.h"
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
#include <libkcal/journal.h>
#include <libtdepim/kpimprefs.h>
#include <libemailfunctions/email.h>
diff --git a/tderesources/kolab/shared/resourcekolabbase.cpp b/tderesources/kolab/shared/resourcekolabbase.cpp
index a56538a67..ce53bad39 100644
--- a/tderesources/kolab/shared/resourcekolabbase.cpp
+++ b/tderesources/kolab/shared/resourcekolabbase.cpp
@@ -36,12 +36,12 @@
#include <folderselectdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kinputdialog.h>
#include <kurl.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
#include <tqtextstream.h>
#include <kdebug.h>