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

(limited to 'tderesources/kolab/kcal')

diff --git a/tderesources/kolab/kcal/incidence.cpp b/tderesources/kolab/kcal/incidence.cpp
index ddc31491b..b5603b191 100644
--- a/tderesources/kolab/kcal/incidence.cpp
+++ b/tderesources/kolab/kcal/incidence.cpp
@@ -44,7 +44,7 @@
 #include <kdebug.h>
 #include <kmdcodec.h>
 #include <kurl.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 
 using namespace Kolab;
 
diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index 44c13fd2b..50f8b5b82 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -37,8 +37,8 @@
 #include "task.h"
 #include "journal.h"
 
-#include <kio/observer.h>
-#include <kio/uiserver_stub.h>
+#include <tdeio/observer.h>
+#include <tdeio/uiserver_stub.h>
 #include <kapplication.h>
 #include <dcopclient.h>
 #include <libtdepim/kincidencechooser.h>
@@ -172,8 +172,8 @@ bool ResourceKolab::loadSubResource( const TQString& subResource,
                            : i18n( "Loading events..." );
   const bool useProgress = tqApp && tqApp->type() != TQApplication::Tty && count > mProgressDialogIncidenceLimit;
   if ( useProgress )
-    (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 ( useProgress ) {
     progressId = uiserver.newJob( kapp->dcopClient()->appId(), true );
-- 
cgit v1.2.1