From cfb328d59024a251690b6e47c9f8d343fd8c241c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:38 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tderesources/kolab/kabc/contact.cpp             |  4 ++--
 tderesources/kolab/kabc/resourcekolab.cpp       | 10 +++++-----
 tderesources/kolab/kcal/resourcekolab.cpp       |  6 +++---
 tderesources/kolab/knotes/resourcekolab.cpp     |  4 ++--
 tderesources/kolab/shared/kmailconnection.cpp   |  2 +-
 tderesources/kolab/shared/kolabbase.cpp         |  2 +-
 tderesources/kolab/shared/resourcekolabbase.cpp |  6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'tderesources/kolab')

diff --git a/tderesources/kolab/kabc/contact.cpp b/tderesources/kolab/kabc/contact.cpp
index dac619fea..fec56ec6f 100644
--- a/tderesources/kolab/kabc/contact.cpp
+++ b/tderesources/kolab/kabc/contact.cpp
@@ -33,8 +33,8 @@
 #include "contact.h"
 #include "resourcekolab.h"
 
-#include <kabc/addressee.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
 #include <libkcal/freebusyurlstore.h>
 #include <libtdepim/distributionlist.h>
 #include <tdeio/netaccess.h>
diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp
index 93308b39f..246c0eec2 100644
--- a/tderesources/kolab/kabc/resourcekolab.cpp
+++ b/tderesources/kolab/kabc/resourcekolab.cpp
@@ -34,13 +34,13 @@
 #include "contact.h"
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <tdeio/observer.h>
 #include <tdeio/uiserver_stub.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
 #include <tdemainwindow.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index 101a9858b..064ea7589 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -42,11 +42,11 @@
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <libtdepim/kincidencechooser.h>
-#include <kabc/locknull.h>
+#include <tdeabc/locknull.h>
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kinputdialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kmdcodec.h>
 
 #include <tqfile.h>
diff --git a/tderesources/kolab/knotes/resourcekolab.cpp b/tderesources/kolab/knotes/resourcekolab.cpp
index a28a51b27..242281598 100644
--- a/tderesources/kolab/knotes/resourcekolab.cpp
+++ b/tderesources/kolab/knotes/resourcekolab.cpp
@@ -40,8 +40,8 @@
 #include <libkcal/icalformat.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace Kolab;
 
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>
 
-- 
cgit v1.2.1