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/groupwise/soap/contactconverter.cpp   |  2 +-
 tderesources/groupwise/soap/contactconverter.h     |  2 +-
 tderesources/groupwise/soap/groupwiseserver.cpp    | 10 +++++-----
 tderesources/groupwise/soap/groupwiseserver.h      |  2 +-
 tderesources/groupwise/soap/gwjobs.cpp             |  6 +++---
 tderesources/groupwise/soap/gwjobs.h               |  2 +-
 tderesources/groupwise/soap/incidenceconverter.cpp |  6 +++---
 tderesources/groupwise/soap/ksslsocket.cpp         |  4 ++--
 tderesources/groupwise/soap/soapdebug.cpp          |  2 +-
 9 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'tderesources/groupwise/soap')

diff --git a/tderesources/groupwise/soap/contactconverter.cpp b/tderesources/groupwise/soap/contactconverter.cpp
index 69c4b90f2..1ce391381 100644
--- a/tderesources/groupwise/soap/contactconverter.cpp
+++ b/tderesources/groupwise/soap/contactconverter.cpp
@@ -21,7 +21,7 @@
 #include "contactconverter.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ContactConverter::ContactConverter( struct soap* soap )
   : GWConverter( soap )
diff --git a/tderesources/groupwise/soap/contactconverter.h b/tderesources/groupwise/soap/contactconverter.h
index 7dbc8c79c..2f98a328c 100644
--- a/tderesources/groupwise/soap/contactconverter.h
+++ b/tderesources/groupwise/soap/contactconverter.h
@@ -21,7 +21,7 @@
 #ifndef KABC_GW_CONTACTCONVERTER_H
 #define KABC_GW_CONTACTCONVERTER_H
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include "gwconverter.h"
 
diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp
index 780708347..4e2810777 100644
--- a/tderesources/groupwise/soap/groupwiseserver.cpp
+++ b/tderesources/groupwise/soap/groupwiseserver.cpp
@@ -27,16 +27,16 @@
 #include <libkcal/incidence.h>
 #include <libtdepim/kpimprefs.h>
 
-#include <kabc/addressee.h>
-#include <kabc/addresseelist.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseelist.h>
 
 #include <tdeio/job.h>
 #include <tdeio/jobclasses.h>
 #include <tdeio/netaccess.h>
-#include <kprotocolmanager.h>
-#include <ktempfile.h>
+#include <tdeprotocolmanager.h>
+#include <tdetempfile.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqnamespace.h>
 #include <tqfile.h>
diff --git a/tderesources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h
index e1c25c0f3..71c6f6d54 100644
--- a/tderesources/groupwise/soap/groupwiseserver.h
+++ b/tderesources/groupwise/soap/groupwiseserver.h
@@ -32,7 +32,7 @@
 
 #include <string>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <libkcal/freebusy.h>
 
 #include "gwjobs.h"
diff --git a/tderesources/groupwise/soap/gwjobs.cpp b/tderesources/groupwise/soap/gwjobs.cpp
index 343a4a208..435bb2aef 100644
--- a/tderesources/groupwise/soap/gwjobs.cpp
+++ b/tderesources/groupwise/soap/gwjobs.cpp
@@ -19,9 +19,9 @@
 */
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kabc/addressee.h>
-#include <kabc/resource.h>
+#include <tdelocale.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/resource.h>
 
 #include <libkcal/incidence.h>
 #include <libkcal/resourcecached.h>
diff --git a/tderesources/groupwise/soap/gwjobs.h b/tderesources/groupwise/soap/gwjobs.h
index bf60ecbd9..e3ce4a2fa 100644
--- a/tderesources/groupwise/soap/gwjobs.h
+++ b/tderesources/groupwise/soap/gwjobs.h
@@ -24,7 +24,7 @@
 
 #include <string>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 namespace KABC {
 class Resource;
diff --git a/tderesources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp
index 79ad94a57..580d84e6e 100644
--- a/tderesources/groupwise/soap/incidenceconverter.cpp
+++ b/tderesources/groupwise/soap/incidenceconverter.cpp
@@ -18,15 +18,15 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
 #include <libtdepim/kpimprefs.h>
 #include <libkcal/event.h>
 #include <libkcal/journal.h>
 #include <libkcal/recurrence.h>
 #include <libkcal/kcalversion.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
 #include <kdebug.h>
 
 #include "incidenceconverter.h"
diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp
index 16ddf70db..6bf74da55 100644
--- a/tderesources/groupwise/soap/ksslsocket.cpp
+++ b/tderesources/groupwise/soap/ksslsocket.cpp
@@ -20,7 +20,7 @@
 #include <tqsocketnotifier.h>
 
 #include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kssl.h>
 #include <ksslinfodlg.h>
@@ -28,7 +28,7 @@
 #include <ksslcertchain.h>
 #include <ksslcertificatecache.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "ksslsocket.h"
 
diff --git a/tderesources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp
index 5ea29cbea..3c9cfc802 100644
--- a/tderesources/groupwise/soap/soapdebug.cpp
+++ b/tderesources/groupwise/soap/soapdebug.cpp
@@ -5,7 +5,7 @@
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <kabcresourcecached.h>
 
-- 
cgit v1.2.1