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/groupdav | |
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/groupdav')
-rw-r--r-- | tderesources/groupdav/groupdavaddressbookadaptor.cpp | 2 | ||||
-rw-r--r-- | tderesources/groupdav/groupdavglobals.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tderesources/groupdav/groupdavaddressbookadaptor.cpp b/tderesources/groupdav/groupdavaddressbookadaptor.cpp index f8f30f659..9704e5bd8 100644 --- a/tderesources/groupdav/groupdavaddressbookadaptor.cpp +++ b/tderesources/groupdav/groupdavaddressbookadaptor.cpp @@ -30,7 +30,7 @@ #include <kabc/vcardconverter.h> #include <kabcresourcecached.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <kdebug.h> using namespace KABC; diff --git a/tderesources/groupdav/groupdavglobals.cpp b/tderesources/groupdav/groupdavglobals.cpp index 5088bca96..793c1b965 100644 --- a/tderesources/groupdav/groupdavglobals.cpp +++ b/tderesources/groupdav/groupdavglobals.cpp @@ -34,8 +34,8 @@ #include <kabc/vcardconverter.h> #include <kdebug.h> -#include <kio/davjob.h> -#include <kio/job.h> +#include <tdeio/davjob.h> +#include <tdeio/job.h> TQString GroupDavGlobals::extractFingerprint( TDEIO::Job *job, const TQString &/*jobData*/ ) { |