diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:15 -0600 |
| commit | 64df902cf71a8ee258fb85f6be26248f399aa01f (patch) | |
| tree | dba58f705042c22cea26b678d5b0e4e9a34bf202 /tderesources/kolab/kcal | |
| parent | de53c98cab07e9c4b0f5e25dab82830fb6fc67ec (diff) | |
| download | tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.tar.gz tdepim-64df902cf71a8ee258fb85f6be26248f399aa01f.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tderesources/kolab/kcal')
| -rw-r--r-- | tderesources/kolab/kcal/incidence.cpp | 2 | ||||
| -rw-r--r-- | tderesources/kolab/kcal/resourcekolab.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
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 ); |