summaryrefslogtreecommitdiffstats
path: root/tderesources/groupdav
diff options
context:
space:
mode:
Diffstat (limited to 'tderesources/groupdav')
-rw-r--r--tderesources/groupdav/groupdavaddressbookadaptor.cpp2
-rw-r--r--tderesources/groupdav/groupdavaddressbookadaptor.h2
-rw-r--r--tderesources/groupdav/groupdavglobals.cpp8
-rw-r--r--tderesources/groupdav/groupdavglobals.h4
-rw-r--r--tderesources/groupdav/tdeabc_resourcegroupdav.cpp2
-rw-r--r--tderesources/groupdav/tdeabc_resourcegroupdav.h2
-rw-r--r--tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp2
7 files changed, 11 insertions, 11 deletions
diff --git a/tderesources/groupdav/groupdavaddressbookadaptor.cpp b/tderesources/groupdav/groupdavaddressbookadaptor.cpp
index 278c261a..75aa3e74 100644
--- a/tderesources/groupdav/groupdavaddressbookadaptor.cpp
+++ b/tderesources/groupdav/groupdavaddressbookadaptor.cpp
@@ -33,7 +33,7 @@
#include <tdeio/job.h>
#include <kdebug.h>
-using namespace KABC;
+using namespace TDEABC;
GroupDavAddressBookAdaptor::GroupDavAddressBookAdaptor() : DavAddressBookAdaptor()
{
diff --git a/tderesources/groupdav/groupdavaddressbookadaptor.h b/tderesources/groupdav/groupdavaddressbookadaptor.h
index 7a845955..89e7809b 100644
--- a/tderesources/groupdav/groupdavaddressbookadaptor.h
+++ b/tderesources/groupdav/groupdavaddressbookadaptor.h
@@ -31,7 +31,7 @@
#include <tqdom.h>
-namespace KABC {
+namespace TDEABC {
class GroupDavAddressBookAdaptor : public DavAddressBookAdaptor
{
diff --git a/tderesources/groupdav/groupdavglobals.cpp b/tderesources/groupdav/groupdavglobals.cpp
index fdf68797..43a7bb67 100644
--- a/tderesources/groupdav/groupdavglobals.cpp
+++ b/tderesources/groupdav/groupdavglobals.cpp
@@ -259,21 +259,21 @@ kdDebug(5800) << jobData << endl;
bool GroupDavGlobals::interpretAddressBookDownloadItemsJob(
- KABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &jobData )
+ TDEABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &jobData )
{
kdDebug(5800) << "GroupDavGlobals::interpretAddressBookDownloadItemsJob, vCard=" << endl;
kdDebug(5800) << jobData << endl;
if ( !adaptor || !job ) return false;
- KABC::VCardConverter conv;
- KABC::Addressee::List addrs( conv.parseVCards( jobData ) );
+ TDEABC::VCardConverter conv;
+ TDEABC::Addressee::List addrs( conv.parseVCards( jobData ) );
if ( addrs.count() != 1 ) {
kdError() << "Parsed vCard does not contain exactly one addressee." << endl;
return false;
}
- KABC::Addressee a = addrs.first();
+ TDEABC::Addressee a = addrs.first();
TDEIO::SimpleJob *sjob = dynamic_cast<TDEIO::SimpleJob*>(job);
KURL remoteId;
diff --git a/tderesources/groupdav/groupdavglobals.h b/tderesources/groupdav/groupdavglobals.h
index e7f2b06e..e996160b 100644
--- a/tderesources/groupdav/groupdavglobals.h
+++ b/tderesources/groupdav/groupdavglobals.h
@@ -36,7 +36,7 @@ namespace TDEIO {
class TransferJob;
class Job;
}
-namespace KABC {
+namespace TDEABC {
class AddressBookAdaptor;
}
namespace KCal {
@@ -65,7 +65,7 @@ class GroupDavGlobals
TDEIO::Job *job );
static bool interpretCalendarDownloadItemsJob( KCal::CalendarAdaptor *adaptor,
TDEIO::Job *job, const TQString &jobData );
- static bool interpretAddressBookDownloadItemsJob( KABC::AddressBookAdaptor *adaptor,
+ static bool interpretAddressBookDownloadItemsJob( TDEABC::AddressBookAdaptor *adaptor,
TDEIO::Job *job, const TQString &jobData );
};
diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.cpp b/tderesources/groupdav/tdeabc_resourcegroupdav.cpp
index e74b4d2c..fc8bb70e 100644
--- a/tderesources/groupdav/tdeabc_resourcegroupdav.cpp
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav.cpp
@@ -25,7 +25,7 @@
#include "tdeabc_resourcegroupdav.h"
-using namespace KABC;
+using namespace TDEABC;
ResourceGroupDav::ResourceGroupDav( const TDEConfig *config )
: ResourceGroupwareBase( config )
diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav.h b/tderesources/groupdav/tdeabc_resourcegroupdav.h
index 51f40856..dba61bf8 100644
--- a/tderesources/groupdav/tdeabc_resourcegroupdav.h
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav.h
@@ -25,7 +25,7 @@
#include "tdeabc_resourcegroupwarebase.h"
#include <tdepimmacros.h>
-namespace KABC {
+namespace TDEABC {
class KDE_EXPORT ResourceGroupDav : public ResourceGroupwareBase
{
diff --git a/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp b/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp
index b877231d..83509b89 100644
--- a/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp
+++ b/tderesources/groupdav/tdeabc_resourcegroupdav_plugin.cpp
@@ -26,7 +26,7 @@
#include <tdeglobal.h>
#include <tdelocale.h>
-using namespace KABC;
+using namespace TDEABC;
typedef KRES::PluginFactory< ResourceGroupDav, ResourceGroupwareBaseConfig > GroupDavFactory;
// FIXME: Use K_EXPORT_COMPONENT_FACTORY( tdeabc_groupdav, GroupDavFactory ); here