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/kabc/resourcekolab.cpp | |
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/kabc/resourcekolab.cpp')
-rw-r--r-- | tderesources/kolab/kabc/resourcekolab.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 ); |