summaryrefslogtreecommitdiffstats
path: root/tderesources/scalix/kcal/resourcescalix.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:05:15 -0600
commit64df902cf71a8ee258fb85f6be26248f399aa01f (patch)
treedba58f705042c22cea26b678d5b0e4e9a34bf202 /tderesources/scalix/kcal/resourcescalix.cpp
parentde53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff)
downloadtdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz
tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/scalix/kcal/resourcescalix.cpp')
-rw-r--r--tderesources/scalix/kcal/resourcescalix.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index a757c81fc..672a7bfbf 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -33,8 +33,8 @@
#include "resourcescalix.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 <libkcal/icalformat.h>
@@ -161,8 +161,8 @@ bool ResourceScalix::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 );