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/kolab/kabc/contact.cpp       | 2 +-
 tderesources/kolab/kabc/resourcekolab.cpp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tderesources/kolab/kabc')

diff --git a/tderesources/kolab/kabc/contact.cpp b/tderesources/kolab/kabc/contact.cpp
index ff8f869b7..dac619fea 100644
--- a/tderesources/kolab/kabc/contact.cpp
+++ b/tderesources/kolab/kabc/contact.cpp
@@ -37,7 +37,7 @@
 #include <kabc/stdaddressbook.h>
 #include <libkcal/freebusyurlstore.h>
 #include <libtdepim/distributionlist.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <kdebug.h>
 #include <tqfile.h>
 #include <float.h>
diff --git a/tderesources/kolab/kabc/resourcekolab.cpp b/tderesources/kolab/kabc/resourcekolab.cpp
index ce7c18c42..51c3a4b42 100644
--- a/tderesources/kolab/kabc/resourcekolab.cpp
+++ b/tderesources/kolab/kabc/resourcekolab.cpp
@@ -38,8 +38,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
-#include <kio/observer.h>
-#include <kio/uiserver_stub.h>
+#include <tdeio/observer.h>
+#include <tdeio/uiserver_stub.h>
 #include <kabc/vcardconverter.h>
 #include <kmainwindow.h>
 #include <kapplication.h>
@@ -197,8 +197,8 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
   // If it's too big the progressbar is jumpy.
   const int nbMessages = 200;
 
-  (void)Observer::self(); // ensure kio_uiserver is running
-  UIServer_stub uiserver( "kio_uiserver", "UIServer" );
+  (void)Observer::self(); // ensure tdeio_uiserver is running
+  UIServer_stub uiserver( "tdeio_uiserver", "UIServer" );
   int progressId = 0;
   if ( count > 200 ) {
     progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
-- 
cgit v1.2.1