summaryrefslogtreecommitdiffstats
path: root/tderesources/lib
diff options
context:
space:
mode:
Diffstat (limited to 'tderesources/lib')
-rw-r--r--tderesources/lib/addressbookadaptor.cpp20
-rw-r--r--tderesources/lib/addressbookadaptor.h16
-rw-r--r--tderesources/lib/davaddressbookadaptor.cpp2
-rw-r--r--tderesources/lib/davaddressbookadaptor.h2
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebase.cpp2
-rw-r--r--tderesources/lib/kcal_resourcegroupwarebase.h4
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebase.cpp8
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebase.h2
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp2
-rw-r--r--tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h2
10 files changed, 30 insertions, 30 deletions
diff --git a/tderesources/lib/addressbookadaptor.cpp b/tderesources/lib/addressbookadaptor.cpp
index fa62e791..d6d719fc 100644
--- a/tderesources/lib/addressbookadaptor.cpp
+++ b/tderesources/lib/addressbookadaptor.cpp
@@ -29,19 +29,19 @@
#include <tdeio/job.h>
-using namespace KABC;
+using namespace TDEABC;
AddressBookUploadItem::AddressBookUploadItem(
KPIM::GroupwareDataAdaptor *adaptor,
- KABC::Addressee addr,
+ TDEABC::Addressee addr,
GroupwareUploadItem::UploadType type )
: GroupwareUploadItem( type )
{
mItemType = KPIM::FolderLister::Contact;
setUrl( addr.custom( adaptor->identifier(), "storagelocation" ) );
setUid( addr.uid() );
- KABC::VCardConverter vcard;
+ TDEABC::VCardConverter vcard;
#if defined(KABC_VCARD_ENCODING_FIX)
setData( vcard.createVCardRaw( addr ) );
#else
@@ -62,14 +62,14 @@ TQString AddressBookAdaptor::mimeType() const
bool AddressBookAdaptor::localItemExists( const TQString &localId )
{
- KABC::Addressee a = mResource->findByUid( localId );
+ TDEABC::Addressee a = mResource->findByUid( localId );
return !a.isEmpty();
}
bool AddressBookAdaptor::localItemHasChanged( const TQString &localId )
{
- KABC::Addressee::List addressees = mResource->deletedAddressees();
- KABC::Addressee::List::ConstIterator it;
+ TDEABC::Addressee::List addressees = mResource->deletedAddressees();
+ TDEABC::Addressee::List::ConstIterator it;
for( it = addressees.begin(); it != addressees.end(); ++it ) {
if ( (*it).uid() == localId ) return true;
}
@@ -85,14 +85,14 @@ bool AddressBookAdaptor::localItemHasChanged( const TQString &localId )
void AddressBookAdaptor::deleteItem( const TQString &localId )
{
- KABC::Addressee a = mResource->findByUid( localId );
+ TDEABC::Addressee a = mResource->findByUid( localId );
if ( !a.isEmpty() ) {
mResource->removeAddressee( a );
mResource->clearChange( a.uid() );
}
}
-void AddressBookAdaptor::addItem( KABC::Addressee addr )
+void AddressBookAdaptor::addItem( TDEABC::Addressee addr )
{
if ( !addr.isEmpty() ) {
addr.setResource( mResource );
@@ -101,7 +101,7 @@ void AddressBookAdaptor::addItem( KABC::Addressee addr )
}
}
-void AddressBookAdaptor::addressbookItemDownloaded( KABC::Addressee addr,
+void AddressBookAdaptor::addressbookItemDownloaded( TDEABC::Addressee addr,
const TQString &newLocalId, const KURL &remoteId, const TQString &fingerprint,
const TQString &storagelocation )
{
@@ -128,7 +128,7 @@ void AddressBookAdaptor::clearChange( const TQString &uid )
}
KPIM::GroupwareUploadItem *AddressBookAdaptor::newUploadItem(
- KABC::Addressee addr, KPIM::GroupwareUploadItem::UploadType type )
+ TDEABC::Addressee addr, KPIM::GroupwareUploadItem::UploadType type )
{
return new AddressBookUploadItem( this, addr, type );
}
diff --git a/tderesources/lib/addressbookadaptor.h b/tderesources/lib/addressbookadaptor.h
index 614afc48..a1a43f0e 100644
--- a/tderesources/lib/addressbookadaptor.h
+++ b/tderesources/lib/addressbookadaptor.h
@@ -29,14 +29,14 @@
#include <tdepimmacros.h>
#include <kurl.h>
-namespace KABC {
+namespace TDEABC {
class ResourceCached;
class AddressBookUploadItem : public KPIM::GroupwareUploadItem
{
public:
AddressBookUploadItem( KPIM::GroupwareDataAdaptor *adaptor,
- KABC::Addressee addr, UploadType type );
+ TDEABC::Addressee addr, UploadType type );
virtual ~AddressBookUploadItem() {}
protected:
AddressBookUploadItem( UploadType type )
@@ -58,14 +58,14 @@ class KDE_EXPORT AddressBookAdaptor : public KPIM::GroupwareDataAdaptor
/**
Set resource.
*/
- void setResource( KABC::ResourceCached *v )
+ void setResource( TDEABC::ResourceCached *v )
{
mResource = v;
}
/**
Get resource. See setResource().
*/
- KABC::ResourceCached *resource() const
+ TDEABC::ResourceCached *resource() const
{
return mResource;
}
@@ -74,17 +74,17 @@ class KDE_EXPORT AddressBookAdaptor : public KPIM::GroupwareDataAdaptor
bool localItemExists( const TQString &localId );
bool localItemHasChanged( const TQString &localId );
void deleteItem( const TQString &localId );
- void addItem( KABC::Addressee addr );
+ void addItem( TDEABC::Addressee addr );
void clearChange( const TQString &uid );
- virtual KPIM::GroupwareUploadItem *newUploadItem( KABC::Addressee addr,
+ virtual KPIM::GroupwareUploadItem *newUploadItem( TDEABC::Addressee addr,
KPIM::GroupwareUploadItem::UploadType type );
- virtual void addressbookItemDownloaded( KABC::Addressee addr,
+ virtual void addressbookItemDownloaded( TDEABC::Addressee addr,
const TQString &newLocalId, const KURL &remoteId,
const TQString &fingerprint, const TQString &storagelocation );
private:
- KABC::ResourceCached *mResource;
+ TDEABC::ResourceCached *mResource;
};
}
diff --git a/tderesources/lib/davaddressbookadaptor.cpp b/tderesources/lib/davaddressbookadaptor.cpp
index b9213e88..b5c23ac7 100644
--- a/tderesources/lib/davaddressbookadaptor.cpp
+++ b/tderesources/lib/davaddressbookadaptor.cpp
@@ -34,7 +34,7 @@
// #include <tdeio/job.h>
#include <kdebug.h>
-using namespace KABC;
+using namespace TDEABC;
void DavAddressBookAdaptor::interpretListFoldersJob( TDEIO::Job *job, KPIM::FolderLister */*folderLister*/ )
{
diff --git a/tderesources/lib/davaddressbookadaptor.h b/tderesources/lib/davaddressbookadaptor.h
index f0f6f39d..883d1510 100644
--- a/tderesources/lib/davaddressbookadaptor.h
+++ b/tderesources/lib/davaddressbookadaptor.h
@@ -26,7 +26,7 @@
#include <tqdom.h>
#include <tdepimmacros.h>
-namespace KABC {
+namespace TDEABC {
class KDE_EXPORT DavAddressBookAdaptor : public AddressBookAdaptor
{
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.cpp b/tderesources/lib/kcal_resourcegroupwarebase.cpp
index 8f507fd1..8474ed21 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.cpp
+++ b/tderesources/lib/kcal_resourcegroupwarebase.cpp
@@ -402,7 +402,7 @@ bool ResourceGroupwareBase::confirmSave()
return result == TQDialog::Accepted;
}
-KABC::Lock *ResourceGroupwareBase::lock()
+TDEABC::Lock *ResourceGroupwareBase::lock()
{
return &mLock;
}
diff --git a/tderesources/lib/kcal_resourcegroupwarebase.h b/tderesources/lib/kcal_resourcegroupwarebase.h
index b0c9af2e..80a1d460 100644
--- a/tderesources/lib/kcal_resourcegroupwarebase.h
+++ b/tderesources/lib/kcal_resourcegroupwarebase.h
@@ -71,7 +71,7 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
bool doLoad();
bool doSave();
- KABC::Lock *lock();
+ TDEABC::Lock *lock();
bool addEvent( Event *event );
bool addTodo( Todo *todo );
@@ -102,7 +102,7 @@ class KDE_EXPORT ResourceGroupwareBase : public ResourceCached
KPIM::GroupwarePrefsBase *mPrefs;
KPIM::FolderLister *mFolderLister;
- KABC::LockNull mLock;
+ TDEABC::LockNull mLock;
CalendarAdaptor *mAdaptor;
KPIM::GroupwareDownloadJob *mDownloadJob;
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
index 93eb0597..f4a46990 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.cpp
@@ -32,7 +32,7 @@
#include <tdeabc/vcardconverter.h>
#include <tdelocale.h>
-using namespace KABC;
+using namespace TDEABC;
ResourceGroupwareBase::ResourceGroupwareBase( const TDEConfig *config )
: ResourceCached( config ),
@@ -114,7 +114,7 @@ KPIM::GroupwarePrefsBase *ResourceGroupwareBase::createPrefs()
void ResourceGroupwareBase::readConfig( const TDEConfig */*config*/ )
{
- kdDebug(5700) << "KABC::ResourceGroupwareBase::readConfig()" << endl;
+ kdDebug(5700) << "TDEABC::ResourceGroupwareBase::readConfig()" << endl;
// ResourceCached::readConfig( config );
if ( mPrefs ) {
mPrefs->readConfig();
@@ -215,8 +215,8 @@ bool ResourceGroupwareBase::asyncSave( Ticket* )
connect( mUploadJob, TQT_SIGNAL( result( KPIM::GroupwareJob * ) ),
TQT_SLOT( slotUploadJobResult( KPIM::GroupwareJob * ) ) );
- KABC::Addressee::List addr;
- KABC::Addressee::List::Iterator it;
+ TDEABC::Addressee::List addr;
+ TDEABC::Addressee::List::Iterator it;
KPIM::GroupwareUploadItem::List addedItems, changedItems, deletedItems;
addr = addedAddressees();
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebase.h b/tderesources/lib/tdeabc_resourcegroupwarebase.h
index 272a2cee..f24a7602 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebase.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebase.h
@@ -36,7 +36,7 @@ class FolderLister;
class GroupwarePrefsBase;
}
-namespace KABC {
+namespace TDEABC {
class AddressBookAdaptor;
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
index db98382b..69dfb3d8 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
+++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.cpp
@@ -35,7 +35,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-using namespace KABC;
+using namespace TDEABC;
ResourceGroupwareBaseConfig::ResourceGroupwareBaseConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
diff --git a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
index f505d9ce..c8f4646e 100644
--- a/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
+++ b/tderesources/lib/tdeabc_resourcegroupwarebaseconfig.h
@@ -32,7 +32,7 @@ namespace KPIM {
class FolderConfig;
}
-namespace KABC {
+namespace TDEABC {
class ResourceGroupwareBase;