summaryrefslogtreecommitdiffstats
path: root/tderesources/slox
diff options
context:
space:
mode:
Diffstat (limited to 'tderesources/slox')
-rw-r--r--tderesources/slox/kcalresourceslox.cpp10
-rw-r--r--tderesources/slox/kcalresourceslox.h4
-rw-r--r--tderesources/slox/sloxaccounts.cpp12
-rw-r--r--tderesources/slox/sloxaccounts.h6
-rw-r--r--tderesources/slox/tdeabcresourceslox.cpp38
-rw-r--r--tderesources/slox/tdeabcresourceslox.h6
-rw-r--r--tderesources/slox/tdeabcresourceslox_plugin.cpp2
-rw-r--r--tderesources/slox/tdeabcresourcesloxconfig.cpp4
-rw-r--r--tderesources/slox/tdeabcresourcesloxconfig.h2
-rw-r--r--tderesources/slox/webdavhandler.cpp2
-rw-r--r--tderesources/slox/webdavhandler.h2
11 files changed, 44 insertions, 44 deletions
diff --git a/tderesources/slox/kcalresourceslox.cpp b/tderesources/slox/kcalresourceslox.cpp
index 238b71832..bc3acce50 100644
--- a/tderesources/slox/kcalresourceslox.cpp
+++ b/tderesources/slox/kcalresourceslox.cpp
@@ -117,7 +117,7 @@ void KCalResourceSlox::init()
mAccounts = 0;
- mLock = new KABC::LockNull( true );
+ mLock = new TDEABC::LockNull( true );
enableChangeNotification();
}
@@ -185,7 +185,7 @@ bool KCalResourceSlox::doLoad()
// The SLOX contacts are loaded asynchronously, so make sure that they are
// actually loaded.
- KABC::StdAddressBook::self( true )->asyncLoad();
+ TDEABC::StdAddressBook::self( true )->asyncLoad();
#if 1
requestEvents();
@@ -603,7 +603,7 @@ void KCalResourceSlox::parseMembersAttribute( const TQDomElement &e,
TQDomElement memberElement = n.toElement();
if ( memberElement.tagName() == fieldName( Participant ) ) {
TQString member = memberElement.text();
- KABC::Addressee account;
+ TDEABC::Addressee account;
if ( mAccounts ) account = mAccounts->lookupUser( member );
else kdError() << "KCalResourceSlox: no accounts set" << endl;
TQString name;
@@ -686,7 +686,7 @@ void KCalResourceSlox::parseIncidenceAttribute( const TQDomElement &e,
incidence->clearAlarms();
}
} else if ( tag == fieldName( CreatedBy ) ) {
- KABC::Addressee a;
+ TDEABC::Addressee a;
if ( mAccounts ) a = mAccounts->lookupUser( text );
else kdDebug() << "KCalResourceSlox: no accounts set" << endl;
incidence->setOrganizer( Person( a.formattedName(), a.preferredEmail() ) );
@@ -1281,7 +1281,7 @@ void KCalResourceSlox::doClose()
}
}
-KABC::Lock *KCalResourceSlox::lock()
+TDEABC::Lock *KCalResourceSlox::lock()
{
return mLock;
}
diff --git a/tderesources/slox/kcalresourceslox.h b/tderesources/slox/kcalresourceslox.h
index 8b2b68d26..39a2757e0 100644
--- a/tderesources/slox/kcalresourceslox.h
+++ b/tderesources/slox/kcalresourceslox.h
@@ -85,7 +85,7 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase
KCal::SloxPrefs *prefs() const { return mPrefs; }
- KABC::Lock *lock();
+ TDEABC::Lock *lock();
bool isSaving();
@@ -158,7 +158,7 @@ class KDE_EXPORT KCalResourceSlox : public KCal::ResourceCached, public SloxBase
KCal::Incidence *mUploadedIncidence;
bool mUploadIsDelete;
- KABC::Lock *mLock;
+ TDEABC::Lock *mLock;
WebdavHandler mWebdavHandler;
diff --git a/tderesources/slox/sloxaccounts.cpp b/tderesources/slox/sloxaccounts.cpp
index 1831d79ae..3afa7019d 100644
--- a/tderesources/slox/sloxaccounts.cpp
+++ b/tderesources/slox/sloxaccounts.cpp
@@ -61,7 +61,7 @@ SloxAccounts::~SloxAccounts()
if ( mDownloadJob ) mDownloadJob->kill();
}
-void SloxAccounts::insertUser( const TQString &id, const KABC::Addressee &a )
+void SloxAccounts::insertUser( const TQString &id, const TDEABC::Addressee &a )
{
kdDebug() << "SloxAccount::insertUser() " << id << endl;
@@ -75,13 +75,13 @@ void SloxAccounts::insertUser( const TQString &id, const KABC::Addressee &a )
KCal::FreeBusyUrlStore::self()->writeUrl( email, url );
}
-KABC::Addressee SloxAccounts::lookupUser( const TQString &id )
+TDEABC::Addressee SloxAccounts::lookupUser( const TQString &id )
{
- TQMap<TQString, KABC::Addressee>::ConstIterator it;
+ TQMap<TQString, TDEABC::Addressee>::ConstIterator it;
it = mUsers.find( id );
if ( it == mUsers.end() ) {
requestAccounts();
- return KABC::Addressee();
+ return TDEABC::Addressee();
} else {
return *it;
}
@@ -91,7 +91,7 @@ TQString SloxAccounts::lookupId( const TQString &email )
{
kdDebug() << "SloxAccounts::lookupId() " << email << endl;
- TQMap<TQString, KABC::Addressee>::ConstIterator it;
+ TQMap<TQString, TDEABC::Addressee>::ConstIterator it;
for( it = mUsers.begin(); it != mUsers.end(); ++it ) {
kdDebug() << "PREF: " << (*it).preferredEmail() << endl;
kdDebug() << "KEY: " << it.key() << endl;
@@ -201,7 +201,7 @@ void SloxAccounts::readAccounts()
for( uint i = 0; i < nodes.count(); ++i ) {
TQDomElement element = nodes.item(i).toElement();
TQString id;
- KABC::Addressee a;
+ TDEABC::Addressee a;
TQDomNode n;
for( n = element.firstChild(); !n.isNull(); n = n.nextSibling() ) {
TQDomElement e = n.toElement();
diff --git a/tderesources/slox/sloxaccounts.h b/tderesources/slox/sloxaccounts.h
index 8bb7a1b5b..2e9d1289f 100644
--- a/tderesources/slox/sloxaccounts.h
+++ b/tderesources/slox/sloxaccounts.h
@@ -38,9 +38,9 @@ class KDE_EXPORT SloxAccounts : public TQObject
SloxAccounts( SloxBase *res, const KURL &baseUrl );
~SloxAccounts();
- void insertUser( const TQString &id, const KABC::Addressee &a );
+ void insertUser( const TQString &id, const TDEABC::Addressee &a );
- KABC::Addressee lookupUser( const TQString &id );
+ TDEABC::Addressee lookupUser( const TQString &id );
TQString lookupId( const TQString &email );
@@ -58,7 +58,7 @@ class KDE_EXPORT SloxAccounts : public TQObject
TDEIO::Job *mDownloadJob;
- TQMap<TQString, KABC::Addressee> mUsers; // map users ids to addressees.
+ TQMap<TQString, TDEABC::Addressee> mUsers; // map users ids to addressees.
KURL mBaseUrl;
SloxBase *mRes;
diff --git a/tderesources/slox/tdeabcresourceslox.cpp b/tderesources/slox/tdeabcresourceslox.cpp
index 77fea0b01..248e3f395 100644
--- a/tderesources/slox/tdeabcresourceslox.cpp
+++ b/tderesources/slox/tdeabcresourceslox.cpp
@@ -38,7 +38,7 @@
#include "tdeabcresourceslox.h"
-using namespace KABC;
+using namespace TDEABC;
ResourceSlox::ResourceSlox( const TDEConfig *config )
: ResourceCached( config ), SloxBase( this )
@@ -106,13 +106,13 @@ void ResourceSlox::init()
ResourceSlox::~ResourceSlox()
{
- kdDebug() << "KABC::~ResourceSlox()" << endl;
+ kdDebug() << "TDEABC::~ResourceSlox()" << endl;
if ( mDownloadJob ) mDownloadJob->kill();
delete mPrefs;
- kdDebug() << "KABC::~ResourceSlox() done" << endl;
+ kdDebug() << "TDEABC::~ResourceSlox() done" << endl;
}
void ResourceSlox::readConfig( const TDEConfig * )
@@ -158,22 +158,22 @@ void ResourceSlox::doClose()
bool ResourceSlox::load()
{
- kdDebug() << "KABC::ResourceSlox::load()" << endl;
+ kdDebug() << "TDEABC::ResourceSlox::load()" << endl;
#if 0
return asyncLoad();
#else
- kdDebug() << "KABC::ResourceSlox::load() is a nop." << endl;
+ kdDebug() << "TDEABC::ResourceSlox::load() is a nop." << endl;
return true;
#endif
}
bool ResourceSlox::asyncLoad()
{
- kdDebug() << "KABC::ResourceSlox::asyncLoad()" << endl;
+ kdDebug() << "TDEABC::ResourceSlox::asyncLoad()" << endl;
if ( mDownloadJob ) {
- kdDebug() << "KABC::ResourceSlox::asyncLoad(): Loading still in progress."
+ kdDebug() << "TDEABC::ResourceSlox::asyncLoad(): Loading still in progress."
<< endl;
return true;
}
@@ -408,11 +408,11 @@ void ResourceSlox::parseContactAttribute( const TQDomElement &e, Addressee &a )
// read addresses
Address addr;
if ( tag.startsWith( fieldName( BusinessPrefix ) ) ) {
- addr = a.address( KABC::Address::Work );
+ addr = a.address( TDEABC::Address::Work );
} else if ( tag.startsWith( fieldName( OtherPrefix ) ) ) {
addr = a.address( 0 );
} else {
- addr = a.address( KABC::Address::Home );
+ addr = a.address( TDEABC::Address::Home );
}
if ( tag.endsWith( fieldName( Street ) ) ) {
addr.setStreet( text );
@@ -484,9 +484,9 @@ void ResourceSlox::uploadContacts()
bool isDelete = false;
- KABC::Addressee::List addedAddr = addedAddressees();
- KABC::Addressee::List changedAddr = changedAddressees();
- KABC::Addressee::List deletedAddr = deletedAddressees();
+ TDEABC::Addressee::List addedAddr = addedAddressees();
+ TDEABC::Addressee::List changedAddr = changedAddressees();
+ TDEABC::Addressee::List deletedAddr = deletedAddressees();
if ( !addedAddr.isEmpty() ) {
mUploadAddressee = addedAddr.first();
@@ -624,15 +624,15 @@ void ResourceSlox::createAddresseeFields( TQDomDocument &doc, TQDomElement &prop
}
// write addresses
- createAddressFields( doc, prop, fieldName( HomePrefix ), a.address( KABC::Address::Home ) );
+ createAddressFields( doc, prop, fieldName( HomePrefix ), a.address( TDEABC::Address::Home ) );
if ( type() == "ox" ) {
- createAddressFields( doc, prop, fieldName( BusinessPrefix ), a.address( KABC::Address::Work ) );
+ createAddressFields( doc, prop, fieldName( BusinessPrefix ), a.address( TDEABC::Address::Work ) );
createAddressFields( doc, prop, fieldName( OtherPrefix ), a.address( 0 ) );
}
}
-void KABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &parent,
- const TQString &prefix, const KABC::Address &addr )
+void TDEABC::ResourceSlox::createAddressFields( TQDomDocument &doc, TQDomElement &parent,
+ const TQString &prefix, const TDEABC::Address &addr )
{
WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( Street ), addr.street() );
WebdavHandler::addSloxElement( this, doc, parent, prefix + fieldName( PostalCode ), addr.postalCode() );
@@ -668,15 +668,15 @@ void ResourceSlox::cancelUpload()
void ResourceSlox::setReadOnly( bool b )
{
if ( type() == "ox" )
- KABC::Resource::setReadOnly( b );
+ TDEABC::Resource::setReadOnly( b );
else
- KABC::Resource::setReadOnly( true );
+ TDEABC::Resource::setReadOnly( true );
}
bool ResourceSlox::readOnly() const
{
if ( type() == "ox" )
- return KABC::Resource::readOnly();
+ return TDEABC::Resource::readOnly();
else
return true;
}
diff --git a/tderesources/slox/tdeabcresourceslox.h b/tderesources/slox/tdeabcresourceslox.h
index b79167a16..af2686f65 100644
--- a/tderesources/slox/tdeabcresourceslox.h
+++ b/tderesources/slox/tdeabcresourceslox.h
@@ -41,7 +41,7 @@ class ProgressItem;
class TDEConfig;
-namespace KABC {
+namespace TDEABC {
class SloxPrefs;
@@ -82,7 +82,7 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
void createAddresseeFields( TQDomDocument &doc, TQDomElement &prop, const Addressee &a );
void createAddressFields( TQDomDocument &doc, TQDomElement &parent,
- const TQString &prefix, const KABC::Address &addr );
+ const TQString &prefix, const TDEABC::Address &addr );
void uploadContacts();
@@ -104,7 +104,7 @@ class KDE_EXPORT ResourceSlox : public ResourceCached, public SloxBase
WebdavHandler mWebdavHandler;
- KABC::Addressee mUploadAddressee;
+ TDEABC::Addressee mUploadAddressee;
TQMap<int, TQStringList> mPhoneNumberSloxMap, mPhoneNumberOxMap;
};
diff --git a/tderesources/slox/tdeabcresourceslox_plugin.cpp b/tderesources/slox/tdeabcresourceslox_plugin.cpp
index b876c8597..9c1c47a66 100644
--- a/tderesources/slox/tdeabcresourceslox_plugin.cpp
+++ b/tderesources/slox/tdeabcresourceslox_plugin.cpp
@@ -24,7 +24,7 @@
#include <tdeglobal.h>
#include <tdelocale.h>
-using namespace KABC;
+using namespace TDEABC;
typedef KRES::PluginFactory< ResourceSlox, ResourceSloxConfig > SloxFactory;
diff --git a/tderesources/slox/tdeabcresourcesloxconfig.cpp b/tderesources/slox/tdeabcresourcesloxconfig.cpp
index 919d156ae..8ad6701c0 100644
--- a/tderesources/slox/tdeabcresourcesloxconfig.cpp
+++ b/tderesources/slox/tdeabcresourcesloxconfig.cpp
@@ -37,7 +37,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-using namespace KABC;
+using namespace TDEABC;
ResourceSloxConfig::ResourceSloxConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name ), mRes( 0 )
@@ -109,7 +109,7 @@ void ResourceSloxConfig::saveSettings( KRES::Resource *res )
resource->prefs()->setFolderId( mFolderId );
}
-void KABC::ResourceSloxConfig::selectAddressFolder( )
+void TDEABC::ResourceSloxConfig::selectAddressFolder( )
{
SloxFolderManager *manager = new SloxFolderManager( mRes, mURL->url() );
SloxFolderDialog *dialog = new SloxFolderDialog( manager, Contacts, this );
diff --git a/tderesources/slox/tdeabcresourcesloxconfig.h b/tderesources/slox/tdeabcresourcesloxconfig.h
index 9cd54d831..6bbaf6ae8 100644
--- a/tderesources/slox/tdeabcresourcesloxconfig.h
+++ b/tderesources/slox/tdeabcresourcesloxconfig.h
@@ -30,7 +30,7 @@ class KPushButton;
class SloxBase;
-namespace KABC {
+namespace TDEABC {
class KDE_EXPORT ResourceSloxConfig : public KRES::ConfigWidget
{
diff --git a/tderesources/slox/webdavhandler.cpp b/tderesources/slox/webdavhandler.cpp
index f3f33d610..4b57e1de7 100644
--- a/tderesources/slox/webdavhandler.cpp
+++ b/tderesources/slox/webdavhandler.cpp
@@ -289,7 +289,7 @@ void WebdavHandler::setSloxAttributes( KCal::Incidence *i )
i->setReadOnly( !mWritable );
}
-void WebdavHandler::setSloxAttributes( KABC::Addressee & )
+void WebdavHandler::setSloxAttributes( TDEABC::Addressee & )
{
// FIXME: libtdeabc doesn't allow to set an individual addressee to read-only
}
diff --git a/tderesources/slox/webdavhandler.h b/tderesources/slox/webdavhandler.h
index 5b835f2ad..c7c93222b 100644
--- a/tderesources/slox/webdavhandler.h
+++ b/tderesources/slox/webdavhandler.h
@@ -81,7 +81,7 @@ class KDE_EXPORT WebdavHandler
void clearSloxAttributeStatus();
void parseSloxAttribute( const TQDomElement & );
void setSloxAttributes( KCal::Incidence * );
- void setSloxAttributes( KABC::Addressee & );
+ void setSloxAttributes( TDEABC::Addressee & );
private:
TQString mLogFile;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-18 14:55:03 +0000