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/scalix/kabc/resourcescalix.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'tderesources/scalix/kabc')

diff --git a/tderesources/scalix/kabc/resourcescalix.cpp b/tderesources/scalix/kabc/resourcescalix.cpp
index 42aef92d..13ee99ec 100644
--- a/tderesources/scalix/kabc/resourcescalix.cpp
+++ b/tderesources/scalix/kabc/resourcescalix.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 <kmainwindow.h>
 #include <kapplication.h>
 #include <dcopclient.h>
@@ -193,8 +193,8 @@ bool KABC::ResourceScalix::loadSubResourceHelper( 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.3