From 64df902cf71a8ee258fb85f6be26248f399aa01f Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:05:15 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 tderesources/groupwise/soap/groupwiseserver.cpp | 6 +++---
 tderesources/groupwise/soap/groupwiseserver.h   | 4 ++--
 tderesources/groupwise/soap/ksslsocket.cpp      | 6 +++---
 tderesources/groupwise/soap/ksslsocket.h        | 2 +-
 tderesources/groupwise/soap/soapdebug.cpp       | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'tderesources/groupwise/soap')

diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp
index 9112fdeab..cedcde6aa 100644
--- a/tderesources/groupwise/soap/groupwiseserver.cpp
+++ b/tderesources/groupwise/soap/groupwiseserver.cpp
@@ -30,9 +30,9 @@
 #include <kabc/addressee.h>
 #include <kabc/addresseelist.h>
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
+#include <tdeio/netaccess.h>
 #include <kprotocolmanager.h>
 #include <ktempfile.h>
 #include <kdebug.h>
diff --git a/tderesources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h
index 95218be06..e1c25c0f3 100644
--- a/tderesources/groupwise/soap/groupwiseserver.h
+++ b/tderesources/groupwise/soap/groupwiseserver.h
@@ -21,8 +21,8 @@
 #ifndef GROUPWISESERVER_H
 #define GROUPWISESERVER_H
 
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
 #include <tqapplication.h>
 #include <tqmap.h>
 #include <tqobject.h>
diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp
index 90ccf83d6..809c29b8b 100644
--- a/tderesources/groupwise/soap/ksslsocket.cpp
+++ b/tderesources/groupwise/soap/ksslsocket.cpp
@@ -181,12 +181,12 @@ int KSSLSocket::messageBox( TDEIO::SlaveBase::MessageBoxType type, const TQStrin
 		d->dcc = new DCOPClient();
 		d->dcc->attach();
 	}
-	if (!d->dcc->isApplicationRegistered("kio_uiserver"))
+	if (!d->dcc->isApplicationRegistered("tdeio_uiserver"))
 	{
-		TDEApplication::startServiceByDesktopPath("kio_uiserver.desktop",TQStringList());
+		TDEApplication::startServiceByDesktopPath("tdeio_uiserver.desktop",TQStringList());
 	}
 
-	d->dcc->call("kio_uiserver", "UIServer",
+	d->dcc->call("tdeio_uiserver", "UIServer",
 			"messageBox(int,int,TQString,TQString,TQString,TQString)", data, returnType, result);
 
 	if( returnType == "int" )
diff --git a/tderesources/groupwise/soap/ksslsocket.h b/tderesources/groupwise/soap/ksslsocket.h
index c19b440a1..425459483 100644
--- a/tderesources/groupwise/soap/ksslsocket.h
+++ b/tderesources/groupwise/soap/ksslsocket.h
@@ -21,7 +21,7 @@
 
 #include <tqvariant.h>
 #include <kextsock.h>
-#include <kio/slavebase.h>
+#include <tdeio/slavebase.h>
 
 class KSSLSocketPrivate;
 
diff --git a/tderesources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp
index 415021a78..e68da9ee1 100644
--- a/tderesources/groupwise/soap/soapdebug.cpp
+++ b/tderesources/groupwise/soap/soapdebug.cpp
@@ -3,7 +3,7 @@
 #include <kaboutdata.h>
 #include <kapplication.h>
 #include <kcmdlineargs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <ktempfile.h>
 
-- 
cgit v1.2.1