summaryrefslogtreecommitdiffstats
path: root/tderesources
diff options
context:
space:
mode:
Diffstat (limited to 'tderesources')
-rw-r--r--tderesources/birthdays/resourcekabc.cpp110
-rw-r--r--tderesources/birthdays/resourcekabc.h6
-rw-r--r--tderesources/caldav/resource.cpp2
-rw-r--r--tderesources/caldav/resource.h4
-rw-r--r--tderesources/carddav/config.cpp2
-rw-r--r--tderesources/carddav/config.h4
-rw-r--r--tderesources/carddav/configwidgets.cpp6
-rw-r--r--tderesources/carddav/configwidgets.h2
-rw-r--r--tderesources/carddav/job.cpp2
-rw-r--r--tderesources/carddav/job.h4
-rw-r--r--tderesources/carddav/plugin.cpp2
-rw-r--r--tderesources/carddav/preferences.cpp2
-rw-r--r--tderesources/carddav/preferences.h4
-rw-r--r--tderesources/carddav/reader.cpp2
-rw-r--r--tderesources/carddav/reader.h4
-rw-r--r--tderesources/carddav/resource.cpp20
-rw-r--r--tderesources/carddav/resource.h8
-rw-r--r--tderesources/carddav/writer.cpp2
-rw-r--r--tderesources/carddav/writer.h4
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpc.cpp4
-rw-r--r--tderesources/egroupware/kcal_resourcexmlrpc.h4
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpc.cpp26
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpc.h8
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp2
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h2
-rw-r--r--tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp2
-rw-r--r--tderesources/exchange/resourceexchange.cpp4
-rw-r--r--tderesources/exchange/resourceexchange.h4
-rw-r--r--tderesources/featureplan/kcal_resourcefeatureplan.cpp2
-rw-r--r--tderesources/featureplan/kcal_resourcefeatureplan.h4
-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
-rw-r--r--tderesources/groupware/kcal_resourcegroupware.cpp2
-rw-r--r--tderesources/groupware/kcal_resourcegroupware.h4
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupware.cpp14
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupware.h2
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp2
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp2
-rw-r--r--tderesources/groupware/tdeabc_resourcegroupwareconfig.h2
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwise.cpp2
-rw-r--r--tderesources/groupwise/kcal_resourcegroupwise.h4
-rw-r--r--tderesources/groupwise/soap/contactconverter.cpp78
-rw-r--r--tderesources/groupwise/soap/contactconverter.h20
-rw-r--r--tderesources/groupwise/soap/groupwiseserver.cpp8
-rw-r--r--tderesources/groupwise/soap/groupwiseserver.h12
-rw-r--r--tderesources/groupwise/soap/gwjobs.cpp12
-rw-r--r--tderesources/groupwise/soap/gwjobs.h6
-rw-r--r--tderesources/groupwise/soap/incidenceconverter.cpp2
-rw-r--r--tderesources/groupwise/soap/soapdebug.cpp8
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwise.cpp20
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwise.h2
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp2
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp2
-rw-r--r--tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h2
-rw-r--r--tderesources/groupwise/tdeioslave/groupwise.cpp14
-rw-r--r--tderesources/groupwise/tdeioslave/groupwise.h2
-rw-r--r--tderesources/kolab/kcal/resourcekolab.cpp4
-rw-r--r--tderesources/kolab/kcal/resourcekolab.h2
-rw-r--r--tderesources/kolab/shared/kolabbase.cpp16
-rw-r--r--tderesources/kolab/shared/kolabbase.h6
-rw-r--r--tderesources/kolab/tdeabc/contact.cpp146
-rw-r--r--tderesources/kolab/tdeabc/contact.h20
-rw-r--r--tderesources/kolab/tdeabc/resourcekolab.cpp76
-rw-r--r--tderesources/kolab/tdeabc/resourcekolab.h2
-rw-r--r--tderesources/kolab/tdeabc/resourcekolab_plugin.cpp2
-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
-rw-r--r--tderesources/newexchange/Person.mapping4
-rw-r--r--tderesources/newexchange/exchangeaddressbookadaptor.cpp6
-rw-r--r--tderesources/newexchange/exchangeaddressbookadaptor.h6
-rw-r--r--tderesources/newexchange/exchangeconvertercontact.cpp16
-rw-r--r--tderesources/newexchange/exchangeconvertercontact.h2
-rw-r--r--tderesources/newexchange/exchangeglobals.cpp10
-rw-r--r--tderesources/newexchange/exchangeglobals.h4
-rw-r--r--tderesources/newexchange/tdeabc_resourceexchange.cpp2
-rw-r--r--tderesources/newexchange/tdeabc_resourceexchange.h2
-rw-r--r--tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp2
-rw-r--r--tderesources/remote/resourceremote.cpp4
-rw-r--r--tderesources/remote/resourceremote.h4
-rw-r--r--tderesources/scalix/kcal/resourcescalix.cpp4
-rw-r--r--tderesources/scalix/kcal/resourcescalix.h2
-rw-r--r--tderesources/scalix/scalixadmin/Makefile.am2
-rw-r--r--tderesources/scalix/scalixadmin/ldapview.cpp8
-rw-r--r--tderesources/scalix/scalixadmin/ldapview.h6
-rw-r--r--tderesources/scalix/shared/scalixbase.cpp16
-rw-r--r--tderesources/scalix/shared/scalixbase.h6
-rw-r--r--tderesources/scalix/tdeabc/contact.cpp54
-rw-r--r--tderesources/scalix/tdeabc/contact.h4
-rw-r--r--tderesources/scalix/tdeabc/resourcescalix.cpp66
-rw-r--r--tderesources/scalix/tdeabc/resourcescalix.h2
-rw-r--r--tderesources/scalix/tdeabc/resourcescalix_plugin.cpp2
-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
-rw-r--r--tderesources/tvanytime/kcal_resourcetvanytime.cpp2
-rw-r--r--tderesources/tvanytime/kcal_resourcetvanytime.h4
117 files changed, 580 insertions, 580 deletions
diff --git a/tderesources/birthdays/resourcekabc.cpp b/tderesources/birthdays/resourcekabc.cpp
index d6869bbe5..6b8d31705 100644
--- a/tderesources/birthdays/resourcekabc.cpp
+++ b/tderesources/birthdays/resourcekabc.cpp
@@ -66,7 +66,7 @@ extern "C"
}
}
-ResourceKABC::ResourceKABC( const TDEConfig* config )
+ResourceTDEABC::ResourceKABC( const TDEConfig* config )
: ResourceCalendar( config ), mCalendar( TQString::fromLatin1( "UTC" ) ),
mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
{
@@ -79,30 +79,30 @@ ResourceKABC::ResourceKABC( const TDEConfig* config )
init();
}
-ResourceKABC::ResourceKABC()
+ResourceTDEABC::ResourceKABC()
: ResourceCalendar( 0 ), mCalendar( TQString::fromLatin1( "UTC" ) ),
mAlarmDays( 0 ), mAlarm( true ), mUseCategories( false )
{
init();
}
-ResourceKABC::~ResourceKABC()
+ResourceTDEABC::~ResourceKABC()
{
delete mLock;
}
-void ResourceKABC::init()
+void ResourceTDEABC::init()
{
setType( "birthdays" );
setReadOnly( true );
- mLock = new KABC::LockNull( false );
+ mLock = new TDEABC::LockNull( false );
mAddressbook = 0;
}
-void ResourceKABC::readConfig( const TDEConfig *config )
+void ResourceTDEABC::readConfig( const TDEConfig *config )
{
mAlarmDays = config->readNumEntry( "AlarmDays", 0 );
mAlarm = config->readBoolEntry( "Alarm", true );
@@ -110,7 +110,7 @@ void ResourceKABC::readConfig( const TDEConfig *config )
mUseCategories = config->readBoolEntry( "UseCategories", false );
}
-void ResourceKABC::writeConfig( TDEConfig *config )
+void ResourceTDEABC::writeConfig( TDEConfig *config )
{
ResourceCalendar::writeConfig( config );
config->writeEntry( "AlarmDays", mAlarmDays );
@@ -120,19 +120,19 @@ void ResourceKABC::writeConfig( TDEConfig *config )
}
-bool ResourceKABC::doOpen()
+bool ResourceTDEABC::doOpen()
{
- kdDebug(5800) << "ResourceKABC::doOpen()" << endl;
+ kdDebug(5800) << "ResourceTDEABC::doOpen()" << endl;
- mAddressbook = KABC::StdAddressBook::self( true );
+ mAddressbook = TDEABC::StdAddressBook::self( true );
connect( mAddressbook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT( reload() ) );
return true;
}
-bool ResourceKABC::doLoad()
+bool ResourceTDEABC::doLoad()
{
- kdDebug(5800) << "ResourceKABC::load()" << endl;
+ kdDebug(5800) << "ResourceTDEABC::load()" << endl;
mCalendar.close();
@@ -140,11 +140,11 @@ bool ResourceKABC::doLoad()
TQString summary;
TQStringList::ConstIterator strIt;
const TQStringList::ConstIterator endStrIt = mCategories.end();
- KABC::Addressee::List anniversaries;
- KABC::Addressee::List::Iterator addrIt;
+ TDEABC::Addressee::List anniversaries;
+ TDEABC::Addressee::List::Iterator addrIt;
- KABC::AddressBook::Iterator it;
- const KABC::AddressBook::Iterator endIt = mAddressbook->end();
+ TDEABC::AddressBook::Iterator it;
+ const TDEABC::AddressBook::Iterator endIt = mAddressbook->end();
for ( it = mAddressbook->begin(); it != endIt; ++it ) {
if ( mUseCategories ) {
@@ -185,7 +185,7 @@ bool ResourceKABC::doLoad()
ev->setCustomProperty("KABC", "UID-1", uid_1 );
ev->setCustomProperty("KABC", "NAME-1", name_1 );
ev->setCustomProperty("KABC", "EMAIL-1", email_1 );
- kdDebug(5800) << "ResourceKABC::doLoad: uid:" << uid_1 << " name: " << name_1
+ kdDebug(5800) << "ResourceTDEABC::doLoad: uid:" << uid_1 << " name: " << name_1
<< " email: " << email_1 << endl;
ev->setSummary(summary);
@@ -267,7 +267,7 @@ bool ResourceKABC::doLoad()
tname.remove( 0, 1 );
tname.truncate( tname.length() - 1 );
}
- KABC::Addressee spouse;
+ TDEABC::Addressee spouse;
spouse.setNameFromString( tname );
name_2 = spouse.nickName();
uid_2 = spouse.uid();
@@ -334,193 +334,193 @@ bool ResourceKABC::doLoad()
return true;
}
-void ResourceKABC::setAlarm( bool a )
+void ResourceTDEABC::setAlarm( bool a )
{
mAlarm = a;
}
-bool ResourceKABC::alarm()
+bool ResourceTDEABC::alarm()
{
return mAlarm;
}
-void ResourceKABC::setAlarmDays( int ad )
+void ResourceTDEABC::setAlarmDays( int ad )
{
mAlarmDays = ad;
}
-int ResourceKABC::alarmDays()
+int ResourceTDEABC::alarmDays()
{
return mAlarmDays;
}
-void ResourceKABC::setCategories( const TQStringList &categories )
+void ResourceTDEABC::setCategories( const TQStringList &categories )
{
mCategories = categories;
}
-TQStringList ResourceKABC::categories() const
+TQStringList ResourceTDEABC::categories() const
{
return mCategories;
}
-void ResourceKABC::setUseCategories( bool useCategories )
+void ResourceTDEABC::setUseCategories( bool useCategories )
{
mUseCategories = useCategories;
}
-bool ResourceKABC::useCategories() const
+bool ResourceTDEABC::useCategories() const
{
return mUseCategories;
}
-bool ResourceKABC::doSave()
+bool ResourceTDEABC::doSave()
{
// is always read only!
return true;
}
-bool ResourceKABC::isSaving()
+bool ResourceTDEABC::isSaving()
{
return false;
}
-KABC::Lock *ResourceKABC::lock()
+TDEABC::Lock *ResourceTDEABC::lock()
{
return mLock;
}
-bool ResourceKABC::addEvent( Event * )
+bool ResourceTDEABC::addEvent( Event * )
{
return false;
}
-bool ResourceKABC::addEvent( Event *, const TQString & )
+bool ResourceTDEABC::addEvent( Event *, const TQString & )
{
return false;
}
-bool ResourceKABC::deleteEvent( Event * )
+bool ResourceTDEABC::deleteEvent( Event * )
{
return false;
}
-Event *ResourceKABC::event( const TQString &uid )
+Event *ResourceTDEABC::event( const TQString &uid )
{
return mCalendar.event( uid );
}
-Event::List ResourceKABC::rawEventsForDate( const TQDate &date,
+Event::List ResourceTDEABC::rawEventsForDate( const TQDate &date,
EventSortField sortField,
SortDirection sortDirection )
{
return mCalendar.rawEventsForDate( date, sortField, sortDirection );
}
-Event::List ResourceKABC::rawEvents( const TQDate &start, const TQDate &end,
+Event::List ResourceTDEABC::rawEvents( const TQDate &start, const TQDate &end,
bool inclusive )
{
return mCalendar.rawEvents( start, end, inclusive );
}
-Event::List ResourceKABC::rawEventsForDate(const TQDateTime &qdt)
+Event::List ResourceTDEABC::rawEventsForDate(const TQDateTime &qdt)
{
return mCalendar.rawEventsForDate( qdt.date() );
}
-Event::List ResourceKABC::rawEvents( EventSortField sortField, SortDirection sortDirection )
+Event::List ResourceTDEABC::rawEvents( EventSortField sortField, SortDirection sortDirection )
{
return mCalendar.rawEvents( sortField, sortDirection );
}
-bool ResourceKABC::addTodo( Todo * )
+bool ResourceTDEABC::addTodo( Todo * )
{
return false;
}
-bool ResourceKABC::addTodo( Todo *, const TQString & )
+bool ResourceTDEABC::addTodo( Todo *, const TQString & )
{
return false;
}
-bool ResourceKABC::deleteTodo( Todo * )
+bool ResourceTDEABC::deleteTodo( Todo * )
{
return false;
}
-Todo::List ResourceKABC::rawTodos( TodoSortField sortField, SortDirection sortDirection )
+Todo::List ResourceTDEABC::rawTodos( TodoSortField sortField, SortDirection sortDirection )
{
return mCalendar.rawTodos( sortField, sortDirection );
}
-Todo *ResourceKABC::todo( const TQString &uid )
+Todo *ResourceTDEABC::todo( const TQString &uid )
{
return mCalendar.todo( uid );
}
-Todo::List ResourceKABC::rawTodosForDate( const TQDate &date )
+Todo::List ResourceTDEABC::rawTodosForDate( const TQDate &date )
{
return mCalendar.rawTodosForDate( date );
}
-bool ResourceKABC::addJournal( Journal * )
+bool ResourceTDEABC::addJournal( Journal * )
{
return false;
}
-bool ResourceKABC::addJournal( Journal *, const TQString & )
+bool ResourceTDEABC::addJournal( Journal *, const TQString & )
{
return false;
}
-bool ResourceKABC::deleteJournal( Journal * )
+bool ResourceTDEABC::deleteJournal( Journal * )
{
return false;
}
-Journal *ResourceKABC::journal(const TQString &uid)
+Journal *ResourceTDEABC::journal(const TQString &uid)
{
return mCalendar.journal( uid );
}
-Journal::List ResourceKABC::rawJournals( JournalSortField sortField, SortDirection sortDirection )
+Journal::List ResourceTDEABC::rawJournals( JournalSortField sortField, SortDirection sortDirection )
{
return mCalendar.rawJournals( sortField, sortDirection );
}
-Journal::List ResourceKABC::rawJournalsForDate( const TQDate &date )
+Journal::List ResourceTDEABC::rawJournalsForDate( const TQDate &date )
{
return mCalendar.rawJournalsForDate( date );
}
-Alarm::List ResourceKABC::alarmsTo( const TQDateTime &to )
+Alarm::List ResourceTDEABC::alarmsTo( const TQDateTime &to )
{
return mCalendar.alarmsTo( to );
}
-Alarm::List ResourceKABC::alarms( const TQDateTime &from, const TQDateTime &to )
+Alarm::List ResourceTDEABC::alarms( const TQDateTime &from, const TQDateTime &to )
{
-// kdDebug(5800) << "ResourceKABC::alarms(" << from.toString() << " - " << to.toString() << ")\n";
+// kdDebug(5800) << "ResourceTDEABC::alarms(" << from.toString() << " - " << to.toString() << ")\n";
return mCalendar.alarms( from, to );
}
-void ResourceKABC::dump() const
+void ResourceTDEABC::dump() const
{
ResourceCalendar::dump();
}
-void ResourceKABC::reload()
+void ResourceTDEABC::reload()
{
load();
emit resourceChanged( this );
}
-void ResourceKABC::setTimeZoneId( const TQString& tzid )
+void ResourceTDEABC::setTimeZoneId( const TQString& tzid )
{
mCalendar.setTimeZoneId( tzid );
}
diff --git a/tderesources/birthdays/resourcekabc.h b/tderesources/birthdays/resourcekabc.h
index 42bb50412..21cd66a4b 100644
--- a/tderesources/birthdays/resourcekabc.h
+++ b/tderesources/birthdays/resourcekabc.h
@@ -74,7 +74,7 @@ class KDE_EXPORT ResourceKABC : public ResourceCalendar
bool isSaving();
- KABC::Lock *lock();
+ TDEABC::Lock *lock();
/** Add Event to calendar. */
KDE_DEPRECATED bool addEvent(Event *event);
@@ -172,9 +172,9 @@ class KDE_EXPORT ResourceKABC : public ResourceCalendar
bool mAlarm;
TQStringList mCategories;
bool mUseCategories;
- KABC::AddressBook *mAddressbook;
+ TDEABC::AddressBook *mAddressbook;
- KABC::Lock *mLock;
+ TDEABC::Lock *mLock;
class Private;
Private *d;
diff --git a/tderesources/caldav/resource.cpp b/tderesources/caldav/resource.cpp
index e84d864d3..7a7e6f653 100644
--- a/tderesources/caldav/resource.cpp
+++ b/tderesources/caldav/resource.cpp
@@ -208,7 +208,7 @@ bool ResourceCalDav::doSave() {
}
-KABC::Lock* ResourceCalDav::lock() {
+TDEABC::Lock* ResourceCalDav::lock() {
log("lock()");
return &mLock;
}
diff --git a/tderesources/caldav/resource.h b/tderesources/caldav/resource.h
index d65c7f904..2d0c3ec0d 100644
--- a/tderesources/caldav/resource.h
+++ b/tderesources/caldav/resource.h
@@ -112,7 +112,7 @@ protected:
virtual bool doLoad();
// virtual bool doSave();
- virtual KABC::Lock* lock();
+ virtual TDEABC::Lock* lock();
/**
* Creates prefs and configures them.
@@ -244,7 +244,7 @@ private:
// members: ===============================================================
- KABC::LockNull mLock;
+ TDEABC::LockNull mLock;
CalDavPrefs* mPrefs;
CalDavReader* mLoader;
CalDavWriter* mWriter;
diff --git a/tderesources/carddav/config.cpp b/tderesources/carddav/config.cpp
index a71035058..b476fb249 100644
--- a/tderesources/carddav/config.cpp
+++ b/tderesources/carddav/config.cpp
@@ -33,7 +33,7 @@
| NAMESPACE
========================================================================*/
-using namespace KABC;
+using namespace TDEABC;
/*=========================================================================
| CONSTANTS
diff --git a/tderesources/carddav/config.h b/tderesources/carddav/config.h
index 7cac40940..e99197237 100644
--- a/tderesources/carddav/config.h
+++ b/tderesources/carddav/config.h
@@ -24,7 +24,7 @@
class TQLineEdit;
class TQCheckBox;
-namespace KABC {
+namespace TDEABC {
class CardDavReloadConfig;
class CardDavSaveConfig;
@@ -74,7 +74,7 @@ private:
static CardDavPrefs* getPrefs(ResourceCardDav* res);
};
-} // namespace KABC
+} // namespace TDEABC
#endif // KABC_RESOURCECARDDAVCONFIG_H
diff --git a/tderesources/carddav/configwidgets.cpp b/tderesources/carddav/configwidgets.cpp
index 800ea26db..d0e55a5f5 100644
--- a/tderesources/carddav/configwidgets.cpp
+++ b/tderesources/carddav/configwidgets.cpp
@@ -48,7 +48,7 @@
#include <tqgroupbox.h>
#include <tqhbox.h>
-using namespace KABC;
+using namespace TDEABC;
//@cond PRIVATE
class CardDavConfigPrivate
@@ -74,7 +74,7 @@ class CardDavSaveConfig::Private
//@endcond
CardDavReloadConfig::CardDavReloadConfig( TQWidget *parent )
- : TQWidget( parent ), d( new KABC::CardDavReloadConfig::Private() )
+ : TQWidget( parent ), d( new TDEABC::CardDavReloadConfig::Private() )
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
@@ -148,7 +148,7 @@ void CardDavReloadConfig::slotIntervalToggled( bool checked )
}
CardDavSaveConfig::CardDavSaveConfig( TQWidget *parent )
- : TQWidget( parent ), d( new KABC::CardDavSaveConfig::Private() )
+ : TQWidget( parent ), d( new TDEABC::CardDavSaveConfig::Private() )
{
TQBoxLayout *topLayout = new TQVBoxLayout( this );
diff --git a/tderesources/carddav/configwidgets.h b/tderesources/carddav/configwidgets.h
index 9f45579d3..f63535c96 100644
--- a/tderesources/carddav/configwidgets.h
+++ b/tderesources/carddav/configwidgets.h
@@ -37,7 +37,7 @@
#include <tqwidget.h>
#include <kdemacros.h>
-namespace KABC {
+namespace TDEABC {
class ResourceCached;
diff --git a/tderesources/carddav/job.cpp b/tderesources/carddav/job.cpp
index 5cab5cdfb..98f269413 100644
--- a/tderesources/carddav/job.cpp
+++ b/tderesources/carddav/job.cpp
@@ -25,7 +25,7 @@
| NAMESPACE
========================================================================*/
-using namespace KABC;
+using namespace TDEABC;
/*=========================================================================
| STATIC
diff --git a/tderesources/carddav/job.h b/tderesources/carddav/job.h
index 52a04bc7a..f41e0ae7d 100644
--- a/tderesources/carddav/job.h
+++ b/tderesources/carddav/job.h
@@ -25,7 +25,7 @@ extern "C" {
#include <carddav.h>
}
-namespace KABC {
+namespace TDEABC {
/*=========================================================================
| CLASS
@@ -170,7 +170,7 @@ private:
void enableCarddavDebug(runtime_info*);
};
-} // namespace KABC
+} // namespace TDEABC
#endif // KABCDAV_JOB_H
diff --git a/tderesources/carddav/plugin.cpp b/tderesources/carddav/plugin.cpp
index 8b19e49a0..9cafa5bf0 100644
--- a/tderesources/carddav/plugin.cpp
+++ b/tderesources/carddav/plugin.cpp
@@ -24,7 +24,7 @@
| NAMESPACE
========================================================================*/
-using namespace KABC;
+using namespace TDEABC;
/*=========================================================================
| CLASS
diff --git a/tderesources/carddav/preferences.cpp b/tderesources/carddav/preferences.cpp
index 1846ae921..30a4bbf4a 100644
--- a/tderesources/carddav/preferences.cpp
+++ b/tderesources/carddav/preferences.cpp
@@ -24,7 +24,7 @@
| NAMESPACES
========================================================================*/
-using namespace KABC;
+using namespace TDEABC;
using namespace KWallet;
/*=========================================================================
diff --git a/tderesources/carddav/preferences.h b/tderesources/carddav/preferences.h
index 96a6377d2..123751d19 100644
--- a/tderesources/carddav/preferences.h
+++ b/tderesources/carddav/preferences.h
@@ -23,7 +23,7 @@
class TQString;
-namespace KABC {
+namespace TDEABC {
/*=========================================================================
| CLASS
@@ -148,7 +148,7 @@ private:
TQString mPassword;
};
-} // namespace KABC
+} // namespace TDEABC
#endif // KABC_CARDDAVPREFS_H
diff --git a/tderesources/carddav/reader.cpp b/tderesources/carddav/reader.cpp
index 62645535b..5836bbccc 100644
--- a/tderesources/carddav/reader.cpp
+++ b/tderesources/carddav/reader.cpp
@@ -21,7 +21,7 @@
| NAMESPACE
========================================================================*/
-using namespace KABC;
+using namespace TDEABC;
/*=========================================================================
| METHODS
diff --git a/tderesources/carddav/reader.h b/tderesources/carddav/reader.h
index 181d4eb6a..17ec1f92f 100644
--- a/tderesources/carddav/reader.h
+++ b/tderesources/carddav/reader.h
@@ -21,7 +21,7 @@
#include <tqstring.h>
#include <tqdatetime.h>
-namespace KABC {
+namespace TDEABC {
/*=========================================================================
| CLASS
@@ -85,7 +85,7 @@ private:
};
-} // namespace KABC
+} // namespace TDEABC
#endif // KABCDAV_LOADER_H
diff --git a/tderesources/carddav/resource.cpp b/tderesources/carddav/resource.cpp
index ddaae59dc..beb233a0b 100644
--- a/tderesources/carddav/resource.cpp
+++ b/tderesources/carddav/resource.cpp
@@ -44,7 +44,7 @@
| NAMESPACE
========================================================================*/
-using namespace KABC;
+using namespace TDEABC;
/*=========================================================================
| CONSTANTS
@@ -212,7 +212,7 @@ bool ResourceCardDav::save( Ticket* ticket ) {
return doSave();
}
-KABC::Lock* ResourceCardDav::lock() {
+TDEABC::Lock* ResourceCardDav::lock() {
log("lock()");
return &mLock;
}
@@ -422,9 +422,9 @@ void ResourceCardDav::loadFinished() {
bool ResourceCardDav::checkData(const TQString& data) {
log("checking the data");
- KABC::VCardConverter converter;
+ TDEABC::VCardConverter converter;
bool ret = true;
- KABC::VCardConverter conv;
+ TDEABC::VCardConverter conv;
Addressee::List addressees = conv.parseVCards( data );
if (addressees.isEmpty() == true) {
ret = false;
@@ -453,11 +453,11 @@ bool ResourceCardDav::parseData(const TQString& data) {
log("actually parsing the data");
- KABC::VCardConverter conv;
+ TDEABC::VCardConverter conv;
Addressee::List addressees = conv.parseVCards( data );
Addressee::List::ConstIterator it;
for( it = addressees.begin(); it != addressees.end(); ++it ) {
- KABC::Addressee addr = *it;
+ TDEABC::Addressee addr = *it;
if ( !addr.isEmpty() ) {
addr.setResource( this );
@@ -599,7 +599,7 @@ bool ResourceCardDav::startWriting(const TQString& url) {
log("startWriting: url = " + url);
WritingTask *t = new WritingTask;
- KABC::VCardConverter converter;
+ TDEABC::VCardConverter converter;
// WARNING: This will segfault if a separate read or write thread
// modifies the calendar with clearChanges() or similar
@@ -613,9 +613,9 @@ bool ResourceCardDav::startWriting(const TQString& url) {
return false;
}
- KABC::Addressee::List added = addedAddressees();
- KABC::Addressee::List changed = changedAddressees();
- KABC::Addressee::List deleted = deletedAddressees();
+ TDEABC::Addressee::List added = addedAddressees();
+ TDEABC::Addressee::List changed = changedAddressees();
+ TDEABC::Addressee::List deleted = deletedAddressees();
t->url = url;
// FIXME KABC
diff --git a/tderesources/carddav/resource.h b/tderesources/carddav/resource.h
index 24d727597..caec0d074 100644
--- a/tderesources/carddav/resource.h
+++ b/tderesources/carddav/resource.h
@@ -28,7 +28,7 @@
#include <tdepimmacros.h>
#include <tdeconfig.h>
-namespace KABC {
+namespace TDEABC {
class CardDavReader;
class CardDavWriter;
@@ -103,7 +103,7 @@ protected:
virtual bool save( Ticket* ticket );
- virtual KABC::Lock* lock();
+ virtual TDEABC::Lock* lock();
/**
* Creates prefs and configures them.
@@ -203,7 +203,7 @@ private:
// members: ===============================================================
- KABC::LockNull mLock;
+ TDEABC::LockNull mLock;
CardDavPrefs* mPrefs;
CardDavReader* mLoader;
CardDavWriter* mWriter;
@@ -221,7 +221,7 @@ private:
-} // namespace KABC
+} // namespace TDEABC
#endif // KABC_RESOURCECARDDAV_H
diff --git a/tderesources/carddav/writer.cpp b/tderesources/carddav/writer.cpp
index 68bf126d5..a90665d15 100644
--- a/tderesources/carddav/writer.cpp
+++ b/tderesources/carddav/writer.cpp
@@ -32,7 +32,7 @@
| NAMESPACE
========================================================================*/
-using namespace KABC;
+using namespace TDEABC;
/*=========================================================================
| METHODS
diff --git a/tderesources/carddav/writer.h b/tderesources/carddav/writer.h
index 4af3fe36b..9bd9429ab 100644
--- a/tderesources/carddav/writer.h
+++ b/tderesources/carddav/writer.h
@@ -22,7 +22,7 @@
#include <tqstring.h>
#include <tqdatetime.h>
-namespace KABC {
+namespace TDEABC {
/*=========================================================================
| CLASS
@@ -103,7 +103,7 @@ private:
TQString mDeleted;
};
-} // namespace KABC
+} // namespace TDEABC
#endif // KCARDDAV_WRITER_H
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.cpp b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
index 7c568e4e6..7ce11dd90 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.cpp
@@ -155,7 +155,7 @@ void ResourceXMLRPC::init()
mPrefs = new EGroupwarePrefs;
mLoaded = 0;
- mLock = new KABC::LockNull( true );
+ mLock = new TDEABC::LockNull( true );
mSynchronizer = new Synchronizer();
}
@@ -321,7 +321,7 @@ bool ResourceXMLRPC::isSaving()
return false;
}
-KABC::Lock *ResourceXMLRPC::lock()
+TDEABC::Lock *ResourceXMLRPC::lock()
{
return mLock;
}
diff --git a/tderesources/egroupware/kcal_resourcexmlrpc.h b/tderesources/egroupware/kcal_resourcexmlrpc.h
index 9be4662fb..271995819 100644
--- a/tderesources/egroupware/kcal_resourcexmlrpc.h
+++ b/tderesources/egroupware/kcal_resourcexmlrpc.h
@@ -67,7 +67,7 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
bool isSaving();
- KABC::Lock *lock();
+ TDEABC::Lock *lock();
/**
Add Event to calendar.
@@ -228,7 +228,7 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
Synchronizer *mSynchronizer;
- KABC::Lock *mLock;
+ TDEABC::Lock *mLock;
int mLoaded;
};
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
index 7c5911d87..1929bd19c 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.cpp
@@ -39,7 +39,7 @@
#include "synchronizer.h"
#include "xmlrpciface.h"
-using namespace KABC;
+using namespace TDEABC;
static const TQString SearchContactsCommand = "addressbook.boaddressbook.search";
static const TQString AddContactCommand = "addressbook.boaddressbook.write";
@@ -47,12 +47,12 @@ static const TQString DeleteContactCommand = "addressbook.boaddressbook.delete";
static const TQString LoadCategoriesCommand = "addressbook.boaddressbook.categories";
static const TQString LoadCustomFieldsCommand = "addressbook.boaddressbook.customfields";
-static void setRights( KABC::Addressee &addr, int rights )
+static void setRights( TDEABC::Addressee &addr, int rights )
{
addr.insertCustom( "EGWRESOURCE", "RIGHTS", TQString::number( rights ) );
}
-static int rights( const KABC::Addressee &addr )
+static int rights( const TDEABC::Addressee &addr )
{
return addr.custom( "EGWRESOURCE", "RIGHTS" ).toInt();
}
@@ -227,19 +227,19 @@ bool ResourceXMLRPC::save( Ticket *ticket )
bool ResourceXMLRPC::asyncSave( Ticket* )
{
- KABC::Addressee::List::ConstIterator it;
+ TDEABC::Addressee::List::ConstIterator it;
- const KABC::Addressee::List addedList = addedAddressees();
+ const TDEABC::Addressee::List addedList = addedAddressees();
for ( it = addedList.begin(); it != addedList.end(); ++it ) {
addContact( *it );
}
- const KABC::Addressee::List changedList = changedAddressees();
+ const TDEABC::Addressee::List changedList = changedAddressees();
for ( it = changedList.begin(); it != changedList.end(); ++it ) {
updateContact( *it );
}
- const KABC::Addressee::List deletedList = deletedAddressees();
+ const TDEABC::Addressee::List deletedList = deletedAddressees();
for ( it = deletedList.begin(); it != deletedList.end(); ++it ) {
deleteContact( *it );
}
@@ -333,7 +333,7 @@ void ResourceXMLRPC::listContactsFinished( const TQValueList<TQVariant> &mapList
const TQValueList<TQVariant> contactList = mapList[ 0 ].toList();
TQValueList<TQVariant>::ConstIterator contactIt;
- KABC::Addressee::List serverContacts;
+ TDEABC::Addressee::List serverContacts;
for ( contactIt = contactList.begin(); contactIt != contactList.end(); ++contactIt ) {
const TQMap<TQString, TQVariant> map = (*contactIt).toMap();
@@ -403,7 +403,7 @@ void ResourceXMLRPC::fault( int error, const TQString &errorMsg,
void ResourceXMLRPC::addContactFault( int, const TQString &errorMsg,
const TQVariant &id )
{
- KABC::Addressee addr = mAddrMap[ id.toString() ];
+ TDEABC::Addressee addr = mAddrMap[ id.toString() ];
mAddrMap.remove( addr.uid() );
@@ -414,7 +414,7 @@ void ResourceXMLRPC::addContactFault( int, const TQString &errorMsg,
void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg,
const TQVariant &id )
{
- KABC::Addressee addr = mAddrMap[ id.toString() ];
+ TDEABC::Addressee addr = mAddrMap[ id.toString() ];
TQString msg = i18n( "Unable to update contact %1 on server. (%2)" );
addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
@@ -423,10 +423,10 @@ void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg,
void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg,
const TQVariant &id )
{
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
- const KABC::Addressee::List deletedList = deletedAddressees();
- KABC::Addressee::List::ConstIterator it;
+ const TDEABC::Addressee::List deletedList = deletedAddressees();
+ TDEABC::Addressee::List::ConstIterator it;
for ( it = deletedList.begin(); it != deletedList.end(); ++it ) {
if ( (*it).uid() == id.toString() ) {
addr = *it;
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpc.h b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
index b4b6411a4..d4d6e233b 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpc.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpc.h
@@ -33,7 +33,7 @@ namespace KXMLRPC {
class Server;
}
-namespace KABC {
+namespace TDEABC {
class EGroupwarePrefs;
@@ -82,9 +82,9 @@ class KDE_EXPORT ResourceXMLRPC : public ResourceCached
void updateContactFault( int, const TQString&, const TQVariant& );
void deleteContactFault( int, const TQString&, const TQVariant& );
- void addContact( const KABC::Addressee& );
- void updateContact( const KABC::Addressee& );
- void deleteContact( const KABC::Addressee& );
+ void addContact( const TDEABC::Addressee& );
+ void updateContact( const TDEABC::Addressee& );
+ void deleteContact( const TDEABC::Addressee& );
private:
void initEGroupware();
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp
index 60cbb83e9..5fa07d93b 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.cpp
@@ -31,7 +31,7 @@
#include "tdeabc_resourcexmlrpc.h"
#include "tdeabc_resourcexmlrpcconfig.h"
-using namespace KABC;
+using namespace TDEABC;
ResourceXMLRPCConfig::ResourceXMLRPCConfig( TQWidget* parent, const char* name )
: KRES::ConfigWidget( parent, name )
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
index 0a9dc9f06..f4893c846 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpcconfig.h
@@ -27,7 +27,7 @@
class KLineEdit;
class KURLRequester;
-namespace KABC {
+namespace TDEABC {
class KDE_EXPORT ResourceXMLRPCConfig : public KRES::ConfigWidget
{
diff --git a/tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp b/tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp
index 004c6a403..01666cbe7 100644
--- a/tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp
+++ b/tderesources/egroupware/tdeabc_resourcexmlrpcplugin.cpp
@@ -24,7 +24,7 @@
#include <tdeglobal.h>
#include <tdelocale.h>
-using namespace KABC;
+using namespace TDEABC;
typedef KRES::PluginFactory< ResourceXMLRPC, ResourceXMLRPCConfig > XMLRPCFactory;
diff --git a/tderesources/exchange/resourceexchange.cpp b/tderesources/exchange/resourceexchange.cpp
index a85c741d2..ae65f9cdc 100644
--- a/tderesources/exchange/resourceexchange.cpp
+++ b/tderesources/exchange/resourceexchange.cpp
@@ -76,7 +76,7 @@ ResourceExchange::ResourceExchange( const TDEConfig *config )
: ResourceCalendar( config ), mClient(0), mMonitor(0), mCache(0), mDates(0),
mEventDates(0), mCacheDates(0)
{
- mLock = new KABC::LockNull( true );
+ mLock = new TDEABC::LockNull( true );
mTimeZoneId = TQString::fromLatin1( "UTC" );
@@ -203,7 +203,7 @@ bool ResourceExchange::doSave()
return true;
}
-KABC::Lock *ResourceExchange::lock()
+TDEABC::Lock *ResourceExchange::lock()
{
return mLock;
}
diff --git a/tderesources/exchange/resourceexchange.h b/tderesources/exchange/resourceexchange.h
index 9b414dbb7..120a4de97 100644
--- a/tderesources/exchange/resourceexchange.h
+++ b/tderesources/exchange/resourceexchange.h
@@ -56,7 +56,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
virtual void writeConfig( TDEConfig* config );
- KABC::Lock *lock();
+ TDEABC::Lock *lock();
/** constructs a new calendar, with variables initialized to sane values. */
// ExchangeCalendar( KPIM::ExchangeAccount* account );
@@ -242,7 +242,7 @@ class ResourceExchange : public ResourceCalendar, public IncidenceBase::Observer
bool mAutoMailbox;
TQString mTimeZoneId;
- KABC::Lock *mLock;
+ TDEABC::Lock *mLock;
// FIXME: Remove variable, use ResourceCached::changedIncidences() instead.
Incidence::List mChangedIncidences;
diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.cpp b/tderesources/featureplan/kcal_resourcefeatureplan.cpp
index d417c0d83..f5c7ee5fd 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplan.cpp
+++ b/tderesources/featureplan/kcal_resourcefeatureplan.cpp
@@ -143,7 +143,7 @@ bool ResourceFeaturePlan::doSave()
return true;
}
-KABC::Lock *ResourceFeaturePlan::lock()
+TDEABC::Lock *ResourceFeaturePlan::lock()
{
return &mLock;
}
diff --git a/tderesources/featureplan/kcal_resourcefeatureplan.h b/tderesources/featureplan/kcal_resourcefeatureplan.h
index f6487521e..2d4928974 100644
--- a/tderesources/featureplan/kcal_resourcefeatureplan.h
+++ b/tderesources/featureplan/kcal_resourcefeatureplan.h
@@ -53,14 +53,14 @@ class KDE_EXPORT ResourceFeaturePlan : public ResourceCached
bool doLoad();
bool doSave();
- KABC::Lock *lock();
+ TDEABC::Lock *lock();
protected:
void insertCategories( const Category::List &categories, Todo *parent );
private:
Prefs *mPrefs;
- KABC::LockNull mLock;
+ TDEABC::LockNull mLock;
};
}
diff --git a/tderesources/groupdav/groupdavaddressbookadaptor.cpp b/tderesources/groupdav/groupdavaddressbookadaptor.cpp
index 278c261a7..75aa3e741 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 7a845955d..89e7809b8 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 fdf687977..43a7bb671 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 e7f2b06e7..e996160b8 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 e74b4d2c8..fc8bb70e0 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 51f40856f..dba61bf8e 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 b877231d7..83509b89b 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
diff --git a/tderesources/groupware/kcal_resourcegroupware.cpp b/tderesources/groupware/kcal_resourcegroupware.cpp
index 1bb0b2db9..6200773bf 100644
--- a/tderesources/groupware/kcal_resourcegroupware.cpp
+++ b/tderesources/groupware/kcal_resourcegroupware.cpp
@@ -288,7 +288,7 @@ bool ResourceGroupware::confirmSave()
return result == TQDialog::Accepted;
}
-KABC::Lock *ResourceGroupware::lock()
+TDEABC::Lock *ResourceGroupware::lock()
{
return &mLock;
}
diff --git a/tderesources/groupware/kcal_resourcegroupware.h b/tderesources/groupware/kcal_resourcegroupware.h
index 7fe564bc7..323f6ade7 100644
--- a/tderesources/groupware/kcal_resourcegroupware.h
+++ b/tderesources/groupware/kcal_resourcegroupware.h
@@ -60,7 +60,7 @@ class ResourceGroupware : public ResourceCached
bool doLoad();
bool doSave();
- KABC::Lock *lock();
+ TDEABC::Lock *lock();
protected:
void init();
@@ -77,7 +77,7 @@ class ResourceGroupware : public ResourceCached
private:
GroupwarePrefsBase *mPrefs;
- KABC::LockNull mLock;
+ TDEABC::LockNull mLock;
TDEIO::TransferJob *mDownloadJob;
KPIM::ProgressItem *mProgress;
diff --git a/tderesources/groupware/tdeabc_resourcegroupware.cpp b/tderesources/groupware/tdeabc_resourcegroupware.cpp
index c46c09371..e8f0c0a2b 100644
--- a/tderesources/groupware/tdeabc_resourcegroupware.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupware.cpp
@@ -32,7 +32,7 @@
#include "tdeabc_resourcegroupware.h"
-using namespace KABC;
+using namespace TDEABC;
ResourceGroupware::ResourceGroupware( const TDEConfig *config )
: ResourceCached( config )
@@ -270,9 +270,9 @@ bool ResourceGroupware::asyncSave( Ticket* )
#if 0
if ( !mServer->login() ) return false;
- KABC::Addressee::List::Iterator it;
+ TDEABC::Addressee::List::Iterator it;
- KABC::Addressee::List addedList = addedAddressees();
+ TDEABC::Addressee::List addedList = addedAddressees();
for ( it = addedList.begin(); it != addedList.end(); ++it ) {
if ( mServer->insertAddressee( mPrefs->writeAddressBook(), *it ) ) {
clearChange( *it );
@@ -280,13 +280,13 @@ bool ResourceGroupware::asyncSave( Ticket* )
}
}
- KABC::Addressee::List changedList = changedAddressees();
+ TDEABC::Addressee::List changedList = changedAddressees();
for ( it = changedList.begin(); it != changedList.end(); ++it ) {
if ( mServer->changeAddressee( *it ) )
clearChange( *it );
}
- KABC::Addressee::List deletedList = deletedAddressees();
+ TDEABC::Addressee::List deletedList = deletedAddressees();
for ( it = deletedList.begin(); it != deletedList.end(); ++it ) {
if ( mServer->removeAddressee( *it ) )
clearChange( *it );
@@ -310,11 +310,11 @@ void ResourceGroupware::slotJobResult( TDEIO::Job *job )
} else {
mAddrMap.clear();
- KABC::VCardConverter conv;
+ TDEABC::VCardConverter conv;
Addressee::List addressees = conv.parseVCards( mJobData );
Addressee::List::ConstIterator it;
for( it = addressees.begin(); it != addressees.end(); ++it ) {
- KABC::Addressee addr = *it;
+ TDEABC::Addressee addr = *it;
if ( !addr.isEmpty() ) {
addr.setResource( this );
diff --git a/tderesources/groupware/tdeabc_resourcegroupware.h b/tderesources/groupware/tdeabc_resourcegroupware.h
index 68d7f6329..06088f5de 100644
--- a/tderesources/groupware/tdeabc_resourcegroupware.h
+++ b/tderesources/groupware/tdeabc_resourcegroupware.h
@@ -28,7 +28,7 @@
class TDEConfig;
-namespace KABC {
+namespace TDEABC {
class GroupwarePrefs;
diff --git a/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp b/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp
index b857496dd..b65ae40e6 100644
--- a/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupware_plugin.cpp
@@ -24,7 +24,7 @@
#include <tdeglobal.h>
#include <tdelocale.h>
-using namespace KABC;
+using namespace TDEABC;
typedef KRES::PluginFactory<ResourceGroupware, ResourceGroupwareConfig> GroupwareFactory;
diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
index feb24db71..e171c7e75 100644
--- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
+++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.cpp
@@ -34,7 +34,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-using namespace KABC;
+using namespace TDEABC;
class AddressBookItem : public TQCheckListItem
{
diff --git a/tderesources/groupware/tdeabc_resourcegroupwareconfig.h b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h
index c07c4d0b4..a52b0fa0a 100644
--- a/tderesources/groupware/tdeabc_resourcegroupwareconfig.h
+++ b/tderesources/groupware/tdeabc_resourcegroupwareconfig.h
@@ -29,7 +29,7 @@ class KLineEdit;
class TDEListView;
class KURLRequester;
-namespace KABC {
+namespace TDEABC {
class ResourceGroupware;
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.cpp b/tderesources/groupwise/kcal_resourcegroupwise.cpp
index 0d385ae98..a8a0727ec 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise.cpp
+++ b/tderesources/groupwise/kcal_resourcegroupwise.cpp
@@ -287,7 +287,7 @@ bool ResourceGroupwise::confirmSave()
return result == TQDialog::Accepted;
}
-KABC::Lock *ResourceGroupwise::lock()
+TDEABC::Lock *ResourceGroupwise::lock()
{
return &mLock;
}
diff --git a/tderesources/groupwise/kcal_resourcegroupwise.h b/tderesources/groupwise/kcal_resourcegroupwise.h
index e1cab8758..c4b330df7 100644
--- a/tderesources/groupwise/kcal_resourcegroupwise.h
+++ b/tderesources/groupwise/kcal_resourcegroupwise.h
@@ -63,7 +63,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
bool doLoad();
bool doSave();
- KABC::Lock *lock();
+ TDEABC::Lock *lock();
bool userSettings( ngwt__Settings * &settings );
bool modifyUserSettings( TQMap<TQString, TQString> & settings );
@@ -80,7 +80,7 @@ class KDE_EXPORT ResourceGroupwise : public ResourceCached
private:
GroupwisePrefsBase *mPrefs;
- KABC::LockNull mLock;
+ TDEABC::LockNull mLock;
TDEIO::TransferJob *mDownloadJob;
KPIM::ProgressItem *mProgress;
diff --git a/tderesources/groupwise/soap/contactconverter.cpp b/tderesources/groupwise/soap/contactconverter.cpp
index 1ce391381..2076ccb6f 100644
--- a/tderesources/groupwise/soap/contactconverter.cpp
+++ b/tderesources/groupwise/soap/contactconverter.cpp
@@ -28,7 +28,7 @@ ContactConverter::ContactConverter( struct soap* soap )
{
}
-ngwt__Contact* ContactConverter::convertToContact( const KABC::Addressee &addr )
+ngwt__Contact* ContactConverter::convertToContact( const TDEABC::Addressee &addr )
{
if ( addr.isEmpty() )
return 0;
@@ -128,15 +128,15 @@ ngwt__Contact* ContactConverter::convertToContact( const KABC::Addressee &addr )
phoneList->default_ = 0;
std::vector<class ngwt__PhoneNumber*> *list = soap_new_std__vectorTemplateOfPointerTongwt__PhoneNumber( soap(), -1 );
- KABC::PhoneNumber::List phones = addr.phoneNumbers();
- KABC::PhoneNumber::List::Iterator it;
+ TDEABC::PhoneNumber::List phones = addr.phoneNumbers();
+ TDEABC::PhoneNumber::List::Iterator it;
for ( it = phones.begin(); it != phones.end(); ++it ) {
ngwt__PhoneNumber* number = convertPhoneNumber( *it );
if ( number ) {
list->push_back( number );
// if preferred number assign it
- if ( (*it).type() & KABC::PhoneNumber::Pref )
+ if ( (*it).type() & TDEABC::PhoneNumber::Pref )
phoneList->default_ = qStringToString( (*it).number() );
}
}
@@ -151,8 +151,8 @@ ngwt__Contact* ContactConverter::convertToContact( const KABC::Addressee &addr )
ngwt__PostalAddressList* addressList = soap_new_ngwt__PostalAddressList( soap(), -1 );
std::vector<class ngwt__PostalAddress*> *list = soap_new_std__vectorTemplateOfPointerTongwt__PostalAddress( soap(), -1 );
- KABC::Address::List addresses = addr.addresses();
- KABC::Address::List::Iterator it;
+ TDEABC::Address::List addresses = addr.addresses();
+ TDEABC::Address::List::Iterator it;
for ( it = addresses.begin(); it != addresses.end(); ++it ) {
ngwt__PostalAddress* address = convertPostalAddress( *it );
if ( address )
@@ -213,10 +213,10 @@ ngwt__Contact* ContactConverter::convertToContact( const KABC::Addressee &addr )
return contact;
}
-KABC::Addressee ContactConverter::convertFromAddressBookItem( ngwt__AddressBookItem * addrBkItem )
+TDEABC::Addressee ContactConverter::convertFromAddressBookItem( ngwt__AddressBookItem * addrBkItem )
{
//kdDebug() << "ContactConverter::convertFromAddressBookItem()" << endl;
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
if ( !addrBkItem )
{
kdDebug() << "Null AddressBookItem, bailing out!" << endl;
@@ -232,17 +232,17 @@ KABC::Addressee ContactConverter::convertFromAddressBookItem( ngwt__AddressBookI
return addr;
}
-KABC::Addressee ContactConverter::convertFromResource( ngwt__Resource* resource )
+TDEABC::Addressee ContactConverter::convertFromResource( ngwt__Resource* resource )
{
//kdDebug() << "ContactConverter::convertFromResource()" << endl;
- KABC::Addressee addr = convertFromAddressBookItem( resource );
+ TDEABC::Addressee addr = convertFromAddressBookItem( resource );
if ( !resource )
{
kdDebug() << "Null Resource, bailing out!" << endl;
return addr;
}
if ( resource->phone )
- addr.insertPhoneNumber( KABC::PhoneNumber( stringToTQString( resource->phone ), KABC::PhoneNumber::Work ) );
+ addr.insertPhoneNumber( TDEABC::PhoneNumber( stringToTQString( resource->phone ), TDEABC::PhoneNumber::Work ) );
if ( resource->email )
addr.insertEmail( stringToTQString( resource->email ), true );
if ( resource->owner )
@@ -252,10 +252,10 @@ KABC::Addressee ContactConverter::convertFromResource( ngwt__Resource* resource
return addr;
}
-KABC::Addressee ContactConverter::convertFromGroup( ngwt__Group* group)
+TDEABC::Addressee ContactConverter::convertFromGroup( ngwt__Group* group)
{
// kdDebug() << "ContactConverter::convertFromGroup()" << endl;
- KABC::Addressee addr = convertFromAddressBookItem( group );
+ TDEABC::Addressee addr = convertFromAddressBookItem( group );
if ( !group )
{
kdDebug() << "Null Resource, bailing out!" << endl;
@@ -265,11 +265,11 @@ KABC::Addressee ContactConverter::convertFromGroup( ngwt__Group* group)
return addr;
}
-KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
+TDEABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
{
// kdDebug() << "ContactConverter::convertFromContact()" << endl;
- KABC::Addressee addr = convertFromAddressBookItem( contact );
+ TDEABC::Addressee addr = convertFromAddressBookItem( contact );
if ( !contact )
{
@@ -329,10 +329,10 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
std::vector<class ngwt__PhoneNumber*> list = contact->phoneList->phone;
std::vector<class ngwt__PhoneNumber*>::const_iterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
- KABC::PhoneNumber phone = convertPhoneNumber( *it );
+ TDEABC::PhoneNumber phone = convertPhoneNumber( *it );
if ( !phone.number().isEmpty() ) {
if ( phone.number() == defaultNumber )
- phone.setType( phone.type() | KABC::PhoneNumber::Pref );
+ phone.setType( phone.type() | TDEABC::PhoneNumber::Pref );
addr.insertPhoneNumber( phone );
}
}
@@ -343,7 +343,7 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
std::vector<class ngwt__PostalAddress*> list = contact->addressList->address;
std::vector<class ngwt__PostalAddress*>::const_iterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
- KABC::Address address = convertPostalAddress( *it );
+ TDEABC::Address address = convertPostalAddress( *it );
if ( !address.isEmpty() )
addr.insertAddress( address );
}
@@ -425,24 +425,24 @@ KABC::Addressee ContactConverter::convertFromContact( ngwt__Contact* contact )
return addr;
}
-KABC::PhoneNumber ContactConverter::convertPhoneNumber( ngwt__PhoneNumber *phone ) const
+TDEABC::PhoneNumber ContactConverter::convertPhoneNumber( ngwt__PhoneNumber *phone ) const
{
- KABC::PhoneNumber phoneNumber;
+ TDEABC::PhoneNumber phoneNumber;
if ( !phone )
return phoneNumber;
phoneNumber.setNumber( stringToTQString( phone->__item ) );
if ( phone->type == Fax ) {
- phoneNumber.setType( KABC::PhoneNumber::Fax );
+ phoneNumber.setType( TDEABC::PhoneNumber::Fax );
} else if ( phone->type == Home ) {
- phoneNumber.setType( KABC::PhoneNumber::Home );
+ phoneNumber.setType( TDEABC::PhoneNumber::Home );
} else if ( phone->type == Mobile ) {
- phoneNumber.setType( KABC::PhoneNumber::Cell );
+ phoneNumber.setType( TDEABC::PhoneNumber::Cell );
} else if ( phone->type == Office ) {
- phoneNumber.setType( KABC::PhoneNumber::Work );
+ phoneNumber.setType( TDEABC::PhoneNumber::Work );
} else if ( phone->type == Pager ) {
- phoneNumber.setType( KABC::PhoneNumber::Pager );
+ phoneNumber.setType( TDEABC::PhoneNumber::Pager );
} else {
// should never been reached, phone numbers have always a type set...
}
@@ -450,7 +450,7 @@ KABC::PhoneNumber ContactConverter::convertPhoneNumber( ngwt__PhoneNumber *phone
return phoneNumber;
}
-ngwt__PhoneNumber* ContactConverter::convertPhoneNumber( const KABC::PhoneNumber &number ) const
+ngwt__PhoneNumber* ContactConverter::convertPhoneNumber( const TDEABC::PhoneNumber &number ) const
{
if ( number.number().isEmpty() )
return 0;
@@ -458,15 +458,15 @@ ngwt__PhoneNumber* ContactConverter::convertPhoneNumber( const KABC::PhoneNumber
ngwt__PhoneNumber* phoneNumber = soap_new_ngwt__PhoneNumber( soap(), -1 );
phoneNumber->__item = number.number().utf8().data();
- if ( number.type() & KABC::PhoneNumber::Fax ) {
+ if ( number.type() & TDEABC::PhoneNumber::Fax ) {
phoneNumber->type = Fax;
- } else if ( number.type() == KABC::PhoneNumber::Home ) {
+ } else if ( number.type() == TDEABC::PhoneNumber::Home ) {
phoneNumber->type = Home;
- } else if ( number.type() & KABC::PhoneNumber::Cell ) {
+ } else if ( number.type() & TDEABC::PhoneNumber::Cell ) {
phoneNumber->type = Mobile;
- } else if ( number.type() == KABC::PhoneNumber::Work ) {
+ } else if ( number.type() == TDEABC::PhoneNumber::Work ) {
phoneNumber->type = Office;
- } else if ( number.type() & KABC::PhoneNumber::Pager ) {
+ } else if ( number.type() & TDEABC::PhoneNumber::Pager ) {
phoneNumber->type = Pager;
} else {
// TODO: cache unsupported types
@@ -475,9 +475,9 @@ ngwt__PhoneNumber* ContactConverter::convertPhoneNumber( const KABC::PhoneNumber
return phoneNumber;
}
-KABC::Address ContactConverter::convertPostalAddress( ngwt__PostalAddress *addr ) const
+TDEABC::Address ContactConverter::convertPostalAddress( ngwt__PostalAddress *addr ) const
{
- KABC::Address address;
+ TDEABC::Address address;
if ( !addr )
return address;
@@ -501,9 +501,9 @@ KABC::Address ContactConverter::convertPostalAddress( ngwt__PostalAddress *addr
address.setCountry( stringToTQString( addr->country ) );
if ( addr->type == Home_ ) {
- address.setType( KABC::Address::Home );
+ address.setType( TDEABC::Address::Home );
} else if ( addr->type == Office_ ) {
- address.setType( KABC::Address::Work );
+ address.setType( TDEABC::Address::Work );
} else {
// should never been reached, addresses have always a type set...
}
@@ -511,7 +511,7 @@ KABC::Address ContactConverter::convertPostalAddress( ngwt__PostalAddress *addr
return address;
}
-ngwt__PostalAddress* ContactConverter::convertPostalAddress( const KABC::Address &address )
+ngwt__PostalAddress* ContactConverter::convertPostalAddress( const TDEABC::Address &address )
{
if ( address.isEmpty() )
return 0;
@@ -550,9 +550,9 @@ ngwt__PostalAddress* ContactConverter::convertPostalAddress( const KABC::Address
else
postalAddress->country = 0;
- if ( address.type() & KABC::Address::Home ) {
+ if ( address.type() & TDEABC::Address::Home ) {
postalAddress->type = Home_;
- } else if ( address.type() & KABC::Address::Work ) {
+ } else if ( address.type() & TDEABC::Address::Work ) {
postalAddress->type = Office_;
} else {
// TODO: cache unsupported types
@@ -561,7 +561,7 @@ ngwt__PostalAddress* ContactConverter::convertPostalAddress( const KABC::Address
return postalAddress;
}
-ngwt__ImAddressList* ContactConverter::convertImAddresses( const KABC::Addressee& addr )
+ngwt__ImAddressList* ContactConverter::convertImAddresses( const TDEABC::Addressee& addr )
{
//return 0;
/* TODO: use IM address dedicated functions in KDE 4.0.
diff --git a/tderesources/groupwise/soap/contactconverter.h b/tderesources/groupwise/soap/contactconverter.h
index 2f98a328c..ffb12e0d3 100644
--- a/tderesources/groupwise/soap/contactconverter.h
+++ b/tderesources/groupwise/soap/contactconverter.h
@@ -30,22 +30,22 @@ class ContactConverter : public GWConverter
public:
ContactConverter( struct soap* );
- KABC::Addressee convertFromContact( ngwt__Contact* );
- ngwt__Contact* convertToContact( const KABC::Addressee& );
- KABC::Addressee convertFromResource( ngwt__Resource* );
- KABC::Addressee convertFromGroup( ngwt__Group* );
+ TDEABC::Addressee convertFromContact( ngwt__Contact* );
+ ngwt__Contact* convertToContact( const TDEABC::Addressee& );
+ TDEABC::Addressee convertFromResource( ngwt__Resource* );
+ TDEABC::Addressee convertFromGroup( ngwt__Group* );
private:
- KABC::Addressee convertFromAddressBookItem( ngwt__AddressBookItem * );
- KABC::PhoneNumber convertPhoneNumber( ngwt__PhoneNumber* ) const;
- ngwt__PhoneNumber* convertPhoneNumber( const KABC::PhoneNumber& ) const;
+ TDEABC::Addressee convertFromAddressBookItem( ngwt__AddressBookItem * );
+ TDEABC::PhoneNumber convertPhoneNumber( ngwt__PhoneNumber* ) const;
+ ngwt__PhoneNumber* convertPhoneNumber( const TDEABC::PhoneNumber& ) const;
- KABC::Address convertPostalAddress( ngwt__PostalAddress* ) const;
- ngwt__PostalAddress* convertPostalAddress( const KABC::Address& );
+ TDEABC::Address convertPostalAddress( ngwt__PostalAddress* ) const;
+ ngwt__PostalAddress* convertPostalAddress( const TDEABC::Address& );
/* we convert all IM addresses in the addressee at once,
because multiple values per IM system are stored in a custom field each
which is a different structure to that used for phone numbers, email addresses etc */
- ngwt__ImAddressList* convertImAddresses( const KABC::Addressee& );
+ ngwt__ImAddressList* convertImAddresses( const TDEABC::Addressee& );
// splits up an arbitrary custom field
void splitField( const TQString &str, TQString &app, TQString &name, TQString &value );
static TQMap<TQString, TQString > mIMProtocolMap;
diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp
index d3e98f08f..07342ec4f 100644
--- a/tderesources/groupwise/soap/groupwiseserver.cpp
+++ b/tderesources/groupwise/soap/groupwiseserver.cpp
@@ -1219,7 +1219,7 @@ bool GroupwiseServer::retractRequest( KCal::Incidence *incidence, RetractCause c
return checkResponse( result, response.status );
}
-bool GroupwiseServer::insertAddressee( const TQString &addrBookId, KABC::Addressee &addr )
+bool GroupwiseServer::insertAddressee( const TQString &addrBookId, TDEABC::Addressee &addr )
{
if ( mSession.empty() ) {
kdError() << "GroupwiseServer::insertAddressee(): no session." << endl;
@@ -1250,7 +1250,7 @@ bool GroupwiseServer::insertAddressee( const TQString &addrBookId, KABC::Address
return true;
}
-bool GroupwiseServer::changeAddressee( const KABC::Addressee &addr )
+bool GroupwiseServer::changeAddressee( const TDEABC::Addressee &addr )
{
if ( mSession.empty() ) {
kdError() << "GroupwiseServer::changeAddressee(): no session." << endl;
@@ -1282,7 +1282,7 @@ bool GroupwiseServer::changeAddressee( const KABC::Addressee &addr )
return checkResponse( result, response.status );
}
-bool GroupwiseServer::removeAddressee( const KABC::Addressee &addr )
+bool GroupwiseServer::removeAddressee( const TDEABC::Addressee &addr )
{
if ( mSession.empty() ) {
kdError() << "GroupwiseServer::removeAddressee(): no session." << endl;
@@ -1463,7 +1463,7 @@ void GroupwiseServer::emitErrorMessage( const TQString & msg, bool fatal )
emit errorMessage( msg, fatal );
}
-void GroupwiseServer::emitGotAddressees( const KABC::Addressee::List addressees )
+void GroupwiseServer::emitGotAddressees( const TDEABC::Addressee::List addressees )
{
emit gotAddressees( addressees );
}
diff --git a/tderesources/groupwise/soap/groupwiseserver.h b/tderesources/groupwise/soap/groupwiseserver.h
index 71c6f6d54..0a0f70e0b 100644
--- a/tderesources/groupwise/soap/groupwiseserver.h
+++ b/tderesources/groupwise/soap/groupwiseserver.h
@@ -37,7 +37,7 @@
#include "gwjobs.h"
-namespace KABC {
+namespace TDEABC {
class AddresseeList;
class Resource;
}
@@ -154,9 +154,9 @@ class GroupwiseServer : public TQObject
bool updateAddressBooks( const TQStringList &addrBookIds,
const unsigned long startSequenceNumber, const unsigned long lastPORebuildTime );
- bool insertAddressee( const TQString &addrBookId, KABC::Addressee& );
- bool changeAddressee( const KABC::Addressee& );
- bool removeAddressee( const KABC::Addressee& );
+ bool insertAddressee( const TQString &addrBookId, TDEABC::Addressee& );
+ bool changeAddressee( const TDEABC::Addressee& );
+ bool removeAddressee( const TDEABC::Addressee& );
bool readFreeBusy( const TQString &email, const TQDate &start,
const TQDate &end, KCal::FreeBusy * );
@@ -178,7 +178,7 @@ class GroupwiseServer : public TQObject
void emitReadAddressBookTotalSize( int );
void emitReadAddressBookProcessedSize( int );
void emitErrorMessage( const TQString &, bool );
- void emitGotAddressees( const KABC::Addressee::List );
+ void emitGotAddressees( const TDEABC::Addressee::List );
bool readUserSettings( ngwt__Settings *&settings );
bool modifyUserSettings( TQMap<TQString, TQString> & );
@@ -191,7 +191,7 @@ class GroupwiseServer : public TQObject
void readAddressBookTotalSize( int );
void readAddressBookProcessedSize( int );
void errorMessage( const TQString &, bool );
- void gotAddressees( const KABC::Addressee::List );
+ void gotAddressees( const TDEABC::Addressee::List );
protected:
void dumpCalendarFolder( const std::string &id );
diff --git a/tderesources/groupwise/soap/gwjobs.cpp b/tderesources/groupwise/soap/gwjobs.cpp
index 8857ff8e5..4bbf728a3 100644
--- a/tderesources/groupwise/soap/gwjobs.cpp
+++ b/tderesources/groupwise/soap/gwjobs.cpp
@@ -152,7 +152,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
ngwt__Contact *contact = dynamic_cast<ngwt__Contact *>( item );
- KABC::Addressee addr = converter.convertFromContact( contact );
+ TDEABC::Addressee addr = converter.convertFromContact( contact );
if ( !addr.isEmpty() ) {
addr.setResource( mResource );
@@ -160,7 +160,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
TQString remoteUid = converter.stringToTQString( (*it)->id );
- KABC::Addressee oldAddressee = mResource->findByUid( mResource->idMapper().localId( remoteUid ) );
+ TDEABC::Addressee oldAddressee = mResource->findByUid( mResource->idMapper().localId( remoteUid ) );
if ( oldAddressee.isEmpty() ) // new addressee
mResource->idMapper().setRemoteId( addr.uid(), remoteUid );
else {
@@ -241,7 +241,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
while ( true )
{
- KABC::Addressee::List contacts;
+ TDEABC::Addressee::List contacts;
mSoap->header->ngwt__session = mSession;
kdDebug() << "sending readCursorRequest with session: " << mSession.c_str() << endl;
_ngwm__readCursorResponse readCursorResponse;
@@ -276,7 +276,7 @@ void ReadAddressBooksJob::readAddressBook( std::string &id )
kdDebug() << "ITEM is null" << endl;
#endif
ngwt__Contact *contact = dynamic_cast<ngwt__Contact *>( item );
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
if ( contact )
{
addr = converter.convertFromContact( contact );
@@ -689,7 +689,7 @@ void UpdateAddressBooksJob::run()
#if 1
kdDebug() << " - got " << items.size() << "contacts" << endl;
#endif
- KABC::Addressee::List contacts;
+ TDEABC::Addressee::List contacts;
ContactConverter converter( mSoap );
std::vector<class ngwt__Item * >::const_iterator it;
@@ -709,7 +709,7 @@ void UpdateAddressBooksJob::run()
ngwt__Contact *contact = dynamic_cast<ngwt__Contact *>( item );
- KABC::Addressee addr = converter.convertFromContact( contact );
+ TDEABC::Addressee addr = converter.convertFromContact( contact );
if ( !addr.isEmpty() )
contacts.append( addr );
}
diff --git a/tderesources/groupwise/soap/gwjobs.h b/tderesources/groupwise/soap/gwjobs.h
index e562ebd5a..75f9564ab 100644
--- a/tderesources/groupwise/soap/gwjobs.h
+++ b/tderesources/groupwise/soap/gwjobs.h
@@ -26,7 +26,7 @@
#include <tdeabc/addressee.h>
-namespace KABC {
+namespace TDEABC {
class Resource;
}
@@ -71,7 +71,7 @@ class ReadAddressBooksJob : public GWJob
private:
TQStringList mAddressBookIds;
- KABC::Resource *mResource;
+ TDEABC::Resource *mResource;
int mProgress;
};
@@ -123,7 +123,7 @@ class UpdateAddressBooksJob : public GWJob
private:
TQStringList mAddressBookIds;
- KABC::Resource *mResource;
+ TDEABC::Resource *mResource;
int mProgress;
unsigned long mLastPORebuildTime;
unsigned long mStartSequenceNumber; // first and last sequence numbers define the current state of the system addressbook
diff --git a/tderesources/groupwise/soap/incidenceconverter.cpp b/tderesources/groupwise/soap/incidenceconverter.cpp
index 580d84e6e..3f08a534f 100644
--- a/tderesources/groupwise/soap/incidenceconverter.cpp
+++ b/tderesources/groupwise/soap/incidenceconverter.cpp
@@ -474,7 +474,7 @@ void IncidenceConverter::setAttendees( KCal::Incidence *incidence,
kdDebug() << "IncidenceConverter::setAttendees(), adding " << (*it)->fullName()
<< endl;
TQString uuid;
- TQValueList<KABC::Addressee> addList = KABC::StdAddressBook::self()->findByEmail( (*it)->email() );
+ TQValueList<TDEABC::Addressee> addList = TDEABC::StdAddressBook::self()->findByEmail( (*it)->email() );
if ( !addList.first().isEmpty() )
uuid = addList.first().custom( "GWRESOURCE", "UUID" ); //uuid may be mandatory for the recipients list to be stored on the server...
item->distribution->recipients->recipient.push_back( createRecipient( (*it)->name(), (*it)->email(), uuid ) );
diff --git a/tderesources/groupwise/soap/soapdebug.cpp b/tderesources/groupwise/soap/soapdebug.cpp
index 0afff20da..d1c1256d0 100644
--- a/tderesources/groupwise/soap/soapdebug.cpp
+++ b/tderesources/groupwise/soap/soapdebug.cpp
@@ -15,7 +15,7 @@
#include <iostream>
-namespace KABC {
+namespace TDEABC {
class ResourceMemory : public ResourceCached
{
@@ -142,7 +142,7 @@ int main( int argc, char **argv )
TQStringList ids;
ids.append( id );
- KABC::ResourceMemory resource;
+ TDEABC::ResourceMemory resource;
kdDebug() << "Login" << endl;
if ( !server.login() ) {
@@ -156,8 +156,8 @@ int main( int argc, char **argv )
server.logout();
}
- KABC::Addressee::List addressees;
- KABC::Resource::Iterator it2;
+ TDEABC::Addressee::List addressees;
+ TDEABC::Resource::Iterator it2;
for( it2 = resource.begin(); it2 != resource.end(); ++it2 ) {
kdDebug() << "ADDRESSEE: " << (*it2).fullEmail() << endl;
addressees.append( *it2 );
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
index 1c29fc65b..7c3ed791e 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.cpp
@@ -31,7 +31,7 @@
#include "tdeabc_resourcegroupwise.h"
-using namespace KABC;
+using namespace TDEABC;
ResourceGroupwise::ResourceGroupwise( const TDEConfig *config )
: ResourceCached( config )
@@ -235,9 +235,9 @@ bool ResourceGroupwise::asyncSave( Ticket* )
{
if ( !mServer->login() ) return false;
- KABC::Addressee::List::Iterator it;
+ TDEABC::Addressee::List::Iterator it;
- KABC::Addressee::List addedList = addedAddressees();
+ TDEABC::Addressee::List addedList = addedAddressees();
for ( it = addedList.begin(); it != addedList.end(); ++it ) {
if ( mServer->insertAddressee( mPrefs->writeAddressBook(), *it ) ) {
clearChange( *it );
@@ -245,13 +245,13 @@ bool ResourceGroupwise::asyncSave( Ticket* )
}
}
- KABC::Addressee::List changedList = changedAddressees();
+ TDEABC::Addressee::List changedList = changedAddressees();
for ( it = changedList.begin(); it != changedList.end(); ++it ) {
if ( mServer->changeAddressee( *it ) )
clearChange( *it );
}
- KABC::Addressee::List deletedList = deletedAddressees();
+ TDEABC::Addressee::List deletedList = deletedAddressees();
for ( it = deletedList.begin(); it != deletedList.end(); ++it ) {
if ( mServer->removeAddressee( *it ) )
clearChange( *it );
@@ -493,7 +493,7 @@ void ResourceGroupwise::slotReadJobData( TDEIO::Job *job , const TQByteArray &da
mJobData.append( data.data() );
- KABC::VCardConverter conv;
+ TDEABC::VCardConverter conv;
TQTime profile;
profile.start();
Addressee::List addressees = conv.parseVCards( mJobData );
@@ -501,7 +501,7 @@ void ResourceGroupwise::slotReadJobData( TDEIO::Job *job , const TQByteArray &da
Addressee::List::ConstIterator it;
for( it = addressees.begin(); it != addressees.end(); ++it ) {
- KABC::Addressee addr = *it;
+ TDEABC::Addressee addr = *it;
if ( !addr.isEmpty() ) {
addr.setResource( this );
@@ -524,14 +524,14 @@ void ResourceGroupwise::slotUpdateJobData( TDEIO::Job *job, const TQByteArray &d
{
kdDebug() << "ResourceGroupwise::slotUpdateJobData()" << endl;
kdDebug() << " Job address: " << job << endl;
- KABC::VCardConverter conv;
+ TDEABC::VCardConverter conv;
mJobData.append( data.data() );
Addressee::List addressees = conv.parseVCards( mJobData );
Addressee::List::ConstIterator it;
for( it = addressees.begin(); it != addressees.end(); ++it ) {
- KABC::Addressee addr = *it;
+ TDEABC::Addressee addr = *it;
if ( !addr.isEmpty() ) {
// if added or changed
TQString syncType = addr.custom( "GWRESOURCE", "SYNC" );
@@ -558,7 +558,7 @@ void ResourceGroupwise::slotUpdateJobData( TDEIO::Job *job, const TQByteArray &d
if ( !local.isEmpty() )
{
idMapper().removeRemoteId( remote );
- KABC::Addressee addrToDelete = findByUid( local );
+ TDEABC::Addressee addrToDelete = findByUid( local );
removeAddressee( addrToDelete );
}
}
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise.h b/tderesources/groupwise/tdeabc_resourcegroupwise.h
index 27cf363fc..8e0867bce 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise.h
@@ -33,7 +33,7 @@ class TDEConfig;
class GroupwiseServer;
-namespace KABC {
+namespace TDEABC {
class GroupwisePrefs;
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp b/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp
index 29d94d4f5..847c071d4 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwise_plugin.cpp
@@ -24,7 +24,7 @@
#include <tdeglobal.h>
#include <tdelocale.h>
-using namespace KABC;
+using namespace TDEABC;
typedef KRES::PluginFactory<ResourceGroupwise, ResourceGroupwiseConfig> GroupwiseFactory;
// FIXME: Use K_EXPORT_COMPONENT_FACTORY( tdeabc_groupwise, GroupwiseFactory ); here
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
index fdb219b77..49016cdd5 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
+++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.cpp
@@ -34,7 +34,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-using namespace KABC;
+using namespace TDEABC;
class AddressBookItem : public TQCheckListItem
{
diff --git a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
index eb54803c0..410221962 100644
--- a/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
+++ b/tderesources/groupwise/tdeabc_resourcegroupwiseconfig.h
@@ -32,7 +32,7 @@ class KLineEdit;
class TDEListView;
class KURLRequester;
-namespace KABC {
+namespace TDEABC {
class ResourceGroupwise;
diff --git a/tderesources/groupwise/tdeioslave/groupwise.cpp b/tderesources/groupwise/tdeioslave/groupwise.cpp
index 5464dae28..56021e68f 100644
--- a/tderesources/groupwise/tdeioslave/groupwise.cpp
+++ b/tderesources/groupwise/tdeioslave/groupwise.cpp
@@ -48,7 +48,7 @@
#include "groupwise.h"
-namespace KABC {
+namespace TDEABC {
class ResourceMemory : public ResourceCached
{
@@ -301,8 +301,8 @@ void Groupwise::getAddressbook( const KURL &url )
TQT_SLOT( slotReadAddressBookProcessedSize( int ) ) );
connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ),
TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
- connect( &server, TQT_SIGNAL( gotAddressees( const KABC::Addressee::List ) ),
- TQT_SLOT( slotReadReceiveAddressees( const KABC::Addressee::List ) ) );
+ connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
+ TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
kdDebug() << "Login" << endl;
if ( !server.login() ) {
@@ -319,10 +319,10 @@ void Groupwise::getAddressbook( const KURL &url )
}
}
-void Groupwise::slotReadReceiveAddressees( const KABC::Addressee::List addressees )
+void Groupwise::slotReadReceiveAddressees( const TDEABC::Addressee::List addressees )
{
kdDebug() << "Groupwise::slotReadReceiveAddressees() - passing " << addressees.count() << " contacts back to application" << endl;
- KABC::VCardConverter conv;
+ TDEABC::VCardConverter conv;
TQString vcard = conv.createVCards( addressees );
@@ -371,8 +371,8 @@ void Groupwise::updateAddressbook( const KURL &url )
GroupwiseServer server( u, user, pass, 0 );
connect( &server, TQT_SIGNAL( errorMessage( const TQString &, bool ) ),
TQT_SLOT( slotServerErrorMessage( const TQString &, bool ) ) );
- connect( &server, TQT_SIGNAL( gotAddressees( const KABC::Addressee::List ) ),
- TQT_SLOT( slotReadReceiveAddressees( const KABC::Addressee::List ) ) );
+ connect( &server, TQT_SIGNAL( gotAddressees( const TDEABC::Addressee::List ) ),
+ TQT_SLOT( slotReadReceiveAddressees( const TDEABC::Addressee::List ) ) );
kdDebug() << " Login" << endl;
if ( !server.login() ) {
diff --git a/tderesources/groupwise/tdeioslave/groupwise.h b/tderesources/groupwise/tdeioslave/groupwise.h
index e95ed260a..5004682d1 100644
--- a/tderesources/groupwise/tdeioslave/groupwise.h
+++ b/tderesources/groupwise/tdeioslave/groupwise.h
@@ -48,7 +48,7 @@ class Groupwise : public TQObject, public TDEIO::SlaveBase
void slotReadAddressBookTotalSize( int );
void slotReadAddressBookProcessedSize( int );
void slotServerErrorMessage( const TQString &, bool );
- void slotReadReceiveAddressees( const KABC::Addressee::List );
+ void slotReadReceiveAddressees( const TDEABC::Addressee::List );
};
#endif
diff --git a/tderesources/kolab/kcal/resourcekolab.cpp b/tderesources/kolab/kcal/resourcekolab.cpp
index 064ea7589..5371ac119 100644
--- a/tderesources/kolab/kcal/resourcekolab.cpp
+++ b/tderesources/kolab/kcal/resourcekolab.cpp
@@ -1211,9 +1211,9 @@ void ResourceKolab::slotEmitResourceChanged()
emit resourceChanged( this );
}
-KABC::Lock* ResourceKolab::lock()
+TDEABC::Lock* ResourceKolab::lock()
{
- return new KABC::LockNull( true );
+ return new TDEABC::LockNull( true );
}
Kolab::ResourceMap* ResourceKolab::subResourceMap( const TQString& contentsType )
diff --git a/tderesources/kolab/kcal/resourcekolab.h b/tderesources/kolab/kcal/resourcekolab.h
index fdf952cc3..357c98040 100644
--- a/tderesources/kolab/kcal/resourcekolab.h
+++ b/tderesources/kolab/kcal/resourcekolab.h
@@ -145,7 +145,7 @@ public:
virtual TQString subresourceType( const TQString &resource );
- KABC::Lock* lock();
+ TDEABC::Lock* lock();
void beginAddingIncidences();
diff --git a/tderesources/kolab/shared/kolabbase.cpp b/tderesources/kolab/shared/kolabbase.cpp
index 35ca5b2b8..1dc5418b8 100644
--- a/tderesources/kolab/shared/kolabbase.cpp
+++ b/tderesources/kolab/shared/kolabbase.cpp
@@ -80,7 +80,7 @@ void KolabBase::saveTo( KCal::Incidence* incidence ) const
// TODO: Attachments
}
-void KolabBase::setFields( const KABC::Addressee* addressee )
+void KolabBase::setFields( const TDEABC::Addressee* addressee )
{
// An addressee does not have a creation date, so somehow we should
// make one, if this is a new entry
@@ -114,16 +114,16 @@ void KolabBase::setFields( const KABC::Addressee* addressee )
const TQString newCreationDate = dateTimeToString( creationDate );
if ( creationString != newCreationDate ) {
// We modified the creation date, so store it for future reference
- const_cast<KABC::Addressee*>( addressee )
+ const_cast<TDEABC::Addressee*>( addressee )
->insertCustom( "KOLAB", "CreationDate", newCreationDate );
kdDebug(5006) << "Creation date modified. New one: " << newCreationDate << endl;
}
switch( addressee->secrecy().type() ) {
- case KABC::Secrecy::Private:
+ case TDEABC::Secrecy::Private:
setSensitivity( Private );
break;
- case KABC::Secrecy::Confidential:
+ case TDEABC::Secrecy::Confidential:
setSensitivity( Confidential );
break;
default:
@@ -133,7 +133,7 @@ void KolabBase::setFields( const KABC::Addressee* addressee )
// TODO: Attachments
}
-void KolabBase::saveTo( KABC::Addressee* addressee ) const
+void KolabBase::saveTo( TDEABC::Addressee* addressee ) const
{
addressee->setUid( uid() );
addressee->setNote( body() );
@@ -144,13 +144,13 @@ void KolabBase::saveTo( KABC::Addressee* addressee ) const
switch( sensitivity() ) {
case Private:
- addressee->setSecrecy( KABC::Secrecy( KABC::Secrecy::Private ) );
+ addressee->setSecrecy( TDEABC::Secrecy( TDEABC::Secrecy::Private ) );
break;
case Confidential:
- addressee->setSecrecy( KABC::Secrecy( KABC::Secrecy::Confidential ) );
+ addressee->setSecrecy( TDEABC::Secrecy( TDEABC::Secrecy::Confidential ) );
break;
default:
- addressee->setSecrecy( KABC::Secrecy( KABC::Secrecy::Public ) );
+ addressee->setSecrecy( TDEABC::Secrecy( TDEABC::Secrecy::Public ) );
break;
}
diff --git a/tderesources/kolab/shared/kolabbase.h b/tderesources/kolab/shared/kolabbase.h
index 294a7d81b..929004902 100644
--- a/tderesources/kolab/shared/kolabbase.h
+++ b/tderesources/kolab/shared/kolabbase.h
@@ -44,7 +44,7 @@ namespace KCal {
class Incidence;
}
-namespace KABC {
+namespace TDEABC {
class Addressee;
}
@@ -130,10 +130,10 @@ protected:
void saveTo( KCal::Incidence* ) const;
/// Read all known fields from this contact
- void setFields( const KABC::Addressee* );
+ void setFields( const TDEABC::Addressee* );
/// Save all known fields into this contact
- void saveTo( KABC::Addressee* ) const;
+ void saveTo( TDEABC::Addressee* ) const;
// This just makes the initial dom tree with version and doctype
static TQDomDocument domTree();
diff --git a/tderesources/kolab/tdeabc/contact.cpp b/tderesources/kolab/tdeabc/contact.cpp
index fec56ec6f..337dbe5c1 100644
--- a/tderesources/kolab/tdeabc/contact.cpp
+++ b/tderesources/kolab/tdeabc/contact.cpp
@@ -50,14 +50,14 @@ static const char* s_soundAttachmentName = "sound";
static const char* s_unhandledTagAppName = "KOLABUNHANDLED"; // no hyphens in appnames!
// saving (addressee->xml)
-Contact::Contact( const KABC::Addressee* addr )
+Contact::Contact( const TDEABC::Addressee* addr )
: mHasGeo( false )
{
setFields( addr );
}
// loading (xml->addressee)
-Contact::Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
+Contact::Contact( const TQString& xml, TDEABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
: mHasGeo( false )
{
load( xml );
@@ -859,11 +859,11 @@ TQString Contact::saveXML() const
return document.toString();
}
-static TQString addressTypeToString( int /*KABC::Address::Type*/ type )
+static TQString addressTypeToString( int /*TDEABC::Address::Type*/ type )
{
- if ( type & KABC::Address::Home )
+ if ( type & TDEABC::Address::Home )
return "home";
- if ( type & KABC::Address::Work )
+ if ( type & TDEABC::Address::Work )
return "business";
return "other";
}
@@ -871,110 +871,110 @@ static TQString addressTypeToString( int /*KABC::Address::Type*/ type )
static int addressTypeFromString( const TQString& type )
{
if ( type == "home" )
- return KABC::Address::Home;
+ return TDEABC::Address::Home;
if ( type == "business" )
- return KABC::Address::Work;
+ return TDEABC::Address::Work;
// well, this shows "other" in the editor, which is what we want...
- return KABC::Address::Dom | KABC::Address::Intl | KABC::Address::Postal | KABC::Address::Parcel;
+ return TDEABC::Address::Dom | TDEABC::Address::Intl | TDEABC::Address::Postal | TDEABC::Address::Parcel;
}
-static TQStringList phoneTypeToString( int /*KABC::PhoneNumber::Types*/ type )
+static TQStringList phoneTypeToString( int /*TDEABC::PhoneNumber::Types*/ type )
{
// KABC has a bitfield, i.e. the same phone number can be used for work and home
// and fax and cellphone etc. etc.
// So when saving we need to create as many tags as bits that were set.
TQStringList types;
- if ( type & KABC::PhoneNumber::Fax ) {
- if ( type & KABC::PhoneNumber::Home )
+ if ( type & TDEABC::PhoneNumber::Fax ) {
+ if ( type & TDEABC::PhoneNumber::Home )
types << "homefax";
- else // assume work -- if ( type & KABC::PhoneNumber::Work )
+ else // assume work -- if ( type & TDEABC::PhoneNumber::Work )
types << "businessfax";
- type = type & ~KABC::PhoneNumber::Home;
- type = type & ~KABC::PhoneNumber::Work;
+ type = type & ~TDEABC::PhoneNumber::Home;
+ type = type & ~TDEABC::PhoneNumber::Work;
}
// To support both "home1" and "home2", map Home+Pref to home2
- if ( ( type & KABC::PhoneNumber::Home ) && ( type & KABC::PhoneNumber::Pref ) )
+ if ( ( type & TDEABC::PhoneNumber::Home ) && ( type & TDEABC::PhoneNumber::Pref ) )
{
types << "home2";
- type = type & ~KABC::PhoneNumber::Home;
- type = type & ~KABC::PhoneNumber::Pref;
+ type = type & ~TDEABC::PhoneNumber::Home;
+ type = type & ~TDEABC::PhoneNumber::Pref;
}
// To support both "business1" and "business2", map Work+Pref to business2
- if ( ( type & KABC::PhoneNumber::Work ) && ( type & KABC::PhoneNumber::Pref ) )
+ if ( ( type & TDEABC::PhoneNumber::Work ) && ( type & TDEABC::PhoneNumber::Pref ) )
{
types << "business2";
- type = type & ~KABC::PhoneNumber::Work;
- type = type & ~KABC::PhoneNumber::Pref;
+ type = type & ~TDEABC::PhoneNumber::Work;
+ type = type & ~TDEABC::PhoneNumber::Pref;
}
- if ( type & KABC::PhoneNumber::Home )
+ if ( type & TDEABC::PhoneNumber::Home )
types << "home1";
- if ( type & KABC::PhoneNumber::Msg ) // Msg==messaging
+ if ( type & TDEABC::PhoneNumber::Msg ) // Msg==messaging
types << "company";
- if ( type & KABC::PhoneNumber::Work )
+ if ( type & TDEABC::PhoneNumber::Work )
types << "business1";
- if ( type & KABC::PhoneNumber::Pref )
+ if ( type & TDEABC::PhoneNumber::Pref )
types << "primary";
- if ( type & KABC::PhoneNumber::Voice )
+ if ( type & TDEABC::PhoneNumber::Voice )
types << "callback"; // ##
- if ( type & KABC::PhoneNumber::Cell )
+ if ( type & TDEABC::PhoneNumber::Cell )
types << "mobile";
- if ( type & KABC::PhoneNumber::Video )
+ if ( type & TDEABC::PhoneNumber::Video )
types << "radio"; // ##
- if ( type & KABC::PhoneNumber::Bbs )
+ if ( type & TDEABC::PhoneNumber::Bbs )
types << "ttytdd";
- if ( type & KABC::PhoneNumber::Modem )
+ if ( type & TDEABC::PhoneNumber::Modem )
types << "telex"; // #
- if ( type & KABC::PhoneNumber::Car )
+ if ( type & TDEABC::PhoneNumber::Car )
types << "car";
- if ( type & KABC::PhoneNumber::Isdn )
+ if ( type & TDEABC::PhoneNumber::Isdn )
types << "isdn";
- if ( type & KABC::PhoneNumber::Pcs )
+ if ( type & TDEABC::PhoneNumber::Pcs )
types << "assistant"; // ## Assistant is e.g. secretary
- if ( type & KABC::PhoneNumber::Pager )
+ if ( type & TDEABC::PhoneNumber::Pager )
types << "pager";
return types;
}
-static int /*KABC::PhoneNumber::Types*/ phoneTypeFromString( const TQString& type )
+static int /*TDEABC::PhoneNumber::Types*/ phoneTypeFromString( const TQString& type )
{
if ( type == "homefax" )
- return KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax;
+ return TDEABC::PhoneNumber::Home | TDEABC::PhoneNumber::Fax;
if ( type == "businessfax" )
- return KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax;
+ return TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Fax;
if ( type == "business2" )
- return KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref;
+ return TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Pref;
if ( type == "business1" )
- return KABC::PhoneNumber::Work;
+ return TDEABC::PhoneNumber::Work;
if ( type == "home2" )
- return KABC::PhoneNumber::Home | KABC::PhoneNumber::Pref;
+ return TDEABC::PhoneNumber::Home | TDEABC::PhoneNumber::Pref;
if ( type == "home1" )
- return KABC::PhoneNumber::Home;
+ return TDEABC::PhoneNumber::Home;
if ( type == "company" )
- return KABC::PhoneNumber::Msg;
+ return TDEABC::PhoneNumber::Msg;
if ( type == "primary" )
- return KABC::PhoneNumber::Pref;
+ return TDEABC::PhoneNumber::Pref;
if ( type == "callback" )
- return KABC::PhoneNumber::Voice;
+ return TDEABC::PhoneNumber::Voice;
if ( type == "mobile" )
- return KABC::PhoneNumber::Cell;
+ return TDEABC::PhoneNumber::Cell;
if ( type == "radio" )
- return KABC::PhoneNumber::Video;
+ return TDEABC::PhoneNumber::Video;
if ( type == "ttytdd" )
- return KABC::PhoneNumber::Bbs;
+ return TDEABC::PhoneNumber::Bbs;
if ( type == "telex" )
- return KABC::PhoneNumber::Modem;
+ return TDEABC::PhoneNumber::Modem;
if ( type == "car" )
- return KABC::PhoneNumber::Car;
+ return TDEABC::PhoneNumber::Car;
if ( type == "isdn" )
- return KABC::PhoneNumber::Isdn;
+ return TDEABC::PhoneNumber::Isdn;
if ( type == "assistant" )
- return KABC::PhoneNumber::Pcs;
+ return TDEABC::PhoneNumber::Pcs;
if ( type == "pager" )
- return KABC::PhoneNumber::Pager;
- return KABC::PhoneNumber::Home; // whatever
+ return TDEABC::PhoneNumber::Pager;
+ return TDEABC::PhoneNumber::Home; // whatever
}
static const char* s_knownCustomFields[] = {
@@ -991,7 +991,7 @@ static const char* s_knownCustomFields[] = {
};
// The saving is addressee -> Contact -> xml, this is the first part
-void Contact::setFields( const KABC::Addressee* addressee )
+void Contact::setFields( const TDEABC::Addressee* addressee )
{
KolabBase::setFields( addressee );
@@ -1000,7 +1000,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
// Hopefully all resources are available during saving, so we can look up
// in the addressbook to get name+email from the UID.
KPIM::DistributionList distrList( *addressee );
- const KPIM::DistributionList::Entry::List entries = distrList.entries( KABC::StdAddressBook::self() );
+ const KPIM::DistributionList::Entry::List entries = distrList.entries( TDEABC::StdAddressBook::self() );
KPIM::DistributionList::Entry::List::ConstIterator it = entries.begin();
for ( ; it != entries.end() ; ++it ) {
Member m;
@@ -1042,7 +1042,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
const TQStringList emails = addressee->emails();
// Conversion problem here:
- // KABC::Addressee has only one full name and N addresses, but the XML format
+ // TDEABC::Addressee has only one full name and N addresses, but the XML format
// has N times (fullname+address). So we just copy the fullname over and ignore it on loading.
for ( TQStringList::ConstIterator it = emails.begin(); it != emails.end(); ++it ) {
Email email;
@@ -1053,8 +1053,8 @@ void Contact::setFields( const KABC::Addressee* addressee )
// Now the real-world addresses
TQString preferredAddress = "home";
- const KABC::Address::List addresses = addressee->addresses();
- for ( KABC::Address::List::ConstIterator it = addresses.begin() ; it != addresses.end(); ++it ) {
+ const TDEABC::Address::List addresses = addressee->addresses();
+ for ( TDEABC::Address::List::ConstIterator it = addresses.begin() ; it != addresses.end(); ++it ) {
Address address;
address.kdeAddressType = (*it).type();
address.type = addressTypeToString( address.kdeAddressType );
@@ -1067,14 +1067,14 @@ void Contact::setFields( const KABC::Addressee* addressee )
// ## TODO not in the XML format: extended address info.
// ## KDE-specific tags? Or hiding those fields? Or adding a warning?
addAddress( address );
- if ( address.kdeAddressType & KABC::Address::Pref ) {
+ if ( address.kdeAddressType & TDEABC::Address::Pref ) {
preferredAddress = address.type; // home, business or other
}
}
setPreferredAddress( preferredAddress );
- const KABC::PhoneNumber::List phones = addressee->phoneNumbers();
- for ( KABC::PhoneNumber::List::ConstIterator it = phones.begin(); it != phones.end(); ++it ) {
+ const TDEABC::PhoneNumber::List phones = addressee->phoneNumbers();
+ for ( TDEABC::PhoneNumber::List::ConstIterator it = phones.begin(); it != phones.end(); ++it ) {
// Create a tag per phone type set in the bitfield
TQStringList types = phoneTypeToString( (*it).type() );
for( TQStringList::Iterator typit = types.begin(); typit != types.end(); ++typit ) {
@@ -1113,7 +1113,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
knownCustoms << TQString::fromLatin1( *p );
TQStringList customs = addressee->customs();
for( TQStringList::Iterator it = customs.begin(); it != customs.end(); ++it ) {
- // KABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves
+ // TDEABC::Addressee doesn't offer a real way to iterate over customs, other than splitting strings ourselves
// The format is "app-name:value".
int pos = (*it).find( '-' );
if ( pos == -1 ) continue;
@@ -1150,7 +1150,7 @@ void Contact::setFields( const KABC::Addressee* addressee )
}
// The loading is: xml -> Contact -> addressee, this is the second part
-void Contact::saveTo( KABC::Addressee* addressee )
+void Contact::saveTo( TDEABC::Addressee* addressee )
{
// TODO: This needs the same set of TODOs as the setFields method
KolabBase::saveTo( addressee );
@@ -1206,19 +1206,19 @@ void Contact::saveTo( KABC::Addressee* addressee )
// We need to store both the original attachment name and the picture data into the addressee.
// This is important, otherwise we would save the image under another attachment name w/o deleting the original one!
if ( !mPicture.isNull() )
- addressee->setPhoto( KABC::Picture( mPicture ) );
+ addressee->setPhoto( TDEABC::Picture( mPicture ) );
// Note that we must save the filename in all cases, so that removing the picture
// actually deletes the attachment.
addressee->insertCustom( "KOLAB", "PictureAttachmentName", mPictureAttachmentName );
if ( !mLogo.isNull() )
- addressee->setLogo( KABC::Picture( mLogo ) );
+ addressee->setLogo( TDEABC::Picture( mLogo ) );
addressee->insertCustom( "KOLAB", "LogoAttachmentName", mLogoAttachmentName );
if ( !mSound.isNull() )
- addressee->setSound( KABC::Sound( mSound ) );
+ addressee->setSound( TDEABC::Sound( mSound ) );
addressee->insertCustom( "KOLAB", "SoundAttachmentName", mSoundAttachmentName );
if ( mHasGeo )
- addressee->setGeo( KABC::Geo( mLatitude, mLongitude ) );
+ addressee->setGeo( TDEABC::Geo( mLatitude, mLongitude ) );
TQStringList emailAddresses;
for ( TQValueList<Email>::ConstIterator it = mEmails.begin(); it != mEmails.end(); ++it ) {
@@ -1228,12 +1228,12 @@ void Contact::saveTo( KABC::Addressee* addressee )
addressee->setEmails( emailAddresses );
for ( TQValueList<Address>::ConstIterator it = mAddresses.begin(); it != mAddresses.end(); ++it ) {
- KABC::Address address;
+ TDEABC::Address address;
int type = (*it).kdeAddressType;
if ( type == -1 ) { // no kde-specific type available
type = addressTypeFromString( (*it).type );
if ( (*it).type == mPreferredAddress )
- type |= KABC::Address::Pref;
+ type |= TDEABC::Address::Pref;
}
address.setType( type );
address.setStreet( (*it).street );
@@ -1246,7 +1246,7 @@ void Contact::saveTo( KABC::Addressee* addressee )
}
for ( TQValueList<PhoneNumber>::ConstIterator it = mPhoneNumbers.begin(); it != mPhoneNumbers.end(); ++it ) {
- KABC::PhoneNumber number;
+ TDEABC::PhoneNumber number;
number.setType( phoneTypeFromString( (*it).type ) );
number.setNumber( (*it).number );
addressee->insertPhoneNumber( number );
@@ -1259,7 +1259,7 @@ void Contact::saveTo( KABC::Addressee* addressee )
//kdDebug(5006) << addressee->customs() << endl;
}
-TQImage Contact::loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
+TQImage Contact::loadPictureFromKMail( const TQString& attachmentName, TDEABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
{
TQImage img;
KURL url;
@@ -1271,7 +1271,7 @@ TQImage Contact::loadPictureFromKMail( const TQString& attachmentName, KABC::Res
return img;
}
-TQImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
+TQImage Contact::loadPictureFromAddressee( const TDEABC::Picture& picture )
{
TQImage img;
if ( !picture.isIntern() && !picture.url().isEmpty() ) {
@@ -1285,7 +1285,7 @@ TQImage Contact::loadPictureFromAddressee( const KABC::Picture& picture )
return img;
}
-TQByteArray Kolab::Contact::loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
+TQByteArray Kolab::Contact::loadDataFromKMail( const TQString& attachmentName, TDEABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum )
{
TQByteArray data;
KURL url;
@@ -1300,7 +1300,7 @@ TQByteArray Kolab::Contact::loadDataFromKMail( const TQString& attachmentName, K
return data;
}
-TQByteArray Kolab::Contact::loadSoundFromAddressee( const KABC::Sound& sound )
+TQByteArray Kolab::Contact::loadSoundFromAddressee( const TDEABC::Sound& sound )
{
TQByteArray data;
if ( !sound.isIntern() && !sound.url().isEmpty() ) {
diff --git a/tderesources/kolab/tdeabc/contact.h b/tderesources/kolab/tdeabc/contact.h
index 6e0de80bc..f13b0a7cb 100644
--- a/tderesources/kolab/tdeabc/contact.h
+++ b/tderesources/kolab/tdeabc/contact.h
@@ -36,7 +36,7 @@
#include <kolabbase.h>
#include <tqimage.h>
-namespace KABC {
+namespace TDEABC {
class Addressee;
class ResourceKolab;
class Picture;
@@ -58,7 +58,7 @@ public:
Address() : kdeAddressType( -1 )
{
}
- int kdeAddressType; // KABC::Address::Type
+ int kdeAddressType; // TDEABC::Address::Type
TQString type; // kolab-compliant address type: home, work or other
TQString street;
TQString pobox;
@@ -68,11 +68,11 @@ public:
TQString country;
};
- explicit Contact( const KABC::Addressee* address );
- Contact( const TQString& xml, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
+ explicit Contact( const TDEABC::Addressee* address );
+ Contact( const TQString& xml, TDEABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
~Contact();
- void saveTo( KABC::Addressee* address );
+ void saveTo( TDEABC::Addressee* address );
TQString type() const { return "Contact"; }
@@ -201,7 +201,7 @@ public:
bool isDistributionList() const { return mIsDistributionList; }
protected:
- void setFields( const KABC::Addressee* );
+ void setFields( const TDEABC::Addressee* );
private:
bool loadNameAttribute( TQDomElement& element );
@@ -221,11 +221,11 @@ private:
void loadDistrListMember( const TQDomElement& element );
void saveDistrListMembers( TQDomElement& element ) const;
- TQImage loadPictureFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
- TQImage loadPictureFromAddressee( const KABC::Picture& picture );
+ TQImage loadPictureFromKMail( const TQString& attachmentName, TDEABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
+ TQImage loadPictureFromAddressee( const TDEABC::Picture& picture );
- TQByteArray loadDataFromKMail( const TQString& attachmentName, KABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
- TQByteArray loadSoundFromAddressee( const KABC::Sound& sound );
+ TQByteArray loadDataFromKMail( const TQString& attachmentName, TDEABC::ResourceKolab* resource, const TQString& subResource, TQ_UINT32 sernum );
+ TQByteArray loadSoundFromAddressee( const TDEABC::Sound& sound );
TQString productID() const;
diff --git a/tderesources/kolab/tdeabc/resourcekolab.cpp b/tderesources/kolab/tdeabc/resourcekolab.cpp
index 226d7da89..f4391f76d 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab.cpp
@@ -60,7 +60,7 @@ class KolabFactory : public KRES::PluginFactoryBase
public:
KRES::Resource *resource( const TDEConfig *config )
{
- return new KABC::ResourceKolab( config );
+ return new TDEABC::ResourceKolab( config );
}
KRES::ConfigWidget *configWidget( TQWidget* )
@@ -76,7 +76,7 @@ static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contac
static const char* s_attachmentMimeTypeDistList = "application/x-vnd.kolab.contact.distlist";
static const char* s_inlineMimeType = "text/x-vcard";
-KABC::ResourceKolab::ResourceKolab( const TDEConfig *config )
+TDEABC::ResourceKolab::ResourceKolab( const TDEConfig *config )
: KPIM::ResourceABC( config ),
Kolab::ResourceKolabBase( "ResourceKolab-KABC" ),
mCachedSubresource( TQString() ), mCachedSubresourceNotFound( false ), mLocked( false )
@@ -87,7 +87,7 @@ KABC::ResourceKolab::ResourceKolab( const TDEConfig *config )
}
}
-KABC::ResourceKolab::~ResourceKolab()
+TDEABC::ResourceKolab::~ResourceKolab()
{
// The resource is deleted on exit (StdAddressBook's KStaticDeleter),
// and it wasn't closed before that, so close here to save the config.
@@ -96,7 +96,7 @@ KABC::ResourceKolab::~ResourceKolab()
}
}
-void KABC::ResourceKolab::loadSubResourceConfig( TDEConfig& config,
+void TDEABC::ResourceKolab::loadSubResourceConfig( TDEConfig& config,
const TQString& name,
const TQString& label,
bool writable )
@@ -108,7 +108,7 @@ void KABC::ResourceKolab::loadSubResourceConfig( TDEConfig& config,
completionWeight ) );
}
-bool KABC::ResourceKolab::doOpen()
+bool TDEABC::ResourceKolab::doOpen()
{
TDEConfig config( configFile() );
@@ -125,12 +125,12 @@ bool KABC::ResourceKolab::doOpen()
return true;
}
-void KABC::ResourceKolab::doClose()
+void TDEABC::ResourceKolab::doClose()
{
writeConfig();
}
-KABC::Ticket * KABC::ResourceKolab::requestSaveTicket()
+TDEABC::Ticket * TDEABC::ResourceKolab::requestSaveTicket()
{
if ( !addressBook() ) {
kdError() << "no addressbook" << endl;
@@ -141,7 +141,7 @@ KABC::Ticket * KABC::ResourceKolab::requestSaveTicket()
return createTicket( this );
}
-void KABC::ResourceKolab::releaseSaveTicket( Ticket* ticket )
+void TDEABC::ResourceKolab::releaseSaveTicket( Ticket* ticket )
{
mLocked = false;
mCachedSubresource = TQString();
@@ -149,17 +149,17 @@ void KABC::ResourceKolab::releaseSaveTicket( Ticket* ticket )
delete ticket;
}
-TQString KABC::ResourceKolab::loadContact( const TQString& contactData,
+TQString TDEABC::ResourceKolab::loadContact( const TQString& contactData,
const TQString& subResource,
TQ_UINT32 sernum,
KMailICalIface::StorageFormat format )
{
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
if ( format == KMailICalIface::StorageXML ) {
Contact contact( contactData, this, subResource, sernum ); // load
contact.saveTo( &addr );
} else {
- KABC::VCardConverter converter;
+ TDEABC::VCardConverter converter;
#if defined(KABC_VCARD_ENCODING_FIX)
addr = converter.parseVCardRaw( contactData.utf8() );
#else
@@ -169,7 +169,7 @@ TQString KABC::ResourceKolab::loadContact( const TQString& contactData,
addr.setResource( this );
addr.setChanged( false );
- KABC::Resource::insertAddressee( addr ); // same as mAddrMap.insert( addr.uid(), addr );
+ TDEABC::Resource::insertAddressee( addr ); // same as mAddrMap.insert( addr.uid(), addr );
mUidMap[ addr.uid() ] = StorageReference( subResource, sernum );
kdDebug(5650) << "Loaded contact uid=" << addr.uid() << " sernum=" << sernum << " fullName=" << addr.name() << endl;
return addr.uid();
@@ -182,11 +182,11 @@ static const struct { const char* mimetype; KMailICalIface::StorageFormat format
{ s_inlineMimeType, KMailICalIface::StorageIcalVcard }
};
-bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
+bool TDEABC::ResourceKolab::loadSubResource( const TQString& subResource )
{
int count = 0;
if ( !kmailIncidencesCount( count, TQString(), subResource ) ) {
- kdError() << "Communication problem in KABC::ResourceKolab::loadSubResource()\n";
+ kdError() << "Communication problem in TDEABC::ResourceKolab::loadSubResource()\n";
return false;
}
if ( !count )
@@ -217,7 +217,7 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
KMailICalIface::StorageFormat format = s_formats[indexFormat].format;
TQMap<TQ_UINT32, TQString> lst;
if ( !kmailIncidences( lst, mimetype, subResource, startIndex, nbMessages ) ) {
- kdError() << "Communication problem in KABC::ResourceKolab::loadSubResource()\n";
+ kdError() << "Communication problem in TDEABC::ResourceKolab::loadSubResource()\n";
if ( progressId )
uiserver.jobFinished( progressId );
return false;
@@ -247,7 +247,7 @@ bool KABC::ResourceKolab::loadSubResource( const TQString& subResource )
return true;
}
-bool KABC::ResourceKolab::load()
+bool TDEABC::ResourceKolab::load()
{
mUidMap.clear();
mAddrMap.clear();
@@ -265,7 +265,7 @@ bool KABC::ResourceKolab::load()
return rc;
}
-bool KABC::ResourceKolab::save( Ticket* )
+bool TDEABC::ResourceKolab::save( Ticket* )
{
bool rc = true;
@@ -330,7 +330,7 @@ void AttachmentList::updateAttachment( const TQByteArray& data, const TQString&
}
}
-bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
+bool TDEABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
{
const TQString uid = addr.uid();
TQString subResource;
@@ -380,7 +380,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
s_attachmentMimeTypeDistList : s_attachmentMimeTypeContact;
} else {
mimetype = s_inlineMimeType;
- KABC::VCardConverter converter;
+ TDEABC::VCardConverter converter;
#if defined(KABC_VCARD_ENCODING_FIX)
data = TQString::fromUtf8( converter.createVCardRaw( addr ) );
#else
@@ -411,7 +411,7 @@ bool KABC::ResourceKolab::kmailUpdateAddressee( const Addressee& addr )
return rc;
}
-void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
+void TDEABC::ResourceKolab::insertAddressee( const Addressee& addr )
{
const TQString uid = addr.uid();
//kdDebug(5650) << k_funcinfo << uid << endl;
@@ -428,7 +428,7 @@ void KABC::ResourceKolab::insertAddressee( const Addressee& addr )
Resource::insertAddressee( addr );
}
-void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
+void TDEABC::ResourceKolab::removeAddressee( const Addressee& addr )
{
const TQString uid = addr.uid();
if ( mUidMap.find( uid ) == mUidMap.end() ) return;
@@ -451,7 +451,7 @@ void KABC::ResourceKolab::removeAddressee( const Addressee& addr )
* These are the DCOP slots that KMail call to notify when something
* changed.
*/
-bool KABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
+bool TDEABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
const TQString& subResource,
TQ_UINT32 sernum,
int format,
@@ -479,7 +479,7 @@ bool KABC::ResourceKolab::fromKMailAddIncidence( const TQString& type,
return true;
}
-void KABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
+void TDEABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
const TQString& subResource,
const TQString& uid )
{
@@ -503,7 +503,7 @@ void KABC::ResourceKolab::fromKMailDelIncidence( const TQString& type,
}
}
-void KABC::ResourceKolab::fromKMailRefresh( const TQString& type,
+void TDEABC::ResourceKolab::fromKMailRefresh( const TQString& type,
const TQString& /*subResource*/ )
{
// Check if this is a contact
@@ -515,7 +515,7 @@ void KABC::ResourceKolab::fromKMailRefresh( const TQString& type,
addressBook()->emitAddressBookChanged();
}
-void KABC::ResourceKolab::fromKMailAddSubresource( const TQString& type,
+void TDEABC::ResourceKolab::fromKMailAddSubresource( const TQString& type,
const TQString& subResource,
const TQString& label,
bool writable,
@@ -535,7 +535,7 @@ void KABC::ResourceKolab::fromKMailAddSubresource( const TQString& type,
emit signalSubresourceAdded( this, type, subResource );
}
-void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
+void TDEABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
const TQString& subResource )
{
if( type != s_kmailContentsType ) return;
@@ -575,7 +575,7 @@ void KABC::ResourceKolab::fromKMailDelSubresource( const TQString& type,
-void KABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
+void TDEABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
const TQString& /* type */,
const TQString& folder )
{
@@ -590,12 +590,12 @@ void KABC::ResourceKolab::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQStr
addressBook()->emitAddressBookChanged();
}
-TQStringList KABC::ResourceKolab::subresources() const
+TQStringList TDEABC::ResourceKolab::subresources() const
{
return mSubResources.keys();
}
-bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
+bool TDEABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].active();
@@ -607,7 +607,7 @@ bool KABC::ResourceKolab::subresourceActive( const TQString& subresource ) const
return true;
}
-bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) const
+bool TDEABC::ResourceKolab::subresourceWritable( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].writable();
@@ -615,7 +615,7 @@ bool KABC::ResourceKolab::subresourceWritable( const TQString& subresource ) con
return false; //better a safe default
}
-int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresource ) const
+int TDEABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].completionWeight();
@@ -626,7 +626,7 @@ int KABC::ResourceKolab::subresourceCompletionWeight( const TQString& subresourc
return 80;
}
-TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) const
+TQString TDEABC::ResourceKolab::subresourceLabel( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].label();
@@ -636,7 +636,7 @@ TQString KABC::ResourceKolab::subresourceLabel( const TQString& subresource ) co
return TQString();
}
-void KABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
+void TDEABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
{
if ( mSubResources.contains( subresource ) ) {
mSubResources[ subresource ].setCompletionWeight( completionWeight );
@@ -645,7 +645,7 @@ void KABC::ResourceKolab::setSubresourceCompletionWeight( const TQString& subres
}
}
-TQMap<TQString, TQString> KABC::ResourceKolab::uidToResourceMap() const
+TQMap<TQString, TQString> TDEABC::ResourceKolab::uidToResourceMap() const
{
// TODO: Couldn't this be made simpler?
TQMap<TQString, TQString> map;
@@ -655,7 +655,7 @@ TQMap<TQString, TQString> KABC::ResourceKolab::uidToResourceMap() const
return map;
}
-void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, bool active )
+void TDEABC::ResourceKolab::setSubresourceActive( const TQString &subresource, bool active )
{
if ( mSubResources.contains( subresource ) ) {
mSubResources[ subresource ].setActive( active );
@@ -668,18 +668,18 @@ void KABC::ResourceKolab::setSubresourceActive( const TQString &subresource, boo
/*virtual*/
-bool KABC::ResourceKolab::addSubresource( const TQString& label, const TQString& parent )
+bool TDEABC::ResourceKolab::addSubresource( const TQString& label, const TQString& parent )
{
return kmailAddSubresource( label, parent, s_kmailContentsType );
}
/*virtual*/
-bool KABC::ResourceKolab::removeSubresource( const TQString& id )
+bool TDEABC::ResourceKolab::removeSubresource( const TQString& id )
{
return kmailRemoveSubresource( id );
}
-void KABC::ResourceKolab::writeConfig()
+void TDEABC::ResourceKolab::writeConfig()
{
TDEConfig config( configFile() );
diff --git a/tderesources/kolab/tdeabc/resourcekolab.h b/tderesources/kolab/tdeabc/resourcekolab.h
index 3a142b209..52fa93d35 100644
--- a/tderesources/kolab/tdeabc/resourcekolab.h
+++ b/tderesources/kolab/tdeabc/resourcekolab.h
@@ -40,7 +40,7 @@
#include <kmail/kmailicalIface.h>
#include <tdepimmacros.h>
-namespace KABC {
+namespace TDEABC {
class FormatPlugin;
diff --git a/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
index 686f3403e..a66cb9bdd 100644
--- a/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
+++ b/tderesources/kolab/tdeabc/resourcekolab_plugin.cpp
@@ -39,7 +39,7 @@ class KolabFactory : public KRES::PluginFactoryBase
public:
KRES::Resource *resource( const TDEConfig *config )
{
- return new KABC::ResourceKolab( config );
+ return new TDEABC::ResourceKolab( config );
}
KRES::ConfigWidget *configWidget( TQWidget* )
diff --git a/tderesources/lib/addressbookadaptor.cpp b/tderesources/lib/addressbookadaptor.cpp
index fa62e791b..d6d719fcf 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 614afc488..a1a43f0e2 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 b9213e880..b5c23ac7b 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 f0f6f39d2..883d1510e 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 8f507fd16..8474ed21d 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 b0c9af2e9..80a1d4600 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 93eb05971..f4a469905 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 272a2ceec..f24a7602c 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 db98382be..69dfb3d83 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 f505d9ceb..c8f4646e6 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;
diff --git a/tderesources/newexchange/Person.mapping b/tderesources/newexchange/Person.mapping
index d7571e773..ac0f0b3a1 100644
--- a/tderesources/newexchange/Person.mapping
+++ b/tderesources/newexchange/Person.mapping
@@ -140,7 +140,7 @@ http://schemas.microsoft.com/mapi/id/{00062004-0000-0000-C000-000000000046}/0x00
-KABC::Addressee method not used:
+TDEABC::Addressee method not used:
logo()
photo()
sound()
@@ -150,7 +150,7 @@ productId()
mailer()
-KABC::Address methods not used:
+TDEABC::Address methods not used:
id()
type()
extended ()
diff --git a/tderesources/newexchange/exchangeaddressbookadaptor.cpp b/tderesources/newexchange/exchangeaddressbookadaptor.cpp
index 1abaacd4d..7b061e868 100644
--- a/tderesources/newexchange/exchangeaddressbookadaptor.cpp
+++ b/tderesources/newexchange/exchangeaddressbookadaptor.cpp
@@ -27,9 +27,9 @@
#include <kdebug.h>
#include <tdeio/davjob.h>
-using namespace KABC;
+using namespace TDEABC;
-ExchangeAddressBookUploadItem::ExchangeAddressBookUploadItem( AddressBookAdaptor *adaptor, KABC::Addressee addr, KPIM::GroupwareUploadItem::UploadType type )
+ExchangeAddressBookUploadItem::ExchangeAddressBookUploadItem( AddressBookAdaptor *adaptor, TDEABC::Addressee addr, KPIM::GroupwareUploadItem::UploadType type )
: GroupwareUploadItem( type )
{
if ( adaptor && !addr.isEmpty() ) {
@@ -88,7 +88,7 @@ TQString ExchangeAddressBookAdaptor::defaultNewItemName( KPIM::GroupwareUploadIt
}
-KPIM::GroupwareUploadItem *ExchangeAddressBookAdaptor::newUploadItem( KABC::Addressee addr,
+KPIM::GroupwareUploadItem *ExchangeAddressBookAdaptor::newUploadItem( TDEABC::Addressee addr,
KPIM::GroupwareUploadItem::UploadType type )
{
return new ExchangeAddressBookUploadItem( this, addr, type );
diff --git a/tderesources/newexchange/exchangeaddressbookadaptor.h b/tderesources/newexchange/exchangeaddressbookadaptor.h
index fd89fa84d..8713b2790 100644
--- a/tderesources/newexchange/exchangeaddressbookadaptor.h
+++ b/tderesources/newexchange/exchangeaddressbookadaptor.h
@@ -33,12 +33,12 @@
#include <kurl.h>
#include <tqdom.h>
-namespace KABC {
+namespace TDEABC {
class ExchangeAddressBookUploadItem : public KPIM::GroupwareUploadItem
{
public:
- ExchangeAddressBookUploadItem( AddressBookAdaptor *adaptor, KABC::Addressee addr, UploadType type );
+ ExchangeAddressBookUploadItem( AddressBookAdaptor *adaptor, TDEABC::Addressee addr, UploadType type );
virtual ~ExchangeAddressBookUploadItem() {}
/**/ virtual TDEIO::TransferJob *createUploadJob(
KPIM::GroupwareDataAdaptor *adaptor, const KURL &baseurl );
@@ -85,7 +85,7 @@ class ExchangeAddressBookAdaptor : public DavAddressBookAdaptor
-/**/ KPIM::GroupwareUploadItem *newUploadItem( KABC::Addressee addr,
+/**/ KPIM::GroupwareUploadItem *newUploadItem( TDEABC::Addressee addr,
KPIM::GroupwareUploadItem::UploadType type );
diff --git a/tderesources/newexchange/exchangeconvertercontact.cpp b/tderesources/newexchange/exchangeconvertercontact.cpp
index e8de19cb8..dae145677 100644
--- a/tderesources/newexchange/exchangeconvertercontact.cpp
+++ b/tderesources/newexchange/exchangeconvertercontact.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
-using namespace KABC;
+using namespace TDEABC;
ExchangeConverterContact::ExchangeConverterContact()
{
@@ -296,17 +296,17 @@ bool ExchangeConverterContact::readAddressee( const TQDomElement &node, Addresse
// 0 None, 1 Personal, 2 Private, 3 Company Confidential
if ( WebdavHandler::extractLong( node, "sensitivity", tmplng ) ) {
switch( tmplng ) {
- case 0: addressee.setSecrecy( KABC::Secrecy::Public ); break;
+ case 0: addressee.setSecrecy( TDEABC::Secrecy::Public ); break;
case 1:
- case 2: addressee.setSecrecy( KABC::Secrecy::Private ); break;
- case 3: addressee.setSecrecy( KABC::Secrecy::Confidential ); break;
+ case 2: addressee.setSecrecy( TDEABC::Secrecy::Private ); break;
+ case 3: addressee.setSecrecy( TDEABC::Secrecy::Confidential ); break;
default: kdWarning() << "Unknown sensitivity: " << tmplng << endl;
}
}
#define insertPhone( name, type ) \
if ( WebdavHandler::extractString( node, name, tmpstr ) ) \
- addressee.insertPhoneNumber( KABC::PhoneNumber( tmpstr, type ) );
+ addressee.insertPhoneNumber( TDEABC::PhoneNumber( tmpstr, type ) );
// Phone numbers
insertPhone( "telephoneNumber", PhoneNumber::Work );
//insertPhone( "telephonenumber2", PhoneNumber::Work );
@@ -499,8 +499,8 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
// 0 None, 1 Personal, 2 Private, 3 Company Confidential
TQString value;
switch ( addr.secrecy().type() ) {
- case KABC::Secrecy::Private: value = "2"; break;
- case KABC::Secrecy::Confidential: value = "3"; break;
+ case TDEABC::Secrecy::Private: value = "2"; break;
+ case TDEABC::Secrecy::Confidential: value = "3"; break;
default: value = "0";
}
domDavProperty( "sensitivity", value );
@@ -599,7 +599,7 @@ TQDomDocument ExchangeConverterContact::createWebDAV( Addressee addr )
// ? TODO: timeZone()
/*
- KABC::Geo geo = addr.geo();
+ TDEABC::Geo geo = addr.geo();
if ( geo.isValid() ) {
// TODO: Do we need to set any other attribute to make it a float?
TQDomAttr att_cal = doc.createAttribute( "xmlns:cal" );
diff --git a/tderesources/newexchange/exchangeconvertercontact.h b/tderesources/newexchange/exchangeconvertercontact.h
index 847b07676..4960284e8 100644
--- a/tderesources/newexchange/exchangeconvertercontact.h
+++ b/tderesources/newexchange/exchangeconvertercontact.h
@@ -26,7 +26,7 @@
#include <tdeabc/addressee.h>
-namespace KABC {
+namespace TDEABC {
class ExchangeConverterContact
{
diff --git a/tderesources/newexchange/exchangeglobals.cpp b/tderesources/newexchange/exchangeglobals.cpp
index dc74650c5..313b04f57 100644
--- a/tderesources/newexchange/exchangeglobals.cpp
+++ b/tderesources/newexchange/exchangeglobals.cpp
@@ -148,7 +148,7 @@ kdDebug() << "Person=" << KPIM::FolderLister::Contact << ", "
KCal::ExchangeConverterCalendar::createRequestJournal( doc, prop );
break;
case KPIM::FolderLister::Contact:
- KABC::ExchangeConverterContact::createRequest( doc, prop );
+ TDEABC::ExchangeConverterContact::createRequest( doc, prop );
break;
default:
break;
@@ -261,18 +261,18 @@ kdDebug() << "ExchangeGlobals::interpretCalendarDownloadItemsJob(): TQDomDocumen
bool ExchangeGlobals::interpretAddressBookDownloadItemsJob(
- KABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &/*jobData*/ )
+ TDEABC::AddressBookAdaptor *adaptor, TDEIO::Job *job, const TQString &/*jobData*/ )
{
TDEIO::DavJob *davjob = dynamic_cast<TDEIO::DavJob*>(job);
if ( !davjob || !adaptor ) return false;
kdDebug() << "ExchangeGlobals::interpretAddressBookDownloadItemsJob(): TQDomDocument="
<< endl << davjob->response().toString() << endl;
- KABC::ExchangeConverterContact conv;
- KABC::Addressee::List addressees = conv.parseWebDAV( davjob->response() );
+ TDEABC::ExchangeConverterContact conv;
+ TDEABC::Addressee::List addressees = conv.parseWebDAV( davjob->response() );
bool res = false;
- KABC::Addressee::List::Iterator it = addressees.begin();
+ TDEABC::Addressee::List::Iterator it = addressees.begin();
for ( ; it != addressees.end(); ++it ) {
TQString fpr = (*it).custom( "TDEPIM-Exchange-Resource", "fingerprint" );
KURL href( (*it).custom( "TDEPIM-Exchange-Resource", "href" ) );
diff --git a/tderesources/newexchange/exchangeglobals.h b/tderesources/newexchange/exchangeglobals.h
index 5d75bc42b..2fa69ffb7 100644
--- a/tderesources/newexchange/exchangeglobals.h
+++ b/tderesources/newexchange/exchangeglobals.h
@@ -34,7 +34,7 @@ namespace KPIM {
class GroupwareDataAdaptor;
class GroupwareUploadItem;
}
-namespace KABC {
+namespace TDEABC {
class AddressBookAdaptor;
}
namespace KCal {
@@ -63,7 +63,7 @@ class ExchangeGlobals
TDEIO::Job *job, const TQString &jobData );
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/newexchange/tdeabc_resourceexchange.cpp b/tderesources/newexchange/tdeabc_resourceexchange.cpp
index 63f46f503..2b495b44f 100644
--- a/tderesources/newexchange/tdeabc_resourceexchange.cpp
+++ b/tderesources/newexchange/tdeabc_resourceexchange.cpp
@@ -28,7 +28,7 @@
#include <tdelocale.h>
-using namespace KABC;
+using namespace TDEABC;
ResourceExchange::ResourceExchange( const TDEConfig *config )
: ResourceGroupwareBase( config )
diff --git a/tderesources/newexchange/tdeabc_resourceexchange.h b/tderesources/newexchange/tdeabc_resourceexchange.h
index db5cc7b55..732ed981c 100644
--- a/tderesources/newexchange/tdeabc_resourceexchange.h
+++ b/tderesources/newexchange/tdeabc_resourceexchange.h
@@ -23,7 +23,7 @@
#include <tdeabc_resourcegroupwarebase.h>
-namespace KABC {
+namespace TDEABC {
class KDE_EXPORT ResourceExchange : public ResourceGroupwareBase
{
diff --git a/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp b/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp
index 4f081a311..7fe3a8b9f 100644
--- a/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp
+++ b/tderesources/newexchange/tdeabc_resourceexchange_plugin.cpp
@@ -21,7 +21,7 @@
#include "tdeabc_resourceexchange.h"
#include "tdeabc_resourcegroupwarebaseconfig.h"
-using namespace KABC;
+using namespace TDEABC;
typedef KRES::PluginFactory<ResourceExchange,ResourceGroupwareBaseConfig> ExchangeFactory;
K_EXPORT_COMPONENT_FACTORY( tdeabc_newexchange, ExchangeFactory )
diff --git a/tderesources/remote/resourceremote.cpp b/tderesources/remote/resourceremote.cpp
index 3e97eed30..0a58aefb3 100644
--- a/tderesources/remote/resourceremote.cpp
+++ b/tderesources/remote/resourceremote.cpp
@@ -96,7 +96,7 @@ void ResourceRemote::init()
setType( "remote" );
- mLock = new KABC::Lock( cacheFile() );
+ mLock = new TDEABC::Lock( cacheFile() );
enableChangeNotification();
}
@@ -314,7 +314,7 @@ void ResourceRemote::slotSaveJobResult( TDEIO::Job *job )
emit resourceSaved( this );
}
-KABC::Lock *ResourceRemote::lock()
+TDEABC::Lock *ResourceRemote::lock()
{
return mLock;
}
diff --git a/tderesources/remote/resourceremote.h b/tderesources/remote/resourceremote.h
index 04099ff97..84e213ae3 100644
--- a/tderesources/remote/resourceremote.h
+++ b/tderesources/remote/resourceremote.h
@@ -84,7 +84,7 @@ class KDE_EXPORT ResourceRemote : public ResourceCached
void setUseCacheFile( bool useCacheFile );
bool useCacheFile() const;
- KABC::Lock *lock();
+ TDEABC::Lock *lock();
bool isSaving();
@@ -121,7 +121,7 @@ class KDE_EXPORT ResourceRemote : public ResourceCached
Incidence::List mChangedIncidences;
- KABC::Lock *mLock;
+ TDEABC::Lock *mLock;
class Private;
Private *d;
diff --git a/tderesources/scalix/kcal/resourcescalix.cpp b/tderesources/scalix/kcal/resourcescalix.cpp
index a58a85957..25963a29b 100644
--- a/tderesources/scalix/kcal/resourcescalix.cpp
+++ b/tderesources/scalix/kcal/resourcescalix.cpp
@@ -881,9 +881,9 @@ void ResourceScalix::slotEmitResourceChanged()
emit resourceChanged( this );
}
-KABC::Lock* ResourceScalix::lock()
+TDEABC::Lock* ResourceScalix::lock()
{
- return new KABC::LockNull( true );
+ return new TDEABC::LockNull( true );
}
diff --git a/tderesources/scalix/kcal/resourcescalix.h b/tderesources/scalix/kcal/resourcescalix.h
index dcd783979..b58eee859 100644
--- a/tderesources/scalix/kcal/resourcescalix.h
+++ b/tderesources/scalix/kcal/resourcescalix.h
@@ -133,7 +133,7 @@ public:
virtual TQString subresourceIdentifier( Incidence *incidence );
- KABC::Lock* lock();
+ TDEABC::Lock* lock();
signals:
void useGlobalMode();
diff --git a/tderesources/scalix/scalixadmin/Makefile.am b/tderesources/scalix/scalixadmin/Makefile.am
index 05d29b985..4d072ac47 100644
--- a/tderesources/scalix/scalixadmin/Makefile.am
+++ b/tderesources/scalix/scalixadmin/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = scalixadmin
INCLUDES = $(all_includes)
scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-scalixadmin_LDADD = $(LIB_KABC)
+scalixadmin_LDADD = $(LIB_TDEABC)
scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \
otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \
delegatemanager.cpp delegateview.cpp delegatepage.cpp delegatedialog.cpp \
diff --git a/tderesources/scalix/scalixadmin/ldapview.cpp b/tderesources/scalix/scalixadmin/ldapview.cpp
index bc3059984..3e6eea04f 100644
--- a/tderesources/scalix/scalixadmin/ldapview.cpp
+++ b/tderesources/scalix/scalixadmin/ldapview.cpp
@@ -44,7 +44,7 @@ LdapView::LdapView( TQWidget *parent )
addColumn( i18n( "User" ) );
setFullWidth( true );
- mClient = new KABC::LdapClient;
+ mClient = new TDEABC::LdapClient;
mClient->setHost( Settings::self()->ldapHost() );
mClient->setPort( Settings::self()->ldapPort() );
@@ -56,8 +56,8 @@ LdapView::LdapView( TQWidget *parent )
attrs << "surname" << "mail";
mClient->setAttrs( attrs );
- connect( mClient, TQT_SIGNAL( result( const KABC::LdapObject& ) ),
- this, TQT_SLOT( entryAdded( const KABC::LdapObject& ) ) );
+ connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
+ this, TQT_SLOT( entryAdded( const TDEABC::LdapObject& ) ) );
connect( mClient, TQT_SIGNAL( error( const TQString& ) ),
this, TQT_SLOT( error( const TQString& ) ) );
}
@@ -83,7 +83,7 @@ void LdapView::setQuery( const TQString &query )
mClient->startQuery( query );
}
-void LdapView::entryAdded( const KABC::LdapObject &obj )
+void LdapView::entryAdded( const TDEABC::LdapObject &obj )
{
const TQString text = TQString( "%1 (%2)" ).arg( TQString(obj.attrs[ "surname" ].first()) )
.arg( TQString(obj.attrs[ "mail" ].first()) );
diff --git a/tderesources/scalix/scalixadmin/ldapview.h b/tderesources/scalix/scalixadmin/ldapview.h
index 3cb635e8b..9de458178 100644
--- a/tderesources/scalix/scalixadmin/ldapview.h
+++ b/tderesources/scalix/scalixadmin/ldapview.h
@@ -22,7 +22,7 @@
#include <tdelistview.h>
-namespace KABC {
+namespace TDEABC {
class LdapClient;
class LdapObject;
}
@@ -42,11 +42,11 @@ class LdapView : public TDEListView
void setQuery( const TQString &query );
private slots:
- void entryAdded( const KABC::LdapObject& );
+ void entryAdded( const TDEABC::LdapObject& );
void error( const TQString& );
private:
- KABC::LdapClient *mClient;
+ TDEABC::LdapClient *mClient;
};
#endif
diff --git a/tderesources/scalix/shared/scalixbase.cpp b/tderesources/scalix/shared/scalixbase.cpp
index 3cdf16c0b..f07a6983e 100644
--- a/tderesources/scalix/shared/scalixbase.cpp
+++ b/tderesources/scalix/shared/scalixbase.cpp
@@ -78,7 +78,7 @@ void ScalixBase::saveTo( KCal::Incidence* incidence ) const
// TODO: Attachments
}
-void ScalixBase::setFields( const KABC::Addressee* addressee )
+void ScalixBase::setFields( const TDEABC::Addressee* addressee )
{
// An addressee does not have a creation date, so somehow we should
// make one, if this is a new entry
@@ -112,16 +112,16 @@ void ScalixBase::setFields( const KABC::Addressee* addressee )
const TQString newCreationDate = dateTimeToString( creationDate );
if ( creationString != newCreationDate ) {
// We modified the creation date, so store it for future reference
- const_cast<KABC::Addressee*>( addressee )
+ const_cast<TDEABC::Addressee*>( addressee )
->insertCustom( "KOLAB", "CreationDate", newCreationDate );
kdDebug(5006) << "Creation date modified. New one: " << newCreationDate << endl;
}
switch( addressee->secrecy().type() ) {
- case KABC::Secrecy::Private:
+ case TDEABC::Secrecy::Private:
setSensitivity( Private );
break;
- case KABC::Secrecy::Confidential:
+ case TDEABC::Secrecy::Confidential:
setSensitivity( Confidential );
break;
default:
@@ -131,7 +131,7 @@ void ScalixBase::setFields( const KABC::Addressee* addressee )
// TODO: Attachments
}
-void ScalixBase::saveTo( KABC::Addressee* addressee ) const
+void ScalixBase::saveTo( TDEABC::Addressee* addressee ) const
{
addressee->setUid( uid() );
addressee->setNote( body() );
@@ -142,13 +142,13 @@ void ScalixBase::saveTo( KABC::Addressee* addressee ) const
switch( sensitivity() ) {
case Private:
- addressee->setSecrecy( KABC::Secrecy( KABC::Secrecy::Private ) );
+ addressee->setSecrecy( TDEABC::Secrecy( TDEABC::Secrecy::Private ) );
break;
case Confidential:
- addressee->setSecrecy( KABC::Secrecy( KABC::Secrecy::Confidential ) );
+ addressee->setSecrecy( TDEABC::Secrecy( TDEABC::Secrecy::Confidential ) );
break;
default:
- addressee->setSecrecy( KABC::Secrecy( KABC::Secrecy::Public ) );
+ addressee->setSecrecy( TDEABC::Secrecy( TDEABC::Secrecy::Public ) );
break;
}
diff --git a/tderesources/scalix/shared/scalixbase.h b/tderesources/scalix/shared/scalixbase.h
index 7bff80a4b..e545938cb 100644
--- a/tderesources/scalix/shared/scalixbase.h
+++ b/tderesources/scalix/shared/scalixbase.h
@@ -43,7 +43,7 @@ namespace KCal {
class Incidence;
}
-namespace KABC {
+namespace TDEABC {
class Addressee;
}
@@ -129,10 +129,10 @@ protected:
void saveTo( KCal::Incidence* ) const;
/// Read all known fields from this contact
- void setFields( const KABC::Addressee* );
+ void setFields( const TDEABC::Addressee* );
/// Save all known fields into this contact
- void saveTo( KABC::Addressee* ) const;
+ void saveTo( TDEABC::Addressee* ) const;
// This just makes the initial dom tree with version and doctype
static TQDomDocument domTree();
diff --git a/tderesources/scalix/tdeabc/contact.cpp b/tderesources/scalix/tdeabc/contact.cpp
index 457a34e77..190837a0d 100644
--- a/tderesources/scalix/tdeabc/contact.cpp
+++ b/tderesources/scalix/tdeabc/contact.cpp
@@ -30,7 +30,7 @@ using namespace Scalix;
static TQMap<TQString, TQString> *s_distListMap = 0;
static KStaticDeleter< TQMap<TQString, TQString> > sd;
-static TQString custom( const TQString &name, const KABC::Addressee &addr, const TQString &defaultValue = TQString() )
+static TQString custom( const TQString &name, const TDEABC::Addressee &addr, const TQString &defaultValue = TQString() )
{
const TQString value = addr.custom( "Scalix", name );
if ( value.isEmpty() )
@@ -39,12 +39,12 @@ static TQString custom( const TQString &name, const KABC::Addressee &addr, const
return value;
}
-static void setCustom( const TQString &name, const TQString &value, KABC::Addressee &addr )
+static void setCustom( const TQString &name, const TQString &value, TDEABC::Addressee &addr )
{
addr.insertCustom( "Scalix", name, value );
}
-TQString Contact::toXml( const KABC::Addressee &addr )
+TQString Contact::toXml( const TDEABC::Addressee &addr )
{
/**
* Handle distribution lists.
@@ -118,44 +118,44 @@ TQString Contact::toXml( const KABC::Addressee &addr )
TQString( "</email%1_display_name>" ).arg( i + 1 ) + "\n";
}
- KABC::PhoneNumber phone = addr.phoneNumber( KABC::PhoneNumber::Home );
+ TDEABC::PhoneNumber phone = addr.phoneNumber( TDEABC::PhoneNumber::Home );
xml += "<home_phone_number>" + phone.number() + "</home_phone_number>\n";
- phone = addr.phoneNumber( KABC::PhoneNumber::Work );
+ phone = addr.phoneNumber( TDEABC::PhoneNumber::Work );
xml += "<work_phone_number>" + phone.number() + "</work_phone_number>\n";
- phone = addr.phoneNumber( KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax );
+ phone = addr.phoneNumber( TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Fax );
xml += "<work_fax_number>" + phone.number() + "</work_fax_number>\n";
- phone = addr.phoneNumber( KABC::PhoneNumber::Cell );
+ phone = addr.phoneNumber( TDEABC::PhoneNumber::Cell );
xml += "<mobile_phone_number>" + phone.number() + "</mobile_phone_number>\n";
- const KABC::Address workAddress = addr.address( KABC::Address::Work );
+ const TDEABC::Address workAddress = addr.address( TDEABC::Address::Work );
xml += "<work_address_street>" + workAddress.street() + "</work_address_street>\n";
xml += "<work_address_zip>" + workAddress.postalCode() + "</work_address_zip>\n";
xml += "<work_address_city>" + workAddress.locality() + "</work_address_city>\n";
xml += "<work_address_state>" + workAddress.region() + "</work_address_state>\n";
xml += "<work_address_country>" + workAddress.country() + "</work_address_country>\n";
- const KABC::Address homeAddress = addr.address( KABC::Address::Home );
+ const TDEABC::Address homeAddress = addr.address( TDEABC::Address::Home );
xml += "<home_address_street>" + homeAddress.street() + "</home_address_street>\n";
xml += "<home_address_zip>" + homeAddress.postalCode() + "</home_address_zip>\n";
xml += "<home_address_city>" + homeAddress.locality() + "</home_address_city>\n";
xml += "<home_address_state>" + homeAddress.region() + "</home_address_state>\n";
xml += "<home_address_country>" + homeAddress.country() + "</home_address_country>\n";
- const KABC::Address otherAddress = addr.address( KABC::Address::Dom );
+ const TDEABC::Address otherAddress = addr.address( TDEABC::Address::Dom );
xml += "<other_address_street>" + otherAddress.street() + "</other_address_street>\n";
xml += "<other_address_zip>" + otherAddress.postalCode() + "</other_address_zip>\n";
xml += "<other_address_city>" + otherAddress.locality() + "</other_address_city>\n";
xml += "<other_address_state>" + otherAddress.region() + "</other_address_state>\n";
xml += "<other_address_country>" + otherAddress.country() + "</other_address_country>\n";
- if ( homeAddress.type() & KABC::Address::Pref )
+ if ( homeAddress.type() & TDEABC::Address::Pref )
xml += "<selected_mailing_address>1</selected_mailing_address>\n";
- else if ( workAddress.type() & KABC::Address::Pref )
+ else if ( workAddress.type() & TDEABC::Address::Pref )
xml += "<selected_mailing_address>2</selected_mailing_address>\n";
- else if ( otherAddress.type() & KABC::Address::Pref )
+ else if ( otherAddress.type() & TDEABC::Address::Pref )
xml += "<selected_mailing_address>3</selected_mailing_address>\n";
xml += "<im_address>" + addr.custom( "KADDRESSBOOK", "X-IMAddress" ) + "</im_address>\n";
@@ -176,7 +176,7 @@ TQString Contact::toXml( const KABC::Addressee &addr )
return xml;
}
-KABC::Addressee Contact::fromXml( const TQString &xml )
+TDEABC::Addressee Contact::fromXml( const TQString &xml )
{
TQDomDocument document;
@@ -184,7 +184,7 @@ KABC::Addressee Contact::fromXml( const TQString &xml )
int errorLine, errorColumn;
if ( !document.setContent( xml, true, &errorMsg, &errorLine, &errorColumn ) ) {
tqDebug( "Error parsing XML in Scalix::Contact::fromXml: %s (%d,%d)", errorMsg.latin1(), errorLine, errorColumn );
- return KABC::Addressee();
+ return TDEABC::Addressee();
}
TQDomElement contactElement = document.documentElement();
@@ -208,16 +208,16 @@ KABC::Addressee Contact::fromXml( const TQString &xml )
return list;
} else {
tqDebug( "Error interpreting XML in Scalix::Contact::fromXml: no 'contact' or 'distlist' tag found" );
- return KABC::Addressee();
+ return TDEABC::Addressee();
}
}
TQString emails[ 3 ];
- KABC::Address homeAddress( KABC::Address::Home );
- KABC::Address workAddress( KABC::Address::Work );
- KABC::Address otherAddress( KABC::Address::Dom );
+ TDEABC::Address homeAddress( TDEABC::Address::Home );
+ TDEABC::Address workAddress( TDEABC::Address::Work );
+ TDEABC::Address otherAddress( TDEABC::Address::Dom );
- KABC::Addressee addr;
+ TDEABC::Addressee addr;
setCustom( "comes_from_scalix", "true", addr );
TQDomNode node = contactElement.firstChild();
@@ -275,13 +275,13 @@ KABC::Addressee Contact::fromXml( const TQString &xml )
// phone numbers
else if ( element.tagName() == "home_phone_number" )
- addr.insertPhoneNumber( KABC::PhoneNumber( element.text(), KABC::PhoneNumber::Home ) );
+ addr.insertPhoneNumber( TDEABC::PhoneNumber( element.text(), TDEABC::PhoneNumber::Home ) );
else if ( element.tagName() == "work_phone_number" )
- addr.insertPhoneNumber( KABC::PhoneNumber( element.text(), KABC::PhoneNumber::Work ) );
+ addr.insertPhoneNumber( TDEABC::PhoneNumber( element.text(), TDEABC::PhoneNumber::Work ) );
else if ( element.tagName() == "work_fax_number" )
- addr.insertPhoneNumber( KABC::PhoneNumber( element.text(), KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax ) );
+ addr.insertPhoneNumber( TDEABC::PhoneNumber( element.text(), TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Fax ) );
else if ( element.tagName() == "mobile_phone_number" )
- addr.insertPhoneNumber( KABC::PhoneNumber( element.text(), KABC::PhoneNumber::Cell ) );
+ addr.insertPhoneNumber( TDEABC::PhoneNumber( element.text(), TDEABC::PhoneNumber::Cell ) );
// address (work)
else if ( element.tagName() == "work_address_street" )
@@ -322,13 +322,13 @@ KABC::Addressee Contact::fromXml( const TQString &xml )
else if ( element.tagName() == "selected_mailing_address" )
switch ( element.text().toInt() ) {
case 1:
- homeAddress.setType( homeAddress.type() | KABC::Address::Pref );
+ homeAddress.setType( homeAddress.type() | TDEABC::Address::Pref );
break;
case 2:
- workAddress.setType( workAddress.type() | KABC::Address::Pref );
+ workAddress.setType( workAddress.type() | TDEABC::Address::Pref );
break;
case 3:
- otherAddress.setType( otherAddress.type() | KABC::Address::Pref );
+ otherAddress.setType( otherAddress.type() | TDEABC::Address::Pref );
break;
default:
Q_ASSERT( !"Unknown selected_mailing_address enum" );
diff --git a/tderesources/scalix/tdeabc/contact.h b/tderesources/scalix/tdeabc/contact.h
index 33ea1a9cb..a8284255c 100644
--- a/tderesources/scalix/tdeabc/contact.h
+++ b/tderesources/scalix/tdeabc/contact.h
@@ -28,8 +28,8 @@ namespace Scalix {
class Contact
{
public:
- static TQString toXml( const KABC::Addressee &addr );
- static KABC::Addressee fromXml( const TQString &xml );
+ static TQString toXml( const TDEABC::Addressee &addr );
+ static TDEABC::Addressee fromXml( const TQString &xml );
};
}
diff --git a/tderesources/scalix/tdeabc/resourcescalix.cpp b/tderesources/scalix/tdeabc/resourcescalix.cpp
index ea3928a59..dc953ded0 100644
--- a/tderesources/scalix/tdeabc/resourcescalix.cpp
+++ b/tderesources/scalix/tdeabc/resourcescalix.cpp
@@ -61,7 +61,7 @@ class ScalixFactory : public KRES::PluginFactoryBase
public:
KRES::Resource *resource( const TDEConfig *config )
{
- return new KABC::ResourceScalix( config );
+ return new TDEABC::ResourceScalix( config );
}
KRES::ConfigWidget *configWidget( TQWidget* )
@@ -77,7 +77,7 @@ static const char* s_attachmentMimeTypeContact = "application/x-vnd.kolab.contac
static const char* s_attachmentMimeTypeDistList = "application/x-vnd.kolab.contact.distlist";
static const char* s_inlineMimeType = "application/scalix-properties";
-KABC::ResourceScalix::ResourceScalix( const TDEConfig *config )
+TDEABC::ResourceScalix::ResourceScalix( const TDEConfig *config )
: KPIM::ResourceABC( config ),
Scalix::ResourceScalixBase( "ResourceScalix-KABC" ),
mCachedSubresource( TQString() ), mLocked( false )
@@ -85,7 +85,7 @@ KABC::ResourceScalix::ResourceScalix( const TDEConfig *config )
setType( "scalix" );
}
-KABC::ResourceScalix::~ResourceScalix()
+TDEABC::ResourceScalix::~ResourceScalix()
{
// The resource is deleted on exit (StdAddressBook's KStaticDeleter),
// and it wasn't closed before that, so close here to save the config.
@@ -94,7 +94,7 @@ KABC::ResourceScalix::~ResourceScalix()
}
}
-void KABC::ResourceScalix::loadSubResourceConfig( TDEConfig& config,
+void TDEABC::ResourceScalix::loadSubResourceConfig( TDEConfig& config,
const TQString& name,
const TQString& label,
bool writable )
@@ -106,7 +106,7 @@ void KABC::ResourceScalix::loadSubResourceConfig( TDEConfig& config,
completionWeight ) );
}
-bool KABC::ResourceScalix::doOpen()
+bool TDEABC::ResourceScalix::doOpen()
{
TDEConfig config( configFile() );
@@ -123,7 +123,7 @@ bool KABC::ResourceScalix::doOpen()
return true;
}
-void KABC::ResourceScalix::doClose()
+void TDEABC::ResourceScalix::doClose()
{
TDEConfig config( configFile() );
@@ -135,7 +135,7 @@ void KABC::ResourceScalix::doClose()
}
}
-KABC::Ticket * KABC::ResourceScalix::requestSaveTicket()
+TDEABC::Ticket * TDEABC::ResourceScalix::requestSaveTicket()
{
if ( !addressBook() ) {
kdError() << "no addressbook" << endl;
@@ -146,29 +146,29 @@ KABC::Ticket * KABC::ResourceScalix::requestSaveTicket()
return createTicket( this );
}
-void KABC::ResourceScalix::releaseSaveTicket( Ticket* ticket )
+void TDEABC::ResourceScalix::releaseSaveTicket( Ticket* ticket )
{
mLocked = false;
mCachedSubresource = TQString();
delete ticket;
}
-TQString KABC::ResourceScalix::loadContact( const TQString& contactData,
+TQString TDEABC::ResourceScalix::loadContact( const TQString& contactData,
const TQString& subResource,
TQ_UINT32 sernum,
KMailICalIface::StorageFormat )
{
- KABC::Addressee addr = Contact::fromXml( contactData );
+ TDEABC::Addressee addr = Contact::fromXml( contactData );
addr.setResource( this );
addr.setChanged( false );
- KABC::Resource::insertAddressee( addr ); // same as mAddrMap.insert( addr.uid(), addr );
+ TDEABC::Resource::insertAddressee( addr ); // same as mAddrMap.insert( addr.uid(), addr );
mUidMap[ addr.uid() ] = StorageReference( subResource, sernum );
kdDebug(5650) << "Loaded contact uid=" << addr.uid() << " sernum=" << sernum << " fullName=" << addr.name() << endl;
return addr.uid();
}
-bool KABC::ResourceScalix::loadSubResource( const TQString& subResource )
+bool TDEABC::ResourceScalix::loadSubResource( const TQString& subResource )
{
bool scalixcontacts = loadSubResourceHelper( subResource, s_attachmentMimeTypeContact, KMailICalIface::StorageXML );
bool scalixdistlists = loadSubResourceHelper( subResource, s_attachmentMimeTypeDistList, KMailICalIface::StorageXML );
@@ -176,13 +176,13 @@ bool KABC::ResourceScalix::loadSubResource( const TQString& subResource )
return scalixcontacts && scalixdistlists && vcardstyle;
}
-bool KABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource,
+bool TDEABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource,
const char* mimetype,
KMailICalIface::StorageFormat format )
{
int count = 0;
if ( !kmailIncidencesCount( count, mimetype, subResource ) ) {
- kdError() << "Communication problem in KABC::ResourceScalix::loadSubResourceHelper()\n";
+ kdError() << "Communication problem in TDEABC::ResourceScalix::loadSubResourceHelper()\n";
return false;
}
if ( !count )
@@ -229,7 +229,7 @@ bool KABC::ResourceScalix::loadSubResourceHelper( const TQString& subResource,
return true;
}
-bool KABC::ResourceScalix::load()
+bool TDEABC::ResourceScalix::load()
{
mUidMap.clear();
mAddrMap.clear();
@@ -247,7 +247,7 @@ bool KABC::ResourceScalix::load()
return rc;
}
-bool KABC::ResourceScalix::save( Ticket* )
+bool TDEABC::ResourceScalix::save( Ticket* )
{
bool rc = true;
@@ -312,7 +312,7 @@ void AttachmentList::updateAttachment( const TQByteArray& data, const TQString&
}
}
-bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
+bool TDEABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
{
const TQString uid = addr.uid();
TQString subResource;
@@ -372,7 +372,7 @@ bool KABC::ResourceScalix::kmailUpdateAddressee( const Addressee& addr )
return rc;
}
-void KABC::ResourceScalix::insertAddressee( const Addressee& addr )
+void TDEABC::ResourceScalix::insertAddressee( const Addressee& addr )
{
const TQString uid = addr.uid();
//kdDebug(5650) << k_funcinfo << uid << endl;
@@ -389,7 +389,7 @@ void KABC::ResourceScalix::insertAddressee( const Addressee& addr )
Resource::insertAddressee( addr );
}
-void KABC::ResourceScalix::removeAddressee( const Addressee& addr )
+void TDEABC::ResourceScalix::removeAddressee( const Addressee& addr )
{
const TQString uid = addr.uid();
if ( mUidMap.find( uid ) == mUidMap.end() ) return;
@@ -412,7 +412,7 @@ void KABC::ResourceScalix::removeAddressee( const Addressee& addr )
* These are the DCOP slots that KMail call to notify when something
* changed.
*/
-bool KABC::ResourceScalix::fromKMailAddIncidence( const TQString& type,
+bool TDEABC::ResourceScalix::fromKMailAddIncidence( const TQString& type,
const TQString& subResource,
TQ_UINT32 sernum,
int format,
@@ -440,7 +440,7 @@ bool KABC::ResourceScalix::fromKMailAddIncidence( const TQString& type,
return true;
}
-void KABC::ResourceScalix::fromKMailDelIncidence( const TQString& type,
+void TDEABC::ResourceScalix::fromKMailDelIncidence( const TQString& type,
const TQString& subResource,
const TQString& uid )
{
@@ -464,7 +464,7 @@ void KABC::ResourceScalix::fromKMailDelIncidence( const TQString& type,
}
}
-void KABC::ResourceScalix::fromKMailRefresh( const TQString& type,
+void TDEABC::ResourceScalix::fromKMailRefresh( const TQString& type,
const TQString& /*subResource*/ )
{
// Check if this is a contact
@@ -476,7 +476,7 @@ void KABC::ResourceScalix::fromKMailRefresh( const TQString& type,
addressBook()->emitAddressBookChanged();
}
-void KABC::ResourceScalix::fromKMailAddSubresource( const TQString& type,
+void TDEABC::ResourceScalix::fromKMailAddSubresource( const TQString& type,
const TQString& subResource,
const TQString& label,
bool writable )
@@ -495,7 +495,7 @@ void KABC::ResourceScalix::fromKMailAddSubresource( const TQString& type,
emit signalSubresourceAdded( this, type, subResource );
}
-void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type,
+void TDEABC::ResourceScalix::fromKMailDelSubresource( const TQString& type,
const TQString& subResource )
{
if( type != s_kmailContentsType ) return;
@@ -535,7 +535,7 @@ void KABC::ResourceScalix::fromKMailDelSubresource( const TQString& type,
-void KABC::ResourceScalix::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
+void TDEABC::ResourceScalix::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQString>& map,
const TQString& /* type */,
const TQString& folder )
{
@@ -550,12 +550,12 @@ void KABC::ResourceScalix::fromKMailAsyncLoadResult( const TQMap<TQ_UINT32, TQSt
addressBook()->emitAddressBookChanged();
}
-TQStringList KABC::ResourceScalix::subresources() const
+TQStringList TDEABC::ResourceScalix::subresources() const
{
return mSubResources.keys();
}
-bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) const
+bool TDEABC::ResourceScalix::subresourceActive( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].active();
@@ -567,7 +567,7 @@ bool KABC::ResourceScalix::subresourceActive( const TQString& subresource ) cons
return true;
}
-bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) const
+bool TDEABC::ResourceScalix::subresourceWritable( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].writable();
@@ -575,7 +575,7 @@ bool KABC::ResourceScalix::subresourceWritable( const TQString& subresource ) co
return false; //better a safe default
}
-int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresource ) const
+int TDEABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].completionWeight();
@@ -586,7 +586,7 @@ int KABC::ResourceScalix::subresourceCompletionWeight( const TQString& subresour
return 80;
}
-TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) const
+TQString TDEABC::ResourceScalix::subresourceLabel( const TQString& subresource ) const
{
if ( mSubResources.contains( subresource ) ) {
return mSubResources[ subresource ].label();
@@ -596,7 +596,7 @@ TQString KABC::ResourceScalix::subresourceLabel( const TQString& subresource ) c
return TQString();
}
-void KABC::ResourceScalix::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
+void TDEABC::ResourceScalix::setSubresourceCompletionWeight( const TQString& subresource, int completionWeight )
{
if ( mSubResources.contains( subresource ) ) {
mSubResources[ subresource ].setCompletionWeight( completionWeight );
@@ -605,7 +605,7 @@ void KABC::ResourceScalix::setSubresourceCompletionWeight( const TQString& subre
}
}
-TQMap<TQString, TQString> KABC::ResourceScalix::uidToResourceMap() const
+TQMap<TQString, TQString> TDEABC::ResourceScalix::uidToResourceMap() const
{
// TODO: Couldn't this be made simpler?
TQMap<TQString, TQString> map;
@@ -615,7 +615,7 @@ TQMap<TQString, TQString> KABC::ResourceScalix::uidToResourceMap() const
return map;
}
-void KABC::ResourceScalix::setSubresourceActive( const TQString &subresource, bool active )
+void TDEABC::ResourceScalix::setSubresourceActive( const TQString &subresource, bool active )
{
if ( mSubResources.contains( subresource ) ) {
mSubResources[ subresource ].setActive( active );
diff --git a/tderesources/scalix/tdeabc/resourcescalix.h b/tderesources/scalix/tdeabc/resourcescalix.h
index dbb0b93c6..0fa58cdff 100644
--- a/tderesources/scalix/tdeabc/resourcescalix.h
+++ b/tderesources/scalix/tdeabc/resourcescalix.h
@@ -41,7 +41,7 @@
#include <kmail/kmailicalIface.h>
#include <tdepimmacros.h>
-namespace KABC {
+namespace TDEABC {
class FormatPlugin;
diff --git a/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp b/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp
index cdfc8f301..ee84b7be3 100644
--- a/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp
+++ b/tderesources/scalix/tdeabc/resourcescalix_plugin.cpp
@@ -40,7 +40,7 @@ class ScalixFactory : public KRES::PluginFactoryBase
public:
KRES::Resource *resource( const TDEConfig *config )
{
- return new KABC::ResourceScalix( config );
+ return new TDEABC::ResourceScalix( config );
}
KRES::ConfigWidget *configWidget( TQWidget* )
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;
diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.cpp b/tderesources/tvanytime/kcal_resourcetvanytime.cpp
index 3a1db8f9a..12161d90b 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytime.cpp
+++ b/tderesources/tvanytime/kcal_resourcetvanytime.cpp
@@ -467,7 +467,7 @@ void ResourceTVAnytime::setSubresourceActive( const TQString & subresource, bool
}
}
-KABC::Lock *ResourceTVAnytime::lock()
+TDEABC::Lock *ResourceTVAnytime::lock()
{
return &mLock;
}
diff --git a/tderesources/tvanytime/kcal_resourcetvanytime.h b/tderesources/tvanytime/kcal_resourcetvanytime.h
index e59f17038..1be0aa0ef 100644
--- a/tderesources/tvanytime/kcal_resourcetvanytime.h
+++ b/tderesources/tvanytime/kcal_resourcetvanytime.h
@@ -78,7 +78,7 @@ class KDE_EXPORT ResourceTVAnytime : public ResourceCached
bool doLoad();
bool doSave() { return true; }
- KABC::Lock *lock();
+ TDEABC::Lock *lock();
protected:
void init();
@@ -107,7 +107,7 @@ class KDE_EXPORT ResourceTVAnytime : public ResourceCached
private:
TVAnytimePrefsBase *mPrefs;
- KABC::LockNull mLock;
+ TDEABC::LockNull mLock;
TDEIO::FileCopyJob *mDownloadJob;
KPIM::ProgressItem *mProgress;