diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-20 16:27:27 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-20 16:27:27 -0600 |
| commit | 94273bcb909fac42ef9427e3d8a614cab8c29c66 (patch) | |
| tree | 91b99186971ecb475db3ca41b1b12df24029e389 | |
| parent | 41b65d69967ad0d35f8b4dd37ac63aad1cebdae9 (diff) | |
| download | tdepim-94273bcb909fac42ef9427e3d8a614cab8c29c66.tar.gz tdepim-94273bcb909fac42ef9427e3d8a614cab8c29c66.zip | |
Rename KABC namespace
386 files changed, 2554 insertions, 2554 deletions
diff --git a/certmanager/Makefile.am b/certmanager/Makefile.am index 0c37f3fae..68ab9ae05 100644 --- a/certmanager/Makefile.am +++ b/certmanager/Makefile.am @@ -18,7 +18,7 @@ kleopatra_SOURCES = \ METASOURCES = AUTO kleopatra_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC) +kleopatra_LDADD = conf/libconf.la lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC) rcdir = $(kde_datadir)/kleopatra rc_DATA = kleopatraui.rc diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp index d220a10af..b0cff6a32 100644 --- a/certmanager/certificatewizardimpl.cpp +++ b/certmanager/certificatewizardimpl.cpp @@ -295,10 +295,10 @@ void CertificateWizardImpl::slotHelpClicked() void CertificateWizardImpl::slotSetValuesFromWhoAmI() { - const KABC::Addressee a = KABC::StdAddressBook::self( true )->whoAmI(); + const TDEABC::Addressee a = TDEABC::StdAddressBook::self( true )->whoAmI(); if ( a.isEmpty() ) return; - const KABC::Address adr = a.address(KABC::Address::Work); + const TDEABC::Address adr = a.address(TDEABC::Address::Work); for ( AttrPairList::const_iterator it = _attrPairList.begin() ; it != _attrPairList.end() ; ++it ) { @@ -369,7 +369,7 @@ void CertificateWizardImpl::createPersonalDataPage() } // enable button only if administrator wants to allow it - if (KABC::StdAddressBook::self( true )->whoAmI().isEmpty() || + if (TDEABC::StdAddressBook::self( true )->whoAmI().isEmpty() || !config.readBoolEntry("ShowSetWhoAmI", true)) insertAddressButton->setEnabled( false ); diff --git a/certmanager/kwatchgnupg/Makefile.am b/certmanager/kwatchgnupg/Makefile.am index f5b28ba41..990ce7d38 100644 --- a/certmanager/kwatchgnupg/Makefile.am +++ b/certmanager/kwatchgnupg/Makefile.am @@ -14,7 +14,7 @@ kwatchgnupg_SOURCES = \ METASOURCES = AUTO kwatchgnupg_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_KABC) +kwatchgnupg_LDADD = ../conf/libconf.la ../lib/libkleopatra.la $(LIB_KUTILS) $(LIB_TDEABC) rcdir = $(kde_datadir)/kwatchgnupg rc_DATA = kwatchgnupgui.rc diff --git a/kabc/frontend/mainWindow.ui b/kabc/frontend/mainWindow.ui index 1ca19b2ca..240114a6a 100644 --- a/kabc/frontend/mainWindow.ui +++ b/kabc/frontend/mainWindow.ui @@ -1359,9 +1359,9 @@ <forward>class AddresseeItem</forward> </forwards> <variables> - <variable>KABC::ResourceFile *mResourceFile</variable> + <variable>TDEABC::ResourceFile *mResourceFile</variable> <variable>AddresseeItem *mCurrentItem</variable> - <variable>KABC::AddressBook *mAddressBook</variable> + <variable>TDEABC::AddressBook *mAddressBook</variable> <variable>TQString mCurrentAddress</variable> <variable>TQString mCurrentPhone</variable> </variables> @@ -1372,19 +1372,19 @@ <slot>fileOpen()</slot> <slot>loadAddressBook( const TQString & fileName )</slot> <slot>updateAddressee( TQListViewItem * item )</slot> - <slot>readAddressee( const KABC::Addressee & a )</slot> - <slot returnType="KABC::Addressee">writeAddressee( const KABC::Addressee & addressee )</slot> + <slot>readAddressee( const TDEABC::Addressee & a )</slot> + <slot returnType="TDEABC::Addressee">writeAddressee( const TDEABC::Addressee & addressee )</slot> <slot>newEntry()</slot> <slot>removeEntry()</slot> <slot>updateAddress( int id )</slot> - <slot returnType="KABC::Address">writeAddress( const KABC::Address & address )</slot> + <slot returnType="TDEABC::Address">writeAddress( const TDEABC::Address & address )</slot> <slot>writeAddress( const TQString & id )</slot> - <slot>readAddress( const KABC::Address & a )</slot> + <slot>readAddress( const TDEABC::Address & a )</slot> <slot>readAddress( const TQString & id )</slot> <slot>updatePhone( int id )</slot> - <slot returnType="KABC::PhoneNumber">writePhone( const KABC::PhoneNumber & phoneNumber )</slot> + <slot returnType="TDEABC::PhoneNumber">writePhone( const TDEABC::PhoneNumber & phoneNumber )</slot> <slot>writePhone( const TQString & id )</slot> - <slot>readPhone( const KABC::PhoneNumber & p )</slot> + <slot>readPhone( const TDEABC::PhoneNumber & p )</slot> <slot>readPhone( const TQString & id )</slot> <slot>newAddress()</slot> <slot>removeAddress()</slot> diff --git a/kabc/frontend/mainWindow.ui.h b/kabc/frontend/mainWindow.ui.h index 1a88f1deb..8e678b932 100644 --- a/kabc/frontend/mainWindow.ui.h +++ b/kabc/frontend/mainWindow.ui.h @@ -15,7 +15,7 @@ #include <tdeabc/stdaddressbook.h> -using namespace KABC; +using namespace TDEABC; class AddresseeItem : public TQListViewItem { @@ -32,7 +32,7 @@ class AddresseeItem : public TQListViewItem void MainWindow::init() { - mAddressBook = KABC::StdAddressBook::self( true ); + mAddressBook = TDEABC::StdAddressBook::self( true ); mCurrentItem = 0; @@ -75,7 +75,7 @@ void MainWindow::loadAddressBook( const TQString &fileName ) mCurrentAddress = TQString(); readAddressee( Addressee() ); - KABC::AddressBook::Iterator it; + TDEABC::AddressBook::Iterator it; for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { new AddresseeItem( mAddresseeList, (*it) ); } @@ -101,7 +101,7 @@ void MainWindow::updateAddressee( TQListViewItem *item ) } -void MainWindow::readAddressee( const KABC::Addressee &a ) +void MainWindow::readAddressee( const TDEABC::Addressee &a ) { kdDebug() << "MainWindow::readAddressee(): " << a.name() << endl; @@ -169,7 +169,7 @@ void MainWindow::readAddressee( const KABC::Addressee &a ) readPhone( mCurrentPhone ); } -KABC::Addressee MainWindow::writeAddressee( const KABC::Addressee &addressee ) +TDEABC::Addressee MainWindow::writeAddressee( const TDEABC::Addressee &addressee ) { Addressee a( addressee ); a.setName( mNameEdit->text() ); @@ -237,7 +237,7 @@ void MainWindow::updateAddress( int id ) readAddress( mCurrentAddress ); } -KABC::Address MainWindow::writeAddress( const KABC::Address &address ) +TDEABC::Address MainWindow::writeAddress( const TDEABC::Address &address ) { Address a( address ); @@ -276,7 +276,7 @@ void MainWindow::writeAddress( const TQString &id ) mCurrentItem->addressee().insertAddress( address ); } -void MainWindow::readAddress( const KABC::Address &a ) +void MainWindow::readAddress( const TDEABC::Address &a ) { mAddressPostOfficeBoxEdit->setText( a.postOfficeBox() ); mAddressExtendedEdit->setText( a.extended() ); @@ -328,7 +328,7 @@ void MainWindow::updatePhone( int id ) readPhone( mCurrentPhone ); } -KABC::PhoneNumber MainWindow::writePhone( const KABC::PhoneNumber &phoneNumber ) +TDEABC::PhoneNumber MainWindow::writePhone( const TDEABC::PhoneNumber &phoneNumber ) { PhoneNumber p( phoneNumber ); @@ -367,7 +367,7 @@ void MainWindow::writePhone( const TQString &id ) mCurrentItem->addressee().insertPhoneNumber( p ); } -void MainWindow::readPhone( const KABC::PhoneNumber &p ) +void MainWindow::readPhone( const TDEABC::PhoneNumber &p ) { mPhoneNumberEdit->setText( p.number() ); diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp index 144ffe2dd..01ae6fd28 100644 --- a/kabc/kabc2mutt/kabc2mutt.cpp +++ b/kabc/kabc2mutt/kabc2mutt.cpp @@ -39,8 +39,8 @@ KABC2Mutt::KABC2Mutt( TQObject *parent, const char *name ) void KABC2Mutt::run() { - mAddressBook = KABC::StdAddressBook::self( true ); - KABC::StdAddressBook::setAutomaticSave( false ); + mAddressBook = TDEABC::StdAddressBook::self( true ); + TDEABC::StdAddressBook::setAutomaticSave( false ); connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), this, TQT_SLOT( loadingFinished() ) ); @@ -49,7 +49,7 @@ void KABC2Mutt::run() void KABC2Mutt::loadingFinished() { // print addressees - KABC::AddressBook::ConstIterator iaddr; + TDEABC::AddressBook::ConstIterator iaddr; for ( iaddr = mAddressBook->begin(); iaddr != mAddressBook->end(); ++iaddr ) { const TQString name = (*iaddr).givenName() + ' ' + (*iaddr).familyName(); if ( !mQuery.isEmpty() ) { @@ -122,12 +122,12 @@ void KABC2Mutt::loadingFinished() } // print all distribution lists - KABC::DistributionListManager manager( mAddressBook ); + TDEABC::DistributionListManager manager( mAddressBook ); manager.load(); TQStringList dists = manager.listNames(); for ( TQStringList::Iterator iaddr = dists.begin(); iaddr != dists.end(); ++iaddr ) { - KABC::DistributionList *list = manager.list( *iaddr ); + TDEABC::DistributionList *list = manager.list( *iaddr ); if ( list ) { if ( !mQuery.isEmpty() ) { bool match = ((*iaddr).find(mQuery) > -1); diff --git a/kabc/kabc2mutt/kabc2mutt.h b/kabc/kabc2mutt/kabc2mutt.h index 328f06c17..92b7e9680 100644 --- a/kabc/kabc2mutt/kabc2mutt.h +++ b/kabc/kabc2mutt/kabc2mutt.h @@ -51,7 +51,7 @@ class KABC2Mutt : public TQObject bool mAllAddresses; bool mAlternateKeyFormat; - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; }; #endif diff --git a/kabc/kabcdistlistupdater/Makefile.am b/kabc/kabcdistlistupdater/Makefile.am index 0eb5c411e..691ec277d 100644 --- a/kabc/kabcdistlistupdater/Makefile.am +++ b/kabc/kabcdistlistupdater/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO bin_PROGRAMS = kabcdistlistupdater kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la +kabcdistlistupdater_LDADD = $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp autostart_DATA = kabcdistlistupdater.desktop diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp index b2e8d93b8..9455e88b4 100644 --- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp +++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp @@ -62,10 +62,10 @@ void convertDistributionLists() } } - KABC::StdAddressBook::self()->insertAddressee( distList ); + TDEABC::StdAddressBook::self()->insertAddressee( distList ); } - KABC::StdAddressBook::self()->save(); + TDEABC::StdAddressBook::self()->save(); } int main( int argc, char **argv ) diff --git a/kaddressbook/Makefile.am b/kaddressbook/Makefile.am index 677d94ad0..3ae6e6366 100644 --- a/kaddressbook/Makefile.am +++ b/kaddressbook/Makefile.am @@ -45,7 +45,7 @@ libkaddressbook_la_LIBADD = $(top_builddir)/kaddressbook/printing/libprinter.la $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ $(top_builddir)/libtdepim/libtdepim.la \ $(top_builddir)/libkcal/libkcal.la \ - -ltdeabc_file $(LIB_KABC) $(LIB_TDEHTML) \ + -ltdeabc_file $(LIB_TDEABC) $(LIB_TDEHTML) \ $(top_builddir)/kaddressbook/common/libkabcommon.la \ $(top_builddir)/kaddressbook/editors/libkabim.la \ -ltdeprint diff --git a/kaddressbook/TODO b/kaddressbook/TODO index df0db82b0..36b7ff8cf 100644 --- a/kaddressbook/TODO +++ b/kaddressbook/TODO @@ -29,7 +29,7 @@ Improvements (things that just need to be improved/rewritten) - Add a meta data wrapper for views - DONE - Add show/hide toolbars in the edit menu - DONE - Break KAddressBook into KAddressBook and ViewManager - DONE -- Change the view items to take a KABC::Addressee rather than a uid - DONE +- Change the view items to take a TDEABC::Addressee rather than a uid - DONE - DnD on Card View - DONE - Card View specific config options - DONE - Implemented a good date picker widget somehow using the KDatePicker @@ -44,7 +44,7 @@ Improvements (things that just need to be improved/rewritten) Fixes (things that used to work and are now broken) ----- -- Fix import/export code to use KABC::Addressee - DONE +- Fix import/export code to use TDEABC::Addressee - DONE - Fix/reinstate LDAP dialog - DONE - Fix vcard importing - Fix KPilot abbrowser conduit diff --git a/kaddressbook/addresseditwidget.cpp b/kaddressbook/addresseditwidget.cpp index a02092646..83f278748 100644 --- a/kaddressbook/addresseditwidget.cpp +++ b/kaddressbook/addresseditwidget.cpp @@ -112,11 +112,11 @@ void AddressEditWidget::setReadOnly( bool readOnly ) mEditButton->setEnabled( !readOnly ); } -KABC::Address::List AddressEditWidget::addresses() +TDEABC::Address::List AddressEditWidget::addresses() { - KABC::Address::List retList; + TDEABC::Address::List retList; - KABC::Address::List::ConstIterator it; + TDEABC::Address::List::ConstIterator it; for ( it = mAddressList.begin(); it != mAddressList.end(); ++it ) if ( !(*it).isEmpty() ) retList.append( *it ); @@ -124,8 +124,8 @@ KABC::Address::List AddressEditWidget::addresses() return retList; } -void AddressEditWidget::setAddresses( const KABC::Addressee &addr, - const KABC::Address::List &list ) +void AddressEditWidget::setAddresses( const TDEABC::Addressee &addr, + const TDEABC::Address::List &list ) { mAddressee = addr; @@ -135,8 +135,8 @@ void AddressEditWidget::setAddresses( const KABC::Addressee &addr, mTypeCombo->insertTypeList( list ); TQValueList<int> defaultTypes; - defaultTypes << KABC::Address::Home; - defaultTypes << KABC::Address::Work; + defaultTypes << TDEABC::Address::Home; + defaultTypes << TDEABC::Address::Work; AddresseeConfig config( mAddressee ); const TQValueList<int> configList = config.noDefaultAddrTypes(); @@ -155,10 +155,10 @@ void AddressEditWidget::setAddresses( const KABC::Addressee &addr, mTypeCombo->updateTypes(); // find preferred address which will be shown - int preferred = KABC::Address::Home; // default if no preferred address set - KABC::Address::List::ConstIterator addrIt; + int preferred = TDEABC::Address::Home; // default if no preferred address set + TDEABC::Address::List::ConstIterator addrIt; for ( addrIt = list.begin(); addrIt != list.end(); ++addrIt ) - if ( (*addrIt).type() & KABC::Address::Pref ) { + if ( (*addrIt).type() & TDEABC::Address::Pref ) { preferred = (*addrIt).type(); break; } @@ -168,7 +168,7 @@ void AddressEditWidget::setAddresses( const KABC::Addressee &addr, updateAddressEdit(); } -void AddressEditWidget::updateAddressee( const KABC::Addressee &addr ) +void AddressEditWidget::updateAddressee( const TDEABC::Addressee &addr ) { mAddressee = addr; updateAddressEdit(); @@ -182,13 +182,13 @@ void AddressEditWidget::edit() mAddressList = dialog.addresses(); bool hasHome = false, hasWork = false; - KABC::Address::List::ConstIterator it; + TDEABC::Address::List::ConstIterator it; for ( it = mAddressList.begin(); it != mAddressList.end(); ++it ) { - if ( (*it).type() == KABC::Address::Home ) { + if ( (*it).type() == TDEABC::Address::Home ) { if ( !(*it).isEmpty() ) hasHome = true; } - if ( (*it).type() == KABC::Address::Work ) { + if ( (*it).type() == TDEABC::Address::Work ) { if ( !(*it).isEmpty() ) hasWork = true; } @@ -197,9 +197,9 @@ void AddressEditWidget::edit() AddresseeConfig config( mAddressee ); TQValueList<int> configList; if ( !hasHome ) - configList << KABC::Address::Home; + configList << TDEABC::Address::Home; if ( !hasWork ) - configList << KABC::Address::Work; + configList << TDEABC::Address::Work; config.setNoDefaultAddrTypes( configList ); mTypeCombo->updateTypes(); @@ -211,7 +211,7 @@ void AddressEditWidget::edit() void AddressEditWidget::updateAddressEdit() { - KABC::Address::List::Iterator it = mTypeCombo->selectedElement(); + TDEABC::Address::List::Iterator it = mTypeCombo->selectedElement(); bool block = signalsBlocked(); blockSignals( true ); @@ -219,10 +219,10 @@ void AddressEditWidget::updateAddressEdit() mAddressField->setText( "" ); if ( it != mAddressList.end() ) { - KABC::Address a = *it; + TDEABC::Address a = *it; if ( !a.isEmpty() ) { #if TDE_VERSION >= 319 - if ( a.type() & KABC::Address::Work && mAddressee.realName() != mAddressee.organization() ) { + if ( a.type() & TDEABC::Address::Work && mAddressee.realName() != mAddressee.organization() ) { mAddressField->setText( a.formattedAddress( mAddressee.realName(), mAddressee.organization() ) ); } else { @@ -256,7 +256,7 @@ void AddressEditWidget::updateAddressEdit() blockSignals( block ); } -AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, +AddressEditDialog::AddressEditDialog( const TDEABC::Address::List &list, int selected, TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "street/postal", "Edit Address" ), Ok | Cancel, Ok, @@ -273,7 +273,7 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, mTypeCombo = new AddressTypeCombo( mAddressList, page ); topLayout->addMultiCellWidget( mTypeCombo, 0, 0, 0, 1 ); - TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( KABC::Address::streetLabel() ), page ); + TQLabel *label = new TQLabel( i18n( "<streetLabel>:", "%1:" ).arg( TDEABC::Address::streetLabel() ), page ); label->setAlignment( TQt::AlignTop | TQt::AlignLeft ); topLayout->addWidget( label, 1, 0 ); mStreetTextEdit = new TQTextEdit( page ); @@ -284,31 +284,31 @@ AddressEditDialog::AddressEditDialog( const KABC::Address::List &list, TabPressEater *eater = new TabPressEater( TQT_TQOBJECT(this) ); mStreetTextEdit->installEventFilter( eater ); - label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( KABC::Address::postOfficeBoxLabel() ), page ); + label = new TQLabel( i18n( "<postOfficeBoxLabel>:", "%1:" ).arg( TDEABC::Address::postOfficeBoxLabel() ), page ); topLayout->addWidget( label, 2 , 0 ); mPOBoxEdit = new KLineEdit( page ); label->setBuddy( mPOBoxEdit ); topLayout->addWidget( mPOBoxEdit, 2, 1 ); - label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).arg( KABC::Address::localityLabel() ), page ); + label = new TQLabel( i18n( "<localityLabel>:", "%1:" ).arg( TDEABC::Address::localityLabel() ), page ); topLayout->addWidget( label, 3, 0 ); mLocalityEdit = new KLineEdit( page ); label->setBuddy( mLocalityEdit ); topLayout->addWidget( mLocalityEdit, 3, 1 ); - label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).arg( KABC::Address::regionLabel() ), page ); + label = new TQLabel( i18n( "<regionLabel>:", "%1:" ).arg( TDEABC::Address::regionLabel() ), page ); topLayout->addWidget( label, 4, 0 ); mRegionEdit = new KLineEdit( page ); label->setBuddy( mRegionEdit ); topLayout->addWidget( mRegionEdit, 4, 1 ); - label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( KABC::Address::postalCodeLabel() ), page ); + label = new TQLabel( i18n( "<postalCodeLabel>:", "%1:" ).arg( TDEABC::Address::postalCodeLabel() ), page ); topLayout->addWidget( label, 5, 0 ); mPostalCodeEdit = new KLineEdit( page ); label->setBuddy( mPostalCodeEdit ); topLayout->addWidget( mPostalCodeEdit, 5, 1 ); - label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).arg( KABC::Address::countryLabel() ), page ); + label = new TQLabel( i18n( "<countryLabel>:", "%1:" ).arg( TDEABC::Address::countryLabel() ), page ); topLayout->addWidget( label, 6, 0 ); mCountryCombo = new KComboBox( page ); mCountryCombo->setEditable( true ); @@ -371,7 +371,7 @@ AddressEditDialog::~AddressEditDialog() { } -KABC::Address::List AddressEditDialog::addresses() +TDEABC::Address::List AddressEditDialog::addresses() { saveAddress( *(mTypeCombo->selectedElement()) ); @@ -403,7 +403,7 @@ void AddressEditDialog::addAddress() void AddressEditDialog::removeAddress() { if ( mAddressList.count() > 0 ) { - KABC::Address::List::Iterator it = mTypeCombo->selectedElement(); + TDEABC::Address::List::Iterator it = mTypeCombo->selectedElement(); if ( mPreviousAddress && mPreviousAddress->id() == (*it).id() ) mPreviousAddress = 0; @@ -421,7 +421,7 @@ void AddressEditDialog::removeAddress() void AddressEditDialog::changeType() { - KABC::Address::List::Iterator a = mTypeCombo->selectedElement(); + TDEABC::Address::List::Iterator a = mTypeCombo->selectedElement(); AddressTypeDialog dlg( (*a).type(), this ); if ( dlg.exec() ) { @@ -437,8 +437,8 @@ void AddressEditDialog::editLabel() { #if KDE_IS_VERSION(3,3,0) bool ok = false; - TQString result = KInputDialog::getMultiLineText( KABC::Address::labelLabel(), - KABC::Address::labelLabel(), + TQString result = KInputDialog::getMultiLineText( TDEABC::Address::labelLabel(), + TDEABC::Address::labelLabel(), mLabel, &ok, this ); if ( ok ) { mLabel = result; @@ -452,8 +452,8 @@ void AddressEditDialog::updateAddressEdits() if ( mPreviousAddress ) saveAddress( *mPreviousAddress ); - KABC::Address::List::Iterator it = mTypeCombo->selectedElement(); - KABC::Address a = *it; + TDEABC::Address::List::Iterator it = mTypeCombo->selectedElement(); + TDEABC::Address a = *it; mPreviousAddress = &(*it); bool tmp = mChanged; @@ -466,7 +466,7 @@ void AddressEditDialog::updateAddressEdits() mCountryCombo->setCurrentText( a.country() ); mLabel = a.label(); - mPreferredCheckBox->setChecked( a.type() & KABC::Address::Pref ); + mPreferredCheckBox->setChecked( a.type() & TDEABC::Address::Pref ); if ( a.isEmpty() ) mCountryCombo->setCurrentText( TDEGlobal::locale()->twoAlphaToCountryName( TDEGlobal::locale()->country() ) ); @@ -481,7 +481,7 @@ void AddressEditDialog::modified() mChanged = true; } -void AddressEditDialog::saveAddress( KABC::Address &addr ) +void AddressEditDialog::saveAddress( TDEABC::Address &addr ) { addr.setLocality( mLocalityEdit->text() ); addr.setRegion( mRegionEdit->text() ); @@ -493,13 +493,13 @@ void AddressEditDialog::saveAddress( KABC::Address &addr ) if ( mPreferredCheckBox->isChecked() ) { - KABC::Address::List::Iterator it; + TDEABC::Address::List::Iterator it; for ( it = mAddressList.begin(); it != mAddressList.end(); ++it ) - (*it).setType( (*it).type() & ~( KABC::Address::Pref ) ); + (*it).setType( (*it).type() & ~( TDEABC::Address::Pref ) ); - addr.setType( addr.type() | KABC::Address::Pref ); + addr.setType( addr.type() | TDEABC::Address::Pref ); } else - addr.setType( addr.type() & ~( KABC::Address::Pref ) ); + addr.setType( addr.type() & ~( TDEABC::Address::Pref ) ); } void AddressEditDialog::fillCountryCombo() @@ -609,12 +609,12 @@ AddressTypeDialog::AddressTypeDialog( int type, TQWidget *parent ) mGroup = new TQButtonGroup( 2, Qt::Horizontal, i18n( "street/postal", "Address Types" ), page ); layout->addWidget( mGroup ); - mTypeList = KABC::Address::typeList(); - mTypeList.remove( KABC::Address::Pref ); + mTypeList = TDEABC::Address::typeList(); + mTypeList.remove( TDEABC::Address::Pref ); - KABC::Address::TypeList::ConstIterator it; + TDEABC::Address::TypeList::ConstIterator it; for ( it = mTypeList.begin(); it != mTypeList.end(); ++it ) - new TQCheckBox( KABC::Address::typeLabel( *it ), mGroup ); + new TQCheckBox( TDEABC::Address::typeLabel( *it ), mGroup ); for ( int i = 0; i < mGroup->count(); ++i ) { TQCheckBox *box = (TQCheckBox*)mGroup->find( i ); diff --git a/kaddressbook/addresseditwidget.h b/kaddressbook/addresseditwidget.h index 5d863573c..e52e5960e 100644 --- a/kaddressbook/addresseditwidget.h +++ b/kaddressbook/addresseditwidget.h @@ -44,7 +44,7 @@ class KComboBox; class KLineEdit; class TDEListView; -typedef TypeCombo<KABC::Address> AddressTypeCombo; +typedef TypeCombo<TDEABC::Address> AddressTypeCombo; /** Editor widget for addresses. @@ -58,13 +58,13 @@ class AddressEditWidget : public TQWidget AddressEditWidget( TQWidget *parent, const char *name = 0 ); ~AddressEditWidget(); - KABC::Address::List addresses(); - void setAddresses( const KABC::Addressee &addr, - const KABC::Address::List &list ); - void updateAddressee( const KABC::Addressee &addr ); + TDEABC::Address::List addresses(); + void setAddresses( const TDEABC::Addressee &addr, + const TDEABC::Address::List &list ); + void updateAddressee( const TDEABC::Addressee &addr ); - void updateTypeCombo( const KABC::Address::List&, KComboBox* ); - KABC::Address currentAddress( KComboBox*, int ); + void updateTypeCombo( const TDEABC::Address::List&, KComboBox* ); + TDEABC::Address currentAddress( KComboBox*, int ); void setReadOnly( bool readOnly ); @@ -82,8 +82,8 @@ class AddressEditWidget : public TQWidget TQPushButton *mEditButton; KActiveLabel *mAddressField; - KABC::Address::List mAddressList; - KABC::Addressee mAddressee; + TDEABC::Address::List mAddressList; + TDEABC::Addressee mAddressee; int mIndex; }; @@ -96,11 +96,11 @@ class AddressEditDialog : public KDialogBase public: - AddressEditDialog( const KABC::Address::List &list, int selected, + AddressEditDialog( const TDEABC::Address::List &list, int selected, TQWidget *parent, const char *name = 0 ); ~AddressEditDialog(); - KABC::Address::List addresses(); + TDEABC::Address::List addresses(); bool changed() const; protected slots: @@ -113,7 +113,7 @@ class AddressEditDialog : public KDialogBase void modified(); private: - void saveAddress( KABC::Address &addr ); + void saveAddress( TDEABC::Address &addr ); void fillCountryCombo(); TQStringList sortLocaleAware( const TQStringList& ); @@ -129,8 +129,8 @@ class AddressEditDialog : public KDialogBase TQPushButton *mRemoveButton; TQPushButton *mChangeTypeButton; - KABC::Address::List mAddressList; - KABC::Address *mPreviousAddress; + TDEABC::Address::List mAddressList; + TDEABC::Address *mPreviousAddress; bool mChanged; TQString mLabel; @@ -150,7 +150,7 @@ class AddressTypeDialog : public KDialogBase private: TQButtonGroup *mGroup; - KABC::Address::TypeList mTypeList; + TDEABC::Address::TypeList mTypeList; }; #endif diff --git a/kaddressbook/addresseeconfig.cpp b/kaddressbook/addresseeconfig.cpp index 81f5ceef5..9afda1b2e 100644 --- a/kaddressbook/addresseeconfig.cpp +++ b/kaddressbook/addresseeconfig.cpp @@ -24,7 +24,7 @@ #include "addresseeconfig.h" #include "kabprefs.h" -using namespace KABC; +using namespace TDEABC; AddresseeConfig::AddresseeConfig() { diff --git a/kaddressbook/addresseeconfig.h b/kaddressbook/addresseeconfig.h index 025663fdd..28056dc5a 100644 --- a/kaddressbook/addresseeconfig.h +++ b/kaddressbook/addresseeconfig.h @@ -27,7 +27,7 @@ #include <tdeabc/addressee.h> #include <tdeconfig.h> -using namespace KABC; +using namespace TDEABC; class AddresseeConfig { diff --git a/kaddressbook/addresseeeditorbase.h b/kaddressbook/addresseeeditorbase.h index d9124609b..036e47e36 100644 --- a/kaddressbook/addresseeeditorbase.h +++ b/kaddressbook/addresseeeditorbase.h @@ -41,8 +41,8 @@ class AddresseeEditorBase : public TQWidget ~AddresseeEditorBase() {} - virtual void setAddressee( const KABC::Addressee& ) = 0; - virtual const KABC::Addressee &addressee() = 0; + virtual void setAddressee( const TDEABC::Addressee& ) = 0; + virtual const TDEABC::Addressee &addressee() = 0; virtual void setInitialFocus() = 0; diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp index e53b57218..77d7bcbed 100644 --- a/kaddressbook/addresseeeditordialog.cpp +++ b/kaddressbook/addresseeeditordialog.cpp @@ -77,7 +77,7 @@ AddresseeEditorDialog::~AddresseeEditorDialog() emit editorDestroyed( mEditorWidget->addressee().uid() ); } -void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr ) +void AddresseeEditorDialog::setAddressee( const TDEABC::Addressee &addr ) { enableButton( KDialogBase::Apply, false ); @@ -87,7 +87,7 @@ void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr ) mEditorWidget->setInitialFocus(); } -KABC::Addressee AddresseeEditorDialog::addressee() +TDEABC::Addressee AddresseeEditorDialog::addressee() { return mEditorWidget->addressee(); } @@ -129,7 +129,7 @@ void AddresseeEditorDialog::slotOk() void AddresseeEditorDialog::widgetModified() { - const KABC::Addressee addressee = mEditorWidget->addressee(); + const TDEABC::Addressee addressee = mEditorWidget->addressee(); if ( !addressee.isEmpty() ) setTitle( addressee ); @@ -144,7 +144,7 @@ void AddresseeEditorDialog::slotCancel() delayedDestruct(); } -void AddresseeEditorDialog::setTitle( const KABC::Addressee &addr ) +void AddresseeEditorDialog::setTitle( const TDEABC::Addressee &addr ) { if ( !addr.realName().isEmpty() ) setCaption( i18n( "Edit Contact '%1'" ).arg( addr.realName() ) ); diff --git a/kaddressbook/addresseeeditordialog.h b/kaddressbook/addresseeeditordialog.h index 9e53580b3..bfdb3ca9d 100644 --- a/kaddressbook/addresseeeditordialog.h +++ b/kaddressbook/addresseeeditordialog.h @@ -42,13 +42,13 @@ class AddresseeEditorDialog : public KDialogBase TQWidget *parent, const char *name = 0 ); ~AddresseeEditorDialog(); - void setAddressee( const KABC::Addressee& ); - KABC::Addressee addressee(); + void setAddressee( const TDEABC::Addressee& ); + TDEABC::Addressee addressee(); bool dirty(); signals: - void contactModified( const KABC::Addressee& ); + void contactModified( const TDEABC::Addressee& ); void editorDestroyed( const TQString& ); protected slots: @@ -58,7 +58,7 @@ class AddresseeEditorDialog : public KDialogBase void widgetModified(); private: - virtual void setTitle( const KABC::Addressee& ); + virtual void setTitle( const TDEABC::Addressee& ); AddresseeEditorBase *mEditorWidget; }; diff --git a/kaddressbook/addresseeeditorextension.cpp b/kaddressbook/addresseeeditorextension.cpp index 9b9aceac4..5ff8a3f13 100644 --- a/kaddressbook/addresseeeditorextension.cpp +++ b/kaddressbook/addresseeeditorextension.cpp @@ -52,8 +52,8 @@ AddresseeEditorExtension::~AddresseeEditorExtension() void AddresseeEditorExtension::contactsSelectionChanged() { - const KABC::Addressee::List selectedAddressees = selectedContacts(); - KABC::Addressee::List modifiedAddress; + const TDEABC::Addressee::List selectedAddressees = selectedContacts(); + TDEABC::Addressee::List modifiedAddress; if ( mAddresseeEditor->dirty() ) { mAddresseeEditor->save(); addressees.append( mAddresseeEditor->addressee() ); diff --git a/kaddressbook/addresseeeditorextension.h b/kaddressbook/addresseeeditorextension.h index 5d152ca2f..949fe0b62 100644 --- a/kaddressbook/addresseeeditorextension.h +++ b/kaddressbook/addresseeeditorextension.h @@ -56,7 +56,7 @@ class AddresseeEditorExtension : public KAB::ExtensionWidget private: AddresseeEditorBase *mAddresseeEditor; bool mDirty; - KABC::Addressee::List addressees; + TDEABC::Addressee::List addressees; }; #endif diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp index 357de392a..a39101b48 100644 --- a/kaddressbook/addresseeeditorwidget.cpp +++ b/kaddressbook/addresseeeditorwidget.cpp @@ -88,14 +88,14 @@ AddresseeEditorWidget::~AddresseeEditorWidget() kdDebug(5720) << "~AddresseeEditorWidget()" << endl; } -void AddresseeEditorWidget::setAddressee( const KABC::Addressee &addr ) +void AddresseeEditorWidget::setAddressee( const TDEABC::Addressee &addr ) { if ( mAddressee.uid() == addr.uid() ) return; mAddressee = addr; bool readOnly = false; - if ( KABC::Resource *res = addr.resource() ) { + if ( TDEABC::Resource *res = addr.resource() ) { if ( res->readOnly() ) { readOnly = true; @@ -113,7 +113,7 @@ void AddresseeEditorWidget::setAddressee( const KABC::Addressee &addr ) load(); } -const KABC::Addressee &AddresseeEditorWidget::addressee() +const TDEABC::Addressee &AddresseeEditorWidget::addressee() { return mAddressee; } @@ -181,7 +181,7 @@ void AddresseeEditorWidget::setupTab1() layout->addWidget( button, 0, 1 ); layout->addWidget( mNameEdit, 0, 2 ); layout->addWidget( mNameLabel, 0, 2 ); - label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( KABC::Addressee::roleLabel() ), tab1 ); + label = new TQLabel( i18n( "<roleLabel>:", "%1:" ).arg( TDEABC::Addressee::roleLabel() ), tab1 ); mRoleEdit = new KLineEdit( tab1 ); connect( mRoleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); @@ -190,7 +190,7 @@ void AddresseeEditorWidget::setupTab1() layout->addWidget( mRoleEdit, 1, 2 ); // Organization - label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( KABC::Addressee::organizationLabel() ), tab1 ); + label = new TQLabel( i18n( "<organizationLabel>:", "%1:" ).arg( TDEABC::Addressee::organizationLabel() ), tab1 ); mOrgEdit = new KLineEdit( tab1 ); label->setBuddy( mOrgEdit ); connect( mOrgEdit, TQT_SIGNAL( textChanged( const TQString& ) ), @@ -256,7 +256,7 @@ void AddresseeEditorWidget::setupTab1() TDEIcon::SizeMedium ) ); homePageLayout->addWidget( label ); - label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( KABC::Addressee::urlLabel() ), tab1 ); + label = new TQLabel( i18n( "<urlLabel>:", "%1:" ).arg( TDEABC::Addressee::urlLabel() ), tab1 ); mURLEdit = new KLineEdit( tab1 ); connect( mURLEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( textChanged( const TQString& ) ) ); @@ -369,7 +369,7 @@ void AddresseeEditorWidget::setupTab2() label->setBuddy( mAssistantEdit ); layout->addMultiCellWidget( mAssistantEdit, 1, 1, 4, 5 ); - label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( KABC::Addressee::titleLabel() ), tab2 ); + label = new TQLabel( i18n( "<titleLabel>:", "%1:" ).arg( TDEABC::Addressee::titleLabel() ), tab2 ); layout->addWidget( label, 2, 3 ); mTitleEdit = new KLineEdit( tab2 ); connect( mTitleEdit, TQT_SIGNAL( textChanged( const TQString& ) ), @@ -468,7 +468,7 @@ void AddresseeEditorWidget::setupAdditionalTabs() } KAB::ContactEditorWidget *widget - = manager->factory( i )->createWidget( KABC::StdAddressBook::self( true ), + = manager->factory( i )->createWidget( TDEABC::StdAddressBook::self( true ), page ); if ( widget ) page->addWidget( widget ); @@ -490,7 +490,7 @@ void AddresseeEditorWidget::setupCustomFieldsTabs() continue; ContactEditorTabPage *page = new ContactEditorTabPage( mTabWidget ); - AdvancedCustomFields *wdg = new AdvancedCustomFields( *it, KABC::StdAddressBook::self( true ), page ); + AdvancedCustomFields *wdg = new AdvancedCustomFields( *it, TDEABC::StdAddressBook::self( true ), page ); if ( wdg ) { mTabPages.insert( wdg->pageIdentifier(), page ); mTabWidget->addTab( page, wdg->pageTitle() ); @@ -662,8 +662,8 @@ void AddresseeEditorWidget::save() mAddressee.setEmails( mEmailWidget->emails() ); // Save the phone numbers - KABC::PhoneNumber::List phoneNumbers; - KABC::PhoneNumber::List::ConstIterator phoneIter; + TDEABC::PhoneNumber::List phoneNumbers; + TDEABC::PhoneNumber::List::ConstIterator phoneIter; phoneNumbers = mAddressee.phoneNumbers(); for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end(); ++phoneIter ) @@ -675,8 +675,8 @@ void AddresseeEditorWidget::save() mAddressee.insertPhoneNumber( *phoneIter ); // Save the addresses - KABC::Address::List addresses; - KABC::Address::List::ConstIterator addressIter; + TDEABC::Address::List addresses; + TDEABC::Address::List::ConstIterator addressIter; addresses = mAddressee.addresses(); for ( addressIter = addresses.begin(); addressIter != addresses.end(); ++addressIter ) @@ -741,7 +741,7 @@ void AddresseeEditorWidget::organizationTextChanged( const TQString &text ) void AddresseeEditorWidget::nameBoxChanged() { - KABC::Addressee addr; + TDEABC::Addressee addr; AddresseeConfig config( mAddressee ); if ( config.automaticNameParsing() ) { addr.setNameFromString( mNameEdit->text() ); diff --git a/kaddressbook/addresseeeditorwidget.h b/kaddressbook/addresseeeditorwidget.h index 30dcad3f5..918070bb5 100644 --- a/kaddressbook/addresseeeditorwidget.h +++ b/kaddressbook/addresseeeditorwidget.h @@ -61,7 +61,7 @@ class CategorySelectDialog; class CategoryEditDialog; } -namespace KABC { class AddressBook; } +namespace TDEABC { class AddressBook; } class AddresseeEditorWidget : public AddresseeEditorBase { @@ -72,8 +72,8 @@ class AddresseeEditorWidget : public AddresseeEditorBase AddresseeEditorWidget( TQWidget *parent, const char *name = 0 ); ~AddresseeEditorWidget(); - void setAddressee( const KABC::Addressee& ); - const KABC::Addressee &addressee(); + void setAddressee( const TDEABC::Addressee& ); + const TDEABC::Addressee &addressee(); void load(); void save(); @@ -122,7 +122,7 @@ class AddresseeEditorWidget : public AddresseeEditorBase void setReadOnly( bool ); - KABC::Addressee mAddressee; + TDEABC::Addressee mAddressee; int mFormattedNameType; bool mDirty; bool mBlockSignals; diff --git a/kaddressbook/addresseeutil.cpp b/kaddressbook/addresseeutil.cpp index 1368e4782..f2a925fcb 100644 --- a/kaddressbook/addresseeutil.cpp +++ b/kaddressbook/addresseeutil.cpp @@ -30,40 +30,40 @@ #include "addresseeutil.h" #if defined(KABC_VCARD_ENCODING_FIX) -TQByteArray AddresseeUtil::addresseesToClipboard( const KABC::Addressee::List &list ) +TQByteArray AddresseeUtil::addresseesToClipboard( const TDEABC::Addressee::List &list ) { - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; return converter.createVCardsRaw( list ); } -KABC::Addressee::List AddresseeUtil::clipboardToAddressees( const TQByteArray &data ) +TDEABC::Addressee::List AddresseeUtil::clipboardToAddressees( const TQByteArray &data ) { - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; return converter.parseVCardsRaw( data.data() ); } #else -TQString AddresseeUtil::addresseesToClipboard( const KABC::Addressee::List &list ) +TQString AddresseeUtil::addresseesToClipboard( const TDEABC::Addressee::List &list ) { - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; return converter.createVCards( list ); } -KABC::Addressee::List AddresseeUtil::clipboardToAddressees( const TQString &data ) +TDEABC::Addressee::List AddresseeUtil::clipboardToAddressees( const TQString &data ) { - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; return converter.parseVCards( data ); } #endif -TQString AddresseeUtil::addresseesToEmails( const KABC::Addressee::List &addrList ) +TQString AddresseeUtil::addresseesToEmails( const TDEABC::Addressee::List &addrList ) { TQStringList emails; - KABC::Addressee::List::ConstIterator it; + TDEABC::Addressee::List::ConstIterator it; for ( it = addrList.begin(); it != addrList.end(); ++it ) emails.append( (*it).fullEmail() ); diff --git a/kaddressbook/addresseeutil.h b/kaddressbook/addresseeutil.h index ed84512ff..0b68069be 100644 --- a/kaddressbook/addresseeutil.h +++ b/kaddressbook/addresseeutil.h @@ -36,19 +36,19 @@ NOTE: Currently these methods are not implemented properly. The vCard parser in KABC needs to be updated and there is no way to get from - KABC::Addressee to vCard. + TDEABC::Addressee to vCard. */ class AddresseeUtil { public: /** - Same as above function, except that an entire list of KABC::Addressee + Same as above function, except that an entire list of TDEABC::Addressee objects will be converted to vCard and put in the string. */ #if defined(KABC_VCARD_ENCODING_FIX) - static TQByteArray addresseesToClipboard( const KABC::Addressee::List &addrList ); + static TQByteArray addresseesToClipboard( const TDEABC::Addressee::List &addrList ); #else - static TQString addresseesToClipboard( const KABC::Addressee::List &addrList ); + static TQString addresseesToClipboard( const TDEABC::Addressee::List &addrList ); #endif /** @@ -57,15 +57,15 @@ class AddresseeUtil will be returned. */ #if defined(KABC_VCARD_ENCODING_FIX) - static KABC::Addressee::List clipboardToAddressees( const TQByteArray &clipboard ); + static TDEABC::Addressee::List clipboardToAddressees( const TQByteArray &clipboard ); #else - static KABC::Addressee::List clipboardToAddressees( const TQString &clipboard ); + static TDEABC::Addressee::List clipboardToAddressees( const TQString &clipboard ); #endif /** Converts the list of addressee objects into a list of email addresses. */ - static TQString addresseesToEmails( const KABC::Addressee::List &addrList ); + static TQString addresseesToEmails( const TDEABC::Addressee::List &addrList ); private: AddresseeUtil() {} diff --git a/kaddressbook/advancedcustomfields.cpp b/kaddressbook/advancedcustomfields.cpp index 6af325236..d5b534791 100644 --- a/kaddressbook/advancedcustomfields.cpp +++ b/kaddressbook/advancedcustomfields.cpp @@ -48,7 +48,7 @@ class KABCStorage : public KPIM::DesignerFields::Storage { public: - KABCStorage( KABC::Addressee *a, const TQString &ns ) + KABCStorage( TDEABC::Addressee *a, const TQString &ns ) : mAddressee( a ), mNs( ns ) { } @@ -79,19 +79,19 @@ class KABCStorage : public KPIM::DesignerFields::Storage } private: - KABC::Addressee *mAddressee; + TDEABC::Addressee *mAddressee; TQString mNs; }; -AdvancedCustomFields::AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab, +AdvancedCustomFields::AdvancedCustomFields( const TQString &uiFile, TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ) { initGUI( uiFile ); } -void AdvancedCustomFields::loadContact( KABC::Addressee *addr ) +void AdvancedCustomFields::loadContact( TDEABC::Addressee *addr ) { TQString ns; if ( mFields->identifier().upper() == "KADDRESSBOOK" || @@ -105,7 +105,7 @@ void AdvancedCustomFields::loadContact( KABC::Addressee *addr ) mFields->load( &storage ); } -void AdvancedCustomFields::storeContact( KABC::Addressee *addr ) +void AdvancedCustomFields::storeContact( TDEABC::Addressee *addr ) { TQString ns; if ( mFields->identifier().upper() == "KADDRESSBOOK" || diff --git a/kaddressbook/advancedcustomfields.h b/kaddressbook/advancedcustomfields.h index 7e36faa31..5d4b27584 100644 --- a/kaddressbook/advancedcustomfields.h +++ b/kaddressbook/advancedcustomfields.h @@ -42,11 +42,11 @@ class AdvancedCustomFields : public KAB::ContactEditorWidget public: - AdvancedCustomFields( const TQString &uiFile, KABC::AddressBook *ab, + AdvancedCustomFields( const TQString &uiFile, TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); - void loadContact( KABC::Addressee *addr ); - void storeContact( KABC::Addressee *addr ); + void loadContact( TDEABC::Addressee *addr ); + void storeContact( TDEABC::Addressee *addr ); void setReadOnly( bool readOnly ); TQString pageIdentifier() const; diff --git a/kaddressbook/common/filter.cpp b/kaddressbook/common/filter.cpp index e312fbcdc..9b7464307 100644 --- a/kaddressbook/common/filter.cpp +++ b/kaddressbook/common/filter.cpp @@ -61,9 +61,9 @@ bool Filter::isInternal() const return mInternal; } -void Filter::apply( KABC::Addressee::List &addresseeList ) +void Filter::apply( TDEABC::Addressee::List &addresseeList ) { - KABC::Addressee::List::Iterator iter; + TDEABC::Addressee::List::Iterator iter; for ( iter = addresseeList.begin(); iter != addresseeList.end(); ) { if ( filterAddressee( *iter ) ) ++iter; @@ -72,7 +72,7 @@ void Filter::apply( KABC::Addressee::List &addresseeList ) } } -bool Filter::filterAddressee( const KABC::Addressee &a ) const +bool Filter::filterAddressee( const TDEABC::Addressee &a ) const { TQStringList::ConstIterator iter; iter = mCategoryList.begin(); diff --git a/kaddressbook/common/filter.h b/kaddressbook/common/filter.h index 004da6425..88ba32cc3 100644 --- a/kaddressbook/common/filter.h +++ b/kaddressbook/common/filter.h @@ -69,7 +69,7 @@ class Filter If the MatchRule is NotMatch, then all the addressees matching the filter will be removed from the list. */ - void apply( KABC::Addressee::List &addresseeList ); + void apply( TDEABC::Addressee::List &addresseeList ); /** Apply the filter to the addressee. @@ -77,7 +77,7 @@ class Filter @return True if the addressee passes the criteria, false otherwise. The return values are opposite if the MatchRule is NotMatch. */ - bool filterAddressee( const KABC::Addressee &a ) const; + bool filterAddressee( const TDEABC::Addressee &a ) const; /** Enable or disable the filter diff --git a/kaddressbook/common/locationmap.cpp b/kaddressbook/common/locationmap.cpp index d4c5cb2d6..0f6bcdb86 100644 --- a/kaddressbook/common/locationmap.cpp +++ b/kaddressbook/common/locationmap.cpp @@ -52,7 +52,7 @@ LocationMap *LocationMap::instance() return mSelf; } -void LocationMap::showAddress( const KABC::Address &addr ) +void LocationMap::showAddress( const TDEABC::Address &addr ) { KURL url( createUrl( addr ) ); if ( url.isEmpty() ) @@ -61,7 +61,7 @@ void LocationMap::showAddress( const KABC::Address &addr ) kapp->invokeBrowser( url.url() ); } -TQString LocationMap::createUrl( const KABC::Address &addr ) +TQString LocationMap::createUrl( const TDEABC::Address &addr ) { /** This method makes substitutions for the following place holders: diff --git a/kaddressbook/common/locationmap.h b/kaddressbook/common/locationmap.h index a5a53426d..be625f579 100644 --- a/kaddressbook/common/locationmap.h +++ b/kaddressbook/common/locationmap.h @@ -38,13 +38,13 @@ class LocationMap : public TQObject ~LocationMap(); public slots: - void showAddress( const KABC::Address& ); + void showAddress( const TDEABC::Address& ); protected: LocationMap(); private: - TQString createUrl( const KABC::Address& ); + TQString createUrl( const TDEABC::Address& ); static LocationMap *mSelf; }; diff --git a/kaddressbook/contacteditorwidgetmanager.cpp b/kaddressbook/contacteditorwidgetmanager.cpp index cc6bc51da..a88a95545 100644 --- a/kaddressbook/contacteditorwidgetmanager.cpp +++ b/kaddressbook/contacteditorwidgetmanager.cpp @@ -136,7 +136,7 @@ void ContactEditorTabPage::addWidget( KAB::ContactEditorWidget *widget ) connect( widget, TQT_SIGNAL( changed() ), TQT_SIGNAL( changed() ) ); } -void ContactEditorTabPage::loadContact( KABC::Addressee *addr ) +void ContactEditorTabPage::loadContact( TDEABC::Addressee *addr ) { KAB::ContactEditorWidget::List::Iterator it; for ( it = mWidgets.begin(); it != mWidgets.end(); ++it ) { @@ -145,7 +145,7 @@ void ContactEditorTabPage::loadContact( KABC::Addressee *addr ) } } -void ContactEditorTabPage::storeContact( KABC::Addressee *addr ) +void ContactEditorTabPage::storeContact( TDEABC::Addressee *addr ) { KAB::ContactEditorWidget::List::Iterator it; for ( it = mWidgets.begin(); it != mWidgets.end(); ++it ) { diff --git a/kaddressbook/contacteditorwidgetmanager.h b/kaddressbook/contacteditorwidgetmanager.h index 26cf50523..27a4fc62c 100644 --- a/kaddressbook/contacteditorwidgetmanager.h +++ b/kaddressbook/contacteditorwidgetmanager.h @@ -28,7 +28,7 @@ #include "contacteditorwidget.h" -namespace KABC { +namespace TDEABC { class Addressee; } @@ -80,13 +80,13 @@ class ContactEditorTabPage : public TQWidget /** Load the contacts data into the GUI. */ - void loadContact( KABC::Addressee *addr ); + void loadContact( TDEABC::Addressee *addr ); /** Save the data from the GUI into the passed contact object. */ - void storeContact( KABC::Addressee *addr ); + void storeContact( TDEABC::Addressee *addr ); /** Sets whether the contact should be presented as diff --git a/kaddressbook/customfieldswidget.cpp b/kaddressbook/customfieldswidget.cpp index 788b43915..b267eddc9 100644 --- a/kaddressbook/customfieldswidget.cpp +++ b/kaddressbook/customfieldswidget.cpp @@ -249,7 +249,7 @@ void FieldWidget::clearFields() } } -void FieldWidget::loadContact( KABC::Addressee *addr ) +void FieldWidget::loadContact( TDEABC::Addressee *addr ) { const TQStringList customs = addr->customs(); @@ -316,7 +316,7 @@ void FieldWidget::setReadOnly( bool readOnly ) } } -void FieldWidget::storeContact( KABC::Addressee *addr ) +void FieldWidget::storeContact( TDEABC::Addressee *addr ) { FieldRecordList::ConstIterator it; for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) { @@ -376,7 +376,7 @@ void FieldWidget::recalculateLayout() (*it).mLabel->setMinimumWidth( maxWidth ); } -CustomFieldsWidget::CustomFieldsWidget( KABC::AddressBook *ab, +CustomFieldsWidget::CustomFieldsWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ) { @@ -388,7 +388,7 @@ CustomFieldsWidget::CustomFieldsWidget( KABC::AddressBook *ab, connect( mFieldWidget, TQT_SIGNAL( changed() ), this, TQT_SLOT( setModified() ) ); } -void CustomFieldsWidget::loadContact( KABC::Addressee *addr ) +void CustomFieldsWidget::loadContact( TDEABC::Addressee *addr ) { mAddressee = *addr; @@ -408,7 +408,7 @@ void CustomFieldsWidget::loadContact( KABC::Addressee *addr ) mFieldWidget->loadContact( addr ); } -void CustomFieldsWidget::storeContact( KABC::Addressee *addr ) +void CustomFieldsWidget::storeContact( TDEABC::Addressee *addr ) { mFieldWidget->storeContact( addr ); } diff --git a/kaddressbook/customfieldswidget.h b/kaddressbook/customfieldswidget.h index ac44521a2..e584833a3 100644 --- a/kaddressbook/customfieldswidget.h +++ b/kaddressbook/customfieldswidget.h @@ -96,8 +96,8 @@ class FieldWidget : public TQWidget void removeField( const TQString &identifier ); - void loadContact( KABC::Addressee *addr ); - void storeContact( KABC::Addressee *addr ); + void loadContact( TDEABC::Addressee *addr ); + void storeContact( TDEABC::Addressee *addr ); void setReadOnly( bool readOnly ); FieldRecordList fields() const { return mFieldList; } @@ -124,10 +124,10 @@ class CustomFieldsWidget : public KAB::ContactEditorWidget public: - CustomFieldsWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + CustomFieldsWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); - void loadContact( KABC::Addressee *addr ); - void storeContact( KABC::Addressee *addr ); + void loadContact( TDEABC::Addressee *addr ); + void storeContact( TDEABC::Addressee *addr ); void setReadOnly( bool readOnly ); private slots: @@ -145,13 +145,13 @@ class CustomFieldsWidget : public KAB::ContactEditorWidget FieldWidget *mFieldWidget; - KABC::Addressee mAddressee; + TDEABC::Addressee mAddressee; }; class CustomFieldsWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) { return new CustomFieldsWidget( ab, parent, name ); } diff --git a/kaddressbook/distributionlisteditor.cpp b/kaddressbook/distributionlisteditor.cpp index 485a36278..3f7b73531 100644 --- a/kaddressbook/distributionlisteditor.cpp +++ b/kaddressbook/distributionlisteditor.cpp @@ -49,7 +49,7 @@ class KPIM::DistributionListEditor::EditorWidgetPrivate public: TQScrollView* scrollView; TQSignalMapper* mapper; - KABC::AddressBook* addressBook; + TDEABC::AddressBook* addressBook; TQString distListUid; TQLabel* nameLabel; TQLabel* memberListLabel; @@ -57,14 +57,14 @@ public: TQWidget* memberListWidget; TQVBoxLayout* addresseeLayout; TQValueList<KPIM::DistributionListEditor::Line*> addressees; - TQGuardedPtr<KABC::Resource> resource; + TQGuardedPtr<TDEABC::Resource> resource; KPIM::DistributionList distributionList; KPIM::DistributionListEditor::Line* addLineForEntry( const KPIM::DistributionList::Entry& entry ); int lastLineId; }; -KPIM::DistributionListEditor::Line::Line( KABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book ) +KPIM::DistributionListEditor::Line::Line( TDEABC::AddressBook* book, TQWidget* parent ) : TQWidget( parent ), m_addressBook( book ) { Q_ASSERT( m_addressBook ); TQBoxLayout* layout = new TQHBoxLayout( this ); @@ -100,12 +100,12 @@ void KPIM::DistributionListEditor::Line::setEntry( const KPIM::DistributionList: m_lineEdit->setText( m_initialText ); } -KABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQString& name, const TQString& email ) const +TDEABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQString& name, const TQString& email ) const { if ( name.isEmpty() && email.isEmpty() ) - return KABC::Addressee(); + return TDEABC::Addressee(); - typedef KABC::Addressee::List List; + typedef TDEABC::Addressee::List List; const List byEmail = m_addressBook->findByEmail( email ); if ( !byEmail.isEmpty() ) { @@ -118,7 +118,7 @@ KABC::Addressee KPIM::DistributionListEditor::Line::findAddressee( const TQStrin return byEmail.first(); } // no entry found, create new addressee: - KABC::Addressee addressee; + TDEABC::Addressee addressee; addressee.setUid( TDEApplication::randomString( 10 ) ); addressee.setFormattedName( name ); addressee.setEmails( email ); @@ -136,7 +136,7 @@ KPIM::DistributionList::Entry KPIM::DistributionListEditor::Line::entry() const KPIM::DistributionList::Entry res; if ( !m_uid.isNull() ) { - const KABC::Addressee addr = m_addressBook->findByUid( m_uid ); + const TDEABC::Addressee addr = m_addressBook->findByUid( m_uid ); if ( m_initialText == text || addr.formattedName() == name ) res.addressee = addr; } @@ -153,7 +153,7 @@ KPIM::DistributionListEditor::LineEdit::LineEdit( TQWidget* parent ) : KPIM::Add } -KPIM::DistributionListEditor::EditorWidget::EditorWidget( KABC::AddressBook* book, TQWidget* parent ) +KPIM::DistributionListEditor::EditorWidget::EditorWidget( TDEABC::AddressBook* book, TQWidget* parent ) : KDialogBase( parent, /*name=*/0, /*modal=*/ true, /*caption=*/TQString(), KDialogBase::Ok|KDialogBase::Cancel ), d( new DistributionListEditor::EditorWidgetPrivate ) { d->addressBook = book; @@ -265,7 +265,7 @@ void KPIM::DistributionListEditor::EditorWidget::slotOk() return; } - KABC::Ticket *ticket = d->resource->requestSaveTicket(); + TDEABC::Ticket *ticket = d->resource->requestSaveTicket(); if ( !ticket ) { kdWarning(5720) << "Unable to get save ticket!" << endl; return; diff --git a/kaddressbook/distributionlisteditor.h b/kaddressbook/distributionlisteditor.h index 74aee7fe9..d1ec2e112 100644 --- a/kaddressbook/distributionlisteditor.h +++ b/kaddressbook/distributionlisteditor.h @@ -25,7 +25,7 @@ #include <kdialogbase.h> -namespace KABC { +namespace TDEABC { class AddressBook; } @@ -41,7 +41,7 @@ class EditorWidget : public KDialogBase Q_OBJECT public: - explicit EditorWidget( KABC::AddressBook* book, TQWidget* parent = 0 ); + explicit EditorWidget( TDEABC::AddressBook* book, TQWidget* parent = 0 ); ~EditorWidget(); void setDistributionList( const KPIM::DistributionList& list ); diff --git a/kaddressbook/distributionlisteditor_p.h b/kaddressbook/distributionlisteditor_p.h index 4bbb24369..9d3ed7552 100644 --- a/kaddressbook/distributionlisteditor_p.h +++ b/kaddressbook/distributionlisteditor_p.h @@ -31,7 +31,7 @@ class TQToolButton; -namespace KABC { +namespace TDEABC { class Addressee; class AddressBook; } @@ -53,7 +53,7 @@ class Line : public TQWidget Q_OBJECT public: - explicit Line( KABC::AddressBook* book, TQWidget* parent = 0 ); + explicit Line( TDEABC::AddressBook* book, TQWidget* parent = 0 ); void setEntry( const KPIM::DistributionList::Entry& entry ); KPIM::DistributionList::Entry entry() const; @@ -64,7 +64,7 @@ signals: void textChanged(); private: - KABC::Addressee findAddressee( const TQString& name, const TQString& email ) const; + TDEABC::Addressee findAddressee( const TQString& name, const TQString& email ) const; private slots: void textChanged( const TQString& ); @@ -74,7 +74,7 @@ private: TQString m_initialText; LineEdit* m_lineEdit; TQToolButton* m_clearButton; - KABC::AddressBook* m_addressBook; + TDEABC::AddressBook* m_addressBook; }; } // namespace DisributionListEditor diff --git a/kaddressbook/distributionlistpicker.cpp b/kaddressbook/distributionlistpicker.cpp index 3a54e6008..272a62005 100644 --- a/kaddressbook/distributionlistpicker.cpp +++ b/kaddressbook/distributionlistpicker.cpp @@ -41,7 +41,7 @@ #include <tqregexp.h> #include <tqvalidator.h> -KPIM::DistributionListPickerDialog::DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent ) : KDialogBase( parent, 0, true, TQString(), Ok | Cancel | User1 ), m_book( book ) +KPIM::DistributionListPickerDialog::DistributionListPickerDialog( TDEABC::AddressBook* book, TQWidget* parent ) : KDialogBase( parent, 0, true, TQString(), Ok | Cancel | User1 ), m_book( book ) { Q_ASSERT( m_book ); setModal( true ); diff --git a/kaddressbook/distributionlistpicker.h b/kaddressbook/distributionlistpicker.h index d38f936d7..bc4c0f650 100644 --- a/kaddressbook/distributionlistpicker.h +++ b/kaddressbook/distributionlistpicker.h @@ -29,7 +29,7 @@ class TDEListBox; -namespace KABC { +namespace TDEABC { class AddressBook; } @@ -40,7 +40,7 @@ class DistributionListPickerDialog : public KDialogBase Q_OBJECT public: - explicit DistributionListPickerDialog( KABC::AddressBook* book, TQWidget* parent = 0 ); + explicit DistributionListPickerDialog( TDEABC::AddressBook* book, TQWidget* parent = 0 ); TQString selectedDistributionList() const; void setLabelText( const TQString& text ); @@ -59,7 +59,7 @@ private slots: void entrySelected( const TQString& name ); private: - KABC::AddressBook* m_book; + TDEABC::AddressBook* m_book; TQLabel* m_label; TDEListBox* m_listBox; TQString m_selectedDistributionList; diff --git a/kaddressbook/editors/Makefile.am b/kaddressbook/editors/Makefile.am index 6c1096c02..2eeafc941 100644 --- a/kaddressbook/editors/Makefile.am +++ b/kaddressbook/editors/Makefile.am @@ -13,7 +13,7 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ libkaddrbk_cryptosettings_la_SOURCES = cryptowidget.cpp libkaddrbk_cryptosettings_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) # -no-undefined -libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) +libkaddrbk_cryptosettings_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) noinst_HEADERS = cryptowidget.h imeditorwidget.h imaddresswidget.h diff --git a/kaddressbook/editors/cryptowidget.cpp b/kaddressbook/editors/cryptowidget.cpp index 892125852..06472da7d 100644 --- a/kaddressbook/editors/cryptowidget.cpp +++ b/kaddressbook/editors/cryptowidget.cpp @@ -68,7 +68,7 @@ TQString CryptoWidgetFactory::pageIdentifier() const return "crypto"; } -CryptoWidget::CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +CryptoWidget::CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false ) { TQGridLayout *topLayout = new TQGridLayout( this, 2, 5, KDialog::marginHint(), @@ -139,7 +139,7 @@ CryptoWidget::~CryptoWidget() { } -void CryptoWidget::loadContact( KABC::Addressee *addr ) +void CryptoWidget::loadContact( TDEABC::Addressee *addr ) { bool blocked = signalsBlocked(); blockSignals( true ); @@ -167,7 +167,7 @@ void CryptoWidget::loadContact( KABC::Addressee *addr ) blockSignals( blocked ); } -void CryptoWidget::storeContact( KABC::Addressee *addr ) +void CryptoWidget::storeContact( TDEABC::Addressee *addr ) { uint cryptoFormats = 0; uint msgFormat = 1; diff --git a/kaddressbook/editors/cryptowidget.h b/kaddressbook/editors/cryptowidget.h index 288920d1a..1d8794ba4 100644 --- a/kaddressbook/editors/cryptowidget.h +++ b/kaddressbook/editors/cryptowidget.h @@ -39,11 +39,11 @@ class CryptoWidget : public KAB::ContactEditorWidget public: - CryptoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + CryptoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~CryptoWidget(); - void loadContact( KABC::Addressee *addr ); - void storeContact( KABC::Addressee *addr ); + void loadContact( TDEABC::Addressee *addr ); + void storeContact( TDEABC::Addressee *addr ); void setReadOnly( bool readOnly ); private: @@ -60,7 +60,7 @@ class CryptoWidgetFactory : public KAB::ContactEditorWidgetFactory { public: CryptoWidgetFactory(); - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) { return new CryptoWidget( ab, parent, name ); } diff --git a/kaddressbook/editors/imeditorwidget.cpp b/kaddressbook/editors/imeditorwidget.cpp index b0f1590e7..38d641c4c 100644 --- a/kaddressbook/editors/imeditorwidget.cpp +++ b/kaddressbook/editors/imeditorwidget.cpp @@ -190,7 +190,7 @@ TQValueList<KPluginInfo *> IMEditorWidget::availableProtocols() const return mProtocols; } -void IMEditorWidget::loadContact( KABC::Addressee *addr ) +void IMEditorWidget::loadContact( TDEABC::Addressee *addr ) { if ( mWidget->lvAddresses ) mWidget->lvAddresses->clear(); @@ -227,7 +227,7 @@ void IMEditorWidget::loadContact( KABC::Addressee *addr ) mWidget->lvAddresses->firstChild()->setSelected( true ); } -void IMEditorWidget::storeContact( KABC::Addressee *addr ) +void IMEditorWidget::storeContact( TDEABC::Addressee *addr ) { // for each changed protocol, write a new custom field containing the current set of // addresses diff --git a/kaddressbook/editors/imeditorwidget.h b/kaddressbook/editors/imeditorwidget.h index 517e26498..1119144ce 100644 --- a/kaddressbook/editors/imeditorwidget.h +++ b/kaddressbook/editors/imeditorwidget.h @@ -55,8 +55,8 @@ class IMEditorWidget : public KDialogBase IMEditorWidget( TQWidget *parent, const TQString &preferredIM, const char *name = 0 ); ~IMEditorWidget() {}; - void loadContact( KABC::Addressee *addr ); - void storeContact( KABC::Addressee *addr ); + void loadContact( TDEABC::Addressee *addr ); + void storeContact( TDEABC::Addressee *addr ); void setReadOnly( bool readOnly ); TQValueList<KPluginInfo *> availableProtocols() const; bool isModified() const; diff --git a/kaddressbook/extensionmanager.cpp b/kaddressbook/extensionmanager.cpp index 7275f90cf..0e88486cd 100644 --- a/kaddressbook/extensionmanager.cpp +++ b/kaddressbook/extensionmanager.cpp @@ -202,8 +202,8 @@ void ExtensionManager::createExtensionWidgets() wdg = new AddresseeEditorExtension( mCore, mDetailsStack ); wdg->hide(); - connect( wdg, TQT_SIGNAL( modified( const KABC::Addressee::List& ) ), - TQT_SIGNAL( modified( const KABC::Addressee::List& ) ) ); + connect( wdg, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ), + TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); connect( wdg, TQT_SIGNAL( deleted( const TQStringList& ) ), TQT_SIGNAL( deleted( const TQStringList& ) ) ); @@ -239,8 +239,8 @@ void ExtensionManager::createExtensionWidgets() if ( wdg->identifier() == "distribution_list_editor_ng" ) mSplitter->moveToFirst( wdg ); wdg->hide(); - connect( wdg, TQT_SIGNAL( modified( const KABC::Addressee::List& ) ), - TQT_SIGNAL( modified( const KABC::Addressee::List& ) ) ); + connect( wdg, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ), + TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ) ); connect( wdg, TQT_SIGNAL( deleted( const TQStringList& ) ), TQT_SIGNAL( deleted( const TQStringList& ) ) ); diff --git a/kaddressbook/extensionmanager.h b/kaddressbook/extensionmanager.h index b80ec01cc..fafa2e3b3 100644 --- a/kaddressbook/extensionmanager.h +++ b/kaddressbook/extensionmanager.h @@ -93,7 +93,7 @@ class ExtensionManager : public TQObject void detailsWidgetActivated( TQWidget* widget ); void detailsWidgetDeactivated( TQWidget* widget ); - void modified( const KABC::Addressee::List& ); + void modified( const TDEABC::Addressee::List& ); void deleted( const TQStringList& ); private slots: diff --git a/kaddressbook/features/Makefile.am b/kaddressbook/features/Makefile.am index c4e8c247d..bfcbd9651 100644 --- a/kaddressbook/features/Makefile.am +++ b/kaddressbook/features/Makefile.am @@ -17,16 +17,16 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ if compile_newdistrlists libkaddrbk_distributionlistng_la_SOURCES = distributionlistngwidget.cpp libkaddrbk_distributionlistng_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) +libkaddrbk_distributionlistng_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) else libkaddrbk_distributionlist_la_SOURCES = distributionlistwidget.cpp libkaddrbk_distributionlist_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) +libkaddrbk_distributionlist_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) endif libkaddrbk_resourceselection_la_SOURCES = resourceselection.cpp libkaddrbk_resourceselection_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) -ltderesources +libkaddrbk_resourceselection_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) -ltderesources noinst_HEADERS = distributionlistwidget.h distributionlistngwidget.h resourceselection.h diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp index 1d5acc09c..4a4a20a28 100644 --- a/kaddressbook/features/distributionlistngwidget.cpp +++ b/kaddressbook/features/distributionlistngwidget.cpp @@ -71,7 +71,7 @@ void KAB::DistributionListNg::ListBox::dropEvent( TQDropEvent *event ) if ( !item || index( item ) == 0 ) return; - KABC::Addressee::List list; + TDEABC::Addressee::List list; if ( !KVCardDrag::decode( event, list ) ) return; @@ -149,8 +149,8 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare mListBox = new ListBox( this ); connect( mListBox, TQT_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ), this, TQT_SLOT( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ) ); - connect( mListBox, TQT_SIGNAL( dropped( const TQString &, const KABC::Addressee::List & ) ), - this, TQT_SLOT( contactsDropped( const TQString &, const KABC::Addressee::List & ) ) ); + connect( mListBox, TQT_SIGNAL( dropped( const TQString &, const TDEABC::Addressee::List & ) ), + this, TQT_SLOT( contactsDropped( const TQString &, const TDEABC::Addressee::List & ) ) ); connect( mListBox, TQT_SIGNAL( highlighted( int ) ), this, TQT_SLOT( itemSelected( int ) ) ); connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) ); @@ -202,7 +202,7 @@ void KAB::DistributionListNg::MainWidget::deleteSelectedDistributionList() core()->deleteDistributionLists( name ); } -void KAB::DistributionListNg::MainWidget::contactsDropped( const TQString &listName, const KABC::Addressee::List &addressees ) +void KAB::DistributionListNg::MainWidget::contactsDropped( const TQString &listName, const TDEABC::Addressee::List &addressees ) { if ( addressees.isEmpty() ) return; @@ -212,7 +212,7 @@ void KAB::DistributionListNg::MainWidget::contactsDropped( const TQString &listN if ( list.isEmpty() ) // not found [should be impossible] return; - for ( KABC::Addressee::List::ConstIterator it = addressees.begin(); it != addressees.end(); ++it ) { + for ( TDEABC::Addressee::List::ConstIterator it = addressees.begin(); it != addressees.end(); ++it ) { list.insertEntry( *it ); } @@ -220,9 +220,9 @@ void KAB::DistributionListNg::MainWidget::contactsDropped( const TQString &listN changed( list ); } -void KAB::DistributionListNg::MainWidget::changed( const KABC::Addressee& dist ) +void KAB::DistributionListNg::MainWidget::changed( const TDEABC::Addressee& dist ) { - emit modified( KABC::Addressee::List() << dist ); + emit modified( TDEABC::Addressee::List() << dist ); } void KAB::DistributionListNg::MainWidget::updateEntries() diff --git a/kaddressbook/features/distributionlistngwidget.h b/kaddressbook/features/distributionlistngwidget.h index 3e5515486..c8cf84d31 100644 --- a/kaddressbook/features/distributionlistngwidget.h +++ b/kaddressbook/features/distributionlistngwidget.h @@ -37,7 +37,7 @@ class TQDropEvent; class TQPoint; class TQPushButton; -namespace KABC { +namespace TDEABC { class DistributionListManager; } @@ -53,7 +53,7 @@ public: signals: - void dropped( const TQString &listName, const KABC::Addressee::List &addressees ); + void dropped( const TQString &listName, const TDEABC::Addressee::List &addressees ); protected: //override @@ -80,7 +80,7 @@ public: private: - void changed( const KABC::Addressee& ); + void changed( const TDEABC::Addressee& ); private slots: @@ -90,7 +90,7 @@ private slots: void contextMenuRequested( TQListBoxItem *item, const TQPoint &point ); void updateEntries(); void itemSelected( int index ); - void contactsDropped( const TQString &listName, const KABC::Addressee::List &addressees ); + void contactsDropped( const TQString &listName, const TDEABC::Addressee::List &addressees ); private: ListBox *mListBox; diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp index 95bf46607..dce024a87 100644 --- a/kaddressbook/features/distributionlistwidget.cpp +++ b/kaddressbook/features/distributionlistwidget.cpp @@ -44,7 +44,7 @@ typedef KPIM::DistributionList DistributionList; #else #include <tdeabc/distributionlist.h> -typedef KABC::DistributionList DistributionList; +typedef TDEABC::DistributionList DistributionList; #endif #include <tdeabc/stdaddressbook.h> #include <tdeabc/vcardconverter.h> @@ -109,7 +109,7 @@ class DeletePressedCatcher : public TQObject class ContactItem : public TQListViewItem { public: - ContactItem( DistributionListView *parent, const KABC::Addressee &addressee, + ContactItem( DistributionListView *parent, const TDEABC::Addressee &addressee, const TQString &email = TQString() ) : TQListViewItem( parent ), mAddressee( addressee ), @@ -125,7 +125,7 @@ class ContactItem : public TQListViewItem } } - KABC::Addressee addressee() const + TDEABC::Addressee addressee() const { return mAddressee; } @@ -142,7 +142,7 @@ class ContactItem : public TQListViewItem } private: - KABC::Addressee mAddressee; + TDEABC::Addressee mAddressee; TQString mEmail; }; @@ -206,9 +206,9 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren connect( core, TQT_SIGNAL( contactsUpdated() ), this, TQT_SLOT( updateNameCombo() ) ); #else - mManager = new KABC::DistributionListManager( core->addressBook() ); + mManager = new TDEABC::DistributionListManager( core->addressBook() ); - connect( KABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ), + connect( TDEABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ), this, TQT_SLOT( updateNameCombo() ) ); #endif @@ -274,7 +274,7 @@ void DistributionListWidget::createList() return; } #ifdef TDEPIM_NEW_DISTRLISTS - KABC::Resource* resource = core()->requestResource( this ); + TDEABC::Resource* resource = core()->requestResource( this ); if ( !resource ) return; @@ -287,7 +287,7 @@ void DistributionListWidget::createList() core()->addressBook()->insertAddressee( dist ); #else - new KABC::DistributionList( mManager, newName ); + new TDEABC::DistributionList( mManager, newName ); changed(); updateNameCombo(); @@ -324,7 +324,7 @@ void DistributionListWidget::editList() changed( dist ); #else - KABC::DistributionList *list = mManager->list( oldName ); + TDEABC::DistributionList *list = mManager->list( oldName ); list->setName( newName ); mManager->save(); updateNameCombo(); @@ -377,14 +377,14 @@ void DistributionListWidget::addContact() return; } #else - KABC::DistributionList *list = mManager->list( mNameCombo->currentText() ); + TDEABC::DistributionList *list = mManager->list( mNameCombo->currentText() ); if ( !list ) return; - KABC::DistributionList& dist = *list; + TDEABC::DistributionList& dist = *list; #endif - const KABC::Addressee::List addrList = selectedContacts(); - KABC::Addressee::List::ConstIterator it; + const TDEABC::Addressee::List addrList = selectedContacts(); + TDEABC::Addressee::List::ConstIterator it; for ( it = addrList.begin(); it != addrList.end(); ++it ) dist.insertEntry( *it ); @@ -405,10 +405,10 @@ void DistributionListWidget::removeContact() if ( dist.isEmpty() ) // not found return; #else - KABC::DistributionList *list = mManager->list( mNameCombo->currentText() ); + TDEABC::DistributionList *list = mManager->list( mNameCombo->currentText() ); if ( !list ) return; - KABC::DistributionList& dist = *list; + TDEABC::DistributionList& dist = *list; #endif ContactItem *contactItem = @@ -435,10 +435,10 @@ void DistributionListWidget::changeEmail() if ( dist.isEmpty() ) // not found return; #else - KABC::DistributionList *list = mManager->list( mNameCombo->currentText() ); + TDEABC::DistributionList *list = mManager->list( mNameCombo->currentText() ); if ( !list ) return; - KABC::DistributionList& dist = *list; + TDEABC::DistributionList& dist = *list; #endif ContactItem *contactItem = @@ -475,7 +475,7 @@ void DistributionListWidget::updateContactView() core()->addressBook(), mNameCombo->currentText() ); isListSelected = !dist.isEmpty(); #else - KABC::DistributionList *list = mManager->list( mNameCombo->currentText() ); + TDEABC::DistributionList *list = mManager->list( mNameCombo->currentText() ); isListSelected = list != 0; #endif if ( !isListSelected ) { @@ -495,8 +495,8 @@ void DistributionListWidget::updateContactView() const KPIM::DistributionList::Entry::List entries = dist.entries( core()->addressBook() ); KPIM::DistributionList::Entry::List::ConstIterator it; #else - const KABC::DistributionList::Entry::List entries = list->entries(); - KABC::DistributionList::Entry::List::ConstIterator it; + const TDEABC::DistributionList::Entry::List entries = list->entries(); + TDEABC::DistributionList::Entry::List::ConstIterator it; #endif for ( it = entries.begin(); it != entries.end(); ++it, ++entryCount ) new ContactItem( mContactView, (*it).addressee, (*it).email ); @@ -535,17 +535,17 @@ void DistributionListWidget::dropEvent( TQDropEvent *e ) if ( dist.isEmpty() ) return; #else - KABC::DistributionList *list = mManager->list( mNameCombo->currentText() ); + TDEABC::DistributionList *list = mManager->list( mNameCombo->currentText() ); if ( !list ) return; - KABC::DistributionList& dist = *list; + TDEABC::DistributionList& dist = *list; #endif TQString vcards; if ( KVCardDrag::decode( e, vcards ) ) { - KABC::VCardConverter converter; - const KABC::Addressee::List lst = converter.parseVCards( vcards ); - for ( KABC::Addressee::List::ConstIterator it = lst.begin(); it != lst.end(); ++it ) + TDEABC::VCardConverter converter; + const TDEABC::Addressee::List lst = converter.parseVCards( vcards ); + for ( TDEABC::Addressee::List::ConstIterator it = lst.begin(); it != lst.end(); ++it ) dist.insertEntry( *it ); #ifdef TDEPIM_NEW_DISTRLISTS @@ -579,9 +579,9 @@ void DistributionListWidget::dropped( TQDropEvent *e, TQListViewItem* ) } #ifdef TDEPIM_NEW_DISTRLISTS -void DistributionListWidget::changed( const KABC::Addressee& dist ) +void DistributionListWidget::changed( const TDEABC::Addressee& dist ) { - emit modified( KABC::Addressee::List() << dist ); + emit modified( TDEABC::Addressee::List() << dist ); } #else void DistributionListWidget::changed() diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h index 1429aa7bc..e502dda1c 100644 --- a/kaddressbook/features/distributionlistwidget.h +++ b/kaddressbook/features/distributionlistwidget.h @@ -40,7 +40,7 @@ namespace KAB { class Core; } -namespace KABC { +namespace TDEABC { class AddressBook; class DistributionListManager; } @@ -77,7 +77,7 @@ class DistributionListWidget : public KAB::ExtensionWidget private: #ifdef TDEPIM_NEW_DISTRLISTS - void changed( const KABC::Addressee& dist ); + void changed( const TDEABC::Addressee& dist ); #else void changed(); #endif @@ -92,7 +92,7 @@ class DistributionListWidget : public KAB::ExtensionWidget DistributionListView *mContactView; #ifndef TDEPIM_NEW_DISTRLISTS - KABC::DistributionListManager *mManager; + TDEABC::DistributionListManager *mManager; #endif TQPushButton *mCreateListButton; TQPushButton *mEditListButton; diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp index 132d0bc8a..66d75b985 100644 --- a/kaddressbook/features/resourceselection.cpp +++ b/kaddressbook/features/resourceselection.cpp @@ -43,12 +43,12 @@ #include "resourceselection.h" #include <libtdepim/resourceabc.h> -class AddressBookWrapper : public KABC::AddressBook +class AddressBookWrapper : public TDEABC::AddressBook { public: - AddressBookWrapper( KABC::AddressBook* ); + AddressBookWrapper( TDEABC::AddressBook* ); - KRES::Manager<KABC::Resource>* getResourceManager() + KRES::Manager<TDEABC::Resource>* getResourceManager() { return resourceManager(); } @@ -57,7 +57,7 @@ class AddressBookWrapper : public KABC::AddressBook class ResourceItem : public TQCheckListItem { public: - ResourceItem( TDEListView *parent, KABC::Resource *resource ) + ResourceItem( TDEListView *parent, TDEABC::Resource *resource ) : TQCheckListItem( parent, resource->resourceName(), CheckBox ), mResource( resource ), mChecked( false ), mIsSubresource( false ), mSubItemsCreated( false ), @@ -88,14 +88,14 @@ class ResourceItem : public TQCheckListItem setOn(state); } bool checked() const { return mChecked; } - KABC::Resource *resource() const { return mResource; } + TDEABC::Resource *resource() const { return mResource; } TQString resourceIdentifier() const { return mResourceIdentifier; } bool isSubResource() const { return mIsSubresource; } virtual void stateChange( bool active ); private: - KABC::Resource * const mResource; + TDEABC::Resource * const mResource; bool mChecked; const bool mIsSubresource; bool mSubItemsCreated; @@ -194,7 +194,7 @@ void ResourceSelection::reloadResource() ResourceItem *item = selectedItem(); if ( !item ) return; - KABC::Resource *r = item->resource(); + TDEABC::Resource *r = item->resource(); r->load(); } @@ -203,8 +203,8 @@ void ResourceSelection::saveResource() ResourceItem *item = selectedItem(); if ( !item ) return; - KABC::Resource *r = item->resource(); - KABC::Ticket *ticket = core()->addressBook()->requestSaveTicket( r ); + TDEABC::Resource *r = item->resource(); + TDEABC::Ticket *ticket = core()->addressBook()->requestSaveTicket( r ); if ( ticket ) { r->save( ticket ); } @@ -244,7 +244,7 @@ void ResourceSelection::add() TQString type = types[ descs.findIndex( desc ) ]; // Create new resource - KABC::Resource *resource = mManager->createResource( type ); + TDEABC::Resource *resource = mManager->createResource( type ); if ( !resource ) { KMessageBox::error( this, i18n("<qt>Unable to create an address book of type <b>%1</b>.</qt>") .arg( type ) ); @@ -277,7 +277,7 @@ void ResourceSelection::edit() // view items can change during "edit", e.g. sub resources being removed -> // sub resource item removed // thus keep their data rather than their pointer - KABC::Resource *resource = item->resource(); + TDEABC::Resource *resource = item->resource(); KRES::ConfigDialog dlg( this, TQString( "contact" ), resource ); @@ -323,7 +323,7 @@ void ResourceSelection::currentChanged( TQListViewItem *item ) if ( !resItem ) return; - KABC::Resource *resource = resItem->resource(); + TDEABC::Resource *resource = resItem->resource(); if ( resItem->checked() != resItem->isOn() ) { resItem->setChecked( resItem->isOn() ); @@ -361,7 +361,7 @@ void ResourceSelection::updateView() mListView->clear(); - KRES::Manager<KABC::Resource>::Iterator it; + KRES::Manager<TDEABC::Resource>::Iterator it; for ( it = mManager->begin(); it != mManager->end(); ++it ) { ResourceItem *item = new ResourceItem( mListView, *it ); diff --git a/kaddressbook/features/resourceselection.h b/kaddressbook/features/resourceselection.h index 4c1a6df61..a627fb512 100644 --- a/kaddressbook/features/resourceselection.h +++ b/kaddressbook/features/resourceselection.h @@ -87,7 +87,7 @@ class ResourceSelection : public KAB::ExtensionWidget TQString mLastResource; - KRES::Manager<KABC::Resource> *mManager; + KRES::Manager<TDEABC::Resource> *mManager; }; #endif diff --git a/kaddressbook/freebusywidget.cpp b/kaddressbook/freebusywidget.cpp index c325ec6fb..491a94658 100644 --- a/kaddressbook/freebusywidget.cpp +++ b/kaddressbook/freebusywidget.cpp @@ -32,7 +32,7 @@ #include "freebusywidget.h" -FreeBusyWidget::FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +FreeBusyWidget::FreeBusyWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ) { TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(), @@ -53,7 +53,7 @@ FreeBusyWidget::~FreeBusyWidget() { } -void FreeBusyWidget::loadContact( KABC::Addressee *addr ) +void FreeBusyWidget::loadContact( TDEABC::Addressee *addr ) { if ( addr->preferredEmail().isEmpty() ) return; @@ -61,7 +61,7 @@ void FreeBusyWidget::loadContact( KABC::Addressee *addr ) mURL->setURL( KCal::FreeBusyUrlStore::self()->readUrl( addr->preferredEmail() ) ); } -void FreeBusyWidget::storeContact( KABC::Addressee *addr ) +void FreeBusyWidget::storeContact( TDEABC::Addressee *addr ) { if ( addr->preferredEmail().isEmpty() ) return; diff --git a/kaddressbook/freebusywidget.h b/kaddressbook/freebusywidget.h index 1a874176c..d9c9ba501 100644 --- a/kaddressbook/freebusywidget.h +++ b/kaddressbook/freebusywidget.h @@ -34,11 +34,11 @@ class FreeBusyWidget : public KAB::ContactEditorWidget public: - FreeBusyWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + FreeBusyWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~FreeBusyWidget(); - void loadContact( KABC::Addressee *addr ); - void storeContact( KABC::Addressee *addr ); + void loadContact( TDEABC::Addressee *addr ); + void storeContact( TDEABC::Addressee *addr ); void setReadOnly( bool readOnly ); @@ -51,7 +51,7 @@ class FreeBusyWidget : public KAB::ContactEditorWidget class FreeBusyWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) { return new FreeBusyWidget( ab, parent, name ); } diff --git a/kaddressbook/geowidget.cpp b/kaddressbook/geowidget.cpp index f7261bf7a..4ff19033e 100644 --- a/kaddressbook/geowidget.cpp +++ b/kaddressbook/geowidget.cpp @@ -44,7 +44,7 @@ #include "geowidget.h" -GeoWidget::GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +GeoWidget::GeoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false ) { TQLabel *label = 0; @@ -105,9 +105,9 @@ GeoWidget::~GeoWidget() { } -void GeoWidget::loadContact( KABC::Addressee *addr ) +void GeoWidget::loadContact( TDEABC::Addressee *addr ) { - KABC::Geo geo = addr->geo(); + TDEABC::Geo geo = addr->geo(); if ( geo.isValid() ) { if ( !mReadOnly ) @@ -118,9 +118,9 @@ void GeoWidget::loadContact( KABC::Addressee *addr ) mGeoIsValid->setChecked( false ); } -void GeoWidget::storeContact( KABC::Addressee *addr ) +void GeoWidget::storeContact( TDEABC::Addressee *addr ) { - KABC::Geo geo; + TDEABC::Geo geo; if ( mGeoIsValid->isChecked() ) { geo.setLatitude( mLatitudeBox->value() ); diff --git a/kaddressbook/geowidget.h b/kaddressbook/geowidget.h index 4598b49c6..9694edcce 100644 --- a/kaddressbook/geowidget.h +++ b/kaddressbook/geowidget.h @@ -28,7 +28,7 @@ #include "contacteditorwidget.h" -namespace KABC { +namespace TDEABC { class Geo; } @@ -54,11 +54,11 @@ class GeoWidget : public KAB::ContactEditorWidget public: - GeoWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + GeoWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~GeoWidget(); - void loadContact( KABC::Addressee *addr ); - void storeContact( KABC::Addressee *addr ); + void loadContact( TDEABC::Addressee *addr ); + void storeContact( TDEABC::Addressee *addr ); void setReadOnly( bool readOnly ); @@ -151,7 +151,7 @@ class GeoMapWidget : public TQWidget class GeoWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) { return new GeoWidget( ab, parent, name ); } diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index b69e90bb2..722b8dd78 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -52,9 +52,9 @@ ImageLoader::ImageLoader( TQWidget *parent ) { } -KABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok ) +TDEABC::Picture ImageLoader::loadPicture( const KURL &url, bool *ok ) { - KABC::Picture picture; + TDEABC::Picture picture; TQString tempFile; if ( url.isEmpty() ) @@ -117,13 +117,13 @@ void ImageButton::setReadOnly( bool readOnly ) mReadOnly = readOnly; } -void ImageButton::setPicture( const KABC::Picture &picture ) +void ImageButton::setPicture( const TDEABC::Picture &picture ) { mPicture = picture; updateGUI(); } -KABC::Picture ImageButton::picture() const +TDEABC::Picture ImageButton::picture() const { return mPicture; } @@ -188,7 +188,7 @@ void ImageButton::dropEvent( TQDropEvent *event ) if ( mImageLoader ) { bool ok = false; - KABC::Picture pic = mImageLoader->loadPicture( urls[ 0 ], &ok ); + TDEABC::Picture pic = mImageLoader->loadPicture( urls[ 0 ], &ok ); if ( ok ) { mPicture = pic; updateGUI(); @@ -228,7 +228,7 @@ void ImageButton::load() if ( url.isValid() ) { if ( mImageLoader ) { bool ok = false; - KABC::Picture pic = mImageLoader->loadPicture( url, &ok ); + TDEABC::Picture pic = mImageLoader->loadPicture( url, &ok ); if ( ok ) { mPicture = pic; updateGUI(); @@ -240,7 +240,7 @@ void ImageButton::load() void ImageButton::clear() { - mPicture = KABC::Picture(); + mPicture = TDEABC::Picture(); updateGUI(); emit changed(); @@ -279,40 +279,40 @@ void ImageBaseWidget::setReadOnly( bool readOnly ) mImageButton->setReadOnly( mReadOnly ); } -void ImageBaseWidget::setImage( const KABC::Picture &photo ) +void ImageBaseWidget::setImage( const TDEABC::Picture &photo ) { mImageButton->setPicture( photo ); } -KABC::Picture ImageBaseWidget::image() const +TDEABC::Picture ImageBaseWidget::image() const { return mImageButton->picture(); } -ImageWidget::ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +ImageWidget::ImageWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ) { TQHBoxLayout *layout = new TQHBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); - mPhotoWidget = new ImageBaseWidget( KABC::Addressee::photoLabel(), this ); + mPhotoWidget = new ImageBaseWidget( TDEABC::Addressee::photoLabel(), this ); layout->addWidget( mPhotoWidget ); - mLogoWidget = new ImageBaseWidget( KABC::Addressee::logoLabel(), this ); + mLogoWidget = new ImageBaseWidget( TDEABC::Addressee::logoLabel(), this ); layout->addWidget( mLogoWidget ); connect( mPhotoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); connect( mLogoWidget, TQT_SIGNAL( changed() ), TQT_SLOT( setModified() ) ); } -void ImageWidget::loadContact( KABC::Addressee *addr ) +void ImageWidget::loadContact( TDEABC::Addressee *addr ) { mPhotoWidget->setImage( addr->photo() ); mLogoWidget->setImage( addr->logo() ); } -void ImageWidget::storeContact( KABC::Addressee *addr ) +void ImageWidget::storeContact( TDEABC::Addressee *addr ) { addr->setPhoto( mPhotoWidget->image() ); addr->setLogo( mLogoWidget->image() ); diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h index 449790e21..77c26478e 100644 --- a/kaddressbook/imagewidget.h +++ b/kaddressbook/imagewidget.h @@ -43,10 +43,10 @@ class ImageLoader : public TQObject public: ImageLoader( TQWidget *parent ); - KABC::Picture loadPicture( const KURL &url, bool *ok ); + TDEABC::Picture loadPicture( const KURL &url, bool *ok ); private: - KABC::Picture mPicture; + TDEABC::Picture mPicture; TQWidget *mParent; }; @@ -63,8 +63,8 @@ class ImageButton : public TQPushButton void setReadOnly( bool readOnly ); - void setPicture( const KABC::Picture &picture ); - KABC::Picture picture() const; + void setPicture( const TDEABC::Picture &picture ); + TDEABC::Picture picture() const; void setImageLoader( ImageLoader *loader ); @@ -89,7 +89,7 @@ class ImageButton : public TQPushButton bool mReadOnly; TQPoint mDragStartPos; - KABC::Picture mPicture; + TDEABC::Picture mPicture; ImageLoader *mImageLoader; }; @@ -107,12 +107,12 @@ class ImageBaseWidget : public TQWidget /** Sets the photo object. */ - void setImage( const KABC::Picture &photo ); + void setImage( const TDEABC::Picture &photo ); /** Returns a photo object. */ - KABC::Picture image() const; + TDEABC::Picture image() const; void setReadOnly( bool readOnly ); @@ -129,10 +129,10 @@ class ImageBaseWidget : public TQWidget class ImageWidget : public KAB::ContactEditorWidget { public: - ImageWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + ImageWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); - void loadContact( KABC::Addressee *addr ); - void storeContact( KABC::Addressee *addr ); + void loadContact( TDEABC::Addressee *addr ); + void storeContact( TDEABC::Addressee *addr ); void setReadOnly( bool readOnly ); int logicalWidth() const { return 2; } @@ -145,7 +145,7 @@ class ImageWidget : public KAB::ContactEditorWidget class ImageWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) { return new ImageWidget( ab, parent, name ); } diff --git a/kaddressbook/imeditwidget.cpp b/kaddressbook/imeditwidget.cpp index 9a36cb77c..b7f812dbf 100644 --- a/kaddressbook/imeditwidget.cpp +++ b/kaddressbook/imeditwidget.cpp @@ -43,7 +43,7 @@ #include "imeditwidget.h" #include "imeditorwidget.h" -IMEditWidget::IMEditWidget( TQWidget *parent, KABC::Addressee &addr, const char *name ) +IMEditWidget::IMEditWidget( TQWidget *parent, TDEABC::Addressee &addr, const char *name ) : TQWidget( parent, name ), mAddressee(addr) { TQGridLayout *topLayout = new TQGridLayout( this, 2, 2, KDialog::marginHint(), diff --git a/kaddressbook/imeditwidget.h b/kaddressbook/imeditwidget.h index 2ef2fb5f3..ce6b1a943 100644 --- a/kaddressbook/imeditwidget.h +++ b/kaddressbook/imeditwidget.h @@ -47,7 +47,7 @@ class IMEditWidget : public TQWidget public: - IMEditWidget(TQWidget *parent, KABC::Addressee &addr, const char *name = 0 ); + IMEditWidget(TQWidget *parent, TDEABC::Addressee &addr, const char *name = 0 ); ~IMEditWidget(); void setIMs( const TQStringList &list ); @@ -69,7 +69,7 @@ class IMEditWidget : public TQWidget TQPushButton *mEditButton; TQStringList mIMList; bool mReadOnly; - KABC::Addressee &mAddressee; + TDEABC::Addressee &mAddressee; }; diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp index dbec4651e..2c7c3870c 100644 --- a/kaddressbook/incsearchwidget.cpp +++ b/kaddressbook/incsearchwidget.cpp @@ -112,22 +112,22 @@ void IncSearchWidget::timeout() void IncSearchWidget::initFields() { - mFieldList = KABC::Field::allFields(); + mFieldList = TDEABC::Field::allFields(); mFieldCombo->clear(); mFieldCombo->insertItem( i18n( "Visible Fields" ) ); mFieldCombo->insertItem( i18n( "All Fields" ) ); - KABC::Field::List::ConstIterator it; + TDEABC::Field::List::ConstIterator it; for ( it = mFieldList.begin(); it != mFieldList.end(); ++it ) mFieldCombo->insertItem( (*it)->label() ); announceDoSearch(); } -KABC::Field::List IncSearchWidget::currentFields() const +TDEABC::Field::List IncSearchWidget::currentFields() const { - KABC::Field::List fieldList; + TDEABC::Field::List fieldList; if ( mFieldCombo->currentItem() == 0 ) fieldList = mViewFields; @@ -147,7 +147,7 @@ int IncSearchWidget::currentItem() const return mFieldCombo->currentItem(); } -void IncSearchWidget::setViewFields( const KABC::Field::List &fields ) +void IncSearchWidget::setViewFields( const TDEABC::Field::List &fields ) { mViewFields = fields; } diff --git a/kaddressbook/incsearchwidget.h b/kaddressbook/incsearchwidget.h index 9b22f75fe..3d5732027 100644 --- a/kaddressbook/incsearchwidget.h +++ b/kaddressbook/incsearchwidget.h @@ -41,7 +41,7 @@ class IncSearchWidget : public TQWidget IncSearchWidget( TQWidget *parent, const char *name = 0 ); ~IncSearchWidget(); - KABC::Field::List currentFields() const; + TDEABC::Field::List currentFields() const; void setCurrentItem( int pos ); int currentItem() const; @@ -67,7 +67,7 @@ class IncSearchWidget : public TQWidget void scrollDown(); public slots: - void setViewFields( const KABC::Field::List& ); + void setViewFields( const TDEABC::Field::List& ); private slots: void announceDoSearch(); @@ -81,8 +81,8 @@ class IncSearchWidget : public TQWidget TQComboBox* mFieldCombo; KLineEdit* mSearchText; - KABC::Field::List mFieldList; - KABC::Field::List mViewFields; + TDEABC::Field::List mFieldList; + TDEABC::Field::List mViewFields; TQTimer* mInputTimer; }; diff --git a/kaddressbook/interfaces/Makefile.am b/kaddressbook/interfaces/Makefile.am index 7b4373643..a857dddb2 100644 --- a/kaddressbook/interfaces/Makefile.am +++ b/kaddressbook/interfaces/Makefile.am @@ -5,7 +5,7 @@ lib_LTLIBRARIES = libkabinterfaces.la libkabinterfaces_la_SOURCES = configurewidget.cpp contacteditorwidget.cpp \ core.cpp extensionwidget.cpp xxport.cpp libkabinterfaces_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined -libkabinterfaces_la_LIBADD = $(LIB_KABC) +libkabinterfaces_la_LIBADD = $(LIB_TDEABC) kabincludedir = $(includedir)/kaddressbook kabinclude_HEADERS = configurewidget.h contacteditorwidget.h core.h \ diff --git a/kaddressbook/interfaces/configurewidget.cpp b/kaddressbook/interfaces/configurewidget.cpp index bcb7a1764..bce8136c1 100644 --- a/kaddressbook/interfaces/configurewidget.cpp +++ b/kaddressbook/interfaces/configurewidget.cpp @@ -27,7 +27,7 @@ using namespace KAB; -ConfigureWidget::ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, +ConfigureWidget::ConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : TQWidget( parent, name ), mAddressBook( ab ) { @@ -47,7 +47,7 @@ void ConfigureWidget::saveSettings( TDEConfig* ) // should be reimplemented in the views, extensions etc. } -KABC::AddressBook *ConfigureWidget::addressBook() const +TDEABC::AddressBook *ConfigureWidget::addressBook() const { return mAddressBook; } diff --git a/kaddressbook/interfaces/configurewidget.h b/kaddressbook/interfaces/configurewidget.h index e8df353df..33bc6f762 100644 --- a/kaddressbook/interfaces/configurewidget.h +++ b/kaddressbook/interfaces/configurewidget.h @@ -29,7 +29,7 @@ #include <tdeconfig.h> #include <tdepimmacros.h> -namespace KABC { +namespace TDEABC { class AddressBook; } @@ -38,7 +38,7 @@ namespace KAB { class KDE_EXPORT ConfigureWidget : public TQWidget { public: - ConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + ConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~ConfigureWidget(); /** @@ -61,10 +61,10 @@ class KDE_EXPORT ConfigureWidget : public TQWidget /** Returns a pointer to the address book of this widget. */ - KABC::AddressBook *addressBook() const; + TDEABC::AddressBook *addressBook() const; private: - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; }; } diff --git a/kaddressbook/interfaces/contacteditorwidget.cpp b/kaddressbook/interfaces/contacteditorwidget.cpp index 3059b7a40..91e388733 100644 --- a/kaddressbook/interfaces/contacteditorwidget.cpp +++ b/kaddressbook/interfaces/contacteditorwidget.cpp @@ -25,7 +25,7 @@ using namespace KAB; -ContactEditorWidget::ContactEditorWidget( KABC::AddressBook *ab, +ContactEditorWidget::ContactEditorWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : TQWidget( parent, name ), mAddressBook( ab ), mModified( false ) { @@ -35,7 +35,7 @@ ContactEditorWidget::~ContactEditorWidget() { } -KABC::AddressBook *ContactEditorWidget::addressBook() const +TDEABC::AddressBook *ContactEditorWidget::addressBook() const { return mAddressBook; } diff --git a/kaddressbook/interfaces/contacteditorwidget.h b/kaddressbook/interfaces/contacteditorwidget.h index c8efa56c1..85195dd84 100644 --- a/kaddressbook/interfaces/contacteditorwidget.h +++ b/kaddressbook/interfaces/contacteditorwidget.h @@ -42,7 +42,7 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget public: typedef TQValueList<ContactEditorWidget*> List; - ContactEditorWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + ContactEditorWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~ContactEditorWidget(); /** @@ -62,13 +62,13 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget /** Load the contacts data into the GUI. */ - virtual void loadContact( KABC::Addressee *addr ) = 0; + virtual void loadContact( TDEABC::Addressee *addr ) = 0; /** Save the data from the GUI into the passed contact object. */ - virtual void storeContact( KABC::Addressee *addr ) = 0; + virtual void storeContact( TDEABC::Addressee *addr ) = 0; /** Sets whether the contact should be presented as @@ -104,10 +104,10 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget /** Returns a pointer to the address book object. */ - KABC::AddressBook *addressBook() const; + TDEABC::AddressBook *addressBook() const; private: - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; bool mModified; class ContactEditorWidgetPrivate; @@ -117,7 +117,7 @@ class KDE_EXPORT ContactEditorWidget : public TQWidget class ContactEditorWidgetFactory : public KLibFactory { public: - virtual ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, + virtual ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ) = 0; /** diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h index fcf41028f..0132399c1 100644 --- a/kaddressbook/interfaces/core.h +++ b/kaddressbook/interfaces/core.h @@ -37,7 +37,7 @@ #include <kxmlguiclient.h> #include <tdepimmacros.h> -namespace KABC { +namespace TDEABC { class AddressBook; class Resource; } @@ -63,7 +63,7 @@ class KDE_EXPORT Core : public TQObject /** Returns a pointer to the StdAddressBook of the application. */ - virtual KABC::AddressBook *addressBook() const = 0; + virtual TDEABC::AddressBook *addressBook() const = 0; /** Returns a pointer to the TDEConfig object of the application. @@ -84,7 +84,7 @@ class KDE_EXPORT Core : public TQObject /** Returns the current sort field. */ - virtual KABC::Field *currentSortField() const = 0; + virtual TDEABC::Field *currentSortField() const = 0; /** Returns the uid list of the currently selected contacts. @@ -96,7 +96,7 @@ class KDE_EXPORT Core : public TQObject resource or a null pointer if no resource was selected by the user. */ - virtual KABC::Resource *requestResource( TQWidget *parent ) = 0; + virtual TDEABC::Resource *requestResource( TQWidget *parent ) = 0; /** Returns the parent widget. diff --git a/kaddressbook/interfaces/extensionwidget.cpp b/kaddressbook/interfaces/extensionwidget.cpp index 63f90200b..da4fcc7d8 100644 --- a/kaddressbook/interfaces/extensionwidget.cpp +++ b/kaddressbook/interfaces/extensionwidget.cpp @@ -47,9 +47,9 @@ bool ExtensionWidget::contactsSelected() const return mCore->selectedUIDs().count() != 0; } -KABC::Addressee::List ExtensionWidget::selectedContacts() +TDEABC::Addressee::List ExtensionWidget::selectedContacts() { - KABC::Addressee::List list; + TDEABC::Addressee::List list; const TQStringList uids = mCore->selectedUIDs(); TQStringList::ConstIterator it; diff --git a/kaddressbook/interfaces/extensionwidget.h b/kaddressbook/interfaces/extensionwidget.h index 265484a4d..3de00edde 100644 --- a/kaddressbook/interfaces/extensionwidget.h +++ b/kaddressbook/interfaces/extensionwidget.h @@ -60,7 +60,7 @@ class KDE_EXPORT ExtensionWidget : public TQWidget Use @ref addresseesSelected() to test if there exists selected contacts. */ - KABC::Addressee::List selectedContacts(); + TDEABC::Addressee::List selectedContacts(); /** This method is called whenever the selection in the view changed. @@ -79,7 +79,7 @@ class KDE_EXPORT ExtensionWidget : public TQWidget virtual TQString identifier() const = 0; signals: - void modified( const KABC::Addressee::List &list ); + void modified( const TDEABC::Addressee::List &list ); void deleted( const TQStringList& uidList ); private: diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp index d0790ccfa..a2874e8c6 100644 --- a/kaddressbook/interfaces/xxport.cpp +++ b/kaddressbook/interfaces/xxport.cpp @@ -40,7 +40,7 @@ class XXPort::XXPortPrivate TDEApplication *mKApp; }; -XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent, +XXPort::XXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : TQObject( parent, name ), mAddressBook( ab ), mParentWidget( parent ), d( new XXPortPrivate ) @@ -62,16 +62,16 @@ XXPort::~XXPort() d = 0; } -bool XXPort::exportContacts( const KABC::AddresseeList&, const TQString& ) +bool XXPort::exportContacts( const TDEABC::AddresseeList&, const TQString& ) { // do nothing return false; } -KABC::AddresseeList XXPort::importContacts( const TQString& ) const +TDEABC::AddresseeList XXPort::importContacts( const TQString& ) const { // do nothing - return KABC::AddresseeList(); + return TDEABC::AddresseeList(); } void XXPort::createImportAction( const TQString &label, const TQString &data ) @@ -94,7 +94,7 @@ void XXPort::createExportAction( const TQString &label, const TQString &data ) setXMLFile( identifier() + "_xxportui.rc" ); } -KABC::AddressBook *XXPort::addressBook() const +TDEABC::AddressBook *XXPort::addressBook() const { return mAddressBook; } diff --git a/kaddressbook/interfaces/xxport.h b/kaddressbook/interfaces/xxport.h index 515470c55..b0dd43e74 100644 --- a/kaddressbook/interfaces/xxport.h +++ b/kaddressbook/interfaces/xxport.h @@ -45,7 +45,7 @@ class TDEApplication; */ #define K_EXPORT_KADDRESSBOOK_XXFILTER_CATALOG( libname, XXPortClass, catalog ) \ class KDE_NO_EXPORT localXXPortFactory : public KAB::XXPortFactory { \ - KAB::XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, const char *name ) \ + KAB::XXPort *xxportObject( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) \ { const char *cat = catalog; \ if (cat) TDEGlobal::locale()->insertCatalogue(cat); \ return new XXPortClass( ab, parent, name ); \ @@ -71,7 +71,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient public: - XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + XXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~XXPort(); /** @@ -104,12 +104,12 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient /** Reimplement this method for exporting the contacts. */ - virtual bool exportContacts( const KABC::AddresseeList &list, const TQString& identifier ); + virtual bool exportContacts( const TDEABC::AddresseeList &list, const TQString& identifier ); /** Reimplement this method for importing the contacts. */ - virtual KABC::AddresseeList importContacts( const TQString& identifier ) const; + virtual TDEABC::AddresseeList importContacts( const TQString& identifier ) const; signals: /** @@ -140,7 +140,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient /** Returns a pointer to the address book object. */ - KABC::AddressBook *addressBook() const; + TDEABC::AddressBook *addressBook() const; /** Returns a pointer to the parent widget. It can be used as parent for @@ -153,7 +153,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient void slotExportActivated( const TQString& ); private: - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; TQWidget *mParentWidget; class XXPortPrivate; @@ -163,7 +163,7 @@ class KDE_EXPORT XXPort : public TQObject, virtual public KXMLGUIClient class XXPortFactory : public KLibFactory { public: - virtual XXPort *xxportObject( KABC::AddressBook *ab, TQWidget *parent, + virtual XXPort *xxportObject( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ) = 0; protected: diff --git a/kaddressbook/jumpbuttonbar.cpp b/kaddressbook/jumpbuttonbar.cpp index b1be78eea..878fff5d7 100644 --- a/kaddressbook/jumpbuttonbar.cpp +++ b/kaddressbook/jumpbuttonbar.cpp @@ -107,10 +107,10 @@ void JumpButtonBar::updateButtons() uint possibleButtons = (height() / buttonHeight) - 1; TQString character; - KABC::AddressBook *ab = mCore->addressBook(); - KABC::AddressBook::Iterator it; + TDEABC::AddressBook *ab = mCore->addressBook(); + TDEABC::AddressBook::Iterator it; for ( it = ab->begin(); it != ab->end(); ++it ) { - KABC::Field *field = 0; + TDEABC::Field *field = 0; field = mCore->currentSortField(); if ( field ) { setEnabled( true ); diff --git a/kaddressbook/jumpbuttonbar.h b/kaddressbook/jumpbuttonbar.h index 620c737be..48a520184 100644 --- a/kaddressbook/jumpbuttonbar.h +++ b/kaddressbook/jumpbuttonbar.h @@ -37,7 +37,7 @@ namespace KAB { class Core; } -namespace KABC { +namespace TDEABC { class Field; } diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index 142f03c44..6a7ece0e8 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -108,36 +108,36 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, this, TQT_SLOT( addressBookChanged() ) ); if ( file.isEmpty() ) { - mAddressBook = KABC::StdAddressBook::self( true ); + mAddressBook = TDEABC::StdAddressBook::self( true ); } else { kdDebug(5720) << "KABCore(): document '" << file << "'" << endl; - mAddressBook = new KABC::AddressBook; - mAddressBook->addResource( new KABC::ResourceFile( file ) ); + mAddressBook = new TDEABC::AddressBook; + mAddressBook->addResource( new TDEABC::ResourceFile( file ) ); if ( !mAddressBook->load() ) { KMessageBox::error( parent, i18n("Unable to load '%1'.").arg( file ) ); } } - mAddressBook->setErrorHandler( new KABC::GuiErrorHandler( mWidget ) ); + mAddressBook->setErrorHandler( new TDEABC::GuiErrorHandler( mWidget ) ); #if ! KDE_IS_VERSION(3,5,8) - mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization, + mAddressBook->addCustomField( i18n( "Department" ), TDEABC::Field::Organization, "X-Department", "KADDRESSBOOK" ); #endif - mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization, + mAddressBook->addCustomField( i18n( "Profession" ), TDEABC::Field::Organization, "X-Profession", "KADDRESSBOOK" ); - mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization, + mAddressBook->addCustomField( i18n( "Assistant's Name" ), TDEABC::Field::Organization, "X-AssistantsName", "KADDRESSBOOK" ); - mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization, + mAddressBook->addCustomField( i18n( "Manager's Name" ), TDEABC::Field::Organization, "X-ManagersName", "KADDRESSBOOK" ); - mAddressBook->addCustomField( i18n( "Partner's Name" ), KABC::Field::Personal, + mAddressBook->addCustomField( i18n( "Partner's Name" ), TDEABC::Field::Personal, "X-SpousesName", "KADDRESSBOOK" ); - mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal, + mAddressBook->addCustomField( i18n( "Office" ), TDEABC::Field::Personal, "X-Office", "KADDRESSBOOK" ); - mAddressBook->addCustomField( i18n( "IM Address" ), KABC::Field::Personal, + mAddressBook->addCustomField( i18n( "IM Address" ), TDEABC::Field::Personal, "X-IMAddress", "KADDRESSBOOK" ); - mAddressBook->addCustomField( i18n( "Anniversary" ), KABC::Field::Personal, + mAddressBook->addCustomField( i18n( "Anniversary" ), TDEABC::Field::Personal, "X-Anniversary", "KADDRESSBOOK" ); - mAddressBook->addCustomField( i18n( "Blog" ), KABC::Field::Personal, + mAddressBook->addCustomField( i18n( "Blog" ), TDEABC::Field::Personal, "BlogFeed", "KADDRESSBOOK" ); mSearchManager = new KAB::SearchManager( mAddressBook, TQT_TQOBJECT(parent) ); @@ -164,8 +164,8 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, TQWidget *parent, mXXPortManager, TQT_SLOT( importVCard( const KURL& ) ) ); connect( mViewManager, TQT_SIGNAL( viewFieldsChanged() ), TQT_SLOT( updateIncSearchWidget() ) ); - connect( mExtensionManager, TQT_SIGNAL( modified( const KABC::Addressee::List& ) ), - this, TQT_SLOT( extensionModified( const KABC::Addressee::List& ) ) ); + connect( mExtensionManager, TQT_SIGNAL( modified( const TDEABC::Addressee::List& ) ), + this, TQT_SLOT( extensionModified( const TDEABC::Addressee::List& ) ) ); connect( mExtensionManager, TQT_SIGNAL( deleted( const TQStringList& ) ), this, TQT_SLOT( extensionDeleted( const TQStringList& ) ) ); @@ -200,7 +200,7 @@ KABCore::~KABCore() mAddressBook->disconnect(); mAddressBook = 0; - KABC::StdAddressBook::close(); + TDEABC::StdAddressBook::close(); mKIMProxy = 0; } @@ -245,7 +245,7 @@ void KABCore::saveSettings() KABPrefs::instance()->setCurrentIncSearchField( mIncSearchWidget->currentItem() ); } -KABC::AddressBook *KABCore::addressBook() const +TDEABC::AddressBook *KABCore::addressBook() const { return mAddressBook; } @@ -260,7 +260,7 @@ TDEActionCollection *KABCore::actionCollection() const return guiClient()->actionCollection(); } -KABC::Field *KABCore::currentSortField() const +TDEABC::Field *KABCore::currentSortField() const { return mViewManager->currentSortField(); } @@ -270,13 +270,13 @@ TQStringList KABCore::selectedUIDs() const return mViewManager->selectedUids(); } -KABC::Resource *KABCore::requestResource( TQWidget *parent ) +TDEABC::Resource *KABCore::requestResource( TQWidget *parent ) { - TQPtrList<KABC::Resource> kabcResources = addressBook()->resources(); + TQPtrList<TDEABC::Resource> kabcResources = addressBook()->resources(); TQPtrList<KRES::Resource> kresResources; - TQPtrListIterator<KABC::Resource> resIt( kabcResources ); - KABC::Resource *resource; + TQPtrListIterator<TDEABC::Resource> resIt( kabcResources ); + TDEABC::Resource *resource; while ( ( resource = resIt.current() ) != 0 ) { ++resIt; bool writable = false; @@ -302,7 +302,7 @@ KABC::Resource *KABCore::requestResource( TQWidget *parent ) } KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent ); - return static_cast<KABC::Resource*>( res ); // upcast + return static_cast<TDEABC::Resource*>( res ); // upcast } TQWidget *KABCore::widget() const @@ -351,7 +351,7 @@ void KABCore::setContactSelected( const TQString &uid ) return; } - KABC::Addressee addr = mAddressBook->findByUid( uid ); + TDEABC::Addressee addr = mAddressBook->findByUid( uid ); if ( !mDetailsViewer->isHidden() ) mDetailsViewer->setAddressee( addr ); #ifdef TDEPIM_NEW_DISTRLISTS @@ -361,7 +361,7 @@ void KABCore::setContactSelected( const TQString &uid ) #endif mExtensionManager->setSelectionChanged(); - KABC::Addressee::List list = mViewManager->selectedAddressees(); + TDEABC::Addressee::List list = mViewManager->selectedAddressees(); const bool someSelected = list.size() > 0; const bool singleSelected = list.size() == 1; bool writable = mReadWrite; @@ -371,9 +371,9 @@ void KABCore::setContactSelected( const TQString &uid ) //### We have a performance problem here - everytime *one* item is added or // removed we re-check *all* items. If this turns out to be a bottleneck // we need to keep some state and check new items only. - KABC::Addressee::List::ConstIterator addrIt = list.constBegin(); + TDEABC::Addressee::List::ConstIterator addrIt = list.constBegin(); for ( ; addrIt != list.constEnd(); ++addrIt ) { - KABC::Resource *res = ( *addrIt ).resource(); + TDEABC::Resource *res = ( *addrIt ).resource(); if ( !res ) { kdDebug() << "KABCore::setContactSelected: this addressee has no resource!" << endl; writable = false; @@ -398,7 +398,7 @@ void KABCore::setContactSelected( const TQString &uid ) bool moreThanOneResource = mAddressBook->resources().count() > 1; if ( !moreThanOneResource && !mAddressBook->resources().isEmpty() ) { - KABC::Resource *res = mAddressBook->resources().first(); + TDEABC::Resource *res = mAddressBook->resources().first(); if ( res->inherits( "KPIM::ResourceABC" ) ) { KPIM::ResourceABC *resAbc = static_cast<KPIM::ResourceABC *>( res ); const TQStringList subresources = resAbc->subresources(); @@ -517,7 +517,7 @@ void KABCore::deleteContacts( const TQStringList &uids ) TQStringList::ConstIterator it = uids.begin(); const TQStringList::ConstIterator endIt( uids.end() ); while ( it != endIt ) { - KABC::Addressee addr = mAddressBook->findByUid( *it ); + TDEABC::Addressee addr = mAddressBook->findByUid( *it ); names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() ); ++it; } @@ -548,7 +548,7 @@ void KABCore::deleteContacts( const TQStringList &uids ) void KABCore::copyContacts() { - KABC::Addressee::List addrList = mViewManager->selectedAddressees(); + TDEABC::Addressee::List addrList = mViewManager->selectedAddressees(); #if defined(KABC_VCARD_ENCODING_FIX) TQByteArray clipText = AddresseeUtil::addresseesToClipboard( addrList ); @@ -578,21 +578,21 @@ void KABCore::pasteContacts() TQClipboard *cb = TQApplication::clipboard(); #if defined(KABC_VCARD_ENCODING_FIX) const TQMimeSource *data = cb->data( TQClipboard::Clipboard ); - KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) ); + TDEABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( data->encodedData( "text/x-vcard" ) ); #else - KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() ); + TDEABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() ); #endif pasteContacts( list ); } -void KABCore::pasteContacts( KABC::Addressee::List &list ) +void KABCore::pasteContacts( TDEABC::Addressee::List &list ) { - KABC::Resource *resource = requestResource( mWidget ); + TDEABC::Resource *resource = requestResource( mWidget ); if ( !resource ) return; - KABC::Addressee::List::Iterator it; - const KABC::Addressee::List::Iterator endIt( list.end() ); + TDEABC::Addressee::List::Iterator it; + const TDEABC::Addressee::List::Iterator endIt( list.end() ); for ( it = list.begin(); it != endIt; ++it ) (*it).setResource( resource ); @@ -604,15 +604,15 @@ void KABCore::pasteContacts( KABC::Addressee::List &list ) void KABCore::mergeContacts() { - KABC::Addressee::List list = mViewManager->selectedAddressees(); + TDEABC::Addressee::List list = mViewManager->selectedAddressees(); if ( list.count() < 2 ) return; - KABC::Addressee addr = KABTools::mergeContacts( list ); + TDEABC::Addressee addr = KABTools::mergeContacts( list ); - KABC::Addressee::List::Iterator it = list.begin(); - const KABC::Addressee::List::Iterator endIt( list.end() ); - KABC::Addressee origAddr = *it; + TDEABC::Addressee::List::Iterator it = list.begin(); + const TDEABC::Addressee::List::Iterator endIt( list.end() ); + TDEABC::Addressee origAddr = *it; TQStringList uids; ++it; while ( it != endIt ) { @@ -631,7 +631,7 @@ void KABCore::mergeContacts() void KABCore::setWhoAmI() { - KABC::Addressee::List addrList = mViewManager->selectedAddressees(); + TDEABC::Addressee::List addrList = mViewManager->selectedAddressees(); if ( addrList.count() > 1 ) { // can probably be removed because we now check the selection in setContactSelected(). @@ -641,7 +641,7 @@ void KABCore::setWhoAmI() TQString text( i18n( "<qt>Do you really want to use <b>%1</b> as your new personal contact?</qt>" ) ); if ( KMessageBox::questionYesNo( mWidget, text.arg( addrList[ 0 ].assembledName() ), TQString(), i18n("Use"), i18n("Do Not Use") ) == KMessageBox::Yes ) - static_cast<KABC::StdAddressBook*>( KABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] ); + static_cast<TDEABC::StdAddressBook*>( TDEABC::StdAddressBook::self( true ) )->setWhoAmI( addrList[ 0 ] ); } void KABCore::incrementalTextSearch( const TQString& text ) @@ -654,12 +654,12 @@ void KABCore::incrementalJumpButtonSearch( const TQString& character ) { mViewManager->setSelected( TQString(), false ); - KABC::AddresseeList list = mSearchManager->contacts(); - KABC::Field *field = mViewManager->currentSortField(); + TDEABC::AddresseeList list = mSearchManager->contacts(); + TDEABC::Field *field = mViewManager->currentSortField(); if ( field ) { list.sortByField( field ); - KABC::AddresseeList::ConstIterator it; - const KABC::AddresseeList::ConstIterator endIt( list.end() ); + TDEABC::AddresseeList::ConstIterator it; + const TDEABC::AddresseeList::ConstIterator endIt( list.end() ); for ( it = list.begin(); it != endIt; ++it ) { if ( field->value( *it ).startsWith( character, false ) ) { mViewManager->setSelected( (*it).uid(), true ); @@ -687,14 +687,14 @@ bool KABCore::modified() const return mModified; } -void KABCore::contactModified( const KABC::Addressee &addr ) +void KABCore::contactModified( const TDEABC::Addressee &addr ) { Command *command = 0; // check if it exists already - KABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() ); + TDEABC::Addressee origAddr = mAddressBook->findByUid( addr.uid() ); if ( origAddr.isEmpty() ) { - KABC::Addressee::List addressees; + TDEABC::Addressee::List addressees; addressees.append( addr ); command = new NewCommand( mAddressBook, addressees ); } else { @@ -710,7 +710,7 @@ void KABCore::contactModified( const KABC::Addressee &addr ) void KABCore::newDistributionList() { #ifdef TDEPIM_NEW_DISTRLISTS - KABC::Resource *resource = requestResource( mWidget ); + TDEABC::Resource *resource = requestResource( mWidget ); if ( !resource ) return; @@ -736,10 +736,10 @@ void KABCore::newContact() { AddresseeEditorDialog *dialog = 0; - KABC::Resource* resource = requestResource( mWidget ); + TDEABC::Resource* resource = requestResource( mWidget ); if ( resource ) { - KABC::Addressee addr; + TDEABC::Addressee addr; addr.setResource( resource ); if ( !KABLock::self( mAddressBook )->lock( addr.resource() ) ) @@ -759,7 +759,7 @@ void KABCore::addEmail( const TQString &aStr ) { TQString fullName, email; - KABC::Addressee::parseEmailAddress( aStr, fullName, email ); + TDEABC::Addressee::parseEmailAddress( aStr, fullName, email ); #if KDE_IS_VERSION(3,4,89) // This ugly hack will be removed in 4.0 @@ -774,8 +774,8 @@ void KABCore::addEmail( const TQString &aStr ) // Try to lookup the addressee matching the email address bool found = false; TQStringList emailList; - 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(); !found && (it != endIt); ++it ) { emailList = (*it).emails(); if ( emailList.contains( email ) > 0 ) { @@ -786,7 +786,7 @@ void KABCore::addEmail( const TQString &aStr ) } if ( !found ) { - KABC::Addressee addr; + TDEABC::Addressee addr; addr.setNameFromString( fullName ); addr.insertEmail( email, true ); @@ -829,7 +829,7 @@ void KABCore::editContact( const TQString &uid ) } #endif - KABC::Addressee addr = mAddressBook->findByUid( localUID ); + TDEABC::Addressee addr = mAddressBook->findByUid( localUID ); if ( !addr.isEmpty() ) { AddresseeEditorDialog *dialog = mEditorDict.find( addr.uid() ); if ( !dialog ) { @@ -871,7 +871,7 @@ void KABCore::storeContactIn( const TQString &uid, bool copy /*false*/ ) } else { uidList << uid; } - KABC::Resource *resource = requestResource( mWidget ); + TDEABC::Resource *resource = requestResource( mWidget ); if ( !resource ) return; @@ -890,10 +890,10 @@ void KABCore::storeContactIn( const TQString &uid, bool copy /*false*/ ) void KABCore::save() { - TQPtrList<KABC::Resource> resources = mAddressBook->resources(); - TQPtrListIterator<KABC::Resource> it( resources ); + TQPtrList<TDEABC::Resource> resources = mAddressBook->resources(); + TQPtrListIterator<TDEABC::Resource> it( resources ); while ( it.current() && !it.current()->readOnly() ) { - KABC::Ticket *ticket = mAddressBook->requestSaveTicket( it.current() ); + TDEABC::Ticket *ticket = mAddressBook->requestSaveTicket( it.current() ); if ( ticket ) { if ( !mAddressBook->save( ticket ) ) { KMessageBox::error( mWidget, @@ -914,8 +914,8 @@ void KABCore::save() void KABCore::load() { - TQPtrList<KABC::Resource> resources = mAddressBook->resources(); - TQPtrListIterator<KABC::Resource> it( resources ); + TQPtrList<TDEABC::Resource> resources = mAddressBook->resources(); + TQPtrListIterator<TDEABC::Resource> it( resources ); while ( it.current() ) { mAddressBook->load(); ++it; @@ -941,18 +941,18 @@ void KABCore::setDetailsVisible( bool visible ) mDetailsPage->hide(); } -void KABCore::extensionModified( const KABC::Addressee::List &list ) +void KABCore::extensionModified( const TDEABC::Addressee::List &list ) { if ( list.count() != 0 ) { - KABC::Addressee::List::ConstIterator it; - const KABC::Addressee::List::ConstIterator endIt( list.end() ); + TDEABC::Addressee::List::ConstIterator it; + const TDEABC::Addressee::List::ConstIterator endIt( list.end() ); for ( it = list.begin(); it != endIt; ++it ) { Command *command = 0; // check if it exists already - KABC::Addressee origAddr = mAddressBook->findByUid( (*it).uid() ); + TDEABC::Addressee origAddr = mAddressBook->findByUid( (*it).uid() ); if ( origAddr.isEmpty() ) { - KABC::Addressee::List addressees; + TDEABC::Addressee::List addressees; addressees.append( *it ); command = new NewCommand( mAddressBook, addressees ); } else @@ -994,15 +994,15 @@ TQString KABCore::getNameByPhone( const TQString &phone ) bool found = false; TQString ownerName = ""; - KABC::PhoneNumber::List phoneList; + TDEABC::PhoneNumber::List phoneList; - KABC::AddressBook::ConstIterator iter; - const KABC::AddressBook::ConstIterator endIter( mAddressBook->end() ); + TDEABC::AddressBook::ConstIterator iter; + const TDEABC::AddressBook::ConstIterator endIter( mAddressBook->end() ); for ( iter = mAddressBook->begin(); !found && ( iter != endIter ); ++iter ) { phoneList = (*iter).phoneNumbers(); - KABC::PhoneNumber::List::Iterator phoneIter( phoneList.begin() ); - const KABC::PhoneNumber::List::Iterator phoneEndIter( phoneList.end() ); + TDEABC::PhoneNumber::List::Iterator phoneIter( phoneList.begin() ); + const TDEABC::PhoneNumber::List::Iterator phoneEndIter( phoneList.end() ); for ( ; !found && ( phoneIter != phoneEndIter ); ++phoneIter) { // Get rid of separator chars so just the numbers are compared. if ( (*phoneIter).number().replace( r, "" ) == localPhone.replace( r, "" ) ) { @@ -1084,13 +1084,13 @@ void KABCore::showContactsAddress( const TQString &addrUid ) if ( uidList.isEmpty() ) return; - KABC::Addressee addr = mAddressBook->findByUid( uidList.first() ); + TDEABC::Addressee addr = mAddressBook->findByUid( uidList.first() ); if ( addr.isEmpty() ) return; - const KABC::Address::List list = addr.addresses(); - KABC::Address::List::ConstIterator it; - const KABC::Address::List::ConstIterator endIt( list.end() ); + const TDEABC::Address::List list = addr.addresses(); + TDEABC::Address::List::ConstIterator it; + const TDEABC::Address::List::ConstIterator endIt( list.end() ); for ( it = list.begin(); it != endIt; ++it ) if ( (*it).id() == addrUid ) { LocationMap::instance()->showAddress( *it ); @@ -1109,8 +1109,8 @@ bool KABCore::queryClose() saveSettings(); KABPrefs::instance()->writeConfig(); - TQPtrList<KABC::Resource> resources = mAddressBook->resources(); - TQPtrListIterator<KABC::Resource> it( resources ); + TQPtrList<TDEABC::Resource> resources = mAddressBook->resources(); + TQPtrListIterator<TDEABC::Resource> it( resources ); while ( it.current() ) { it.current()->close(); ++it; @@ -1157,8 +1157,8 @@ AddresseeEditorDialog *KABCore::createAddresseeEditorDialog( TQWidget *parent, { AddresseeEditorDialog *dialog = new AddresseeEditorDialog( this, parent, name ? name : "editorDialog" ); - connect( dialog, TQT_SIGNAL( contactModified( const KABC::Addressee& ) ), - TQT_SLOT( contactModified( const KABC::Addressee& ) ) ); + connect( dialog, TQT_SIGNAL( contactModified( const TDEABC::Addressee& ) ), + TQT_SLOT( contactModified( const TDEABC::Addressee& ) ) ); connect( dialog, TQT_SIGNAL( editorDestroyed( const TQString& ) ), TQT_SLOT( slotEditorDestroyed( const TQString& ) ) ); @@ -1183,7 +1183,7 @@ void KABCore::slotEditorDestroyed( const TQString &uid ) { AddresseeEditorDialog *dialog = mEditorDict.take( uid ); - KABC::Addressee addr = dialog->addressee(); + TDEABC::Addressee addr = dialog->addressee(); if ( !addr.resource()->readOnly() ) { TQApplication::setOverrideCursor( TQt::waitCursor ); @@ -1471,8 +1471,8 @@ TQStringList KABCore::allCategories() const return allCategories; } - KABC::AddressBook::ConstIterator it; - const KABC::AddressBook::ConstIterator endIt( mAddressBook->end() ); + TDEABC::AddressBook::ConstIterator it; + const TDEABC::AddressBook::ConstIterator endIt( mAddressBook->end() ); for ( it = mAddressBook->begin(); it != endIt; ++it ) { categories = (*it).categories(); const TQStringList::ConstIterator catEndIt( categories.end() ); @@ -1510,7 +1510,7 @@ void KABCore::categoriesSelected( const TQStringList &categories ) TQStringList::ConstIterator it; const TQStringList::ConstIterator endIt( uids.end() ); for ( it = uids.begin(); it != endIt; ++it ) { - KABC::Addressee addr = mAddressBook->findByUid( *it ); + TDEABC::Addressee addr = mAddressBook->findByUid( *it ); if ( !addr.isEmpty() ) { if ( !merge ) addr.setCategories( categories ); @@ -1617,7 +1617,7 @@ void KABCore::removeSelectedContactsFromDistList() TQStringList::ConstIterator it = uids.begin(); const TQStringList::ConstIterator endIt( uids.end() ); while ( it != endIt ) { - KABC::Addressee addr = mAddressBook->findByUid( *it ); + TDEABC::Addressee addr = mAddressBook->findByUid( *it ); names.append( addr.realName().isEmpty() ? addr.preferredEmail() : addr.realName() ); ++it; } diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h index f9a7fbf10..2a4bb2f4a 100644 --- a/kaddressbook/kabcore.h +++ b/kaddressbook/kabcore.h @@ -35,7 +35,7 @@ #include "core.h" #include <tdepimmacros.h> -namespace KABC { +namespace TDEABC { class AddressBook; class Ticket; } @@ -76,7 +76,7 @@ namespace KAB { } typedef struct { - KABC::Ticket *ticket; + TDEABC::Ticket *ticket; int counter; } ResourceMapEntry; @@ -103,7 +103,7 @@ class KDE_EXPORT KABCore : public KAB::Core /** Returns a pointer to the StdAddressBook of the application. */ - KABC::AddressBook *addressBook() const; + TDEABC::AddressBook *addressBook() const; /** Returns a pointer to the TDEConfig object of the application. @@ -119,7 +119,7 @@ class KDE_EXPORT KABCore : public KAB::Core /** Returns the current sort field of the view. */ - KABC::Field *currentSortField() const; + TDEABC::Field *currentSortField() const; /** Returns the uid list of the currently selected contacts. @@ -131,7 +131,7 @@ class KDE_EXPORT KABCore : public KAB::Core resource or a null pointer if no resource was selected by the user. */ - KABC::Resource *requestResource( TQWidget *parent ); + TDEABC::Resource *requestResource( TQWidget *parent ); /** Returns the parent widget. @@ -243,7 +243,7 @@ class KDE_EXPORT KABCore : public KAB::Core @param list The list of addressee, which shall be pasted. */ - void pasteContacts( KABC::Addressee::List &list ); + void pasteContacts( TDEABC::Addressee::List &list ); /** @@ -290,7 +290,7 @@ class KDE_EXPORT KABCore : public KAB::Core Called whenever an contact is modified in the contact editor dialog or the quick edit. */ - void contactModified( const KABC::Addressee &addr ); + void contactModified( const TDEABC::Addressee &addr ); /** DCOP METHOD: Adds the given email address to address book. @@ -404,7 +404,7 @@ class KDE_EXPORT KABCore : public KAB::Core void setJumpButtonBarVisible( bool visible ); void setDetailsVisible( bool visible ); - void extensionModified( const KABC::Addressee::List &list ); + void extensionModified( const TDEABC::Addressee::List &list ); void extensionDeleted( const TQStringList &uidList ); void clipboardDataChanged(); void updateIncSearchWidget(); @@ -439,7 +439,7 @@ class KDE_EXPORT KABCore : public KAB::Core const char *name = 0 ); TQWidget *mWidget; - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; KStatusBar *mStatusBar; ViewManager *mViewManager; diff --git a/kaddressbook/kablock.cpp b/kaddressbook/kablock.cpp index 8d36977fe..58fa19f14 100644 --- a/kaddressbook/kablock.cpp +++ b/kaddressbook/kablock.cpp @@ -29,12 +29,12 @@ #include "kablock.h" -class AddressBookWrapper : public KABC::AddressBook +class AddressBookWrapper : public TDEABC::AddressBook { public: - AddressBookWrapper( KABC::AddressBook* ); + AddressBookWrapper( TDEABC::AddressBook* ); - KABC::Resource* getStandardResource() + TDEABC::Resource* getStandardResource() { return standardResource(); } @@ -44,7 +44,7 @@ KABLock *KABLock::mSelf = 0; static KStaticDeleter<KABLock> kabLockDeleter; -KABLock::KABLock( KABC::AddressBook *ab ) +KABLock::KABLock( TDEABC::AddressBook *ab ) : mAddressBook( ab ) { } @@ -53,7 +53,7 @@ KABLock::~KABLock() { } -KABLock *KABLock::self( KABC::AddressBook *ab ) +KABLock *KABLock::self( TDEABC::AddressBook *ab ) { if ( !mSelf ) kabLockDeleter.setObject( mSelf, new KABLock( ab ) ); @@ -63,10 +63,10 @@ KABLock *KABLock::self( KABC::AddressBook *ab ) return mSelf; } -bool KABLock::lock( KABC::Resource *resource ) +bool KABLock::lock( TDEABC::Resource *resource ) { if ( mLocks.find( resource ) == mLocks.end() ) { // not locked yet - KABC::Ticket *ticket = mAddressBook->requestSaveTicket( resource ); + TDEABC::Ticket *ticket = mAddressBook->requestSaveTicket( resource ); if ( !ticket ) { return false; } else { @@ -83,7 +83,7 @@ bool KABLock::lock( KABC::Resource *resource ) return true; } -bool KABLock::unlock( KABC::Resource *resource ) +bool KABLock::unlock( TDEABC::Resource *resource ) { AddressBookWrapper *wrapper = static_cast<AddressBookWrapper*>( mAddressBook ); if ( resource == 0 ) diff --git a/kaddressbook/kablock.h b/kaddressbook/kablock.h index a706d88fd..110a1cf2a 100644 --- a/kaddressbook/kablock.h +++ b/kaddressbook/kablock.h @@ -24,14 +24,14 @@ #ifndef KABLOCK_H #define KABLOCK_H -namespace KABC { +namespace TDEABC { class AddressBook; class Resource; class Ticket; } typedef struct { - KABC::Ticket *ticket; + TDEABC::Ticket *ticket; uint counter; } LockEntry; @@ -40,19 +40,19 @@ class KABLock public: ~KABLock(); - static KABLock *self( KABC::AddressBook *ab ); + static KABLock *self( TDEABC::AddressBook *ab ); - bool lock( KABC::Resource* ); - bool unlock( KABC::Resource* ); + bool lock( TDEABC::Resource* ); + bool unlock( TDEABC::Resource* ); protected: - KABLock( KABC::AddressBook *ab ); + KABLock( TDEABC::AddressBook *ab ); private: static KABLock *mSelf; - TQMap<KABC::Resource*, LockEntry> mLocks; - KABC::AddressBook *mAddressBook; + TQMap<TDEABC::Resource*, LockEntry> mLocks; + TDEABC::AddressBook *mAddressBook; }; #endif diff --git a/kaddressbook/kabtools.cpp b/kaddressbook/kabtools.cpp index cfa16df81..ddebac13e 100644 --- a/kaddressbook/kabtools.cpp +++ b/kaddressbook/kabtools.cpp @@ -31,7 +31,7 @@ #include "kabtools.h" -static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList &existingFiles ) +static TQString uniqueFileName( const TDEABC::Addressee &addressee, TQStringList &existingFiles ) { TQString name; TQString uniquePart; @@ -51,7 +51,7 @@ static TQString uniqueFileName( const KABC::Addressee &addressee, TQStringList & return name; } -void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab ) +void KABTools::mailVCards( const TQStringList &uids, TDEABC::AddressBook *ab ) { KURL::List urls; @@ -65,7 +65,7 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab ) TQStringList::ConstIterator it( uids.begin() ); const TQStringList::ConstIterator endIt( uids.end() ); for ( ; it != endIt; ++it ) { - KABC::Addressee addressee = ab->findByUid( *it ); + TDEABC::Addressee addressee = ab->findByUid( *it ); if ( addressee.isEmpty() ) continue; @@ -77,14 +77,14 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab ) TQFile file( path ); if ( file.open( IO_WriteOnly ) ) { - KABC::VCardConverter converter; - KABC::Addressee::List list; + TDEABC::VCardConverter converter; + TDEABC::Addressee::List list; list.append( addressee ); #if defined(KABC_VCARD_ENCODING_FIX) - const TQCString vcard = converter.createVCardsRaw( list, KABC::VCardConverter::v3_0 ); + const TQCString vcard = converter.createVCardsRaw( list, TDEABC::VCardConverter::v3_0 ); file.writeBlock( vcard, vcard.length() ); #else - TQString vcard = converter.createVCards( list, KABC::VCardConverter::v3_0 ); + TQString vcard = converter.createVCards( list, TDEABC::VCardConverter::v3_0 ); TQTextStream t( &file ); t.setEncoding( TQTextStream::UnicodeUTF8 ); t << vcard; @@ -104,7 +104,7 @@ void KABTools::mailVCards( const TQStringList &uids, KABC::AddressBook *ab ) urls.toStringList() ); } -static void mergePictures( KABC::Picture &master, const KABC::Picture &slave ) +static void mergePictures( TDEABC::Picture &master, const TDEABC::Picture &slave ) { if ( master.isIntern() ) { if ( master.data().isNull() ) { @@ -123,23 +123,23 @@ static void mergePictures( KABC::Picture &master, const KABC::Picture &slave ) } } -KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) +TDEABC::Addressee KABTools::mergeContacts( const TDEABC::Addressee::List &list ) { if ( list.count() == 0 ) //emtpy - return KABC::Addressee(); + return TDEABC::Addressee(); else if ( list.count() == 1 ) // nothing to merge return list.first(); - KABC::Addressee masterAddressee = list.first(); + TDEABC::Addressee masterAddressee = list.first(); - KABC::Addressee::List::ConstIterator contactIt( list.begin() ); - const KABC::Addressee::List::ConstIterator contactEndIt( list.end() ); + TDEABC::Addressee::List::ConstIterator contactIt( list.begin() ); + const TDEABC::Addressee::List::ConstIterator contactEndIt( list.end() ); for ( ++contactIt; contactIt != contactEndIt; ++contactIt ) { // ADR + LABEL - const KABC::Address::List addresses = (*contactIt).addresses(); - KABC::Address::List masterAddresses = masterAddressee.addresses(); - KABC::Address::List::ConstIterator addrIt( addresses.begin() ); - const KABC::Address::List::ConstIterator addrEndIt( addresses.end() ); + const TDEABC::Address::List addresses = (*contactIt).addresses(); + TDEABC::Address::List masterAddresses = masterAddressee.addresses(); + TDEABC::Address::List::ConstIterator addrIt( addresses.begin() ); + const TDEABC::Address::List::ConstIterator addrEndIt( addresses.end() ); for ( ; addrIt != addrEndIt; ++addrIt ) { if ( !masterAddresses.contains( *addrIt ) ) masterAddressee.insertAddress( *addrIt ); @@ -184,7 +184,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) // KEY */ // LOGO - KABC::Picture logo = masterAddressee.logo(); + TDEABC::Picture logo = masterAddressee.logo(); mergePictures( logo, (*contactIt).logo() ); masterAddressee.setLogo( logo ); @@ -209,7 +209,7 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) masterAddressee.setOrganization( (*contactIt).organization() ); // PHOTO - KABC::Picture photo = masterAddressee.photo(); + TDEABC::Picture photo = masterAddressee.photo(); mergePictures( photo, (*contactIt).photo() ); masterAddressee.setPhoto( photo ); @@ -234,10 +234,10 @@ KABC::Addressee KABTools::mergeContacts( const KABC::Addressee::List &list ) */ // TEL - const KABC::PhoneNumber::List phones = (*contactIt).phoneNumbers(); - const KABC::PhoneNumber::List masterPhones = masterAddressee.phoneNumbers(); - KABC::PhoneNumber::List::ConstIterator phoneIt( phones.begin() ); - const KABC::PhoneNumber::List::ConstIterator phoneEndIt( phones.end() ); + const TDEABC::PhoneNumber::List phones = (*contactIt).phoneNumbers(); + const TDEABC::PhoneNumber::List masterPhones = masterAddressee.phoneNumbers(); + TDEABC::PhoneNumber::List::ConstIterator phoneIt( phones.begin() ); + const TDEABC::PhoneNumber::List::ConstIterator phoneEndIt( phones.end() ); for ( ; phoneIt != phoneEndIt; ++phoneIt ) if ( !masterPhones.contains( *phoneIt ) ) masterAddressee.insertPhoneNumber( *phoneIt ); diff --git a/kaddressbook/kabtools.h b/kaddressbook/kabtools.h index 504540e9b..8061bfe1d 100644 --- a/kaddressbook/kabtools.h +++ b/kaddressbook/kabtools.h @@ -24,7 +24,7 @@ #ifndef KABTOOLS_H #define KABTOOLS_H -namespace KABC { +namespace TDEABC { class AddressBook; } @@ -34,12 +34,12 @@ class KABTools /** Sends a mail with vCards as attachments for all given UIDs. */ - static void mailVCards( const TQStringList &uids, KABC::AddressBook *ab ); + static void mailVCards( const TQStringList &uids, TDEABC::AddressBook *ab ); /** Merges all passed contacts to a single one. */ - static KABC::Addressee mergeContacts( const KABC::Addressee::List &list ); + static TDEABC::Addressee mergeContacts( const TDEABC::Addressee::List &list ); }; #endif diff --git a/kaddressbook/kaddressbookview.cpp b/kaddressbook/kaddressbookview.cpp index 09b713f26..d86103db8 100644 --- a/kaddressbook/kaddressbookview.cpp +++ b/kaddressbook/kaddressbookview.cpp @@ -55,10 +55,10 @@ KAddressBookView::~KAddressBookView() void KAddressBookView::readConfig( TDEConfig *config ) { - mFieldList = KABC::Field::restoreFields( config, "KABCFields" ); + mFieldList = TDEABC::Field::restoreFields( config, "KABCFields" ); if ( mFieldList.isEmpty() ) - mFieldList = KABC::Field::defaultFields(); + mFieldList = TDEABC::Field::defaultFields(); mDefaultFilterType = (DefaultFilterType)config->readNumEntry( "DefaultFilterType", 1 ); mDefaultFilterName = config->readEntry( "DefaultFilterName" ); @@ -74,7 +74,7 @@ TQString KAddressBookView::selectedEmails() bool first = true; TQString emailAddrs; const TQStringList uidList = selectedUids(); - KABC::Addressee addr; + TDEABC::Addressee addr; TQString email; TQStringList::ConstIterator it; @@ -85,7 +85,7 @@ TQString KAddressBookView::selectedEmails() TQString m = TQString(); if ( addr.emails().count() > 1 ) - m = KABC::EmailSelector::getEmail( addr.emails(), addr.preferredEmail(), this ); + m = TDEABC::EmailSelector::getEmail( addr.emails(), addr.preferredEmail(), this ); email = addr.fullEmail( m ); @@ -101,16 +101,16 @@ TQString KAddressBookView::selectedEmails() return emailAddrs; } -KABC::Addressee::List KAddressBookView::addressees() +TDEABC::Addressee::List KAddressBookView::addressees() { if ( mFilter.isEmpty() ) return mCore->searchManager()->contacts(); - KABC::Addressee::List addresseeList; - const KABC::Addressee::List contacts = mCore->searchManager()->contacts(); + TDEABC::Addressee::List addresseeList; + const TDEABC::Addressee::List contacts = mCore->searchManager()->contacts(); - KABC::Addressee::List::ConstIterator it; - KABC::Addressee::List::ConstIterator contactsEnd( contacts.end() ); + TDEABC::Addressee::List::ConstIterator it; + TDEABC::Addressee::List::ConstIterator contactsEnd( contacts.end() ); for ( it = contacts.begin(); it != contactsEnd; ++it ) { if ( mFilter.filterAddressee( *it ) ) addresseeList.append( *it ); @@ -129,7 +129,7 @@ void KAddressBookView::initGUI() layout->addWidget( mViewWidget ); } -KABC::Field::List KAddressBookView::fields() const +TDEABC::Field::List KAddressBookView::fields() const { return mFieldList; } @@ -185,7 +185,7 @@ void KAddressBookView::updateView() setSelected( *it, true ); } else { - const KABC::Addressee::List contacts = mCore->searchManager()->contacts(); + const TDEABC::Addressee::List contacts = mCore->searchManager()->contacts(); if ( !contacts.isEmpty() ) setFirstSelected( true ); else @@ -193,7 +193,7 @@ void KAddressBookView::updateView() } } -ViewConfigureWidget *ViewFactory::configureWidget( KABC::AddressBook *ab, +ViewConfigureWidget *ViewFactory::configureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) { diff --git a/kaddressbook/kaddressbookview.h b/kaddressbook/kaddressbookview.h index 44e82a572..8090408dc 100644 --- a/kaddressbook/kaddressbookview.h +++ b/kaddressbook/kaddressbookview.h @@ -42,7 +42,7 @@ class KXMLGUIClient; class TQDropEvent; namespace KAB { class Core; } -namespace KABC { class AddressBook; } +namespace TDEABC { class AddressBook; } /** Base class for all views in kaddressbook. This class implements @@ -121,7 +121,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget this method whenever a readConfig() is called in order to get the newest list of fields. */ - KABC::Field::List fields() const; + TDEABC::Field::List fields() const; /** Sets the active filter. This filter will be used for filtering @@ -152,7 +152,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget /** @return The current sort field. */ - virtual KABC::Field *sortField() const = 0; + virtual TDEABC::Field *sortField() const = 0; virtual void scrollUp() = 0; virtual void scrollDown() = 0; @@ -248,7 +248,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget method internally takes many factors into account, including the current filter. */ - KABC::Addressee::List addressees(); + TDEABC::Addressee::List addressees(); /** This method returns the widget that should be used as the parent for @@ -268,7 +268,7 @@ class KDE_EXPORT KAddressBookView : public TQWidget Filter mFilter; TQString mDefaultFilterName; KAB::Core *mCore; - KABC::Field::List mFieldList; + TDEABC::Field::List mFieldList; TQWidget *mViewWidget; }; @@ -300,7 +300,7 @@ class KDE_EXPORT ViewFactory : public KLibFactory If this method is over loaded the base classes method should <B>not</B> be called. */ - virtual ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, + virtual ViewConfigureWidget *configureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); diff --git a/kaddressbook/kcmconfigs/Makefile.am b/kaddressbook/kcmconfigs/Makefile.am index 62fb7612f..d066dfed4 100644 --- a/kaddressbook/kcmconfigs/Makefile.am +++ b/kaddressbook/kcmconfigs/Makefile.am @@ -20,7 +20,7 @@ kcm_kabldapconfig_la_SOURCES = addhostdialog.cpp kcmkabldapconfig.cpp \ ldapoptionswidget.cpp kcm_kabldapconfig_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \ -avoid-version -no-undefined -kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la +kcm_kabldapconfig_la_LIBADD = $(LIB_KIO) $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la kcm_kabcustomfields_la_SOURCES = kcmkabcustomfields.cpp kcm_kabcustomfields_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) \ diff --git a/kaddressbook/kcmconfigs/addhostdialog.cpp b/kaddressbook/kcmconfigs/addhostdialog.cpp index 44a51680e..7cf7a77fd 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.cpp +++ b/kaddressbook/kcmconfigs/addhostdialog.cpp @@ -41,19 +41,19 @@ AddHostDialog::AddHostDialog( KPIM::LdapServer *server, TQWidget* parent, const TQWidget *page = plainPage(); TQHBoxLayout *layout = new TQHBoxLayout( page, marginHint(), spacingHint() ); - mCfg = new KABC::LdapConfigWidget( - KABC::LdapConfigWidget::W_USER | - KABC::LdapConfigWidget::W_PASS | - KABC::LdapConfigWidget::W_BINDDN | - KABC::LdapConfigWidget::W_REALM | - KABC::LdapConfigWidget::W_HOST | - KABC::LdapConfigWidget::W_PORT | - KABC::LdapConfigWidget::W_VER | - KABC::LdapConfigWidget::W_TIMELIMIT | - KABC::LdapConfigWidget::W_SIZELIMIT | - KABC::LdapConfigWidget::W_DN | - KABC::LdapConfigWidget::W_SECBOX | - KABC::LdapConfigWidget::W_AUTHBOX, + mCfg = new TDEABC::LdapConfigWidget( + TDEABC::LdapConfigWidget::W_USER | + TDEABC::LdapConfigWidget::W_PASS | + TDEABC::LdapConfigWidget::W_BINDDN | + TDEABC::LdapConfigWidget::W_REALM | + TDEABC::LdapConfigWidget::W_HOST | + TDEABC::LdapConfigWidget::W_PORT | + TDEABC::LdapConfigWidget::W_VER | + TDEABC::LdapConfigWidget::W_TIMELIMIT | + TDEABC::LdapConfigWidget::W_SIZELIMIT | + TDEABC::LdapConfigWidget::W_DN | + TDEABC::LdapConfigWidget::W_SECBOX | + TDEABC::LdapConfigWidget::W_AUTHBOX, page ); layout->addWidget( mCfg ); diff --git a/kaddressbook/kcmconfigs/addhostdialog.h b/kaddressbook/kcmconfigs/addhostdialog.h index 1ea1865fd..5c900c07b 100644 --- a/kaddressbook/kcmconfigs/addhostdialog.h +++ b/kaddressbook/kcmconfigs/addhostdialog.h @@ -48,7 +48,7 @@ class AddHostDialog : public KDialogBase void slotHostEditChanged( const TQString& ); virtual void slotOk(); private: - KABC::LdapConfigWidget *mCfg; + TDEABC::LdapConfigWidget *mCfg; KPIM::LdapServer *mServer; }; diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp index 6d8522f6f..226bb3095 100644 --- a/kaddressbook/kcmconfigs/addresseewidget.cpp +++ b/kaddressbook/kcmconfigs/addresseewidget.cpp @@ -196,7 +196,7 @@ void AddresseeWidget::saveSettings() DCOPClient *client = DCOPClient::mainClient(); if ( client ) - client->emitDCOPSignal( "KABC::AddressBookConfig", "changed()", TQByteArray() ); + client->emitDCOPSignal( "TDEABC::AddressBookConfig", "changed()", TQByteArray() ); } #include "addresseewidget.moc" diff --git a/kaddressbook/keywidget.cpp b/kaddressbook/keywidget.cpp index 671d07298..8af9f2618 100644 --- a/kaddressbook/keywidget.cpp +++ b/kaddressbook/keywidget.cpp @@ -70,14 +70,14 @@ KeyWidget::~KeyWidget() { } -void KeyWidget::setKeys( const KABC::Key::List &list ) +void KeyWidget::setKeys( const TDEABC::Key::List &list ) { mKeyList = list; updateKeyCombo(); } -KABC::Key::List KeyWidget::keys() const +TDEABC::Key::List KeyWidget::keys() const { return mKeyList; } @@ -88,19 +88,19 @@ void KeyWidget::addKey() TQStringList keyTypeNames; TQStringList existingKeyTypes; - KABC::Key::List::ConstIterator listIt; + TDEABC::Key::List::ConstIterator listIt; for ( listIt = mKeyList.begin(); listIt != mKeyList.end(); ++listIt ) { - if ( (*listIt).type() != KABC::Key::Custom ) - existingKeyTypes.append( KABC::Key::typeLabel( (*listIt).type() ) ); + if ( (*listIt).type() != TDEABC::Key::Custom ) + existingKeyTypes.append( TDEABC::Key::typeLabel( (*listIt).type() ) ); } - KABC::Key::TypeList typeList = KABC::Key::typeList(); - KABC::Key::TypeList::ConstIterator it; + TDEABC::Key::TypeList typeList = TDEABC::Key::typeList(); + TDEABC::Key::TypeList::ConstIterator it; for ( it = typeList.begin(); it != typeList.end(); ++it ) { - if ( (*it) != KABC::Key::Custom && - !existingKeyTypes.contains( KABC::Key::typeLabel( *it ) ) ) { - keyMap.insert( KABC::Key::typeLabel( *it ), *it ); - keyTypeNames.append( KABC::Key::typeLabel( *it ) ); + if ( (*it) != TDEABC::Key::Custom && + !existingKeyTypes.contains( TDEABC::Key::typeLabel( *it ) ) ) { + keyMap.insert( TDEABC::Key::typeLabel( *it ), *it ); + keyTypeNames.append( TDEABC::Key::typeLabel( *it ) ); } } @@ -111,7 +111,7 @@ void KeyWidget::addKey() int type = keyMap[ name ]; if ( !keyTypeNames.contains( name ) ) - type = KABC::Key::Custom; + type = TDEABC::Key::Custom; KURL url = KFileDialog::getOpenURL(); if ( url.isEmpty() ) @@ -133,8 +133,8 @@ void KeyWidget::addKey() s >> data; file.close(); - KABC::Key key( data, type ); - if ( type == KABC::Key::Custom ) + TDEABC::Key key( data, type ); + if ( type == TDEABC::Key::Custom ) key.setCustomTypeString( name ); mKeyList.append( key ); @@ -165,7 +165,7 @@ void KeyWidget::removeKey() void KeyWidget::exportKey() { - KABC::Key key = (*mKeyList.at( mKeyCombo->currentItem() ) ); + TDEABC::Key key = (*mKeyList.at( mKeyCombo->currentItem() ) ); KURL url = KFileDialog::getSaveURL(); @@ -183,12 +183,12 @@ void KeyWidget::updateKeyCombo() int pos = mKeyCombo->currentItem(); mKeyCombo->clear(); - KABC::Key::List::ConstIterator it; + TDEABC::Key::List::ConstIterator it; for ( it = mKeyList.begin(); it != mKeyList.end(); ++it ) { - if ( (*it).type() == KABC::Key::Custom ) + if ( (*it).type() == TDEABC::Key::Custom ) mKeyCombo->insertItem( (*it).customTypeString() ); else - mKeyCombo->insertItem( KABC::Key::typeLabel( (*it).type() ) ); + mKeyCombo->insertItem( TDEABC::Key::typeLabel( (*it).type() ) ); } mKeyCombo->setCurrentItem( pos ); diff --git a/kaddressbook/keywidget.h b/kaddressbook/keywidget.h index 3e437fa00..3507af804 100644 --- a/kaddressbook/keywidget.h +++ b/kaddressbook/keywidget.h @@ -40,8 +40,8 @@ class KeyWidget : public TQWidget KeyWidget( TQWidget *parent, const char *name = 0 ); ~KeyWidget(); - void setKeys( const KABC::Key::List &list ); - KABC::Key::List keys() const; + void setKeys( const TDEABC::Key::List &list ); + TDEABC::Key::List keys() const; signals: void changed(); @@ -60,7 +60,7 @@ class KeyWidget : public TQWidget TQPushButton *mRemoveButton; TQPushButton *mExportButton; - KABC::Key::List mKeyList; + TDEABC::Key::List mKeyList; }; #endif diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp index 3ed815046..0dc741253 100644 --- a/kaddressbook/ldapsearchdialog.cpp +++ b/kaddressbook/ldapsearchdialog.cpp @@ -138,7 +138,7 @@ TQValueList<ContactListItem*> LDAPSearchDialog::Private::selectedItems( TQListVi return selected; } -LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, +LDAPSearchDialog::LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core, TQWidget* parent, const char* name ) : KDialogBase( Plain, i18n( "Search for Addresses in Directory" ), Help | User1 | User2 | Cancel, Default, parent, name, false, true ), @@ -481,9 +481,9 @@ void LDAPSearchDialog::slotSelectAll() mResultListView->selectAll( true ); } -KABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs ) +TDEABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs ) { - KABC::Addressee addr; + TDEABC::Addressee addr; // name addr.setNameFromString( asUtf8( attrs["cn"].first() ) ); @@ -509,7 +509,7 @@ KABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM:: #endif // Address - KABC::Address workAddr( KABC::Address::Work ); + TDEABC::Address workAddr( TDEABC::Address::Work ); workAddr.setStreet( asUtf8( attrs[ "street" ].first()) ); workAddr.setLocality( asUtf8( attrs[ "l" ].first()) ); @@ -521,24 +521,24 @@ KABC::Addressee LDAPSearchDialog::convertLdapAttributesToAddressee( const KPIM:: addr.insertAddress( workAddr ); // phone - KABC::PhoneNumber homeNr = asUtf8( attrs[ "homePhone" ].first() ); - homeNr.setType( KABC::PhoneNumber::Home ); + TDEABC::PhoneNumber homeNr = asUtf8( attrs[ "homePhone" ].first() ); + homeNr.setType( TDEABC::PhoneNumber::Home ); addr.insertPhoneNumber( homeNr ); - KABC::PhoneNumber workNr = asUtf8( attrs[ "telephoneNumber" ].first() ); - workNr.setType( KABC::PhoneNumber::Work ); + TDEABC::PhoneNumber workNr = asUtf8( attrs[ "telephoneNumber" ].first() ); + workNr.setType( TDEABC::PhoneNumber::Work ); addr.insertPhoneNumber( workNr ); - KABC::PhoneNumber faxNr = asUtf8( attrs[ "facsimileTelephoneNumber" ].first() ); - faxNr.setType( KABC::PhoneNumber::Fax ); + TDEABC::PhoneNumber faxNr = asUtf8( attrs[ "facsimileTelephoneNumber" ].first() ); + faxNr.setType( TDEABC::PhoneNumber::Fax ); addr.insertPhoneNumber( faxNr ); - KABC::PhoneNumber cellNr = asUtf8( attrs[ "mobile" ].first() ); - cellNr.setType( KABC::PhoneNumber::Cell ); + TDEABC::PhoneNumber cellNr = asUtf8( attrs[ "mobile" ].first() ); + cellNr.setType( TDEABC::PhoneNumber::Cell ); addr.insertPhoneNumber( cellNr ); - KABC::PhoneNumber pagerNr = asUtf8( attrs[ "pager" ].first() ); - pagerNr.setType( KABC::PhoneNumber::Pager ); + TDEABC::PhoneNumber pagerNr = asUtf8( attrs[ "pager" ].first() ); + pagerNr.setType( TDEABC::PhoneNumber::Pager ); addr.insertPhoneNumber( pagerNr ); return addr; } @@ -557,19 +557,19 @@ KPIM::DistributionList LDAPSearchDialog::selectDistributionList() } #endif -KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& selectedItems, - KABC::Resource * const resource ) +TDEABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& selectedItems, + TDEABC::Resource * const resource ) { const TQDateTime now = TQDateTime::currentDateTime(); TQStringList importedAddrs; - KABC::Addressee::List localAddrs; + TDEABC::Addressee::List localAddrs; KABLock::self( mCore->addressBook() )->lock( resource ); for ( TQValueList<ContactListItem*>::ConstIterator it = selectedItems.begin(); it != selectedItems.end(); ++it ) { const ContactListItem * const cli = *it; - KABC::Addressee addr = convertLdapAttributesToAddressee( cli->mAttrs ); - const KABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() ); + TDEABC::Addressee addr = convertLdapAttributesToAddressee( cli->mAttrs ); + const TDEABC::Addressee::List existing = mCore->addressBook()->findByEmail( addr.preferredEmail() ); if ( existing.isEmpty() ) { addr.setUid( TDEApplication::randomString( 10 ) ); @@ -608,7 +608,7 @@ void LDAPSearchDialog::slotUser2() return; } - KABC::Resource *resource = mCore->requestResource( this ); + TDEABC::Resource *resource = mCore->requestResource( this ); if ( !resource ) return; KPIM::DistributionList dist = selectDistributionList(); @@ -616,12 +616,12 @@ void LDAPSearchDialog::slotUser2() return; - KABC::Addressee::List localAddrs = importContactsUnlessTheyExist( selectedItems, resource ); + TDEABC::Addressee::List localAddrs = importContactsUnlessTheyExist( selectedItems, resource ); if ( localAddrs.isEmpty() ) return; - for ( KABC::Addressee::List::ConstIterator it = localAddrs.begin(); it != localAddrs.end(); ++it ) { + for ( TDEABC::Addressee::List::ConstIterator it = localAddrs.begin(); it != localAddrs.end(); ++it ) { dist.insertEntry( *it, TQString() ); } KABLock::self( mCore->addressBook() )->lock( resource ); @@ -633,7 +633,7 @@ void LDAPSearchDialog::slotUser2() void LDAPSearchDialog::slotUser1() { - KABC::Resource *resource = mCore->requestResource( this ); + TDEABC::Resource *resource = mCore->requestResource( this ); if ( !resource ) return; const TQValueList<ContactListItem*> selectedItems = d->selectedItems( mResultListView ); if( selectedItems.isEmpty() ) diff --git a/kaddressbook/ldapsearchdialog.h b/kaddressbook/ldapsearchdialog.h index dde2bc955..1f3a5c3b0 100644 --- a/kaddressbook/ldapsearchdialog.h +++ b/kaddressbook/ldapsearchdialog.h @@ -43,7 +43,7 @@ class TQPushButton; class KABCore; class ContactListItem; -namespace KABC { +namespace TDEABC { class Resource; } @@ -53,7 +53,7 @@ class LDAPSearchDialog : public KDialogBase public: - LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core, TQWidget* parent, const char* name = 0 ); + LDAPSearchDialog( TDEABC::AddressBook *ab, KABCore *core, TQWidget* parent, const char* name = 0 ); ~LDAPSearchDialog(); bool isOK() const { return mIsOK; } @@ -80,7 +80,7 @@ class LDAPSearchDialog : public KDialogBase * unless they already exist. Returns the list of both the added * and the existing contacts. */ - KABC::Addressee::List importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& items, KABC::Resource * const resource ); + TDEABC::Addressee::List importContactsUnlessTheyExist( const TQValueList<ContactListItem*>& items, TDEABC::Resource * const resource ); protected: TQString selectedEMails() const; @@ -89,7 +89,7 @@ class LDAPSearchDialog : public KDialogBase private: void saveSettings(); - static KABC::Addressee convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs ); + static TDEABC::Addressee convertLdapAttributesToAddressee( const KPIM::LdapAttrMap& attrs ); #ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList selectDistributionList(); #endif @@ -101,7 +101,7 @@ class LDAPSearchDialog : public KDialogBase int mNumHosts; TQPtrList<KPIM::LdapClient> mLdapClientList; bool mIsOK; - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; KABCore *mCore; KComboBox* mFilterCombo; diff --git a/kaddressbook/nameeditdialog.cpp b/kaddressbook/nameeditdialog.cpp index 91c018a7d..7724dd875 100644 --- a/kaddressbook/nameeditdialog.cpp +++ b/kaddressbook/nameeditdialog.cpp @@ -45,7 +45,7 @@ #include "nameeditdialog.h" -NameEditDialog::NameEditDialog( const KABC::Addressee &addr, int type, +NameEditDialog::NameEditDialog( const TDEABC::Addressee &addr, int type, bool readOnly, TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "Edit Contact Name" ), Help | Ok | Cancel, Ok, parent, name, true ), mAddressee( addr ) @@ -235,7 +235,7 @@ void NameEditDialog::formattedNameTypeChanged() if ( formattedNameType() == CustomName ) name = mCustomFormattedName; else { - KABC::Addressee addr; + TDEABC::Addressee addr; addr.setPrefix( prefix() ); addr.setFamilyName( familyName() ); addr.setAdditionalName( additionalName() ); @@ -249,7 +249,7 @@ void NameEditDialog::formattedNameTypeChanged() mFormattedNameEdit->setText( name ); } -TQString NameEditDialog::formattedName( const KABC::Addressee &addr, int type ) +TQString NameEditDialog::formattedName( const TDEABC::Addressee &addr, int type ) { TQString name; diff --git a/kaddressbook/nameeditdialog.h b/kaddressbook/nameeditdialog.h index 855cd04c2..277031d97 100644 --- a/kaddressbook/nameeditdialog.h +++ b/kaddressbook/nameeditdialog.h @@ -53,7 +53,7 @@ class NameEditDialog : public KDialogBase Organization // the organization name }; - NameEditDialog( const KABC::Addressee &addr, int type, + NameEditDialog( const TDEABC::Addressee &addr, int type, bool readOnly, TQWidget *parent, const char *name = 0 ); ~NameEditDialog(); @@ -67,7 +67,7 @@ class NameEditDialog : public KDialogBase bool changed() const; - static TQString formattedName( const KABC::Addressee &addr, int type ); + static TQString formattedName( const TDEABC::Addressee &addr, int type ); protected slots: void slotHelp(); @@ -91,7 +91,7 @@ class NameEditDialog : public KDialogBase TQCheckBox *mParseBox; AddresseeConfig mAddresseeConfig; - KABC::Addressee mAddressee; + TDEABC::Addressee mAddressee; TQString mCustomFormattedName; bool mChanged; }; diff --git a/kaddressbook/phoneeditwidget.cpp b/kaddressbook/phoneeditwidget.cpp index 70381d8e7..80f45cff5 100644 --- a/kaddressbook/phoneeditwidget.cpp +++ b/kaddressbook/phoneeditwidget.cpp @@ -48,9 +48,9 @@ PhoneTypeCombo::PhoneTypeCombo( TQWidget *parent ) : KComboBox( parent, "TypeCombo" ), - mType( KABC::PhoneNumber::Home ), + mType( TDEABC::PhoneNumber::Home ), mLastSelected( 0 ), - mTypeList( KABC::PhoneNumber::typeList() ) + mTypeList( TDEABC::PhoneNumber::typeList() ) { mTypeList.append( -1 ); // Others... @@ -91,7 +91,7 @@ void PhoneTypeCombo::update() if ( *it == -1 ) { // "Other..." entry insertItem( i18n( "Other..." ) ); } else { - KABC::PhoneNumber number; + TDEABC::PhoneNumber number; number.setType( *it ); insertItem( number.typeLabel() ); } @@ -141,7 +141,7 @@ PhoneNumberWidget::PhoneNumberWidget( TQWidget *parent ) connect( mNumberEdit, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SIGNAL( modified() ) ); } -void PhoneNumberWidget::setNumber( const KABC::PhoneNumber &number ) +void PhoneNumberWidget::setNumber( const TDEABC::PhoneNumber &number ) { mNumber = number; @@ -149,9 +149,9 @@ void PhoneNumberWidget::setNumber( const KABC::PhoneNumber &number ) mNumberEdit->setText( number.number() ); } -KABC::PhoneNumber PhoneNumberWidget::number() const +TDEABC::PhoneNumber PhoneNumberWidget::number() const { - KABC::PhoneNumber number( mNumber ); + TDEABC::PhoneNumber number( mNumber ); number.setType( mTypeCombo->type() ); number.setNumber( mNumberEdit->text() ); @@ -207,28 +207,28 @@ void PhoneEditWidget::setReadOnly( bool readOnly ) } } -void PhoneEditWidget::setPhoneNumbers( const KABC::PhoneNumber::List &list ) +void PhoneEditWidget::setPhoneNumbers( const TDEABC::PhoneNumber::List &list ) { mPhoneNumberList = list; - KABC::PhoneNumber::TypeList types; - types << KABC::PhoneNumber::Home; - types << KABC::PhoneNumber::Work; - types << KABC::PhoneNumber::Cell; + TDEABC::PhoneNumber::TypeList types; + types << TDEABC::PhoneNumber::Home; + types << TDEABC::PhoneNumber::Work; + types << TDEABC::PhoneNumber::Cell; // add an empty entry per default if ( mPhoneNumberList.count() < 3 ) for ( int i = mPhoneNumberList.count(); i < 3; ++i ) - mPhoneNumberList.append( KABC::PhoneNumber( "", types[ i ] ) ); + mPhoneNumberList.append( TDEABC::PhoneNumber( "", types[ i ] ) ); recreateNumberWidgets(); } -KABC::PhoneNumber::List PhoneEditWidget::phoneNumbers() const +TDEABC::PhoneNumber::List PhoneEditWidget::phoneNumbers() const { - KABC::PhoneNumber::List list; + TDEABC::PhoneNumber::List list; - KABC::PhoneNumber::List::ConstIterator it; + TDEABC::PhoneNumber::List::ConstIterator it; for ( it = mPhoneNumberList.begin(); it != mPhoneNumberList.end(); ++it ) if ( !(*it).number().isEmpty() ) list.append( *it ); @@ -244,7 +244,7 @@ void PhoneEditWidget::changed() void PhoneEditWidget::add() { - mPhoneNumberList.append( KABC::PhoneNumber() ); + mPhoneNumberList.append( TDEABC::PhoneNumber() ); recreateNumberWidgets(); } @@ -265,7 +265,7 @@ void PhoneEditWidget::recreateNumberWidgets() } mWidgets.clear(); - KABC::PhoneNumber::List::ConstIterator it; + TDEABC::PhoneNumber::List::ConstIterator it; int counter = 0; for ( it = mPhoneNumberList.begin(); it != mPhoneNumberList.end(); ++it ) { PhoneNumberWidget *wdg = new PhoneNumberWidget( this ); @@ -307,19 +307,19 @@ PhoneTypeDialog::PhoneTypeDialog( int type, TQWidget *parent ) layout->addWidget( mGroup ); // fill widgets - mTypeList = KABC::PhoneNumber::typeList(); - mTypeList.remove( KABC::PhoneNumber::Pref ); + mTypeList = TDEABC::PhoneNumber::typeList(); + mTypeList.remove( TDEABC::PhoneNumber::Pref ); - KABC::PhoneNumber::TypeList::ConstIterator it; + TDEABC::PhoneNumber::TypeList::ConstIterator it; for ( it = mTypeList.begin(); it != mTypeList.end(); ++it ) - new TQCheckBox( KABC::PhoneNumber::typeLabel( *it ), mGroup ); + new TQCheckBox( TDEABC::PhoneNumber::typeLabel( *it ), mGroup ); for ( int i = 0; i < mGroup->count(); ++i ) { TQCheckBox *box = (TQCheckBox*)mGroup->find( i ); box->setChecked( mType & mTypeList[ i ] ); } - mPreferredBox->setChecked( mType & KABC::PhoneNumber::Pref ); + mPreferredBox->setChecked( mType & TDEABC::PhoneNumber::Pref ); } int PhoneTypeDialog::type() const @@ -333,9 +333,9 @@ int PhoneTypeDialog::type() const } if ( mPreferredBox->isChecked() ) - type = type | KABC::PhoneNumber::Pref; + type = type | TDEABC::PhoneNumber::Pref; else - type = type & ~KABC::PhoneNumber::Pref; + type = type & ~TDEABC::PhoneNumber::Pref; return type; } diff --git a/kaddressbook/phoneeditwidget.h b/kaddressbook/phoneeditwidget.h index f9ca8ed4c..13c088916 100644 --- a/kaddressbook/phoneeditwidget.h +++ b/kaddressbook/phoneeditwidget.h @@ -71,8 +71,8 @@ class PhoneNumberWidget : public TQWidget public: PhoneNumberWidget( TQWidget *parent ); - void setNumber( const KABC::PhoneNumber &number ); - KABC::PhoneNumber number() const; + void setNumber( const TDEABC::PhoneNumber &number ); + TDEABC::PhoneNumber number() const; void setReadOnly( bool readOnly ); @@ -82,7 +82,7 @@ class PhoneNumberWidget : public TQWidget private: PhoneTypeCombo *mTypeCombo; KLineEdit *mNumberEdit; - KABC::PhoneNumber mNumber; + TDEABC::PhoneNumber mNumber; }; /** @@ -97,8 +97,8 @@ class PhoneEditWidget : public TQWidget PhoneEditWidget( TQWidget *parent, const char *name = 0 ); ~PhoneEditWidget(); - void setPhoneNumbers( const KABC::PhoneNumber::List &list ); - KABC::PhoneNumber::List phoneNumbers() const; + void setPhoneNumbers( const TDEABC::PhoneNumber::List &list ); + TDEABC::PhoneNumber::List phoneNumbers() const; void setReadOnly( bool readOnly ); @@ -114,7 +114,7 @@ class PhoneEditWidget : public TQWidget private: void recreateNumberWidgets(); - KABC::PhoneNumber::List mPhoneNumberList; + TDEABC::PhoneNumber::List mPhoneNumberList; TQPtrList<PhoneNumberWidget> mWidgets; TQPushButton *mAddButton; @@ -139,7 +139,7 @@ class PhoneTypeDialog : public KDialogBase private: int mType; - KABC::PhoneNumber::TypeList mTypeList; + TDEABC::PhoneNumber::TypeList mTypeList; TQButtonGroup *mGroup; TQCheckBox *mPreferredBox; diff --git a/kaddressbook/printing/detailledstyle.cpp b/kaddressbook/printing/detailledstyle.cpp index e1d48db56..41d6231e9 100644 --- a/kaddressbook/printing/detailledstyle.cpp +++ b/kaddressbook/printing/detailledstyle.cpp @@ -122,7 +122,7 @@ DetailledPrintStyle::~DetailledPrintStyle() mPainter = 0; } -void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintProgress *progress ) +void DetailledPrintStyle::print( const TDEABC::Addressee::List &contacts, PrintProgress *progress ) { mPrintProgress = progress; @@ -239,7 +239,7 @@ void DetailledPrintStyle::print( const KABC::Addressee::List &contacts, PrintPro config->sync(); } -bool DetailledPrintStyle::printEntries( const KABC::Addressee::List &contacts, +bool DetailledPrintStyle::printEntries( const TDEABC::Addressee::List &contacts, KPrinter *printer, TQPainter *painter, const TQRect &window) @@ -247,7 +247,7 @@ bool DetailledPrintStyle::printEntries( const KABC::Addressee::List &contacts, TQRect brect; int ypos = 0, count = 0; - KABC::Addressee::List::ConstIterator it; + TDEABC::Addressee::List::ConstIterator it; for ( it = contacts.begin(); it != contacts.end(); ++it ) { if ( !(*it).isEmpty() ) { // do a faked print to get the bounding rect: diff --git a/kaddressbook/printing/detailledstyle.h b/kaddressbook/printing/detailledstyle.h index c68568aa1..05f30bae4 100644 --- a/kaddressbook/printing/detailledstyle.h +++ b/kaddressbook/printing/detailledstyle.h @@ -42,12 +42,12 @@ class DetailledPrintStyle : public PrintStyle DetailledPrintStyle( PrintingWizard *parent, const char *name = 0 ); ~DetailledPrintStyle(); - void print( const KABC::Addressee::List &contacts, PrintProgress* ); + void print( const TDEABC::Addressee::List &contacts, PrintProgress* ); protected: - bool printEntries( const KABC::Addressee::List &contacts, KPrinter *printer, + bool printEntries( const TDEABC::Addressee::List &contacts, KPrinter *printer, TQPainter *painter, const TQRect &window ); - bool printEntry( const KABC::Addressee &contact, const TQRect &window, + bool printEntry( const TDEABC::Addressee &contact, const TQRect &window, TQPainter *painter, int top, bool fake, TQRect *brect ); private: AppearancePage *mPageAppearance; diff --git a/kaddressbook/printing/kabentrypainter.cpp b/kaddressbook/printing/kabentrypainter.cpp index d973f810c..49247ce8a 100644 --- a/kaddressbook/printing/kabentrypainter.cpp +++ b/kaddressbook/printing/kabentrypainter.cpp @@ -148,7 +148,7 @@ int KABEntryPainter::hits( const TQRectList& list, const TQPoint &p ) return -1; } -bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, +bool KABEntryPainter::printAddressee( const TDEABC::Addressee &addr, const TQRect &window, TQPainter *painter, int top, bool fake, TQRect *brect ) { @@ -169,7 +169,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, TQFontMetrics fmComment( mCommentFont ); int y = top; - KABC::Address address; + TDEABC::Address address; // this is used to prepare some fields for printing and decide about // the layout later: @@ -255,7 +255,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, } // Telephones: - const KABC::PhoneNumber::List phoneNumbers( addr.phoneNumbers() ); + const TDEABC::PhoneNumber::List phoneNumbers( addr.phoneNumbers() ); if ( !phoneNumbers.isEmpty() && mShowPhones ) { contents.push_back( &mPhoneRects ); TQStringList list; @@ -264,7 +264,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, list.append( phoneNumbers.count() == 1 ? i18n( "Telephone:" ) : i18n( "Telephones:" ) ); - KABC::PhoneNumber::List::ConstIterator it; + TDEABC::PhoneNumber::List::ConstIterator it; for ( it = phoneNumbers.begin(); it != phoneNumbers.end(); ++it ) { line = (*it).typeLabel(); line += ": " + (*it).number(); @@ -354,7 +354,7 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, // ^^^^^ done with emails, telephone, URLs and talk addresses // now print the addresses: - KABC::Address::List addresses = addr.addresses(); + TDEABC::Address::List addresses = addr.addresses(); if ( addresses.count() > 0 && mShowAddresses ) { y += fmBody.lineSpacing() / 2; painter->setFont( mHeadLineFont ); @@ -372,29 +372,29 @@ bool KABEntryPainter::printAddressee( const KABC::Addressee &addr, y += fmBody.lineSpacing() / 4; painter->setFont( mBodyFont ); - KABC::Address::List::ConstIterator it; + TDEABC::Address::List::ConstIterator it; for ( it = addresses.begin(); it != addresses.end(); ++it ) { address = *it; switch ( address.type() ) { - case KABC::Address::Dom: + case TDEABC::Address::Dom: line1 = i18n( "Domestic Address" ); break; - case KABC::Address::Intl: + case TDEABC::Address::Intl: line1 = i18n( "International Address" ); break; - case KABC::Address::Postal: + case TDEABC::Address::Postal: line1 = i18n( "Postal Address" ); break; - case KABC::Address::Parcel: + case TDEABC::Address::Parcel: line1 = i18n( "Parcel Address" ); break; - case KABC::Address::Home: + case TDEABC::Address::Home: line1 = i18n( "Home Address" ); break; - case KABC::Address::Work: + case TDEABC::Address::Work: line1 = i18n( "Work Address" ); break; - case KABC::Address::Pref: + case TDEABC::Address::Pref: default: line1 = i18n( "Preferred Address" ); } diff --git a/kaddressbook/printing/kabentrypainter.h b/kaddressbook/printing/kabentrypainter.h index f8fea4912..cd933b579 100644 --- a/kaddressbook/printing/kabentrypainter.h +++ b/kaddressbook/printing/kabentrypainter.h @@ -58,7 +58,7 @@ class KABEntryPainter @returns false if some error happens, otherwise true. */ - bool printAddressee( const KABC::Addressee &addr, const TQRect &window, + bool printAddressee( const TDEABC::Addressee &addr, const TQRect &window, TQPainter *p, int top = 0, bool fake = false, TQRect *rect = 0 ); diff --git a/kaddressbook/printing/mikesstyle.cpp b/kaddressbook/printing/mikesstyle.cpp index aa718dfd0..25b2e02e9 100644 --- a/kaddressbook/printing/mikesstyle.cpp +++ b/kaddressbook/printing/mikesstyle.cpp @@ -53,7 +53,7 @@ MikesStyle::~MikesStyle() { } -void MikesStyle::print( const KABC::Addressee::List &contacts, PrintProgress *progress ) +void MikesStyle::print( const TDEABC::Addressee::List &contacts, PrintProgress *progress ) { TQFont mFont; TQFont mBoldFont; @@ -71,7 +71,7 @@ void MikesStyle::print( const KABC::Addressee::List &contacts, PrintProgress *pr TQPaintDeviceMetrics metrics( p.device() ); int height = 0; - KABC::Addressee::List::ConstIterator it; + TDEABC::Addressee::List::ConstIterator it; progress->addMessage( i18n( "Preparing" ) ); progress->addMessage( i18n( "Printing" ) ); @@ -136,7 +136,7 @@ TQString MikesStyle::trimString( const TQString &text, int width, TQFontMetrics return trimmed; } -void MikesStyle::doPaint( TQPainter &painter, const KABC::Addressee &addr, +void MikesStyle::doPaint( TQPainter &painter, const TDEABC::Addressee &addr, int maxHeight, const TQFont &font, const TQFont &bFont ) { TQFontMetrics fm( font ); @@ -164,7 +164,7 @@ void MikesStyle::doPaint( TQPainter &painter, const KABC::Addressee &addr, // now the fields, in two halves painter.setFont( font ); - KABC::Field::List fields = wizard()->addressBook()->fields(); + TDEABC::Field::List fields = wizard()->addressBook()->fields(); int numFields = fields.count(); TQString label; TQString value; @@ -211,7 +211,7 @@ void MikesStyle::paintTagLine( TQPainter &p, const TQFont &font ) p.drawText( 0, fm.height(), text ); } -int MikesStyle::calcHeight( const KABC::Addressee &addr, +int MikesStyle::calcHeight( const TDEABC::Addressee &addr, const TQFont &font, const TQFont &bFont ) { TQFontMetrics fm( font ); @@ -220,7 +220,7 @@ int MikesStyle::calcHeight( const KABC::Addressee &addr, int height = 0; // get the fields - KABC::Field::List fieldList = wizard()->addressBook()->fields(); + TDEABC::Field::List fieldList = wizard()->addressBook()->fields(); int numFields = fieldList.count(); int halfHeight = 0; diff --git a/kaddressbook/printing/mikesstyle.h b/kaddressbook/printing/mikesstyle.h index f94dce309..fe1be4224 100644 --- a/kaddressbook/printing/mikesstyle.h +++ b/kaddressbook/printing/mikesstyle.h @@ -42,12 +42,12 @@ class MikesStyle : public PrintStyle MikesStyle( PrintingWizard *parent, const char *name ); ~MikesStyle(); - void print( const KABC::Addressee::List&, PrintProgress* ); + void print( const TDEABC::Addressee::List&, PrintProgress* ); protected: - void doPaint( TQPainter &painter, const KABC::Addressee &addr, int maxHeight, + void doPaint( TQPainter &painter, const TDEABC::Addressee &addr, int maxHeight, const TQFont &font, const TQFont &bFont ); - int calcHeight( const KABC::Addressee &addr, const TQFont &font, const TQFont &bFont); + int calcHeight( const TDEABC::Addressee &addr, const TQFont &font, const TQFont &bFont); void paintTagLine( TQPainter &p, const TQFont &font); TQString trimString( const TQString &text, int width, TQFontMetrics &fm); }; diff --git a/kaddressbook/printing/printingwizard.cpp b/kaddressbook/printing/printingwizard.cpp index 9ee8fe4a6..eecf434c3 100644 --- a/kaddressbook/printing/printingwizard.cpp +++ b/kaddressbook/printing/printingwizard.cpp @@ -52,7 +52,7 @@ using namespace KABPrinting; -PrintingWizard::PrintingWizard( KPrinter *printer, KABC::AddressBook* ab, +PrintingWizard::PrintingWizard( KPrinter *printer, TDEABC::AddressBook* ab, const TQStringList& selection, TQWidget *parent, const char* name ) : KWizard( parent, name ), mPrinter( printer ), mAddressBook( ab ), @@ -137,7 +137,7 @@ void PrintingWizard::slotStyleSelected( int index ) } } -KABC::AddressBook* PrintingWizard::addressBook() +TDEABC::AddressBook* PrintingWizard::addressBook() { return mAddressBook; } @@ -157,12 +157,12 @@ void PrintingWizard::print() // prepare list of contacts to print: - KABC::AddresseeList list; + TDEABC::AddresseeList list; if ( mStyle != 0 ) { if ( mSelectionPage->useSelection() ) { TQStringList::ConstIterator it; for ( it = mSelection.begin(); it != mSelection.end(); ++it ) { - KABC::Addressee addr = addressBook()->findByUid( *it ); + TDEABC::Addressee addr = addressBook()->findByUid( *it ); if ( !addr.isEmpty() ) list.append( addr ); } @@ -173,7 +173,7 @@ void PrintingWizard::print() if ( (*filterIt).name() == mSelectionPage->filter() ) break; - KABC::AddressBook::ConstIterator it; + TDEABC::AddressBook::ConstIterator it; for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) { if ( (*filterIt).filterAddressee( *it ) ) list.append( *it ); @@ -181,7 +181,7 @@ void PrintingWizard::print() } else if ( mSelectionPage->useCategories() ) { TQStringList categories = mSelectionPage->categories(); - KABC::AddressBook::ConstIterator it; + TDEABC::AddressBook::ConstIterator it; for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) { const TQStringList tmp( (*it).categories() ); TQStringList::ConstIterator tmpIt; @@ -193,7 +193,7 @@ void PrintingWizard::print() } } else { // create a string list of all entries: - KABC::AddressBook::ConstIterator it; + TDEABC::AddressBook::ConstIterator it; for ( it = addressBook()->begin(); it != addressBook()->end(); ++it ) list.append( *it ); } diff --git a/kaddressbook/printing/printingwizard.h b/kaddressbook/printing/printingwizard.h index 359b746fe..3d2d0b27e 100644 --- a/kaddressbook/printing/printingwizard.h +++ b/kaddressbook/printing/printingwizard.h @@ -57,7 +57,7 @@ class PrintingWizard : public KWizard Construct a printing wizard. Give the addressbook instance to print. */ PrintingWizard( KPrinter *printer, - KABC::AddressBook* ab, + TDEABC::AddressBook* ab, const TQStringList& selection, TQWidget *parent = 0, const char *name = 0 ); ~PrintingWizard(); @@ -75,7 +75,7 @@ class PrintingWizard : public KWizard /** Retrieve the document object. */ - KABC::AddressBook *addressBook(); + TDEABC::AddressBook *addressBook(); /** Retrieve the printer to be used. @@ -94,7 +94,7 @@ class PrintingWizard : public KWizard TQPtrList<PrintStyle> mStyleList; Filter::List mFilters; KPrinter *mPrinter; - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; TQStringList mSelection; PrintStyle *mStyle; diff --git a/kaddressbook/printing/printsortmode.cpp b/kaddressbook/printing/printsortmode.cpp index 3e1af4203..edbb9acc9 100644 --- a/kaddressbook/printing/printsortmode.cpp +++ b/kaddressbook/printing/printsortmode.cpp @@ -27,23 +27,23 @@ #if KDE_IS_VERSION(3,3,91) -PrintSortMode::PrintSortMode( KABC::Field *field, bool ascending ) +PrintSortMode::PrintSortMode( TDEABC::Field *field, bool ascending ) : mSortField( field ), mAscending( ascending ) { - const KABC::Field::List fields = KABC::Field::allFields(); - KABC::Field::List::ConstIterator it; + const TDEABC::Field::List fields = TDEABC::Field::allFields(); + TDEABC::Field::List::ConstIterator it; for ( it = fields.begin(); it != fields.end(); ++it ) { - if ( (*it)->label() == KABC::Addressee::givenNameLabel() ) + if ( (*it)->label() == TDEABC::Addressee::givenNameLabel() ) mGivenNameField = *it; - else if ( (*it)->label() == KABC::Addressee::familyNameLabel() ) + else if ( (*it)->label() == TDEABC::Addressee::familyNameLabel() ) mFamilyNameField = *it; - else if ( (*it)->label() == KABC::Addressee::formattedNameLabel() ) + else if ( (*it)->label() == TDEABC::Addressee::formattedNameLabel() ) mFormattedNameField = *it; } } -bool PrintSortMode::lesser( const KABC::Addressee &first, - const KABC::Addressee &second ) const +bool PrintSortMode::lesser( const TDEABC::Addressee &first, + const TDEABC::Addressee &second ) const { if ( !mSortField ) return false; diff --git a/kaddressbook/printing/printsortmode.h b/kaddressbook/printing/printsortmode.h index a764e6c74..fca9f6baf 100644 --- a/kaddressbook/printing/printsortmode.h +++ b/kaddressbook/printing/printsortmode.h @@ -30,18 +30,18 @@ #include <tdeabc/sortmode.h> -class PrintSortMode : public KABC::SortMode +class PrintSortMode : public TDEABC::SortMode { public: - PrintSortMode( KABC::Field *field, bool ascending = true ); + PrintSortMode( TDEABC::Field *field, bool ascending = true ); - virtual bool lesser( const KABC::Addressee&, const KABC::Addressee& ) const; + virtual bool lesser( const TDEABC::Addressee&, const TDEABC::Addressee& ) const; private: - KABC::Field *mSortField; - KABC::Field *mGivenNameField; - KABC::Field *mFamilyNameField; - KABC::Field *mFormattedNameField; + TDEABC::Field *mSortField; + TDEABC::Field *mGivenNameField; + TDEABC::Field *mFamilyNameField; + TDEABC::Field *mFormattedNameField; bool mAscending; }; diff --git a/kaddressbook/printing/printstyle.cpp b/kaddressbook/printing/printstyle.cpp index 9387db325..33ef9ab54 100644 --- a/kaddressbook/printing/printstyle.cpp +++ b/kaddressbook/printing/printstyle.cpp @@ -102,13 +102,13 @@ void PrintStyle::hidePages() mWizard->removePage( wdg ); } -void PrintStyle::setPreferredSortOptions( KABC::Field *field, bool ascending ) +void PrintStyle::setPreferredSortOptions( TDEABC::Field *field, bool ascending ) { mSortField = field; mSortType = ascending; } -KABC::Field* PrintStyle::preferredSortField() +TDEABC::Field* PrintStyle::preferredSortField() { return mSortField; } diff --git a/kaddressbook/printing/printstyle.h b/kaddressbook/printing/printstyle.h index 2c5ef51b5..9eeca876f 100644 --- a/kaddressbook/printing/printstyle.h +++ b/kaddressbook/printing/printstyle.h @@ -69,7 +69,7 @@ class PrintStyle : public TQObject /** Reimplement this method to actually print. */ - virtual void print( const KABC::Addressee::List &contacts, PrintProgress* ) = 0; + virtual void print( const TDEABC::Addressee::List &contacts, PrintProgress* ) = 0; /** Reimplement this method to provide a preview of what will @@ -91,7 +91,7 @@ class PrintStyle : public TQObject /** Returns the preferred sort criterion field. */ - KABC::Field* preferredSortField(); + TDEABC::Field* preferredSortField(); /** Returns the preferred sort type. @@ -118,7 +118,7 @@ class PrintStyle : public TQObject /** Set preferred sort options for this printing style. */ - void setPreferredSortOptions( KABC::Field *field, bool ascending = true ); + void setPreferredSortOptions( TDEABC::Field *field, bool ascending = true ); /** Return the wizard object. @@ -137,7 +137,7 @@ class PrintStyle : public TQObject TQPtrList<TQWidget> mPageList; TQStringList mPageTitles; - KABC::Field *mSortField; + TDEABC::Field *mSortField; bool mSortType; }; diff --git a/kaddressbook/printing/stylepage.cpp b/kaddressbook/printing/stylepage.cpp index 0b67897d2..0df149315 100644 --- a/kaddressbook/printing/stylepage.cpp +++ b/kaddressbook/printing/stylepage.cpp @@ -34,7 +34,7 @@ #include "stylepage.h" -StylePage::StylePage( KABC::AddressBook *ab, TQWidget* parent, const char* name ) +StylePage::StylePage( TDEABC::AddressBook *ab, TQWidget* parent, const char* name ) : TQWidget( parent, name ), mAddressBook( ab ) { initGUI(); @@ -69,7 +69,7 @@ void StylePage::clearStyleNames() mStyleCombo->clear(); } -void StylePage::setSortField( KABC::Field *field ) +void StylePage::setSortField( TDEABC::Field *field ) { mFieldCombo->setCurrentText( field->label() ); } @@ -82,7 +82,7 @@ void StylePage::setSortAscending( bool value ) mSortTypeCombo->setCurrentItem( 1 ); } -KABC::Field* StylePage::sortField() +TDEABC::Field* StylePage::sortField() { if ( mFieldCombo->currentItem() == -1 ) return mFields[ 0 ]; @@ -102,8 +102,8 @@ void StylePage::initFieldCombo() mFieldCombo->clear(); - mFields = mAddressBook->fields( KABC::Field::All ); - KABC::Field::List::ConstIterator it; + mFields = mAddressBook->fields( TDEABC::Field::All ); + TDEABC::Field::List::ConstIterator it; for ( it = mFields.begin(); it != mFields.end(); ++it ) mFieldCombo->insertItem( (*it)->label() ); } diff --git a/kaddressbook/printing/stylepage.h b/kaddressbook/printing/stylepage.h index 46fbc2d6e..9b6958f71 100644 --- a/kaddressbook/printing/stylepage.h +++ b/kaddressbook/printing/stylepage.h @@ -41,7 +41,7 @@ class StylePage : public TQWidget public: - StylePage( KABC::AddressBook *ab, TQWidget* parent = 0, const char* name = 0 ); + StylePage( TDEABC::AddressBook *ab, TQWidget* parent = 0, const char* name = 0 ); ~StylePage(); /** @@ -63,12 +63,12 @@ class StylePage : public TQWidget /** * Set the sort criterion field. */ - void setSortField( KABC::Field *field ); + void setSortField( TDEABC::Field *field ); /** * Returns the sort criterion field. */ - KABC::Field* sortField(); + TDEABC::Field* sortField(); /** * Set the sort type. @@ -96,8 +96,8 @@ class StylePage : public TQWidget KComboBox *mStyleCombo; TQLabel *mPreview; - KABC::AddressBook *mAddressBook; - KABC::Field::List mFields; + TDEABC::AddressBook *mAddressBook; + TDEABC::Field::List mFields; }; #endif // STYLEPAGE_H diff --git a/kaddressbook/searchmanager.cpp b/kaddressbook/searchmanager.cpp index fef8f27db..350a4ffd8 100644 --- a/kaddressbook/searchmanager.cpp +++ b/kaddressbook/searchmanager.cpp @@ -29,30 +29,30 @@ using namespace KAB; -SearchManager::SearchManager( KABC::AddressBook *ab, +SearchManager::SearchManager( TDEABC::AddressBook *ab, TQObject *parent, const char *name ) : TQObject( parent, name ), mAddressBook( ab ) { } -void SearchManager::search( const TQString &pattern, const KABC::Field::List &fields, Type type ) +void SearchManager::search( const TQString &pattern, const TDEABC::Field::List &fields, Type type ) { mPattern = pattern; mFields = fields; mType = type; - KABC::Addressee::List allContacts; + TDEABC::Addressee::List allContacts; mContacts.clear(); #if TDE_VERSION >= 319 - KABC::AddresseeList list( mAddressBook->allAddressees() ); + TDEABC::AddresseeList list( mAddressBook->allAddressees() ); if ( !fields.isEmpty() ) list.sortByField( fields.first() ); allContacts = list; #else - KABC::AddressBook::ConstIterator abIt( mAddressBook->begin() ); - const KABC::AddressBook::ConstIterator abEndIt( mAddressBook->end() ); + TDEABC::AddressBook::ConstIterator abIt( mAddressBook->begin() ); + const TDEABC::AddressBook::ConstIterator abEndIt( mAddressBook->end() ); for ( ; abIt != abEndIt; ++abIt ) allContacts.append( *abIt ); #endif @@ -60,8 +60,8 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi #ifdef TDEPIM_NEW_DISTRLISTS // Extract distribution lists from allContacts mDistributionLists.clear(); - KABC::Addressee::List::Iterator rmIt( allContacts.begin() ); - const KABC::Addressee::List::Iterator rmEndIt( allContacts.end() ); + TDEABC::Addressee::List::Iterator rmIt( allContacts.begin() ); + const TDEABC::Addressee::List::Iterator rmEndIt( allContacts.end() ); while ( rmIt != rmEndIt ) { if ( KPIM::DistributionList::isDistributionList( *rmIt ) ) { mDistributionLists.append( static_cast<KPIM::DistributionList>( *rmIt ) ); @@ -93,10 +93,10 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi return; } - const KABC::Field::List fieldList = !mFields.isEmpty() ? mFields : KABC::Field::allFields(); + const TDEABC::Field::List fieldList = !mFields.isEmpty() ? mFields : TDEABC::Field::allFields(); - KABC::Addressee::List::ConstIterator it( allContacts.begin() ); - const KABC::Addressee::List::ConstIterator endIt( allContacts.end() ); + TDEABC::Addressee::List::ConstIterator it( allContacts.begin() ); + const TDEABC::Addressee::List::ConstIterator endIt( allContacts.end() ); for ( ; it != endIt; ++it ) { #ifdef TDEPIM_NEW_DISTRLISTS if ( KPIM::DistributionList::isDistributionList( *it ) ) @@ -105,8 +105,8 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi bool found = false; // search over all fields - KABC::Field::List::ConstIterator fieldIt( fieldList.begin() ); - const KABC::Field::List::ConstIterator fieldEndIt( fieldList.end() ); + TDEABC::Field::List::ConstIterator fieldIt( fieldList.begin() ); + const TDEABC::Field::List::ConstIterator fieldEndIt( fieldList.end() ); for ( ; fieldIt != fieldEndIt; ++fieldIt ) { if ( type == StartsWith && (*fieldIt)->value( *it ).startsWith( pattern, false ) ) { @@ -159,7 +159,7 @@ void SearchManager::search( const TQString &pattern, const KABC::Field::List &fi emit contactsUpdated(); } -KABC::Addressee::List SearchManager::contacts() const +TDEABC::Addressee::List SearchManager::contacts() const { return mContacts; } diff --git a/kaddressbook/searchmanager.h b/kaddressbook/searchmanager.h index 9e1370320..3972110c3 100644 --- a/kaddressbook/searchmanager.h +++ b/kaddressbook/searchmanager.h @@ -47,7 +47,7 @@ class SearchManager : public TQObject Equals }; - SearchManager( KABC::AddressBook *ab, + SearchManager( TDEABC::AddressBook *ab, TQObject *parent, const char *name = 0 ); /** @@ -59,12 +59,12 @@ class SearchManager : public TQObject @param field The field which shall be compared with the search string. @param type The type for the matching. */ - void search( const TQString &pattern, const KABC::Field::List &fields, Type type = Contains ); + void search( const TQString &pattern, const TDEABC::Field::List &fields, Type type = Contains ); /** Returns the contacts which matched the last search query. */ - KABC::Addressee::List contacts() const; + TDEABC::Addressee::List contacts() const; #ifdef TDEPIM_NEW_DISTRLISTS @@ -94,15 +94,15 @@ class SearchManager : public TQObject void reload(); private: - KABC::Addressee::List mContacts; + TDEABC::Addressee::List mContacts; #ifdef TDEPIM_NEW_DISTRLISTS TQString mSelectedDistributionList; KPIM::DistributionList::List mDistributionLists; #endif - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; TQString mPattern; - KABC::Field::List mFields; + TDEABC::Field::List mFields; Type mType; }; diff --git a/kaddressbook/secrecywidget.cpp b/kaddressbook/secrecywidget.cpp index 62360196c..ae2b9c498 100644 --- a/kaddressbook/secrecywidget.cpp +++ b/kaddressbook/secrecywidget.cpp @@ -37,10 +37,10 @@ SecrecyWidget::SecrecyWidget( TQWidget *parent, const char *name ) mSecrecyCombo = new KComboBox( this ); layout->addWidget( mSecrecyCombo ); - const KABC::Secrecy::TypeList list = KABC::Secrecy::typeList(); - KABC::Secrecy::TypeList::ConstIterator it; + const TDEABC::Secrecy::TypeList list = TDEABC::Secrecy::typeList(); + TDEABC::Secrecy::TypeList::ConstIterator it; for ( it = list.begin(); it != list.end(); ++it ) - mSecrecyCombo->insertItem( KABC::Secrecy::typeLabel( *it ), *it ); + mSecrecyCombo->insertItem( TDEABC::Secrecy::typeLabel( *it ), *it ); connect( mSecrecyCombo, TQT_SIGNAL( activated( const TQString& ) ), TQT_SIGNAL( changed() ) ); @@ -55,15 +55,15 @@ void SecrecyWidget::setReadOnly( bool readOnly ) mSecrecyCombo->setEnabled( !readOnly ); } -void SecrecyWidget::setSecrecy( const KABC::Secrecy &secrecy ) +void SecrecyWidget::setSecrecy( const TDEABC::Secrecy &secrecy ) { - if ( secrecy.type() != KABC::Secrecy::Invalid ) + if ( secrecy.type() != TDEABC::Secrecy::Invalid ) mSecrecyCombo->setCurrentItem( secrecy.type() ); } -KABC::Secrecy SecrecyWidget::secrecy() const +TDEABC::Secrecy SecrecyWidget::secrecy() const { - KABC::Secrecy secrecy; + TDEABC::Secrecy secrecy; secrecy.setType( mSecrecyCombo->currentItem() ); return secrecy; diff --git a/kaddressbook/secrecywidget.h b/kaddressbook/secrecywidget.h index 46f76ba4d..1424d5e55 100644 --- a/kaddressbook/secrecywidget.h +++ b/kaddressbook/secrecywidget.h @@ -26,7 +26,7 @@ #include <tqwidget.h> -namespace KABC { class Secrecy; } +namespace TDEABC { class Secrecy; } class KComboBox; class SecrecyWidget : public TQWidget @@ -38,8 +38,8 @@ class SecrecyWidget : public TQWidget SecrecyWidget( TQWidget *parent, const char *name = 0 ); ~SecrecyWidget(); - void setSecrecy( const KABC::Secrecy &secrecy ); - KABC::Secrecy secrecy() const; + void setSecrecy( const TDEABC::Secrecy &secrecy ); + TDEABC::Secrecy secrecy() const; void setReadOnly( bool readOnly ); diff --git a/kaddressbook/simpleaddresseeeditor.cpp b/kaddressbook/simpleaddresseeeditor.cpp index cabd98ba6..7d7914b98 100644 --- a/kaddressbook/simpleaddresseeeditor.cpp +++ b/kaddressbook/simpleaddresseeeditor.cpp @@ -45,14 +45,14 @@ SimpleAddresseeEditor::~SimpleAddresseeEditor() kdDebug(5720) << "~SimpleAddresseeEditor()" << endl; } -void SimpleAddresseeEditor::setAddressee( const KABC::Addressee &addr ) +void SimpleAddresseeEditor::setAddressee( const TDEABC::Addressee &addr ) { mAddressee = addr; load(); } -const KABC::Addressee &SimpleAddresseeEditor::addressee() +const TDEABC::Addressee &SimpleAddresseeEditor::addressee() { return mAddressee; } diff --git a/kaddressbook/simpleaddresseeeditor.h b/kaddressbook/simpleaddresseeeditor.h index 81280ca69..6f297edcf 100644 --- a/kaddressbook/simpleaddresseeeditor.h +++ b/kaddressbook/simpleaddresseeeditor.h @@ -37,8 +37,8 @@ class SimpleAddresseeEditor : public AddresseeEditorBase SimpleAddresseeEditor( TQWidget *parent, const char *name = 0 ); ~SimpleAddresseeEditor(); - void setAddressee( const KABC::Addressee& ); - const KABC::Addressee &addressee(); + void setAddressee( const TDEABC::Addressee& ); + const TDEABC::Addressee &addressee(); void load(); void save(); @@ -57,7 +57,7 @@ class SimpleAddresseeEditor : public AddresseeEditorBase KLineEdit *mNameEdit; KLineEdit *mEmailEdit; - KABC::Addressee mAddressee; + TDEABC::Addressee mAddressee; bool mDirty; bool mBlockModified; diff --git a/kaddressbook/soundwidget.cpp b/kaddressbook/soundwidget.cpp index e26b3d3aa..dd10e2118 100644 --- a/kaddressbook/soundwidget.cpp +++ b/kaddressbook/soundwidget.cpp @@ -39,7 +39,7 @@ #include "soundwidget.h" -SoundWidget::SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +SoundWidget::SoundWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ContactEditorWidget( ab, parent, name ), mReadOnly( false ) { TQGridLayout *topLayout = new TQGridLayout( this, 2, 3, KDialog::marginHint(), @@ -85,12 +85,12 @@ SoundWidget::~SoundWidget() { } -void SoundWidget::loadContact( KABC::Addressee *addr ) +void SoundWidget::loadContact( TDEABC::Addressee *addr ) { bool blocked = signalsBlocked(); blockSignals( true ); - KABC::Sound sound = addr->sound(); + TDEABC::Sound sound = addr->sound(); if ( sound.isIntern() ) { mSound.setData( sound.data() ); mPlayButton->setEnabled( true ); @@ -105,9 +105,9 @@ void SoundWidget::loadContact( KABC::Addressee *addr ) blockSignals( blocked ); } -void SoundWidget::storeContact( KABC::Addressee *addr ) +void SoundWidget::storeContact( TDEABC::Addressee *addr ) { - KABC::Sound sound; + TDEABC::Sound sound; if ( mUseSoundUrl->isChecked() ) sound.setUrl( mSoundUrl->url() ); diff --git a/kaddressbook/soundwidget.h b/kaddressbook/soundwidget.h index f72a0181e..12283b4a3 100644 --- a/kaddressbook/soundwidget.h +++ b/kaddressbook/soundwidget.h @@ -39,11 +39,11 @@ class SoundWidget : public KAB::ContactEditorWidget public: - SoundWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + SoundWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~SoundWidget(); - void loadContact( KABC::Addressee *addr ); - void storeContact( KABC::Addressee *addr ); + void loadContact( TDEABC::Addressee *addr ); + void storeContact( TDEABC::Addressee *addr ); void setReadOnly( bool readOnly ); private slots: @@ -58,14 +58,14 @@ class SoundWidget : public KAB::ContactEditorWidget TQCheckBox *mUseSoundUrl; TQPushButton *mPlayButton; - KABC::Sound mSound; + TDEABC::Sound mSound; bool mReadOnly; }; class SoundWidgetFactory : public KAB::ContactEditorWidgetFactory { public: - KAB::ContactEditorWidget *createWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ) + KAB::ContactEditorWidget *createWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) { return new SoundWidget( ab, parent, name ); } diff --git a/kaddressbook/thumbnailcreator/Makefile.am b/kaddressbook/thumbnailcreator/Makefile.am index 2f8ba9c84..06b763c03 100644 --- a/kaddressbook/thumbnailcreator/Makefile.am +++ b/kaddressbook/thumbnailcreator/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = ldifvcardthumbnail.la ldifvcardthumbnail_la_SOURCES = ldifvcardcreator.cpp ldifvcardthumbnail_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -ldifvcardthumbnail_la_LIBADD = $(LIB_TDECORE) $(LIB_KABC) -ltdefx +ldifvcardthumbnail_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEABC) -ltdefx noinst_HEADERS = ldifvcardcreator.h diff --git a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp index a0c557d1b..44e4684f8 100644 --- a/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp +++ b/kaddressbook/thumbnailcreator/ldifvcardcreator.cpp @@ -84,10 +84,10 @@ bool VCard_LDIFCreator::readContents( const TQString &path ) #endif file.close(); - // convert the file contents to a KABC::Addressee address - KABC::AddresseeList addrList; - KABC::Addressee addr; - KABC::VCardConverter converter; + // convert the file contents to a TDEABC::Addressee address + TDEABC::AddresseeList addrList; + TDEABC::Addressee addr; + TDEABC::VCardConverter converter; #if defined(KABC_VCARD_ENCODING_FIX) addrList = converter.parseVCardsRaw( contentsRaw ); @@ -95,7 +95,7 @@ bool VCard_LDIFCreator::readContents( const TQString &path ) addrList = converter.parseVCards( contents ); #endif if ( addrList.count() == 0 ) - if ( !KABC::LDIFConverter::LDIFToAddressee( contents, addrList ) ) + if ( !TDEABC::LDIFConverter::LDIFToAddressee( contents, addrList ) ) return false; if ( addrList.count()>1 ) { // create an overview (list of all names) @@ -126,7 +126,7 @@ bool VCard_LDIFCreator::readContents( const TQString &path ) name = name.simplifyWhiteSpace(); - KABC::PhoneNumber::List pnList = addr.phoneNumbers(); + TDEABC::PhoneNumber::List pnList = addr.phoneNumbers(); TQStringList phoneNumbers; for (unsigned int no=0; no<pnList.count(); ++no) { TQString pn = pnList[no].number().simplifyWhiteSpace(); @@ -141,11 +141,11 @@ bool VCard_LDIFCreator::readContents( const TQString &path ) text += info + "\n"; // get an address - KABC::Address address = addr.address(KABC::Address::Work); + TDEABC::Address address = addr.address(TDEABC::Address::Work); if (address.isEmpty()) - address = addr.address(KABC::Address::Home); + address = addr.address(TDEABC::Address::Home); if (address.isEmpty()) - address = addr.address(KABC::Address::Pref); + address = addr.address(TDEABC::Address::Pref); info = address.formattedAddress(); if ( !info.isEmpty() ) text += info + "\n"; diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp index dc66696e5..aff63dd31 100644 --- a/kaddressbook/undocmds.cpp +++ b/kaddressbook/undocmds.cpp @@ -37,9 +37,9 @@ #include "undocmds.h" -bool Command::resourceExist( KABC::Resource *resource ) +bool Command::resourceExist( TDEABC::Resource *resource ) { - TQPtrList<KABC::Resource> lst = addressBook()->resources(); + TQPtrList<TDEABC::Resource> lst = addressBook()->resources(); for ( Resource *res = lst.first(); res; res = lst.next() ) { if ( res == resource ) return true; @@ -47,7 +47,7 @@ bool Command::resourceExist( KABC::Resource *resource ) return false; } -DeleteCommand::DeleteCommand( KABC::AddressBook *addressBook, +DeleteCommand::DeleteCommand( TDEABC::AddressBook *addressBook, const TQStringList &uidList) : Command( addressBook ), mUIDList( uidList ) { @@ -61,8 +61,8 @@ TQString DeleteCommand::name() const void DeleteCommand::unexecute() { // Put it back in the document - KABC::Addressee::List::ConstIterator it; - const KABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() ); + TDEABC::Addressee::List::ConstIterator it; + const TDEABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() ); // lock resources for ( it = mAddresseeList.begin(); it != endIt; ++it ) @@ -79,7 +79,7 @@ void DeleteCommand::unexecute() void DeleteCommand::execute() { - KABC::Addressee addr; + TDEABC::Addressee addr; TQStringList::ConstIterator it; const TQStringList::ConstIterator endIt( mUIDList.end() ); @@ -91,8 +91,8 @@ void DeleteCommand::execute() cfg.remove(); } - KABC::Addressee::List::ConstIterator addrIt; - const KABC::Addressee::List::ConstIterator addrEndIt( mAddresseeList.end() ); + TDEABC::Addressee::List::ConstIterator addrIt; + const TDEABC::Addressee::List::ConstIterator addrEndIt( mAddresseeList.end() ); for ( addrIt = mAddresseeList.begin(); addrIt != addrEndIt; ++addrIt ) { if ( resourceExist( ( *addrIt ).resource() ) ) addressBook()->removeAddressee( *addrIt ); @@ -101,7 +101,7 @@ void DeleteCommand::execute() } -PasteCommand::PasteCommand( KAB::Core *core, const KABC::Addressee::List &addressees ) +PasteCommand::PasteCommand( KAB::Core *core, const TDEABC::Addressee::List &addressees ) : Command( core->addressBook() ), mAddresseeList( addressees ), mCore( core ) { } @@ -113,8 +113,8 @@ TQString PasteCommand::name() const void PasteCommand::unexecute() { - KABC::Addressee::List::ConstIterator it; - const KABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() ); + TDEABC::Addressee::List::ConstIterator it; + const TDEABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() ); // lock resources for ( it = mAddresseeList.begin(); it != endIt; ++it ) @@ -131,15 +131,15 @@ void PasteCommand::execute() { TQStringList uids; - KABC::Addressee::List::ConstIterator constIt; - const KABC::Addressee::List::ConstIterator constEndIt( mAddresseeList.end() ); + TDEABC::Addressee::List::ConstIterator constIt; + const TDEABC::Addressee::List::ConstIterator constEndIt( mAddresseeList.end() ); // lock resources for ( constIt = mAddresseeList.begin(); constIt != constEndIt; ++constIt ) lock()->lock( (*constIt).resource() ); - KABC::Addressee::List::Iterator it; - const KABC::Addressee::List::Iterator endIt( mAddresseeList.end() ); + TDEABC::Addressee::List::Iterator it; + const TDEABC::Addressee::List::Iterator endIt( mAddresseeList.end() ); for ( it = mAddresseeList.begin(); it != endIt; ++it ) { if ( resourceExist( ( *it ).resource() ) ) { @@ -157,7 +157,7 @@ void PasteCommand::execute() } -NewCommand::NewCommand( KABC::AddressBook *addressBook, const KABC::Addressee::List &addressees ) +NewCommand::NewCommand( TDEABC::AddressBook *addressBook, const TDEABC::Addressee::List &addressees ) : Command( addressBook ), mAddresseeList( addressees ) { } @@ -169,8 +169,8 @@ TQString NewCommand::name() const void NewCommand::unexecute() { - KABC::Addressee::List::ConstIterator it; - const KABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() ); + TDEABC::Addressee::List::ConstIterator it; + const TDEABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() ); // lock resources for ( it = mAddresseeList.begin(); it != endIt; ++it ) @@ -185,8 +185,8 @@ void NewCommand::unexecute() void NewCommand::execute() { - KABC::Addressee::List::Iterator it; - const KABC::Addressee::List::Iterator endIt( mAddresseeList.end() ); + TDEABC::Addressee::List::Iterator it; + const TDEABC::Addressee::List::Iterator endIt( mAddresseeList.end() ); // lock resources for ( it = mAddresseeList.begin(); it != endIt; ++it ) @@ -200,9 +200,9 @@ void NewCommand::execute() } -EditCommand::EditCommand( KABC::AddressBook *addressBook, - const KABC::Addressee &oldAddressee, - const KABC::Addressee &newAddressee ) +EditCommand::EditCommand( TDEABC::AddressBook *addressBook, + const TDEABC::Addressee &oldAddressee, + const TDEABC::Addressee &newAddressee ) : Command( addressBook ), mOldAddressee( oldAddressee ), mNewAddressee( newAddressee ) { @@ -234,7 +234,7 @@ void EditCommand::execute() } -CutCommand::CutCommand( KABC::AddressBook *addressBook, const TQStringList &uidList ) +CutCommand::CutCommand( TDEABC::AddressBook *addressBook, const TQStringList &uidList ) : Command( addressBook ), mUIDList( uidList ) { } @@ -246,8 +246,8 @@ TQString CutCommand::name() const void CutCommand::unexecute() { - KABC::Addressee::List::ConstIterator it; - const KABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() ); + TDEABC::Addressee::List::ConstIterator it; + const TDEABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() ); // lock resources for ( it = mAddresseeList.begin(); it != endIt; ++it ) @@ -268,7 +268,7 @@ void CutCommand::unexecute() void CutCommand::execute() { - KABC::Addressee addr; + TDEABC::Addressee addr; TQStringList::ConstIterator it; const TQStringList::ConstIterator endIt( mUIDList.end() ); @@ -278,8 +278,8 @@ void CutCommand::execute() lock()->lock( addr.resource() ); } - KABC::Addressee::List::ConstIterator addrIt; - const KABC::Addressee::List::ConstIterator addrEndIt( mAddresseeList.end() ); + TDEABC::Addressee::List::ConstIterator addrIt; + const TDEABC::Addressee::List::ConstIterator addrEndIt( mAddresseeList.end() ); for ( addrIt = mAddresseeList.begin(); addrIt != addrEndIt; ++addrIt ) { if ( resourceExist( ( *addrIt ).resource() ) ) addressBook()->removeAddressee( *addrIt ); @@ -299,8 +299,8 @@ void CutCommand::execute() #endif } -CopyToCommand::CopyToCommand( KABC::AddressBook *addressBook, const TQStringList &uidList, - KABC::Resource *resource ) +CopyToCommand::CopyToCommand( TDEABC::AddressBook *addressBook, const TQStringList &uidList, + TDEABC::Resource *resource ) : Command( addressBook ), mUIDList( uidList ), mResource( resource ) { } @@ -312,8 +312,8 @@ TQString CopyToCommand::name() const void CopyToCommand::unexecute() { - KABC::Addressee::List::ConstIterator it; - const KABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() ); + TDEABC::Addressee::List::ConstIterator it; + const TDEABC::Addressee::List::ConstIterator endIt( mAddresseeList.end() ); //For copy : just remove it from the "copied to" resource. // lock resources for ( it = mAddresseeList.begin(); it != endIt; ++it ) @@ -332,9 +332,9 @@ void CopyToCommand::execute() TQStringList::Iterator it( mUIDList.begin() ); const TQStringList::Iterator endIt( mUIDList.end() ); while ( it != endIt ) { - KABC::Addressee addr = addressBook()->findByUid( *it++ ); + TDEABC::Addressee addr = addressBook()->findByUid( *it++ ); if ( !addr.isEmpty() ) { - KABC::Addressee newAddr( addr ); + TDEABC::Addressee newAddr( addr ); // We need to set a new uid, otherwise the insert below is // ignored. This is bad for syncing, but unavoidable, afaiks newAddr.setUid( TDEApplication::randomString( 10 ) ); @@ -349,7 +349,7 @@ void CopyToCommand::execute() } MoveToCommand::MoveToCommand( KAB::Core *core, const TQStringList &uidList, - KABC::Resource *resource ) + TDEABC::Resource *resource ) : Command( core->addressBook() ), mUIDList( uidList ), mResource( resource ), mCore( core ) { } @@ -362,7 +362,7 @@ TQString MoveToCommand::name() const void MoveToCommand::unexecute() { //For move : remove it from the "copied to" resource and insert it back to "copied from" resource. - KABC::Resource *resource = mCore->requestResource( mCore->widget() ); + TDEABC::Resource *resource = mCore->requestResource( mCore->widget() ); if ( !resource ) return; moveContactTo( resource ); @@ -373,15 +373,15 @@ void MoveToCommand::execute() moveContactTo( mResource ); } -void MoveToCommand::moveContactTo( KABC::Resource *resource ) +void MoveToCommand::moveContactTo( TDEABC::Resource *resource ) { KABLock::self( addressBook() )->lock( resource ); TQStringList::Iterator it( mUIDList.begin() ); const TQStringList::Iterator endIt( mUIDList.end() ); while ( it != endIt ) { - KABC::Addressee addr = addressBook()->findByUid( *it++ ); + TDEABC::Addressee addr = addressBook()->findByUid( *it++ ); if ( !addr.isEmpty() ) { - KABC::Addressee newAddr( addr ); + TDEABC::Addressee newAddr( addr ); // We need to set a new uid, otherwise the insert below is // ignored. This is bad for syncing, but unavoidable, afaiks TQString uid = TDEApplication::randomString( 10 ); diff --git a/kaddressbook/undocmds.h b/kaddressbook/undocmds.h index b9915f150..91d881842 100644 --- a/kaddressbook/undocmds.h +++ b/kaddressbook/undocmds.h @@ -45,27 +45,27 @@ class Core; class Command : public KCommand { public: - Command( KABC::AddressBook *addressBook ) { mAddressBook = addressBook; } + Command( TDEABC::AddressBook *addressBook ) { mAddressBook = addressBook; } protected: - KABC::AddressBook *addressBook() const { return mAddressBook; } + TDEABC::AddressBook *addressBook() const { return mAddressBook; } KABLock *lock() const { return KABLock::self( mAddressBook ); } - bool resourceExist( KABC::Resource *resource ); + bool resourceExist( TDEABC::Resource *resource ); private: - KABC::AddressBook* mAddressBook; + TDEABC::AddressBook* mAddressBook; }; class DeleteCommand : public Command { public: - DeleteCommand( KABC::AddressBook *addressBook, const TQStringList &uidList ); + DeleteCommand( TDEABC::AddressBook *addressBook, const TQStringList &uidList ); virtual TQString name() const; virtual void unexecute(); virtual void execute(); private: - KABC::Addressee::List mAddresseeList; + TDEABC::Addressee::List mAddresseeList; TQStringList mUIDList; }; @@ -73,28 +73,28 @@ class PasteCommand : public Command { public: PasteCommand( KAB::Core *core, - const KABC::Addressee::List &addressees ); + const TDEABC::Addressee::List &addressees ); virtual TQString name() const; virtual void unexecute(); virtual void execute(); private: - KABC::Addressee::List mAddresseeList; + TDEABC::Addressee::List mAddresseeList; KAB::Core *mCore; }; class CutCommand : public Command { public: - CutCommand( KABC::AddressBook *addressBook, const TQStringList &uidList ); + CutCommand( TDEABC::AddressBook *addressBook, const TQStringList &uidList ); virtual TQString name() const; virtual void unexecute(); virtual void execute(); private: - KABC::Addressee::List mAddresseeList; + TDEABC::Addressee::List mAddresseeList; TQStringList mUIDList; #if defined(KABC_VCARD_ENCODING_FIX) TQByteArray mClipText; @@ -107,63 +107,63 @@ class CutCommand : public Command class NewCommand : public Command { public: - NewCommand( KABC::AddressBook *addressBook, - const KABC::Addressee::List &addressees ); + NewCommand( TDEABC::AddressBook *addressBook, + const TDEABC::Addressee::List &addressees ); virtual TQString name() const; virtual void unexecute(); virtual void execute(); private: - KABC::Addressee::List mAddresseeList; + TDEABC::Addressee::List mAddresseeList; }; class EditCommand : public Command { public: - EditCommand( KABC::AddressBook *addressBook, const KABC::Addressee &oldAddressee, - const KABC::Addressee &newAddressee ); + EditCommand( TDEABC::AddressBook *addressBook, const TDEABC::Addressee &oldAddressee, + const TDEABC::Addressee &newAddressee ); virtual TQString name() const; virtual void unexecute(); virtual void execute(); private: - KABC::Addressee mOldAddressee; - KABC::Addressee mNewAddressee; + TDEABC::Addressee mOldAddressee; + TDEABC::Addressee mNewAddressee; }; class CopyToCommand : public Command { public: - CopyToCommand( KABC::AddressBook *addressBook, const TQStringList &uidList, - KABC::Resource *resource ); + CopyToCommand( TDEABC::AddressBook *addressBook, const TQStringList &uidList, + TDEABC::Resource *resource ); virtual TQString name() const; virtual void unexecute(); virtual void execute(); private: - KABC::Addressee::List mAddresseeList; + TDEABC::Addressee::List mAddresseeList; TQStringList mUIDList; - KABC::Resource *mResource; + TDEABC::Resource *mResource; }; class MoveToCommand : public Command { public: MoveToCommand( KAB::Core *core, const TQStringList &uidList, - KABC::Resource *resource ); + TDEABC::Resource *resource ); virtual TQString name() const; virtual void unexecute(); virtual void execute(); - void moveContactTo( KABC::Resource *resource ); + void moveContactTo( TDEABC::Resource *resource ); private: - KABC::Addressee::List mAddresseeList; + TDEABC::Addressee::List mAddresseeList; TQStringList mUIDList; - KABC::Resource *mResource; + TDEABC::Resource *mResource; KAB::Core *mCore; }; #endif diff --git a/kaddressbook/viewconfigurefieldspage.cpp b/kaddressbook/viewconfigurefieldspage.cpp index cdfb28eab..828825fad 100644 --- a/kaddressbook/viewconfigurefieldspage.cpp +++ b/kaddressbook/viewconfigurefieldspage.cpp @@ -39,21 +39,21 @@ class FieldItem : public TQListBoxText { public: - FieldItem( TQListBox *parent, KABC::Field *field ) + FieldItem( TQListBox *parent, TDEABC::Field *field ) : TQListBoxText( parent, field->label() ), mField( field ) {} - FieldItem( TQListBox *parent, KABC::Field *field, int index ) + FieldItem( TQListBox *parent, TDEABC::Field *field, int index ) : TQListBoxText( parent, field->label(), parent->item( index ) ), mField( field ) {} - KABC::Field *field() { return mField; } + TDEABC::Field *field() { return mField; } private: - KABC::Field *mField; + TDEABC::Field *mField; }; -ViewConfigureFieldsPage::ViewConfigureFieldsPage( KABC::AddressBook *ab, +ViewConfigureFieldsPage::ViewConfigureFieldsPage( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : TQWidget( parent, name ), mAddressBook( ab ) @@ -63,12 +63,12 @@ ViewConfigureFieldsPage::ViewConfigureFieldsPage( KABC::AddressBook *ab, void ViewConfigureFieldsPage::restoreSettings( TDEConfig *config ) { - KABC::Field::List fields = KABC::Field::restoreFields( config, "KABCFields" ); + TDEABC::Field::List fields = TDEABC::Field::restoreFields( config, "KABCFields" ); if ( fields.isEmpty() ) - fields = KABC::Field::defaultFields(); + fields = TDEABC::Field::defaultFields(); - KABC::Field::List::ConstIterator it; + TDEABC::Field::List::ConstIterator it; for ( it = fields.begin(); it != fields.end(); ++it ) new FieldItem( mSelectedBox, *it ); @@ -77,14 +77,14 @@ void ViewConfigureFieldsPage::restoreSettings( TDEConfig *config ) void ViewConfigureFieldsPage::saveSettings( TDEConfig *config ) { - KABC::Field::List fields; + TDEABC::Field::List fields; for ( uint i = 0; i < mSelectedBox->count(); ++i ) { FieldItem *fieldItem = static_cast<FieldItem *>( mSelectedBox->item( i ) ); fields.append( fieldItem->field() ); } - KABC::Field::saveFields( config, "KABCFields", fields ); + TDEABC::Field::saveFields( config, "KABCFields", fields ); } void ViewConfigureFieldsPage::slotShowFields( int index ) @@ -93,12 +93,12 @@ void ViewConfigureFieldsPage::slotShowFields( int index ) mUnSelectedBox->clear(); int category; - if ( index == 0 ) category = KABC::Field::All; + if ( index == 0 ) category = TDEABC::Field::All; else category = 1 << ( index - 1 ); - KABC::Field::List allFields = mAddressBook->fields( category ); + TDEABC::Field::List allFields = mAddressBook->fields( category ); - KABC::Field::List::ConstIterator it; + TDEABC::Field::List::ConstIterator it; for ( it = allFields.begin(); it != allFields.end(); ++it ) { TQListBoxItem *item = mSelectedBox->firstItem(); while( item ) { @@ -207,13 +207,13 @@ void ViewConfigureFieldsPage::initGUI() TQGridLayout *gl = new TQGridLayout( this , 6, 4, 0, KDialog::spacingHint() ); mCategoryCombo = new KComboBox( false, this ); - mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::All ) ); - mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Frequent ) ); - mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Address ) ); - mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Email ) ); - mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Personal ) ); - mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::Organization ) ); - mCategoryCombo->insertItem( KABC::Field::categoryLabel( KABC::Field::CustomCategory ) ); + mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::All ) ); + mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Frequent ) ); + mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Address ) ); + mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Email ) ); + mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Personal ) ); + mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::Organization ) ); + mCategoryCombo->insertItem( TDEABC::Field::categoryLabel( TDEABC::Field::CustomCategory ) ); connect( mCategoryCombo, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotShowFields(int) ) ); gl->addWidget( mCategoryCombo, 0, 0 ); diff --git a/kaddressbook/viewconfigurefieldspage.h b/kaddressbook/viewconfigurefieldspage.h index cbafec5ae..9b66b1599 100644 --- a/kaddressbook/viewconfigurefieldspage.h +++ b/kaddressbook/viewconfigurefieldspage.h @@ -41,7 +41,7 @@ class ViewConfigureFieldsPage : public TQWidget public: - ViewConfigureFieldsPage( KABC::AddressBook *ab, TQWidget *parent = 0, + ViewConfigureFieldsPage( TDEABC::AddressBook *ab, TQWidget *parent = 0, const char *name = 0 ); void restoreSettings( TDEConfig* ); @@ -67,7 +67,7 @@ class ViewConfigureFieldsPage : public TQWidget TQToolButton *mUpButton; TQToolButton *mDownButton; - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; }; #endif diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp index 105bd6857..cc60ce539 100644 --- a/kaddressbook/viewconfigurewidget.cpp +++ b/kaddressbook/viewconfigurewidget.cpp @@ -37,7 +37,7 @@ #include "viewconfigurewidget.h" -ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, +ViewConfigureWidget::ViewConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::ConfigureWidget( ab, parent, name ) { diff --git a/kaddressbook/viewconfigurewidget.h b/kaddressbook/viewconfigurewidget.h index c13f0fab9..839078e66 100644 --- a/kaddressbook/viewconfigurewidget.h +++ b/kaddressbook/viewconfigurewidget.h @@ -51,7 +51,7 @@ class KDE_EXPORT ViewConfigureWidget : public KAB::ConfigureWidget public: - ViewConfigureWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + ViewConfigureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); virtual ~ViewConfigureWidget(); /** diff --git a/kaddressbook/viewmanager.cpp b/kaddressbook/viewmanager.cpp index 4a4f601ad..8b2113678 100644 --- a/kaddressbook/viewmanager.cpp +++ b/kaddressbook/viewmanager.cpp @@ -126,14 +126,14 @@ TQStringList ViewManager::selectedEmails() const return TQStringList(); } -KABC::Addressee::List ViewManager::selectedAddressees() const +TDEABC::Addressee::List ViewManager::selectedAddressees() const { - KABC::Addressee::List list; + TDEABC::Addressee::List list; const TQStringList uids = selectedUids(); TQStringList::ConstIterator it; for ( it = uids.begin(); it != uids.end(); ++it ) { - KABC::Addressee addr = mCore->addressBook()->findByUid( *it ); + TDEABC::Addressee addr = mCore->addressBook()->findByUid( *it ); if ( !addr.isEmpty() ) list.append( addr ); } @@ -146,7 +146,7 @@ void ViewManager::setFilterSelectionWidget( FilterSelectionWidget *wdg ) mFilterSelectionWidget = wdg; } -KABC::Field *ViewManager::currentSortField() const +TDEABC::Field *ViewManager::currentSortField() const { if ( mActiveView ) return mActiveView->sortField(); @@ -154,14 +154,14 @@ KABC::Field *ViewManager::currentSortField() const return 0; } -KABC::Field::List ViewManager::viewFields() const +TDEABC::Field::List ViewManager::viewFields() const { /* if ( mActiveView ) return mActiveView->fields(); else */ - return KABC::Field::List(); + return TDEABC::Field::List(); } void ViewManager::setSelected( const TQString &uid, bool selected ) @@ -419,7 +419,7 @@ void ViewManager::dropped( TQDropEvent *e ) if ( e->source() == this ) return; - KABC::Addressee::List list; + TDEABC::Addressee::List list; KURL::List urls; if ( KURLDrag::decode( e, urls) ) { @@ -434,9 +434,9 @@ void ViewManager::dropped( TQDropEvent *e ) } else if ( c == 1 ) emit urlDropped( *it ); } else if ( KVCardDrag::decode( e, list ) ) { - KABC::Addressee::List::ConstIterator it; + TDEABC::Addressee::List::ConstIterator it; for ( it = list.begin(); it != list.end(); ++it ) { - KABC::Addressee a = mCore->addressBook()->findByUid( (*it).uid() ); + TDEABC::Addressee a = mCore->addressBook()->findByUid( (*it).uid() ); if ( a.isEmpty() ) { // not yet in address book mCore->addressBook()->insertAddressee( *it ); emit modified(); @@ -450,7 +450,7 @@ void ViewManager::dropped( TQDropEvent *e ) void ViewManager::startDrag() { // Get the list of all the selected addressees - KABC::Addressee::List addrList; + TDEABC::Addressee::List addrList; const TQStringList uidList = selectedUids(); if ( uidList.isEmpty() ) return; @@ -463,7 +463,7 @@ void ViewManager::startDrag() KMultipleDrag *drag = new KMultipleDrag( this ); - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; #if defined(KABC_VCARD_ENCODING_FIX) TQCString vcards = converter.createVCardsRaw( addrList ); #else diff --git a/kaddressbook/viewmanager.h b/kaddressbook/viewmanager.h index d248a6baa..9820607e0 100644 --- a/kaddressbook/viewmanager.h +++ b/kaddressbook/viewmanager.h @@ -37,7 +37,7 @@ class TDESelectAction; class FilterSelectionWidget; namespace KAB { class Core; } -namespace KABC { class AddressBook; } +namespace TDEABC { class AddressBook; } /** The view manager manages the views and everything related to them. The @@ -63,12 +63,12 @@ class ViewManager : public TQWidget TQStringList selectedUids() const; TQStringList selectedEmails() const; - KABC::Addressee::List selectedAddressees() const; + TDEABC::Addressee::List selectedAddressees() const; void setFilterSelectionWidget( FilterSelectionWidget *wdg ); - KABC::Field *currentSortField() const; - KABC::Field::List viewFields() const; + TDEABC::Field *currentSortField() const; + TDEABC::Field::List viewFields() const; public slots: void setSelected( const TQString &uid = TQString(), bool selected = true ); diff --git a/kaddressbook/views/Makefile.am b/kaddressbook/views/Makefile.am index 7b8cf31c0..37440a445 100644 --- a/kaddressbook/views/Makefile.am +++ b/kaddressbook/views/Makefile.am @@ -12,17 +12,17 @@ libkaddrbk_cardview_la_SOURCES = cardview.cpp colorlistbox.cpp \ configurecardviewdialog.cpp \ kaddressbookcardview.cpp libkaddrbk_cardview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC) +libkaddrbk_cardview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC) libkaddrbk_iconview_la_SOURCES = kaddressbookiconview.cpp libkaddrbk_iconview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC) +libkaddrbk_iconview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC) libkaddrbk_tableview_la_SOURCES = configuretableviewdialog.cpp \ contactlistview.cpp \ kaddressbooktableview.cpp libkaddrbk_tableview_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KABC) $(LIB_KIO) $(LIB_KIMPROXY) +libkaddrbk_tableview_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_TDEABC) $(LIB_KIO) $(LIB_KIMPROXY) noinst_HEADERS = cardview.h colorlistbox.h configurecardviewdialog.h \ configuretableviewdialog.h contactlistview.h \ diff --git a/kaddressbook/views/configurecardviewdialog.cpp b/kaddressbook/views/configurecardviewdialog.cpp index a386743c9..35d0b50c4 100644 --- a/kaddressbook/views/configurecardviewdialog.cpp +++ b/kaddressbook/views/configurecardviewdialog.cpp @@ -47,7 +47,7 @@ ///////////////////////////////// // ConfigureCardViewDialog -ConfigureCardViewWidget::ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, +ConfigureCardViewWidget::ConfigureCardViewWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : ViewConfigureWidget( ab, parent, name ) { diff --git a/kaddressbook/views/configurecardviewdialog.h b/kaddressbook/views/configurecardviewdialog.h index 892532c5e..afb938a61 100644 --- a/kaddressbook/views/configurecardviewdialog.h +++ b/kaddressbook/views/configurecardviewdialog.h @@ -36,7 +36,7 @@ class TQCheckBox; class TQLabel; class TDEConfig; -namespace KABC { class AddressBook; } +namespace TDEABC { class AddressBook; } class CardViewLookAndFeelPage; @@ -48,7 +48,7 @@ class CardViewLookAndFeelPage; class ConfigureCardViewWidget : public ViewConfigureWidget { public: - ConfigureCardViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ); + ConfigureCardViewWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ); virtual ~ConfigureCardViewWidget(); virtual void restoreSettings( TDEConfig* ); diff --git a/kaddressbook/views/configuretableviewdialog.cpp b/kaddressbook/views/configuretableviewdialog.cpp index f14a5c451..04044e4c8 100644 --- a/kaddressbook/views/configuretableviewdialog.cpp +++ b/kaddressbook/views/configuretableviewdialog.cpp @@ -40,7 +40,7 @@ #include "configuretableviewdialog.h" -ConfigureTableViewWidget::ConfigureTableViewWidget( KABC::AddressBook *ab, +ConfigureTableViewWidget::ConfigureTableViewWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : ViewConfigureWidget( ab, parent, name ) diff --git a/kaddressbook/views/configuretableviewdialog.h b/kaddressbook/views/configuretableviewdialog.h index 94fd2a687..fc38d0da5 100644 --- a/kaddressbook/views/configuretableviewdialog.h +++ b/kaddressbook/views/configuretableviewdialog.h @@ -33,7 +33,7 @@ class TQCheckBox; class KURLRequester; class TDEConfig; -namespace KABC { class AddressBook; } +namespace TDEABC { class AddressBook; } class LookAndFeelPage; @@ -45,7 +45,7 @@ class LookAndFeelPage; class ConfigureTableViewWidget : public ViewConfigureWidget { public: - ConfigureTableViewWidget( KABC::AddressBook *ab, TQWidget *parent, const char *name ); + ConfigureTableViewWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ); virtual ~ConfigureTableViewWidget(); virtual void restoreSettings( TDEConfig* ); diff --git a/kaddressbook/views/contactlistview.cpp b/kaddressbook/views/contactlistview.cpp index 0d7942f95..3a01974bc 100644 --- a/kaddressbook/views/contactlistview.cpp +++ b/kaddressbook/views/contactlistview.cpp @@ -78,7 +78,7 @@ void DynamicTip::maybeTip( const TQPoint &pos ) //kdDebug(5720) << "Tip rec: " << r.x() << "," << r.y() << "," << r.width() // << "," << r.height() << endl; - KABC::Addressee a = plvi->addressee(); + TDEABC::Addressee a = plvi->addressee(); if (a.isEmpty()) return; @@ -146,10 +146,10 @@ void DynamicTip::maybeTip( const TQPoint &pos ) /////////////////////////// // ContactListViewItem Methods -ContactListViewItem::ContactListViewItem(const KABC::Addressee &a, +ContactListViewItem::ContactListViewItem(const TDEABC::Addressee &a, ContactListView *parent, - KABC::AddressBook *doc, - const KABC::Field::List &fields, + TDEABC::AddressBook *doc, + const TDEABC::Field::List &fields, KIMProxy *proxy ) : TDEListViewItem(parent), mAddressee(a), mFields( fields ), parentListView( parent ), mDocument(doc), mIMProxy( proxy ) @@ -235,9 +235,9 @@ void ContactListViewItem::refresh() setPixmap( parentListView->imColumn(), TQPixmap() ); } - KABC::Field::List::ConstIterator it; + TDEABC::Field::List::ConstIterator it; for ( it = mFields.begin(); it != mFields.end(); ++it ) { - if ( (*it)->label() == KABC::Addressee::birthdayLabel() ) { + if ( (*it)->label() == TDEABC::Addressee::birthdayLabel() ) { TQDate date = mAddressee.birthday().date(); if ( date.isValid() ) setText( i++, TDEGlobal::locale()->formatDate( date, true ) ); @@ -257,7 +257,7 @@ void ContactListViewItem::setHasIM( bool hasIM ) // ContactListView ContactListView::ContactListView(KAddressBookTableView *view, - KABC::AddressBook* /* doc */, + TDEABC::AddressBook* /* doc */, TQWidget *parent, const char *name ) : TDEListView( parent, name ), diff --git a/kaddressbook/views/contactlistview.h b/kaddressbook/views/contactlistview.h index b893cc352..138830b60 100644 --- a/kaddressbook/views/contactlistview.h +++ b/kaddressbook/views/contactlistview.h @@ -56,9 +56,9 @@ class ContactListViewItem : public TDEListViewItem { public: - ContactListViewItem(const KABC::Addressee &a, ContactListView* parent, - KABC::AddressBook *doc, const KABC::Field::List &fields, KIMProxy *proxy ); - const KABC::Addressee &addressee() const { return mAddressee; } + ContactListViewItem(const TDEABC::Addressee &a, ContactListView* parent, + TDEABC::AddressBook *doc, const TDEABC::Field::List &fields, KIMProxy *proxy ); + const TDEABC::Addressee &addressee() const { return mAddressee; } virtual void refresh(); virtual ContactListView* parent(); virtual TQString key ( int, bool ) const; @@ -70,10 +70,10 @@ public: int column, int width, int align ); private: - KABC::Addressee mAddressee; - KABC::Field::List mFields; + TDEABC::Addressee mAddressee; + TDEABC::Field::List mFields; ContactListView *parentListView; - KABC::AddressBook *mDocument; + TDEABC::AddressBook *mDocument; KIMProxy *mIMProxy; bool mHasIM; }; @@ -89,7 +89,7 @@ class ContactListView : public TDEListView public: ContactListView(KAddressBookTableView *view, - KABC::AddressBook *doc, + TDEABC::AddressBook *doc, TQWidget *parent, const char *name = 0L ); virtual ~ContactListView() {} @@ -127,8 +127,8 @@ public: /** * Set the column index of the column used for instant messaging presence. * This method is necessary because presence, unlike the other fields, is not - * a KABC::Field, and cannot be handled using their methods. - * TODO: make presence a KABC::Field post 3.3 + * a TDEABC::Field, and cannot be handled using their methods. + * TODO: make presence a TDEABC::Field post 3.3 */ void setIMColumn( int column ); diff --git a/kaddressbook/views/kaddressbookcardview.cpp b/kaddressbook/views/kaddressbookcardview.cpp index f60d171a3..9c6b55e10 100644 --- a/kaddressbook/views/kaddressbookcardview.cpp +++ b/kaddressbook/views/kaddressbookcardview.cpp @@ -52,7 +52,7 @@ class CardViewFactory : public ViewFactory TQString description() const { return i18n( "Rolodex style cards represent contacts." ); } - ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent, + ViewConfigureWidget *configureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ) { return new ConfigureCardViewWidget( ab, parent, name ); @@ -69,21 +69,21 @@ extern "C" { class AddresseeCardViewItem : public CardViewItem { public: - AddresseeCardViewItem( const KABC::Field::List &fields, + AddresseeCardViewItem( const TDEABC::Field::List &fields, bool showEmptyFields, - KABC::AddressBook *doc, const KABC::Addressee &addr, + TDEABC::AddressBook *doc, const TDEABC::Addressee &addr, CardView *parent ) : CardViewItem( parent, addr.realName() ), mFields( fields ), mShowEmptyFields( showEmptyFields ), mDocument( doc ), mAddressee( addr ) { if ( mFields.isEmpty() ) - mFields = KABC::Field::defaultFields(); + mFields = TDEABC::Field::defaultFields(); refresh(); } - const KABC::Addressee &addressee() const { return mAddressee; } + const TDEABC::Addressee &addressee() const { return mAddressee; } void refresh() { @@ -92,8 +92,8 @@ class AddresseeCardViewItem : public CardViewItem if ( !mAddressee.isEmpty() ) { clearFields(); - KABC::Field::List::ConstIterator it( mFields.begin() ); - const KABC::Field::List::ConstIterator endIt( mFields.end() ); + TDEABC::Field::List::ConstIterator it( mFields.begin() ); + const TDEABC::Field::List::ConstIterator endIt( mFields.end() ); for ( ; it != endIt; ++it ) { // insert empty fields or not? not doing so saves a bit of memory and CPU // (during geometry calculations), but prevents having equally @@ -109,10 +109,10 @@ class AddresseeCardViewItem : public CardViewItem } private: - KABC::Field::List mFields; + TDEABC::Field::List mFields; bool mShowEmptyFields; - KABC::AddressBook *mDocument; - KABC::Addressee mAddressee; + TDEABC::AddressBook *mDocument; + TDEABC::Addressee mAddressee; }; @@ -172,10 +172,10 @@ KAddressBookCardView::~KAddressBookCardView() { } -KABC::Field *KAddressBookCardView::sortField() const +TDEABC::Field *KAddressBookCardView::sortField() const { // we have hardcoded sorting, so we have to return a hardcoded field :( - return KABC::Field::allFields()[ 0 ]; + return TDEABC::Field::allFields()[ 0 ]; } void KAddressBookCardView::readConfig( TDEConfig *config ) @@ -271,9 +271,9 @@ void KAddressBookCardView::refresh( const TQString &uid ) mCardView->viewport()->setUpdatesEnabled( false ); mCardView->clear(); - const KABC::Addressee::List addresseeList( addressees() ); - KABC::Addressee::List::ConstIterator it( addresseeList.begin() ); - const KABC::Addressee::List::ConstIterator endIt( addresseeList.end() ); + const TDEABC::Addressee::List addresseeList( addressees() ); + TDEABC::Addressee::List::ConstIterator it( addresseeList.begin() ); + const TDEABC::Addressee::List::ConstIterator endIt( addresseeList.end() ); for ( ; it != endIt; ++it ) { aItem = new AddresseeCardViewItem( fields(), mShowEmptyFields, core()->addressBook(), *it, mCardView ); diff --git a/kaddressbook/views/kaddressbookcardview.h b/kaddressbook/views/kaddressbookcardview.h index 90b738d53..15c77a7c9 100644 --- a/kaddressbook/views/kaddressbookcardview.h +++ b/kaddressbook/views/kaddressbookcardview.h @@ -52,7 +52,7 @@ class KAddressBookCardView : public KAddressBookView virtual TQStringList selectedUids(); virtual TQString type() const { return "Card"; } - virtual KABC::Field *sortField() const; + virtual TDEABC::Field *sortField() const; virtual void readConfig( TDEConfig *config ); virtual void writeConfig( TDEConfig *config ); diff --git a/kaddressbook/views/kaddressbookiconview.cpp b/kaddressbook/views/kaddressbookiconview.cpp index f88af5ffe..8b9780183 100644 --- a/kaddressbook/views/kaddressbookiconview.cpp +++ b/kaddressbook/views/kaddressbookiconview.cpp @@ -95,14 +95,14 @@ TQDragObject *AddresseeIconView::dragObject() class AddresseeIconViewItem : public TDEIconViewItem { public: - AddresseeIconViewItem( const KABC::Field::List&, KABC::AddressBook *doc, - const KABC::Addressee &addr, TQIconView *parent ) + AddresseeIconViewItem( const TDEABC::Field::List&, TDEABC::AddressBook *doc, + const TDEABC::Addressee &addr, TQIconView *parent ) : TDEIconViewItem( parent ), mDocument( doc ), mAddressee( addr ) { refresh(); } - const KABC::Addressee &addressee() const { return mAddressee; } + const TDEABC::Addressee &addressee() const { return mAddressee; } void refresh() { @@ -113,7 +113,7 @@ class AddresseeIconViewItem : public TDEIconViewItem TQPixmap icon; TQPixmap defaultIcon( TDEGlobal::iconLoader()->loadIcon( "vcard", TDEIcon::Desktop ) ); - KABC::Picture pic = mAddressee.photo(); + TDEABC::Picture pic = mAddressee.photo(); if ( pic.data().isNull() ) pic = mAddressee.logo(); @@ -130,8 +130,8 @@ class AddresseeIconViewItem : public TDEIconViewItem } private: - KABC::AddressBook *mDocument; - KABC::Addressee mAddressee; + TDEABC::AddressBook *mDocument; + TDEABC::Addressee mAddressee; }; @@ -161,10 +161,10 @@ KAddressBookIconView::~KAddressBookIconView() { } -KABC::Field *KAddressBookIconView::sortField() const +TDEABC::Field *KAddressBookIconView::sortField() const { // we have hardcoded sorting, so we have to return a hardcoded field :( - return KABC::Field::allFields()[ 2 ]; + return TDEABC::Field::allFields()[ 2 ]; } void KAddressBookIconView::readConfig( TDEConfig *config ) @@ -209,9 +209,9 @@ void KAddressBookIconView::refresh( const TQString &uid ) mIconView->clear(); mIconList.clear(); - const KABC::Addressee::List addresseeList( addressees() ); - KABC::Addressee::List::ConstIterator it( addresseeList.begin() ); - const KABC::Addressee::List::ConstIterator endIt( addresseeList.end() ); + const TDEABC::Addressee::List addresseeList( addressees() ); + TDEABC::Addressee::List::ConstIterator it( addresseeList.begin() ); + const TDEABC::Addressee::List::ConstIterator endIt( addresseeList.end() ); for ( ; it != endIt; ++it ) aItem = new AddresseeIconViewItem( fields(), core()->addressBook(), *it, mIconView ); diff --git a/kaddressbook/views/kaddressbookiconview.h b/kaddressbook/views/kaddressbookiconview.h index 4cf585b35..feb9edf3c 100644 --- a/kaddressbook/views/kaddressbookiconview.h +++ b/kaddressbook/views/kaddressbookiconview.h @@ -33,7 +33,7 @@ class TDEConfig; class AddresseeIconView; class AddresseeIconViewItem; -namespace KABC { class AddressBook; } +namespace TDEABC { class AddressBook; } /** This is an example kaddressbook view that is implemented using * TDEIconView. This view is not the most useful view, but it displays @@ -51,7 +51,7 @@ class KAddressBookIconView : public KAddressBookView virtual TQStringList selectedUids(); virtual TQString type() const { return "Icon"; } - virtual KABC::Field *sortField() const; + virtual TDEABC::Field *sortField() const; virtual void readConfig( TDEConfig *config ); void scrollUp(); diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp index 6d8d0c971..ad39eb644 100644 --- a/kaddressbook/views/kaddressbooktableview.cpp +++ b/kaddressbook/views/kaddressbooktableview.cpp @@ -71,7 +71,7 @@ class TableViewFactory : public ViewFactory TQString description() const { return i18n( "A listing of contacts in a table. Each cell of " "the table holds a field of the contact." ); } - ViewConfigureWidget *configureWidget( KABC::AddressBook *ab, TQWidget *parent, + ViewConfigureWidget *configureWidget( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ) { return new ConfigureTableViewWidget( ab, parent, name ); @@ -121,8 +121,8 @@ void KAddressBookTableView::reconstructListView() mListView->setShowIM( mIMProxy != 0 ); // Add the columns - const KABC::Field::List fieldList( fields() ); - KABC::Field::List::ConstIterator it; + const TDEABC::Field::List fieldList( fields() ); + TDEABC::Field::List::ConstIterator it; int c = 0; for ( it = fieldList.begin(); it != fieldList.end(); ++it ) { @@ -167,7 +167,7 @@ void KAddressBookTableView::reconstructListView() mListView->show(); } -KABC::Field *KAddressBookTableView::sortField() const +TDEABC::Field *KAddressBookTableView::sortField() const { // we have hardcoded sorting, so we have to return a hardcoded field :( return ( mListView->sortColumn() == -1 ? fields()[ 0 ] : fields()[ mListView->sortColumn() ] ); @@ -230,9 +230,9 @@ void KAddressBookTableView::refresh( const TQString &uid ) mListView->clear(); currentItem = 0; - const KABC::Addressee::List addresseeList( addressees() ); - KABC::Addressee::List::ConstIterator it( addresseeList.begin() ); - const KABC::Addressee::List::ConstIterator endIt( addresseeList.end() ); + const TDEABC::Addressee::List addresseeList( addressees() ); + TDEABC::Addressee::List::ConstIterator it( addresseeList.begin() ); + const TDEABC::Addressee::List::ConstIterator endIt( addresseeList.end() ); for ( ; it != endIt; ++it ) { ContactListViewItem *item = new ContactListViewItem( *it, mListView, core()->addressBook(), fields(), mIMProxy ); diff --git a/kaddressbook/views/kaddressbooktableview.h b/kaddressbook/views/kaddressbooktableview.h index acbfb08d4..7d258d2a7 100644 --- a/kaddressbook/views/kaddressbooktableview.h +++ b/kaddressbook/views/kaddressbooktableview.h @@ -47,7 +47,7 @@ class KIMProxy; class ContactListViewItem; class ContactListView; -namespace KABC { class AddressBook; } +namespace TDEABC { class AddressBook; } /** * This class is the table view for kaddressbook. This view is a TDEListView @@ -73,7 +73,7 @@ friend class ContactListView; virtual TQStringList selectedUids(); virtual void setSelected( const TQString &uid = TQString(), bool selected = false ); virtual void setFirstSelected( bool selected = true ); - virtual KABC::Field *sortField() const; + virtual TDEABC::Field *sortField() const; virtual void readConfig( TDEConfig *config ); virtual void writeConfig( TDEConfig *config ); diff --git a/kaddressbook/xxport/Makefile.am b/kaddressbook/xxport/Makefile.am index bdf1e86f5..ecf0372c4 100644 --- a/kaddressbook/xxport/Makefile.am +++ b/kaddressbook/xxport/Makefile.am @@ -21,33 +21,33 @@ XXLIBS = $(top_builddir)/kaddressbook/interfaces/libkabinterfaces.la \ $(top_builddir)/libtdepim/libtdepim.la libkaddrbk_csv_xxport_la_SOURCES = csv_xxport.cpp csvimportdialog.cpp dateparser.cpp -libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_csv_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) libkaddrbk_vcard_xxport_la_SOURCES = vcard_xxport.cpp -libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) \ +libkaddrbk_vcard_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) \ $(top_builddir)/kaddressbook/libkaddressbook.la \ $(top_builddir)/libtdenetwork/qgpgme/libqgpgme.la libkaddrbk_kde2_xxport_la_SOURCES = kde2_xxport.cpp -libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_kde2_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) libkaddrbk_bookmark_xxport_la_SOURCES = bookmark_xxport.cpp -libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_bookmark_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) libkaddrbk_eudora_xxport_la_SOURCES = eudora_xxport.cpp -libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_eudora_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) libkaddrbk_ldif_xxport_la_SOURCES = ldif_xxport.cpp -libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_ldif_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) libkaddrbk_gnokii_xxport_la_SOURCES = gnokii_xxport.cpp -libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_gnokii_xxport_la_LIBADD = $(XPMLIB) $(LIB_GNOKII) $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) libkaddrbk_opera_xxport_la_SOURCES = opera_xxport.cpp -libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_opera_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) libkaddrbk_pab_xxport_la_SOURCES = pab_xxport.cpp pab_mapihd.cpp pab_pablib.cpp -libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KABC) $(LIB_KIO) +libkaddrbk_pab_xxport_la_LIBADD = $(XXLIBS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEABC) $(LIB_KIO) noinst_HEADERS = csvimportdialog.h diff --git a/kaddressbook/xxport/bookmark_xxport.cpp b/kaddressbook/xxport/bookmark_xxport.cpp index 62357a599..39c709b3e 100644 --- a/kaddressbook/xxport/bookmark_xxport.cpp +++ b/kaddressbook/xxport/bookmark_xxport.cpp @@ -33,13 +33,13 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_bookmark_xxport, BookmarkXXPort ) -BookmarkXXPort::BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +BookmarkXXPort::BookmarkXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::XXPort( ab, parent, name ) { createExportAction( i18n( "Export Bookmarks Menu..." ) ); } -bool BookmarkXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& ) +bool BookmarkXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString& ) { TQString fileName = locateLocal( "data", "tdeabc/bookmarks.xml" ); @@ -47,7 +47,7 @@ bool BookmarkXXPort::exportContacts( const KABC::AddresseeList &list, const TQSt KBookmarkDomBuilder *builder = new KBookmarkDomBuilder( mgr->root(), mgr ); builder->connectImporter( this ); - KABC::AddresseeList::ConstIterator it; + TDEABC::AddresseeList::ConstIterator it; emit newFolder( i18n( "AddressBook" ), false, "" ); for ( it = list.begin(); it != list.end(); ++it ) { if ( !(*it).url().isEmpty() ) { diff --git a/kaddressbook/xxport/bookmark_xxport.h b/kaddressbook/xxport/bookmark_xxport.h index 3c74dc68c..fde6fe4dc 100644 --- a/kaddressbook/xxport/bookmark_xxport.h +++ b/kaddressbook/xxport/bookmark_xxport.h @@ -33,12 +33,12 @@ class BookmarkXXPort : public KAB::XXPort public: - BookmarkXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + BookmarkXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "bookmark"; } public slots: - bool exportContacts( const KABC::AddresseeList &list, const TQString &data ); + bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data ); signals: /** diff --git a/kaddressbook/xxport/csv_xxport.cpp b/kaddressbook/xxport/csv_xxport.cpp index 20ed9aac7..a0a85ab27 100644 --- a/kaddressbook/xxport/csv_xxport.cpp +++ b/kaddressbook/xxport/csv_xxport.cpp @@ -36,14 +36,14 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_csv_xxport, CSVXXPort ) -CSVXXPort::CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +CSVXXPort::CSVXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import CSV List..." ) ); createExportAction( i18n( "Export CSV List..." ) ); } -bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& ) +bool CSVXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString& ) { KURL url = KFileDialog::getSaveURL( "addressbook.csv" ); if ( url.isEmpty() ) @@ -84,23 +84,23 @@ bool CSVXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& } } -KABC::AddresseeList CSVXXPort::importContacts( const TQString& ) const +TDEABC::AddresseeList CSVXXPort::importContacts( const TQString& ) const { CSVImportDialog dlg( addressBook(), parentWidget() ); if ( dlg.exec() ) return dlg.contacts(); else - return KABC::AddresseeList(); + return TDEABC::AddresseeList(); } -void CSVXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) +void CSVXXPort::doExport( TQFile *fp, const TDEABC::AddresseeList &list ) { TQTextStream t( fp ); t.setEncoding( TQTextStream::Locale ); - KABC::AddresseeList::ConstIterator iter; - KABC::Field::List fields = addressBook()->fields(); - KABC::Field::List::Iterator fieldIter; + TDEABC::AddresseeList::ConstIterator iter; + TDEABC::Field::List fields = addressBook()->fields(); + TDEABC::Field::List::Iterator fieldIter; bool first = true; // First output the column headings @@ -114,7 +114,7 @@ void CSVXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) t << "\n"; // Then all the addressee objects - KABC::Addressee addr; + TDEABC::Addressee addr; for ( iter = list.begin(); iter != list.end(); ++iter ) { addr = *iter; first = true; diff --git a/kaddressbook/xxport/csv_xxport.h b/kaddressbook/xxport/csv_xxport.h index c7bea01b5..f0a28fdec 100644 --- a/kaddressbook/xxport/csv_xxport.h +++ b/kaddressbook/xxport/csv_xxport.h @@ -32,16 +32,16 @@ class CSVXXPort : public KAB::XXPort public: - CSVXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + CSVXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "csv"; } public slots: - bool exportContacts( const KABC::AddresseeList &list, const TQString &data ); - KABC::AddresseeList importContacts( const TQString &data ) const; + bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data ); + TDEABC::AddresseeList importContacts( const TQString &data ) const; private: - void doExport( TQFile *fp, const KABC::AddresseeList &list ); + void doExport( TQFile *fp, const TDEABC::AddresseeList &list ); }; #endif diff --git a/kaddressbook/xxport/csvimportdialog.cpp b/kaddressbook/xxport/csvimportdialog.cpp index 93635d25a..091d277f9 100644 --- a/kaddressbook/xxport/csvimportdialog.cpp +++ b/kaddressbook/xxport/csvimportdialog.cpp @@ -50,7 +50,7 @@ enum { Local = 0, Guess = 1, Latin1 = 2, Uni = 3, MSBug = 4, Codec = 5 }; -CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent, +CSVImportDialog::CSVImportDialog( TDEABC::AddressBook *ab, TQWidget *parent, const char * name ) : KDialogBase( Plain, i18n ( "CSV Import Dialog" ), Ok | Cancel | User1 | User2, Ok, parent, name, true, true ), @@ -63,59 +63,59 @@ CSVImportDialog::CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent, initGUI(); mTypeMap.insert( i18n( "Undefined" ), Undefined ); - mTypeMap.insert( KABC::Addressee::formattedNameLabel(), FormattedName ); - mTypeMap.insert( KABC::Addressee::familyNameLabel(), FamilyName ); - mTypeMap.insert( KABC::Addressee::givenNameLabel(), GivenName ); - mTypeMap.insert( KABC::Addressee::additionalNameLabel(), AdditionalName ); - mTypeMap.insert( KABC::Addressee::prefixLabel(), Prefix ); - mTypeMap.insert( KABC::Addressee::suffixLabel(), Suffix ); - mTypeMap.insert( KABC::Addressee::nickNameLabel(), NickName ); - mTypeMap.insert( KABC::Addressee::birthdayLabel(), Birthday ); - - mTypeMap.insert( KABC::Addressee::homeAddressStreetLabel(), HomeAddressStreet ); - mTypeMap.insert( KABC::Addressee::homeAddressLocalityLabel(), + mTypeMap.insert( TDEABC::Addressee::formattedNameLabel(), FormattedName ); + mTypeMap.insert( TDEABC::Addressee::familyNameLabel(), FamilyName ); + mTypeMap.insert( TDEABC::Addressee::givenNameLabel(), GivenName ); + mTypeMap.insert( TDEABC::Addressee::additionalNameLabel(), AdditionalName ); + mTypeMap.insert( TDEABC::Addressee::prefixLabel(), Prefix ); + mTypeMap.insert( TDEABC::Addressee::suffixLabel(), Suffix ); + mTypeMap.insert( TDEABC::Addressee::nickNameLabel(), NickName ); + mTypeMap.insert( TDEABC::Addressee::birthdayLabel(), Birthday ); + + mTypeMap.insert( TDEABC::Addressee::homeAddressStreetLabel(), HomeAddressStreet ); + mTypeMap.insert( TDEABC::Addressee::homeAddressLocalityLabel(), HomeAddressLocality ); - mTypeMap.insert( KABC::Addressee::homeAddressRegionLabel(), HomeAddressRegion ); - mTypeMap.insert( KABC::Addressee::homeAddressPostalCodeLabel(), + mTypeMap.insert( TDEABC::Addressee::homeAddressRegionLabel(), HomeAddressRegion ); + mTypeMap.insert( TDEABC::Addressee::homeAddressPostalCodeLabel(), HomeAddressPostalCode ); - mTypeMap.insert( KABC::Addressee::homeAddressCountryLabel(), + mTypeMap.insert( TDEABC::Addressee::homeAddressCountryLabel(), HomeAddressCountry ); - mTypeMap.insert( KABC::Addressee::homeAddressLabelLabel(), HomeAddressLabel ); + mTypeMap.insert( TDEABC::Addressee::homeAddressLabelLabel(), HomeAddressLabel ); - mTypeMap.insert( KABC::Addressee::businessAddressStreetLabel(), + mTypeMap.insert( TDEABC::Addressee::businessAddressStreetLabel(), BusinessAddressStreet ); - mTypeMap.insert( KABC::Addressee::businessAddressLocalityLabel(), + mTypeMap.insert( TDEABC::Addressee::businessAddressLocalityLabel(), BusinessAddressLocality ); - mTypeMap.insert( KABC::Addressee::businessAddressRegionLabel(), + mTypeMap.insert( TDEABC::Addressee::businessAddressRegionLabel(), BusinessAddressRegion ); - mTypeMap.insert( KABC::Addressee::businessAddressPostalCodeLabel(), + mTypeMap.insert( TDEABC::Addressee::businessAddressPostalCodeLabel(), BusinessAddressPostalCode ); - mTypeMap.insert( KABC::Addressee::businessAddressCountryLabel(), + mTypeMap.insert( TDEABC::Addressee::businessAddressCountryLabel(), BusinessAddressCountry ); - mTypeMap.insert( KABC::Addressee::businessAddressLabelLabel(), + mTypeMap.insert( TDEABC::Addressee::businessAddressLabelLabel(), BusinessAddressLabel ); - mTypeMap.insert( KABC::Addressee::homePhoneLabel(), HomePhone ); - mTypeMap.insert( KABC::Addressee::businessPhoneLabel(), BusinessPhone ); - mTypeMap.insert( KABC::Addressee::mobilePhoneLabel(), MobilePhone ); - mTypeMap.insert( KABC::Addressee::homeFaxLabel(), HomeFax ); - mTypeMap.insert( KABC::Addressee::businessFaxLabel(), BusinessFax ); - mTypeMap.insert( KABC::Addressee::carPhoneLabel(), CarPhone ); - mTypeMap.insert( KABC::Addressee::isdnLabel(), Isdn ); - mTypeMap.insert( KABC::Addressee::pagerLabel(), Pager ); - mTypeMap.insert( KABC::Addressee::emailLabel(), Email ); - mTypeMap.insert( KABC::Addressee::mailerLabel(), Mailer ); - mTypeMap.insert( KABC::Addressee::titleLabel(), Title ); - mTypeMap.insert( KABC::Addressee::roleLabel(), Role ); - mTypeMap.insert( KABC::Addressee::organizationLabel(), Organization ); - mTypeMap.insert( KABC::Addressee::noteLabel(), Note ); - mTypeMap.insert( KABC::Addressee::urlLabel(), URL ); + mTypeMap.insert( TDEABC::Addressee::homePhoneLabel(), HomePhone ); + mTypeMap.insert( TDEABC::Addressee::businessPhoneLabel(), BusinessPhone ); + mTypeMap.insert( TDEABC::Addressee::mobilePhoneLabel(), MobilePhone ); + mTypeMap.insert( TDEABC::Addressee::homeFaxLabel(), HomeFax ); + mTypeMap.insert( TDEABC::Addressee::businessFaxLabel(), BusinessFax ); + mTypeMap.insert( TDEABC::Addressee::carPhoneLabel(), CarPhone ); + mTypeMap.insert( TDEABC::Addressee::isdnLabel(), Isdn ); + mTypeMap.insert( TDEABC::Addressee::pagerLabel(), Pager ); + mTypeMap.insert( TDEABC::Addressee::emailLabel(), Email ); + mTypeMap.insert( TDEABC::Addressee::mailerLabel(), Mailer ); + mTypeMap.insert( TDEABC::Addressee::titleLabel(), Title ); + mTypeMap.insert( TDEABC::Addressee::roleLabel(), Role ); + mTypeMap.insert( TDEABC::Addressee::organizationLabel(), Organization ); + mTypeMap.insert( TDEABC::Addressee::noteLabel(), Note ); + mTypeMap.insert( TDEABC::Addressee::urlLabel(), URL ); mCustomCounter = mTypeMap.count(); int count = mCustomCounter; - KABC::Field::List fields = mAddressBook->fields( KABC::Field::CustomCategory ); - KABC::Field::List::Iterator it; + TDEABC::Field::List fields = mAddressBook->fields( TDEABC::Field::CustomCategory ); + TDEABC::Field::List::Iterator it; for ( it = fields.begin(); it != fields.end(); ++it, ++count ) mTypeMap.insert( (*it)->label(), count ); @@ -155,10 +155,10 @@ CSVImportDialog::~CSVImportDialog() mCodecs.clear(); } -KABC::AddresseeList CSVImportDialog::contacts() const +TDEABC::AddresseeList CSVImportDialog::contacts() const { DateParser dateParser( mDatePatternEdit->text() ); - KABC::AddresseeList contacts; + TDEABC::AddresseeList contacts; KProgressDialog progressDialog( mPage ); progressDialog.setAutoClose( true ); @@ -169,10 +169,10 @@ KABC::AddresseeList CSVImportDialog::contacts() const kapp->processEvents(); for ( int row = 1; row < mTable->numRows(); ++row ) { - KABC::Addressee a; + TDEABC::Addressee a; bool emptyRow = true; - KABC::Address addrHome( KABC::Address::Home ); - KABC::Address addrWork( KABC::Address::Work ); + TDEABC::Address addrHome( TDEABC::Address::Home ); + TDEABC::Address addrWork( TDEABC::Address::Work ); for ( int col = 0; col < mTable->numCols(); ++col ) { TQComboTableItem *item = static_cast<TQComboTableItem*>( mTable->item( 0, col ) ); @@ -242,51 +242,51 @@ KABC::AddresseeList CSVImportDialog::contacts() const case HomePhone: if ( !value.isEmpty() ) { - KABC::PhoneNumber number( value, KABC::PhoneNumber::Home ); + TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Home ); a.insertPhoneNumber( number ); } break; case BusinessPhone: if ( !value.isEmpty() ) { - KABC::PhoneNumber number( value, KABC::PhoneNumber::Work ); + TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Work ); a.insertPhoneNumber( number ); } break; case MobilePhone: if ( !value.isEmpty() ) { - KABC::PhoneNumber number( value, KABC::PhoneNumber::Cell ); + TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Cell ); a.insertPhoneNumber( number ); } break; case HomeFax: if ( !value.isEmpty() ) { - KABC::PhoneNumber number( value, KABC::PhoneNumber::Home | - KABC::PhoneNumber::Fax ); + TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Home | + TDEABC::PhoneNumber::Fax ); a.insertPhoneNumber( number ); } break; case BusinessFax: if ( !value.isEmpty() ) { - KABC::PhoneNumber number( value, KABC::PhoneNumber::Work | - KABC::PhoneNumber::Fax ); + TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Work | + TDEABC::PhoneNumber::Fax ); a.insertPhoneNumber( number ); } break; case CarPhone: if ( !value.isEmpty() ) { - KABC::PhoneNumber number( value, KABC::PhoneNumber::Car ); + TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Car ); a.insertPhoneNumber( number ); } break; case Isdn: if ( !value.isEmpty() ) { - KABC::PhoneNumber number( value, KABC::PhoneNumber::Isdn ); + TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Isdn ); a.insertPhoneNumber( number ); } break; case Pager: if ( !value.isEmpty() ) { - KABC::PhoneNumber number( value, KABC::PhoneNumber::Pager ); + TDEABC::PhoneNumber number( value, TDEABC::PhoneNumber::Pager ); a.insertPhoneNumber( number ); } break; @@ -329,8 +329,8 @@ KABC::AddresseeList CSVImportDialog::contacts() const addrWork.setLabel( value ); break; default: - KABC::Field::List fields = mAddressBook->fields( KABC::Field::CustomCategory ); - KABC::Field::List::Iterator it; + TDEABC::Field::List fields = mAddressBook->fields( TDEABC::Field::CustomCategory ); + TDEABC::Field::List::Iterator it; int counter = 0; for ( it = fields.begin(); it != fields.end(); ++it ) { @@ -347,7 +347,7 @@ KABC::AddresseeList CSVImportDialog::contacts() const kapp->processEvents(); if ( progressDialog.wasCancelled() ) - return KABC::AddresseeList(); + return TDEABC::AddresseeList(); progressDialog.progressBar()->advance( 1 ); diff --git a/kaddressbook/xxport/csvimportdialog.h b/kaddressbook/xxport/csvimportdialog.h index b6b89d7ec..da91c019a 100644 --- a/kaddressbook/xxport/csvimportdialog.h +++ b/kaddressbook/xxport/csvimportdialog.h @@ -44,11 +44,11 @@ class CSVImportDialog : public KDialogBase public: - CSVImportDialog( KABC::AddressBook *ab, TQWidget *parent, + CSVImportDialog( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); ~CSVImportDialog(); - KABC::AddresseeList contacts() const; + TDEABC::AddresseeList contacts() const; protected slots: virtual void slotOk(); @@ -116,7 +116,7 @@ class CSVImportDialog : public KDialogBase TQString mDelimiter; TQByteArray mFileArray; TQMap<TQString, uint> mTypeMap; - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; int mCustomCounter; bool mClearTypeStore; TQValueList<int> mTypeStore; diff --git a/kaddressbook/xxport/eudora_xxport.cpp b/kaddressbook/xxport/eudora_xxport.cpp index 75f2ea24d..f310cb598 100644 --- a/kaddressbook/xxport/eudora_xxport.cpp +++ b/kaddressbook/xxport/eudora_xxport.cpp @@ -38,29 +38,29 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_eudora_xxport, EudoraXXPort ) -EudoraXXPort::EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +EudoraXXPort::EudoraXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import Eudora Addressbook..." ) ); } -KABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const +TDEABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const { TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(), "*.[tT][xX][tT]|" + i18n("Eudora Light Addressbook (*.txt)"), 0 ); if ( fileName.isEmpty() ) - return KABC::AddresseeList(); + return TDEABC::AddresseeList(); TQFile file( fileName ); if ( !file.open( IO_ReadOnly ) ) - return KABC::AddresseeList(); + return TDEABC::AddresseeList(); TQString line; TQTextStream stream( &file ); - KABC::Addressee *a = 0; + TDEABC::Addressee *a = 0; int bytesRead = 0; - KABC::AddresseeList list; + TDEABC::AddresseeList list; while( !stream.eof() ) { line = stream.readLine(); @@ -72,9 +72,9 @@ KABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const list << *a; delete a; a = 0; - a = new KABC::Addressee(); + a = new TDEABC::Addressee(); } else - a = new KABC::Addressee(); + a = new TDEABC::Addressee(); tmp = key( line ).stripWhiteSpace(); if ( !tmp.isEmpty() ) @@ -97,7 +97,7 @@ KABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const tmp = get( line, "address" ).stripWhiteSpace(); if ( !tmp.isEmpty() ) { - KABC::Address addr; + TDEABC::Address addr; kdDebug(5720) << tmp << endl; // dump complete address addr.setLabel( tmp ); a->insertAddress( addr ); @@ -105,7 +105,7 @@ KABC::AddresseeList EudoraXXPort::importContacts( const TQString& ) const tmp = get( line, "phone" ).stripWhiteSpace(); if ( !tmp.isEmpty() ) - a->insertPhoneNumber( KABC::PhoneNumber( tmp, KABC::PhoneNumber::Home ) ); + a->insertPhoneNumber( TDEABC::PhoneNumber( tmp, TDEABC::PhoneNumber::Home ) ); } } diff --git a/kaddressbook/xxport/eudora_xxport.h b/kaddressbook/xxport/eudora_xxport.h index b1b6ebf8e..b6b346022 100644 --- a/kaddressbook/xxport/eudora_xxport.h +++ b/kaddressbook/xxport/eudora_xxport.h @@ -32,12 +32,12 @@ class EudoraXXPort : public KAB::XXPort public: - EudoraXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + EudoraXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "eudora"; } public slots: - KABC::AddresseeList importContacts( const TQString &data ) const; + TDEABC::AddresseeList importContacts( const TQString &data ) const; private: TQString get( const TQString& line, const TQString& key ) const; diff --git a/kaddressbook/xxport/gnokii_xxport.cpp b/kaddressbook/xxport/gnokii_xxport.cpp index 306fbe808..5755784af 100644 --- a/kaddressbook/xxport/gnokii_xxport.cpp +++ b/kaddressbook/xxport/gnokii_xxport.cpp @@ -77,7 +77,7 @@ static KProgressDialog *m_progressDlg; K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_gnokii_xxport, GNOKIIXXPort ) -GNOKIIXXPort::GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +GNOKIIXXPort::GNOKIIXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::XXPort( ab, parent, name ) { this_filter = this; @@ -187,7 +187,7 @@ static TQString buildPhoneInfoString( const gn_memory_status &memstat ) // read and evaluate all phone entries static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memtype, - KABC::AddresseeList *addrList ) + TDEABC::AddresseeList *addrList ) { gn_error error; @@ -204,7 +204,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty error = read_phone_memstat(memtype, &memstat); TQStringList addrlist; - KABC::Address *addr; + TDEABC::Address *addr; TQString s, country; progress->setTotalSteps(memstat.used); @@ -237,7 +237,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty .arg(GN_FROM(name)).arg(GN_FROM(number)) .arg(gn_lib_get_pb_location(state)).arg(gn_lib_get_pb_caller_group(state)) .arg(subentries_count)); - KABC::Addressee *a = new KABC::Addressee(); + TDEABC::Addressee *a = new TDEABC::Addressee(); // try to split Name into FamilyName and GivenName s = GN_FROM(name).simplifyWhiteSpace(); @@ -280,8 +280,8 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty a->setRevision(datetime); if (!subentries_count) - a->insertPhoneNumber(KABC::PhoneNumber(number, - KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref)); + a->insertPhoneNumber(TDEABC::PhoneNumber(number, + TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Pref)); /* scan sub-entries */ if (subentries_count) @@ -307,7 +307,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty break; case GN_PHONEBOOK_ENTRY_Postal: addrlist = TQStringList::split(';', s, true); - addr = new KABC::Address(KABC::Address::Work); + addr = new TDEABC::Address(TDEABC::Address::Work); if (addrlist.count() <= 1) { addrlist = TQStringList::split(',', s, true); if (addrlist.count() > 1 ) { @@ -341,18 +341,18 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty a->setNote(a->note()+s); break; case GN_PHONEBOOK_ENTRY_Number: - enum KABC::PhoneNumber::Types phonetype; + enum TDEABC::PhoneNumber::Types phonetype; switch (number_type) { - case GN_PHONEBOOK_NUMBER_Mobile: phonetype = KABC::PhoneNumber::Cell; break; - case GN_PHONEBOOK_NUMBER_Fax: phonetype = KABC::PhoneNumber::Fax; break; + case GN_PHONEBOOK_NUMBER_Mobile: phonetype = TDEABC::PhoneNumber::Cell; break; + case GN_PHONEBOOK_NUMBER_Fax: phonetype = TDEABC::PhoneNumber::Fax; break; case GN_PHONEBOOK_NUMBER_General: - case GN_PHONEBOOK_NUMBER_Work: phonetype = KABC::PhoneNumber::Work; break; + case GN_PHONEBOOK_NUMBER_Work: phonetype = TDEABC::PhoneNumber::Work; break; default: - case GN_PHONEBOOK_NUMBER_Home: phonetype = KABC::PhoneNumber::Home; break; + case GN_PHONEBOOK_NUMBER_Home: phonetype = TDEABC::PhoneNumber::Home; break; } //if (s == entry.number) - // type = (KABC::PhoneNumber::Types) (phonetype | KABC::PhoneNumber::Pref); - a->insertPhoneNumber(KABC::PhoneNumber(s, phonetype)); + // type = (TDEABC::PhoneNumber::Types) (phonetype | TDEABC::PhoneNumber::Pref); + a->insertPhoneNumber(TDEABC::PhoneNumber(s, phonetype)); break; case GN_PHONEBOOK_ENTRY_URL: a->setUrl(s); @@ -388,7 +388,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty // export to phone static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type memtype, - const KABC::Addressee *addr) + const TDEABC::Addressee *addr) { TQString s; @@ -398,13 +398,13 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem gn_lib_set_pb_location(state, phone_location); gn_lib_set_pb_name(state, GN_TO(addr->realName())); - s = addr->phoneNumber(KABC::PhoneNumber::Pref).number(); + s = addr->phoneNumber(TDEABC::PhoneNumber::Pref).number(); if (s.isEmpty()) - s = addr->phoneNumber(KABC::PhoneNumber::Work).number(); + s = addr->phoneNumber(TDEABC::PhoneNumber::Work).number(); if (s.isEmpty()) - s = addr->phoneNumber(KABC::PhoneNumber::Home).number(); + s = addr->phoneNumber(TDEABC::PhoneNumber::Home).number(); if (s.isEmpty()) - s = addr->phoneNumber(KABC::PhoneNumber::Cell).number(); + s = addr->phoneNumber(TDEABC::PhoneNumber::Cell).number(); if (s.isEmpty() && addr->phoneNumbers().count()>0) s = (*addr->phoneNumbers().at(0)).number(); s = makeValidPhone(s); @@ -428,25 +428,25 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location) .arg(GN_FROM(gn_lib_get_pb_name(state))).arg(GN_FROM(gn_lib_get_pb_number(state)))); - const KABC::Address homeAddr = addr->address(KABC::Address::Home); - const KABC::Address workAddr = addr->address(KABC::Address::Work); + const TDEABC::Address homeAddr = addr->address(TDEABC::Address::Home); + const TDEABC::Address workAddr = addr->address(TDEABC::Address::Work); // add all phone numbers - const KABC::PhoneNumber::List phoneList = addr->phoneNumbers(); - KABC::PhoneNumber::List::ConstIterator it; + const TDEABC::PhoneNumber::List phoneList = addr->phoneNumbers(); + TDEABC::PhoneNumber::List::ConstIterator it; for ( it = phoneList.begin(); it != phoneList.end(); ++it ) { - const KABC::PhoneNumber *phonenumber = &(*it); + const TDEABC::PhoneNumber *phonenumber = &(*it); s = phonenumber->number(); if (s.isEmpty()) continue; gn_phonebook_number_type type; int pn_type = phonenumber->type(); - if ((pn_type & KABC::PhoneNumber::Cell)) + if ((pn_type & TDEABC::PhoneNumber::Cell)) type = GN_PHONEBOOK_NUMBER_Mobile; - else if ((pn_type & KABC::PhoneNumber::Fax)) + else if ((pn_type & TDEABC::PhoneNumber::Fax)) type = GN_PHONEBOOK_NUMBER_Fax; - else if ((pn_type & KABC::PhoneNumber::Home)) + else if ((pn_type & TDEABC::PhoneNumber::Home)) type = GN_PHONEBOOK_NUMBER_Home; - else if ((pn_type & KABC::PhoneNumber::Work)) + else if ((pn_type & TDEABC::PhoneNumber::Work)) type = GN_PHONEBOOK_NUMBER_Work; else type = GN_PHONEBOOK_NUMBER_General; gn_lib_set_pb_subentry(state, -1 /* index to append entry */, @@ -474,10 +474,10 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem GN_PHONEBOOK_ENTRY_Email, GN_PHONEBOOK_NUMBER_General, GN_TO(s)); } // add Adresses - const KABC::Address::List addresses = addr->addresses(); - KABC::Address::List::ConstIterator it2; + const TDEABC::Address::List addresses = addr->addresses(); + TDEABC::Address::List::ConstIterator it2; for ( it2 = addresses.begin(); it2 != addresses.end(); ++it2 ) { - const KABC::Address *Addr = &(*it2); + const TDEABC::Address *Addr = &(*it2); if (Addr->isEmpty()) continue; TQStringList a; TQChar sem(';'); @@ -524,9 +524,9 @@ static gn_error xxport_phone_delete_entry( int phone_location, gn_memory_type me } -KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const +TDEABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const { - KABC::AddresseeList addrList; + TDEABC::AddresseeList addrList; if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " @@ -573,7 +573,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const } -bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & ) +bool GNOKIIXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString & ) { if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " @@ -597,7 +597,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri KProgress* progress = (KProgress*)m_progressDlg->progressBar(); - KABC::AddresseeList::ConstIterator it; + TDEABC::AddresseeList::ConstIterator it; TQStringList failedList; gn_error error; @@ -663,7 +663,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri // Now run the loop... phone_entry_no = 1; for ( it = list.begin(); it != list.end(); ++it ) { - const KABC::Addressee *addr = &(*it); + const TDEABC::Addressee *addr = &(*it); if (addr->isEmpty()) continue; // don't write back SIM-card entries ! @@ -966,7 +966,7 @@ static TQString buildMemoryTypeString( gn_memory_type memtype ) // read and evaluate all phone entries static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memtype, - KABC::AddresseeList *addrList ) + TDEABC::AddresseeList *addrList ) { gn_error error; @@ -984,7 +984,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty gn_phonebook_entry entry; TQStringList addrlist; - KABC::Address *addr; + TDEABC::Address *addr; TQString s, country; progress->setTotalSteps(memstat.used); @@ -1010,7 +1010,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty if (error == GN_ERR_NONE) { GNOKII_DEBUG(TQString("%1: %2, num=%3, location=%4, group=%5, count=%6\n").arg(i).arg(GN_FROM(entry.name)) .arg(GN_FROM(entry.number)).arg(entry.location).arg(entry.caller_group).arg(entry.subentries_count)); - KABC::Addressee *a = new KABC::Addressee(); + TDEABC::Addressee *a = new TDEABC::Addressee(); // try to split Name into FamilyName and GivenName s = GN_FROM(entry.name).simplifyWhiteSpace(); @@ -1052,7 +1052,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty a->setRevision(datetime); if (!entry.subentries_count) - a->insertPhoneNumber(KABC::PhoneNumber(entry.number, KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref)); + a->insertPhoneNumber(TDEABC::PhoneNumber(entry.number, TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Pref)); /* scan sub-entries */ if (entry.subentries_count) @@ -1072,7 +1072,7 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty break; case GN_PHONEBOOK_ENTRY_Postal: addrlist = TQStringList::split(';', s, true); - addr = new KABC::Address(KABC::Address::Work); + addr = new TDEABC::Address(TDEABC::Address::Work); if (addrlist.count() <= 1) { addrlist = TQStringList::split(',', s, true); if (addrlist.count() > 1 ) { @@ -1106,18 +1106,18 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty a->setNote(a->note()+s); break; case GN_PHONEBOOK_ENTRY_Number: - enum KABC::PhoneNumber::Types phonetype; + enum TDEABC::PhoneNumber::Types phonetype; switch (entry.subentries[n].number_type) { - case GN_PHONEBOOK_NUMBER_Mobile: phonetype = KABC::PhoneNumber::Cell; break; - case GN_PHONEBOOK_NUMBER_Fax: phonetype = KABC::PhoneNumber::Fax; break; + case GN_PHONEBOOK_NUMBER_Mobile: phonetype = TDEABC::PhoneNumber::Cell; break; + case GN_PHONEBOOK_NUMBER_Fax: phonetype = TDEABC::PhoneNumber::Fax; break; case GN_PHONEBOOK_NUMBER_General: - case GN_PHONEBOOK_NUMBER_Work: phonetype = KABC::PhoneNumber::Work; break; + case GN_PHONEBOOK_NUMBER_Work: phonetype = TDEABC::PhoneNumber::Work; break; default: - case GN_PHONEBOOK_NUMBER_Home: phonetype = KABC::PhoneNumber::Home; break; + case GN_PHONEBOOK_NUMBER_Home: phonetype = TDEABC::PhoneNumber::Home; break; } //if (s == entry.number) - // type = (KABC::PhoneNumber::Types) (phonetype | KABC::PhoneNumber::Pref); - a->insertPhoneNumber(KABC::PhoneNumber(s, phonetype)); + // type = (TDEABC::PhoneNumber::Types) (phonetype | TDEABC::PhoneNumber::Pref); + a->insertPhoneNumber(TDEABC::PhoneNumber(s, phonetype)); break; case GN_PHONEBOOK_ENTRY_URL: a->setUrl(s); @@ -1154,20 +1154,20 @@ static gn_error read_phone_entries( const char *memtypestr, gn_memory_type memty // export to phone static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type memtype, - const KABC::Addressee *addr) + const TDEABC::Addressee *addr) { gn_phonebook_entry entry; TQString s; memset(&entry, 0, sizeof(entry)); strncpy(entry.name, GN_TO(addr->realName()), sizeof(entry.name)-1); - s = addr->phoneNumber(KABC::PhoneNumber::Pref).number(); + s = addr->phoneNumber(TDEABC::PhoneNumber::Pref).number(); if (s.isEmpty()) - s = addr->phoneNumber(KABC::PhoneNumber::Work).number(); + s = addr->phoneNumber(TDEABC::PhoneNumber::Work).number(); if (s.isEmpty()) - s = addr->phoneNumber(KABC::PhoneNumber::Home).number(); + s = addr->phoneNumber(TDEABC::PhoneNumber::Home).number(); if (s.isEmpty()) - s = addr->phoneNumber(KABC::PhoneNumber::Cell).number(); + s = addr->phoneNumber(TDEABC::PhoneNumber::Cell).number(); if (s.isEmpty() && addr->phoneNumbers().count()>0) s = (*addr->phoneNumbers().at(0)).number(); s = makeValidPhone(s); @@ -1194,28 +1194,28 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem GNOKII_DEBUG(TQString("Write #%1: name=%2, number=%3\n").arg(phone_location) .arg(GN_FROM(entry.name)).arg(GN_FROM(entry.number))); - const KABC::Address homeAddr = addr->address(KABC::Address::Home); - const KABC::Address workAddr = addr->address(KABC::Address::Work); + const TDEABC::Address homeAddr = addr->address(TDEABC::Address::Home); + const TDEABC::Address workAddr = addr->address(TDEABC::Address::Work); entry.subentries_count = 0; gn_phonebook_subentry *subentry = &entry.subentries[0]; // add all phone numbers - const KABC::PhoneNumber::List phoneList = addr->phoneNumbers(); - KABC::PhoneNumber::List::ConstIterator it; + const TDEABC::PhoneNumber::List phoneList = addr->phoneNumbers(); + TDEABC::PhoneNumber::List::ConstIterator it; for ( it = phoneList.begin(); it != phoneList.end(); ++it ) { - const KABC::PhoneNumber *phonenumber = &(*it); + const TDEABC::PhoneNumber *phonenumber = &(*it); s = phonenumber->number(); if (s.isEmpty()) continue; subentry->entry_type = GN_PHONEBOOK_ENTRY_Number; gn_phonebook_number_type type; int pn_type = phonenumber->type(); - if ((pn_type & KABC::PhoneNumber::Cell)) + if ((pn_type & TDEABC::PhoneNumber::Cell)) type = GN_PHONEBOOK_NUMBER_Mobile; - else if ((pn_type & KABC::PhoneNumber::Fax)) + else if ((pn_type & TDEABC::PhoneNumber::Fax)) type = GN_PHONEBOOK_NUMBER_Fax; - else if ((pn_type & KABC::PhoneNumber::Home)) + else if ((pn_type & TDEABC::PhoneNumber::Home)) type = GN_PHONEBOOK_NUMBER_Home; - else if ((pn_type & KABC::PhoneNumber::Work)) + else if ((pn_type & TDEABC::PhoneNumber::Work)) type = GN_PHONEBOOK_NUMBER_Work; else type = GN_PHONEBOOK_NUMBER_General; subentry->number_type = type; @@ -1253,12 +1253,12 @@ static gn_error xxport_phone_write_entry( int phone_location, gn_memory_type mem subentry++; } // add Adresses - const KABC::Address::List addresses = addr->addresses(); - KABC::Address::List::ConstIterator it2; + const TDEABC::Address::List addresses = addr->addresses(); + TDEABC::Address::List::ConstIterator it2; for ( it2 = addresses.begin(); it2 != addresses.end(); ++it2 ) { if (entry.subentries_count >= GN_PHONEBOOK_SUBENTRIES_MAX_NUMBER) break; // Phonebook full - const KABC::Address *Addr = &(*it2); + const TDEABC::Address *Addr = &(*it2); if (Addr->isEmpty()) continue; subentry->entry_type = GN_PHONEBOOK_ENTRY_Postal; TQStringList a; @@ -1315,9 +1315,9 @@ static gn_error xxport_phone_delete_entry( int phone_location, gn_memory_type me return error; } -KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const +TDEABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const { - KABC::AddresseeList addrList; + TDEABC::AddresseeList addrList; if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " @@ -1364,7 +1364,7 @@ KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const } -bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & ) +bool GNOKIIXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString & ) { if (KMessageBox::Continue != KMessageBox::warningContinueCancel(parentWidget(), i18n("<qt>Please connect your Mobile Phone to your computer and press " @@ -1388,7 +1388,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri KProgress* progress = (KProgress*)m_progressDlg->progressBar(); - KABC::AddresseeList::ConstIterator it; + TDEABC::AddresseeList::ConstIterator it; TQStringList failedList; gn_error error; @@ -1454,7 +1454,7 @@ bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQStri // Now run the loop... phone_entry_no = 1; for ( it = list.begin(); it != list.end(); ++it ) { - const KABC::Addressee *addr = &(*it); + const TDEABC::Addressee *addr = &(*it); if (addr->isEmpty()) continue; // don't write back SIM-card entries ! @@ -1572,15 +1572,15 @@ finish: #else /* no gnokii installed */ -KABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const +TDEABC::AddresseeList GNOKIIXXPort::importContacts( const TQString& ) const { - KABC::AddresseeList addrList; + TDEABC::AddresseeList addrList; KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n" "Please ask your distributor to add gnokii at compile time.")); return addrList; } -bool GNOKIIXXPort::exportContacts( const KABC::AddresseeList &list, const TQString & ) +bool GNOKIIXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString & ) { Q_UNUSED(list); KMessageBox::error(parentWidget(), i18n("Gnokii interface is not available.\n" diff --git a/kaddressbook/xxport/gnokii_xxport.h b/kaddressbook/xxport/gnokii_xxport.h index 898d1600f..b41aace12 100644 --- a/kaddressbook/xxport/gnokii_xxport.h +++ b/kaddressbook/xxport/gnokii_xxport.h @@ -32,13 +32,13 @@ class GNOKIIXXPort : public KAB::XXPort public: - GNOKIIXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + GNOKIIXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "gnokii"; } public slots: - bool exportContacts( const KABC::AddresseeList &list, const TQString &data ); - KABC::AddresseeList importContacts( const TQString &data ) const; + bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data ); + TDEABC::AddresseeList importContacts( const TQString &data ) const; }; #endif diff --git a/kaddressbook/xxport/kde2_xxport.cpp b/kaddressbook/xxport/kde2_xxport.cpp index 730de8237..58ae2afdf 100644 --- a/kaddressbook/xxport/kde2_xxport.cpp +++ b/kaddressbook/xxport/kde2_xxport.cpp @@ -39,25 +39,25 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_kde2_xxport, KDE2XXPort ) -KDE2XXPort::KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +KDE2XXPort::KDE2XXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import KDE 2 Addressbook..." ) ); } -KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const +TDEABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const { TQString fileName = locateLocal( "data", "tdeabc/std.vcf" ); if ( !TQFile::exists( fileName ) ) { KMessageBox::sorry( parentWidget(), i18n( "<qt>Could not find a KDE 2 address book <b>%1</b>.</qt>" ).arg( fileName ) ); - return KABC::AddresseeList(); + return TDEABC::AddresseeList(); } int result = KMessageBox::questionYesNoCancel( parentWidget(), i18n( "Override previously imported entries?" ), i18n( "Import KDE 2 Addressbook" ), i18n("Import"), i18n("Do Not Import") ); - if ( !result ) return KABC::AddresseeList(); + if ( !result ) return TDEABC::AddresseeList(); TDEProcess proc; @@ -68,13 +68,13 @@ KABC::AddresseeList KDE2XXPort::importContacts( const TQString& ) const proc << "tdeab2tdeabc"; else { kdDebug(5720) << "KAddressBook::importKDE2(): Unknow return value." << endl; - return KABC::AddresseeList(); + return TDEABC::AddresseeList(); } proc.start( TDEProcess::Block ); addressBook()->load(); - return KABC::AddresseeList(); + return TDEABC::AddresseeList(); } #include "kde2_xxport.moc" diff --git a/kaddressbook/xxport/kde2_xxport.h b/kaddressbook/xxport/kde2_xxport.h index b66440df5..694b0b1ba 100644 --- a/kaddressbook/xxport/kde2_xxport.h +++ b/kaddressbook/xxport/kde2_xxport.h @@ -32,12 +32,12 @@ class KDE2XXPort : public KAB::XXPort public: - KDE2XXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + KDE2XXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "kde2"; } public slots: - KABC::AddresseeList importContacts( const TQString &data ) const; + TDEABC::AddresseeList importContacts( const TQString &data ) const; }; #endif diff --git a/kaddressbook/xxport/ldif_xxport.cpp b/kaddressbook/xxport/ldif_xxport.cpp index 31d3c2936..8a68c481a 100644 --- a/kaddressbook/xxport/ldif_xxport.cpp +++ b/kaddressbook/xxport/ldif_xxport.cpp @@ -50,7 +50,7 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_ldif_xxport, LDIFXXPort ) -LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +LDIFXXPort::LDIFXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import LDIF Addressbook..." ) ); @@ -59,9 +59,9 @@ LDIFXXPort::LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *nam /* import */ -KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const +TDEABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const { - KABC::AddresseeList addrList; + TDEABC::AddresseeList addrList; TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(), "text/x-ldif", 0 ); @@ -81,7 +81,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const TQDateTime dtDefault = TQFileInfo(file).lastModified(); file.close(); - KABC::LDIFConverter::LDIFToAddressee( wholeFile, addrList, dtDefault ); + TDEABC::LDIFConverter::LDIFToAddressee( wholeFile, addrList, dtDefault ); return addrList; } @@ -89,7 +89,7 @@ KABC::AddresseeList LDIFXXPort::importContacts( const TQString& ) const /* export */ -bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString& ) +bool LDIFXXPort::exportContacts( const TDEABC::AddresseeList &list, const TQString& ) { KURL url = KFileDialog::getSaveURL( TQDir::homeDirPath() + "/addressbook.ldif", "text/x-ldif" ); @@ -132,10 +132,10 @@ bool LDIFXXPort::exportContacts( const KABC::AddresseeList &list, const TQString } } -void LDIFXXPort::doExport( TQFile *fp, const KABC::AddresseeList &list ) +void LDIFXXPort::doExport( TQFile *fp, const TDEABC::AddresseeList &list ) { TQString str; - KABC::LDIFConverter::addresseeToLDIF( list, str ); + TDEABC::LDIFConverter::addresseeToLDIF( list, str ); TQTextStream t( fp ); t.setEncoding( TQTextStream::UnicodeUTF8 ); diff --git a/kaddressbook/xxport/ldif_xxport.h b/kaddressbook/xxport/ldif_xxport.h index 06c3c9155..1e8282a83 100644 --- a/kaddressbook/xxport/ldif_xxport.h +++ b/kaddressbook/xxport/ldif_xxport.h @@ -33,16 +33,16 @@ class LDIFXXPort : public KAB::XXPort public: - LDIFXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + LDIFXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "ldif"; } public slots: - bool exportContacts( const KABC::AddresseeList &list, const TQString &data ); - KABC::AddresseeList importContacts( const TQString &data ) const; + bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data ); + TDEABC::AddresseeList importContacts( const TQString &data ) const; private: - void doExport( TQFile *fp, const KABC::AddresseeList &list ); + void doExport( TQFile *fp, const TDEABC::AddresseeList &list ); }; #endif diff --git a/kaddressbook/xxport/opera_xxport.cpp b/kaddressbook/xxport/opera_xxport.cpp index 0a4ac4886..0332d9acc 100644 --- a/kaddressbook/xxport/opera_xxport.cpp +++ b/kaddressbook/xxport/opera_xxport.cpp @@ -38,15 +38,15 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_opera_xxport, OperaXXPort ) -OperaXXPort::OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +OperaXXPort::OperaXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import Opera Addressbook..." ) ); } -KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const +TDEABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const { - KABC::AddresseeList addrList; + TDEABC::AddresseeList addrList; TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath() + TQString::fromLatin1( "/.opera/contacts.adr" ) ); if ( fileName.isEmpty() ) @@ -63,7 +63,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const stream.setEncoding( TQTextStream::UnicodeUTF8 ); TQString line, key, value; bool parseContact = false; - KABC::Addressee addr; + TDEABC::Addressee addr; TQRegExp separator( "\x02\x02" ); @@ -72,13 +72,13 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const line = line.stripWhiteSpace(); if ( line == TQString::fromLatin1( "#CONTACT" ) ) { parseContact = true; - addr = KABC::Addressee(); + addr = TDEABC::Addressee(); continue; } else if ( line.isEmpty() ) { parseContact = false; if ( !addr.isEmpty() ) { addrList.append( addr ); - addr = KABC::Addressee(); + addr = TDEABC::Addressee(); } continue; } @@ -99,12 +99,12 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const preferred = false; } } else if ( key == TQString::fromLatin1( "phone" ) ) - addr.insertPhoneNumber( KABC::PhoneNumber( value ) ); + addr.insertPhoneNumber( TDEABC::PhoneNumber( value ) ); else if ( key == TQString::fromLatin1( "fax" ) ) - addr.insertPhoneNumber( KABC::PhoneNumber( value, - KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) ); + addr.insertPhoneNumber( TDEABC::PhoneNumber( value, + TDEABC::PhoneNumber::Fax | TDEABC::PhoneNumber::Home ) ); else if ( key == TQString::fromLatin1( "postaladdress" ) ) { - KABC::Address address( KABC::Address::Home ); + TDEABC::Address address( TDEABC::Address::Home ); address.setLabel( value.replace( separator, "\n" ) ); addr.insertAddress( address ); } else if ( key == TQString::fromLatin1( "description" ) ) @@ -112,7 +112,7 @@ KABC::AddresseeList OperaXXPort::importContacts( const TQString& ) const else if ( key == TQString::fromLatin1( "url" ) ) addr.setUrl( KURL( value ) ); else if ( key == TQString::fromLatin1( "pictureurl" ) ) { - KABC::Picture pic( value ); + TDEABC::Picture pic( value ); addr.setPhoto( pic ); } } diff --git a/kaddressbook/xxport/opera_xxport.h b/kaddressbook/xxport/opera_xxport.h index 730e4972d..ce0a33ec4 100644 --- a/kaddressbook/xxport/opera_xxport.h +++ b/kaddressbook/xxport/opera_xxport.h @@ -33,12 +33,12 @@ class OperaXXPort : public KAB::XXPort public: - OperaXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + OperaXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "opera"; } public slots: - KABC::AddresseeList importContacts( const TQString &data ) const; + TDEABC::AddresseeList importContacts( const TQString &data ) const; }; #endif diff --git a/kaddressbook/xxport/pab_mapihd.cpp b/kaddressbook/xxport/pab_mapihd.cpp index 6d61cb339..9f1879b87 100644 --- a/kaddressbook/xxport/pab_mapihd.cpp +++ b/kaddressbook/xxport/pab_mapihd.cpp @@ -286,8 +286,8 @@ content_t pabfields_t::order(int k) return tags[k].order(); } -KABC::Addressee pabfields_t::get() { - KABC::Addressee a; +TDEABC::Addressee pabfields_t::get() { + TDEABC::Addressee a; if (!givenName.isEmpty()) a.setFormattedName(givenName); if (!email.isEmpty()) a.insertEmail(email); if (!title.isEmpty()) a.setTitle(title); @@ -295,7 +295,7 @@ KABC::Addressee pabfields_t::get() { if (!additionalName.isEmpty()) a.setAdditionalName(additionalName); if (!lastName.isEmpty()) a.setFamilyName(lastName); - KABC::Address addr; + TDEABC::Address addr; if (!address.isEmpty()) addr.setStreet(address); if (!town.isEmpty()) addr.setLocality(town); if (!zip.isEmpty()) addr.setPostalCode(zip); @@ -306,10 +306,10 @@ KABC::Addressee pabfields_t::get() { if (!organization.isEmpty()) a.setOrganization(organization); if (!department.isEmpty()) a.setRole(department); // Miss out department, subDep, job - if (!tel.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( tel, KABC::PhoneNumber::Voice ) ); - if (!fax.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( fax, KABC::PhoneNumber::Fax ) ); - if (!mobile.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( mobile, KABC::PhoneNumber::Cell ) ); - if (!modem.isEmpty()) a.insertPhoneNumber( KABC::PhoneNumber( modem, KABC::PhoneNumber::Modem ) ); + if (!tel.isEmpty()) a.insertPhoneNumber( TDEABC::PhoneNumber( tel, TDEABC::PhoneNumber::Voice ) ); + if (!fax.isEmpty()) a.insertPhoneNumber( TDEABC::PhoneNumber( fax, TDEABC::PhoneNumber::Fax ) ); + if (!mobile.isEmpty()) a.insertPhoneNumber( TDEABC::PhoneNumber( mobile, TDEABC::PhoneNumber::Cell ) ); + if (!modem.isEmpty()) a.insertPhoneNumber( TDEABC::PhoneNumber( modem, TDEABC::PhoneNumber::Modem ) ); if (!homepage.isEmpty()) a.setUrl(KURL( homepage )); // Miss out talk if (!comment.isEmpty()) a.setNote(comment); diff --git a/kaddressbook/xxport/pab_mapihd.h b/kaddressbook/xxport/pab_mapihd.h index c54be4500..2df9953cc 100644 --- a/kaddressbook/xxport/pab_mapihd.h +++ b/kaddressbook/xxport/pab_mapihd.h @@ -107,7 +107,7 @@ public: pabfields_t(pabrec & R, TQWidget *parent); public: - KABC::Addressee get( ); + TDEABC::Addressee get( ); bool isOK(void) { return OK; } bool isUsable(void) { return givenName!=""; } }; diff --git a/kaddressbook/xxport/pab_xxport.cpp b/kaddressbook/xxport/pab_xxport.cpp index 894adf3d5..21070acfb 100644 --- a/kaddressbook/xxport/pab_xxport.cpp +++ b/kaddressbook/xxport/pab_xxport.cpp @@ -40,15 +40,15 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_pab_xxport, PABXXPort ) -PABXXPort::PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +PABXXPort::PABXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::XXPort( ab, parent, name ) { createImportAction( i18n("Import MS Exchange Personal Address Book (.PAB)") ); } -KABC::AddresseeList PABXXPort::importContacts( const TQString& ) const +TDEABC::AddresseeList PABXXPort::importContacts( const TQString& ) const { - KABC::AddresseeList addrList; + TDEABC::AddresseeList addrList; TQString fileName = KFileDialog::getOpenFileName( TQDir::homeDirPath(), "*.[pP][aA][bB]|" + i18n("MS Exchange Personal Address Book Files (*.pab)"), 0 ); diff --git a/kaddressbook/xxport/pab_xxport.h b/kaddressbook/xxport/pab_xxport.h index 04395f416..796894a06 100644 --- a/kaddressbook/xxport/pab_xxport.h +++ b/kaddressbook/xxport/pab_xxport.h @@ -33,15 +33,15 @@ class PABXXPort : public KAB::XXPort public: - PABXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + PABXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "pab"; } public slots: - KABC::AddresseeList importContacts( const TQString &data ) const; + TDEABC::AddresseeList importContacts( const TQString &data ) const; private: - void doExport( TQFile *fp, const KABC::AddresseeList &list ); + void doExport( TQFile *fp, const TDEABC::AddresseeList &list ); }; diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index b12779cbb..293879cc5 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp @@ -55,10 +55,10 @@ K_EXPORT_KADDRESSBOOK_XXFILTER( libkaddrbk_vcard_xxport, VCardXXPort ) class VCardViewerDialog : public KDialogBase { public: - VCardViewerDialog( const KABC::Addressee::List &list, + VCardViewerDialog( const TDEABC::Addressee::List &list, TQWidget *parent, const char *name = 0 ); - KABC::Addressee::List contacts() const; + TDEABC::Addressee::List contacts() const; protected: void slotUser1(); @@ -71,8 +71,8 @@ class VCardViewerDialog : public KDialogBase KPIM::AddresseeView *mView; - KABC::Addressee::List mContacts; - KABC::Addressee::List::Iterator mIt; + TDEABC::Addressee::List mContacts; + TDEABC::Addressee::List::Iterator mIt; }; class VCardExportSelectionDialog : public KDialogBase @@ -93,7 +93,7 @@ class VCardExportSelectionDialog : public KDialogBase TQCheckBox *mEncryptionKeys; }; -VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name ) +VCardXXPort::VCardXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name ) : KAB::XXPort( ab, parent, name ) { createImportAction( i18n( "Import vCard..." ) ); @@ -101,11 +101,11 @@ VCardXXPort::VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *n createExportAction( i18n( "Export vCard 3.0..." ), "v30" ); } -bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQString &data ) +bool VCardXXPort::exportContacts( const TDEABC::AddresseeList &addrList, const TQString &data ) { - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; KURL url; - KABC::AddresseeList list; + TDEABC::AddresseeList list; list = filterContacts( addrList ); @@ -119,13 +119,13 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS if ( data == "v21" ) #if defined(KABC_VCARD_ENCODING_FIX) - ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v2_1 ) ); + ok = doExport( url, converter.createVCardsRaw( list, TDEABC::VCardConverter::v2_1 ) ); else - ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v3_0 ) ); + ok = doExport( url, converter.createVCardsRaw( list, TDEABC::VCardConverter::v3_0 ) ); #else - ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v2_1 ) ); + ok = doExport( url, converter.createVCards( list, TDEABC::VCardConverter::v2_1 ) ); else - ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v3_0 ) ); + ok = doExport( url, converter.createVCards( list, TDEABC::VCardConverter::v3_0 ) ); #endif } else { TQString msg = i18n( "You have selected a list of contacts, shall they be " @@ -137,7 +137,7 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS if ( baseUrl.isEmpty() ) return true; - KABC::AddresseeList::ConstIterator it; + TDEABC::AddresseeList::ConstIterator it; uint counter = 0; for ( it = list.begin(); it != list.end(); ++it ) { TQString testUrl; @@ -153,18 +153,18 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS url = testUrl + ".vcf"; bool tmpOk; - KABC::AddresseeList tmpList; + TDEABC::AddresseeList tmpList; tmpList.append( *it ); if ( data == "v21" ) #if defined(KABC_VCARD_ENCODING_FIX) - tmpOk = doExport( url, converter.createVCardsRaw( tmpList, KABC::VCardConverter::v2_1 ) ); + tmpOk = doExport( url, converter.createVCardsRaw( tmpList, TDEABC::VCardConverter::v2_1 ) ); else - tmpOk = doExport( url, converter.createVCardsRaw( tmpList, KABC::VCardConverter::v3_0 ) ); + tmpOk = doExport( url, converter.createVCardsRaw( tmpList, TDEABC::VCardConverter::v3_0 ) ); #else - tmpOk = doExport( url, converter.createVCards( tmpList, KABC::VCardConverter::v2_1 ) ); + tmpOk = doExport( url, converter.createVCards( tmpList, TDEABC::VCardConverter::v2_1 ) ); else - tmpOk = doExport( url, converter.createVCards( tmpList, KABC::VCardConverter::v3_0 ) ); + tmpOk = doExport( url, converter.createVCards( tmpList, TDEABC::VCardConverter::v3_0 ) ); #endif ok = ok && tmpOk; } @@ -178,13 +178,13 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS if ( data == "v21" ) #if defined(KABC_VCARD_ENCODING_FIX) - ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v2_1 ) ); + ok = doExport( url, converter.createVCardsRaw( list, TDEABC::VCardConverter::v2_1 ) ); else - ok = doExport( url, converter.createVCardsRaw( list, KABC::VCardConverter::v3_0 ) ); + ok = doExport( url, converter.createVCardsRaw( list, TDEABC::VCardConverter::v3_0 ) ); #else - ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v2_1 ) ); + ok = doExport( url, converter.createVCards( list, TDEABC::VCardConverter::v2_1 ) ); else - ok = doExport( url, converter.createVCards( list, KABC::VCardConverter::v3_0 ) ); + ok = doExport( url, converter.createVCards( list, TDEABC::VCardConverter::v3_0 ) ); #endif } } @@ -193,10 +193,10 @@ bool VCardXXPort::exportContacts( const KABC::AddresseeList &addrList, const TQS return ok; } -KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const +TDEABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const { TQString fileName; - KABC::AddresseeList addrList; + TDEABC::AddresseeList addrList; KURL::List urls; if ( !XXPortManager::importData.isEmpty() ) { @@ -283,9 +283,9 @@ KABC::AddresseeList VCardXXPort::importContacts( const TQString& ) const } #if defined(KABC_VCARD_ENCODING_FIX) -KABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const +TDEABC::AddresseeList VCardXXPort::parseVCard( const TQByteArray &data ) const { - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; return converter.parseVCardsRaw( data.data() ); } @@ -305,9 +305,9 @@ bool VCardXXPort::doExport( const KURL &url, const TQByteArray &data ) return TDEIO::NetAccess::upload( tmpFile.name(), url, parentWidget() ); } #else -KABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const +TDEABC::AddresseeList VCardXXPort::parseVCard( const TQString &data ) const { - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; return converter.parseVCards( data ); } @@ -331,9 +331,9 @@ bool VCardXXPort::doExport( const KURL &url, const TQString &data ) } #endif -KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addrList ) +TDEABC::AddresseeList VCardXXPort::filterContacts( const TDEABC::AddresseeList &addrList ) { - KABC::AddresseeList list; + TDEABC::AddresseeList list; if ( addrList.isEmpty() ) return addrList; @@ -342,9 +342,9 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr if ( !dlg.exec() ) return list; - KABC::AddresseeList::ConstIterator it; + TDEABC::AddresseeList::ConstIterator it; for ( it = addrList.begin(); it != addrList.end(); ++it ) { - KABC::Addressee addr; + TDEABC::Addressee addr; addr.setUid( (*it).uid() ); addr.setFormattedName( (*it).formattedName() ); @@ -378,38 +378,38 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr addr.setLogo( (*it).logo() ); - KABC::PhoneNumber::List phones = (*it).phoneNumbers( KABC::PhoneNumber::Work ); - KABC::PhoneNumber::List::Iterator phoneIt; + TDEABC::PhoneNumber::List phones = (*it).phoneNumbers( TDEABC::PhoneNumber::Work ); + TDEABC::PhoneNumber::List::Iterator phoneIt; for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) addr.insertPhoneNumber( *phoneIt ); - KABC::Address::List addresses = (*it).addresses( KABC::Address::Work ); - KABC::Address::List::Iterator addrIt; + TDEABC::Address::List addresses = (*it).addresses( TDEABC::Address::Work ); + TDEABC::Address::List::Iterator addrIt; for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt ) addr.insertAddress( *addrIt ); } - KABC::PhoneNumber::List phones = (*it).phoneNumbers(); - KABC::PhoneNumber::List::Iterator phoneIt; + TDEABC::PhoneNumber::List phones = (*it).phoneNumbers(); + TDEABC::PhoneNumber::List::Iterator phoneIt; for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) { int type = (*phoneIt).type(); - if ( type & KABC::PhoneNumber::Home && dlg.exportPrivateFields() ) + if ( type & TDEABC::PhoneNumber::Home && dlg.exportPrivateFields() ) addr.insertPhoneNumber( *phoneIt ); - else if ( type & KABC::PhoneNumber::Work && dlg.exportBusinessFields() ) + else if ( type & TDEABC::PhoneNumber::Work && dlg.exportBusinessFields() ) addr.insertPhoneNumber( *phoneIt ); else if ( dlg.exportOtherFields() ) addr.insertPhoneNumber( *phoneIt ); } - KABC::Address::List addresses = (*it).addresses(); - KABC::Address::List::Iterator addrIt; + TDEABC::Address::List addresses = (*it).addresses(); + TDEABC::Address::List::Iterator addrIt; for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt ) { int type = (*addrIt).type(); - if ( type & KABC::Address::Home && dlg.exportPrivateFields() ) + if ( type & TDEABC::Address::Home && dlg.exportPrivateFields() ) addr.insertAddress( *addrIt ); - else if ( type & KABC::Address::Work && dlg.exportBusinessFields() ) + else if ( type & TDEABC::Address::Work && dlg.exportBusinessFields() ) addr.insertAddress( *addrIt ); else if ( dlg.exportOtherFields() ) addr.insertAddress( *addrIt ); @@ -419,8 +419,8 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr addr.setCustoms( (*it).customs() ); if ( dlg.exportEncryptionKeys() ) { - addKey( addr, KABC::Key::PGP ); - addKey( addr, KABC::Key::X509 ); + addKey( addr, TDEABC::Key::PGP ); + addKey( addr, TDEABC::Key::X509 ); } list.append( addr ); @@ -429,10 +429,10 @@ KABC::AddresseeList VCardXXPort::filterContacts( const KABC::AddresseeList &addr return list; } -void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type ) +void VCardXXPort::addKey( TDEABC::Addressee &addr, TDEABC::Key::Types type ) { TQString fingerprint = addr.custom( "KADDRESSBOOK", - (type == KABC::Key::PGP ? "OPENPGPFP" : "SMIMEFP") ); + (type == TDEABC::Key::PGP ? "OPENPGPFP" : "SMIMEFP") ); if ( fingerprint.isEmpty() ) return; @@ -455,7 +455,7 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type ) return; } - KABC::Key key; + TDEABC::Key key; key.setType( type ); key.setBinaryData( dataProvider.data() ); @@ -464,7 +464,7 @@ void VCardXXPort::addKey( KABC::Addressee &addr, KABC::Key::Types type ) // ---------- VCardViewer Dialog ---------------- // -VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list, +VCardViewerDialog::VCardViewerDialog( const TDEABC::Addressee::List &list, TQWidget *parent, const char *name ) : KDialogBase( Plain, i18n( "Import vCard" ), Yes | No | Apply | Cancel, Yes, parent, name, true, true, KStdGuiItem::no(), KStdGuiItem::yes() ), @@ -491,7 +491,7 @@ VCardViewerDialog::VCardViewerDialog( const KABC::Addressee::List &list, updateView(); } -KABC::Addressee::List VCardViewerDialog::contacts() const +TDEABC::Addressee::List VCardViewerDialog::contacts() const { return mContacts; } @@ -500,7 +500,7 @@ void VCardViewerDialog::updateView() { mView->setAddressee( *mIt ); - KABC::Addressee::List::Iterator it = mIt; + TDEABC::Addressee::List::Iterator it = mIt; actionButton( Apply )->setEnabled( (++it) != mContacts.end() ); } diff --git a/kaddressbook/xxport/vcard_xxport.h b/kaddressbook/xxport/vcard_xxport.h index b4b03284f..c5f66f930 100644 --- a/kaddressbook/xxport/vcard_xxport.h +++ b/kaddressbook/xxport/vcard_xxport.h @@ -33,25 +33,25 @@ class VCardXXPort : public KAB::XXPort public: - VCardXXPort( KABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); + VCardXXPort( TDEABC::AddressBook *ab, TQWidget *parent, const char *name = 0 ); TQString identifier() const { return "vcard"; } public slots: - bool exportContacts( const KABC::AddresseeList &list, const TQString &data ); - KABC::AddresseeList importContacts( const TQString &data ) const; + bool exportContacts( const TDEABC::AddresseeList &list, const TQString &data ); + TDEABC::AddresseeList importContacts( const TQString &data ) const; private: #if defined(KABC_VCARD_ENCODING_FIX) - KABC::AddresseeList parseVCard( const TQByteArray &data ) const; + TDEABC::AddresseeList parseVCard( const TQByteArray &data ) const; bool doExport( const KURL &url, const TQByteArray &data ); #else - KABC::AddresseeList parseVCard( const TQString &data ) const; + TDEABC::AddresseeList parseVCard( const TQString &data ) const; bool doExport( const KURL &url, const TQString &data ); #endif - void addKey( KABC::Addressee &addr, KABC::Key::Types type ); + void addKey( TDEABC::Addressee &addr, TDEABC::Key::Types type ); - KABC::AddresseeList filterContacts( const KABC::AddresseeList& ); + TDEABC::AddresseeList filterContacts( const TDEABC::AddresseeList& ); }; #endif diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 22d8a2d10..bdc48f6b6 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -81,12 +81,12 @@ void XXPortManager::slotImport( const TQString &identifier, const TQString &data return; } - KABC::Resource *resource = mCore->requestResource( mCore->widget() ); + TDEABC::Resource *resource = mCore->requestResource( mCore->widget() ); if ( !resource ) return; - KABC::AddresseeList list = obj->importContacts( data ); - KABC::AddresseeList::Iterator it; + TDEABC::AddresseeList list = obj->importContacts( data ); + TDEABC::AddresseeList::Iterator it; for ( it = list.begin(); it != list.end(); ++it ) (*it).setResource( resource ); @@ -105,7 +105,7 @@ void XXPortManager::slotExport( const TQString &identifier, const TQString &data return; } - KABC::AddresseeList addrList; + TDEABC::AddresseeList addrList; XXPortSelectDialog dlg( mCore, obj->requiresSorting(), mCore->widget() ); if ( dlg.exec() ) addrList = dlg.contacts(); diff --git a/kaddressbook/xxportselectdialog.cpp b/kaddressbook/xxportselectdialog.cpp index 6c67c8ff5..b6849aaca 100644 --- a/kaddressbook/xxportselectdialog.cpp +++ b/kaddressbook/xxportselectdialog.cpp @@ -80,21 +80,21 @@ XXPortSelectDialog::XXPortSelectDialog( KAB::Core *core, bool sort, mSortTypeCombo->insertItem( i18n( "Ascending" ) ); mSortTypeCombo->insertItem( i18n( "Descending" ) ); - mFields = mCore->addressBook()->fields( KABC::Field::All ); - KABC::Field::List::ConstIterator fieldIt; + mFields = mCore->addressBook()->fields( TDEABC::Field::All ); + TDEABC::Field::List::ConstIterator fieldIt; for ( fieldIt = mFields.begin(); fieldIt != mFields.end(); ++fieldIt ) mFieldCombo->insertItem( (*fieldIt)->label() ); } -KABC::AddresseeList XXPortSelectDialog::contacts() +TDEABC::AddresseeList XXPortSelectDialog::contacts() { const TQStringList selection = mCore->selectedUIDs(); - KABC::AddresseeList list; + TDEABC::AddresseeList list; if ( mUseSelection->isChecked() ) { TQStringList::ConstIterator it; for ( it = selection.begin(); it != selection.end(); ++it ) { - KABC::Addressee addr = mCore->addressBook()->findByUid( *it ); + TDEABC::Addressee addr = mCore->addressBook()->findByUid( *it ); if ( !addr.isEmpty() ) list.append( addr ); } @@ -105,7 +105,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts() if ( (*filterIt).name() == mFiltersCombo->currentText() ) break; - KABC::AddressBook::Iterator it; + TDEABC::AddressBook::Iterator it; for ( it = mCore->addressBook()->begin(); it != mCore->addressBook()->end(); ++it ) { if ( (*filterIt).filterAddressee( *it ) ) list.append( *it ); @@ -113,8 +113,8 @@ KABC::AddresseeList XXPortSelectDialog::contacts() } else if ( mUseCategories->isChecked() ) { const TQStringList categorieList = categories(); - KABC::AddressBook::ConstIterator it; - KABC::AddressBook::ConstIterator addressBookEnd( mCore->addressBook()->end() ); + TDEABC::AddressBook::ConstIterator it; + TDEABC::AddressBook::ConstIterator addressBookEnd( mCore->addressBook()->end() ); for ( it = mCore->addressBook()->begin(); it != addressBookEnd; ++it ) { const TQStringList tmp( (*it).categories() ); TQStringList::ConstIterator tmpIt; @@ -126,7 +126,7 @@ KABC::AddresseeList XXPortSelectDialog::contacts() } } else { // create a string list of all entries: - KABC::AddressBook::ConstIterator it; + TDEABC::AddressBook::ConstIterator it; for ( it = mCore->addressBook()->begin(); it != mCore->addressBook()->end(); ++it ) list.append( *it ); } diff --git a/kaddressbook/xxportselectdialog.h b/kaddressbook/xxportselectdialog.h index 5141e5d39..d9355e5b5 100644 --- a/kaddressbook/xxportselectdialog.h +++ b/kaddressbook/xxportselectdialog.h @@ -51,7 +51,7 @@ class XXPortSelectDialog : public KDialogBase XXPortSelectDialog( KAB::Core *core, bool sort, TQWidget* parent, const char* name = 0 ); - KABC::AddresseeList contacts(); + TDEABC::AddresseeList contacts(); private slots: void filterChanged( int ); @@ -76,9 +76,9 @@ class XXPortSelectDialog : public KDialogBase KComboBox *mSortTypeCombo; KAB::Core *mCore; - KABC::AddresseeList mAddresseeList; + TDEABC::AddresseeList mAddresseeList; Filter::List mFilters; - KABC::Field::List mFields; + TDEABC::Field::List mFields; bool mUseSorting; }; diff --git a/kalarm/birthdaydlg.cpp b/kalarm/birthdaydlg.cpp index e50723ff0..c98a9987f 100644 --- a/kalarm/birthdaydlg.cpp +++ b/kalarm/birthdaydlg.cpp @@ -67,7 +67,7 @@ class AddresseeItem : public TQListViewItem }; -const KABC::AddressBook* BirthdayDlg::mAddressBook = 0; +const TDEABC::AddressBook* BirthdayDlg::mAddressBook = 0; BirthdayDlg::BirthdayDlg(TQWidget* parent) @@ -196,11 +196,11 @@ void BirthdayDlg::loadAddressBook() if (!mAddressBook) { #if KDE_IS_VERSION(3,1,90) - mAddressBook = KABC::StdAddressBook::self(true); + mAddressBook = TDEABC::StdAddressBook::self(true); if (mAddressBook) connect(mAddressBook, TQT_SIGNAL(addressBookChanged(AddressBook*)), TQT_SLOT(updateSelectionList())); #else - mAddressBook = KABC::StdAddressBook::self(); + mAddressBook = TDEABC::StdAddressBook::self(); if (mAddressBook) updateSelectionList(); #endif @@ -218,7 +218,7 @@ void BirthdayDlg::close() { if (mAddressBook) { - KABC::StdAddressBook::close(); + TDEABC::StdAddressBook::close(); mAddressBook = 0; } } @@ -244,9 +244,9 @@ void BirthdayDlg::updateSelectionList() } // Fetch all birthdays from the address book - for (KABC::AddressBook::ConstIterator abit = mAddressBook->begin(); abit != mAddressBook->end(); ++abit) + for (TDEABC::AddressBook::ConstIterator abit = mAddressBook->begin(); abit != mAddressBook->end(); ++abit) { - const KABC::Addressee& addressee = *abit; + const TDEABC::Addressee& addressee = *abit; if (addressee.birthday().isValid()) { // Create a list entry for this birthday diff --git a/kalarm/birthdaydlg.h b/kalarm/birthdaydlg.h index ccddbd656..ee5511466 100644 --- a/kalarm/birthdaydlg.h +++ b/kalarm/birthdaydlg.h @@ -35,7 +35,7 @@ class SpecialActionsButton; class RepetitionButton; class LateCancelSelector; class Reminder; -namespace KABC { class AddressBook; } +namespace TDEABC { class AddressBook; } class BLineEdit; class BListView; @@ -60,7 +60,7 @@ class BirthdayDlg : public KDialogBase private: void loadAddressBook(); - static const KABC::AddressBook* mAddressBook; + static const TDEABC::AddressBook* mAddressBook; BListView* mAddresseeList; BLineEdit* mPrefix; BLineEdit* mSuffix; diff --git a/kalarm/editdlg.cpp b/kalarm/editdlg.cpp index 091a648a3..0a7b3d587 100644 --- a/kalarm/editdlg.cpp +++ b/kalarm/editdlg.cpp @@ -1879,7 +1879,7 @@ void EditAlarmDlg::slotAnyTimeToggled(bool anyTime) */ void EditAlarmDlg::openAddressBook() { - KABC::Addressee a = KABC::AddresseeDialog::getAddressee(this); + TDEABC::Addressee a = TDEABC::AddresseeDialog::getAddressee(this); if (a.isEmpty()) return; Person person(a.realName(), a.preferredEmail()); diff --git a/kalarm/lib/lineedit.cpp b/kalarm/lib/lineedit.cpp index 1db384d3c..4e40e2c7d 100644 --- a/kalarm/lib/lineedit.cpp +++ b/kalarm/lib/lineedit.cpp @@ -110,7 +110,7 @@ void LineEdit::dropEvent(TQDropEvent* e) TQString txt; KPIM::MailList mailList; KURL::List files; - KABC::Addressee::List addrList; + TDEABC::Addressee::List addrList; if (mType != Url && e->provides(KPIM::MailListDrag::format()) @@ -130,7 +130,7 @@ void LineEdit::dropEvent(TQDropEvent* e) && KVCardDrag::canDecode(e) && KVCardDrag::decode(e, addrList)) { // KAddressBook entries - for (KABC::Addressee::List::Iterator it = addrList.begin(); it != addrList.end(); ++it) + for (TDEABC::Addressee::List::Iterator it = addrList.begin(); it != addrList.end(); ++it) { TQString em((*it).fullEmail()); if (!em.isEmpty()) diff --git a/kandy/src/mobilegui.cpp b/kandy/src/mobilegui.cpp index 5b391c389..819d7e0fa 100644 --- a/kandy/src/mobilegui.cpp +++ b/kandy/src/mobilegui.cpp @@ -88,7 +88,7 @@ class SyncEntryKab : public SyncEntry TQString mName; TQString mPhone; - KABC::Addressee mAddressee; + TDEABC::Addressee mAddressee; int mKABindex; int mPhoneNumberIndex; }; @@ -494,16 +494,16 @@ void MobileGui::readKabc() mSyncer->mKabEntries.clear(); - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - KABC::AddressBook::Iterator it; + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); + TDEABC::AddressBook::Iterator it; int kabIndex = 0; for ( it = addressBook->begin(); it != addressBook->end(); it++, kabIndex++ ) { TQString index, name; - KABC::PhoneNumber phoneNumber; - KABC::PhoneNumber::List phoneNumbers = (*it).phoneNumbers(); - KABC::PhoneNumber::List::Iterator it2; + TDEABC::PhoneNumber phoneNumber; + TDEABC::PhoneNumber::List phoneNumbers = (*it).phoneNumbers(); + TDEABC::PhoneNumber::List::Iterator it2; int phoneNumberIndex = 0; @@ -516,37 +516,37 @@ void MobileGui::readKabc() if ( (*mPrefs).excludeHome() && - ( phoneNumber.type() & KABC::PhoneNumber::Home ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Home ) ) excludeNumber = true; if ( (*mPrefs).excludeWork() && - ( phoneNumber.type() & KABC::PhoneNumber::Work ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Work ) ) excludeNumber = true; if ( (*mPrefs).excludeMessaging() && - ( phoneNumber.type() & KABC::PhoneNumber::Msg ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Msg ) ) excludeNumber = true; if ( (*mPrefs).excludeFax() && - ( phoneNumber.type() & KABC::PhoneNumber::Fax ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Fax ) ) excludeNumber = true; if ( (*mPrefs).excludeCell() && - ( phoneNumber.type() & KABC::PhoneNumber::Cell ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Cell ) ) excludeNumber = true; if ( (*mPrefs).excludeVideo() && - ( phoneNumber.type() & KABC::PhoneNumber::Video ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Video ) ) excludeNumber = true; if ( (*mPrefs).excludeMailbox() && - ( phoneNumber.type() & KABC::PhoneNumber::Bbs ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Bbs ) ) excludeNumber = true; if ( (*mPrefs).excludeModem() && - ( phoneNumber.type() & KABC::PhoneNumber::Modem ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Modem ) ) excludeNumber = true; if ( (*mPrefs).excludeCar() && - ( phoneNumber.type() & KABC::PhoneNumber::Car ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Car ) ) excludeNumber = true; if ( (*mPrefs).excludeISDN() && - ( phoneNumber.type() & KABC::PhoneNumber::Isdn ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Isdn ) ) excludeNumber = true; if ( (*mPrefs).excludePager() && - ( phoneNumber.type() & KABC::PhoneNumber::Pager ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Pager ) ) excludeNumber = true; if ( excludeNumber == false ) { @@ -556,8 +556,8 @@ void MobileGui::readKabc() index = ""; name = (*it).familyName(); - KABC::AddressBook::Iterator it3; - KABC::Addressee::List tmp; + TDEABC::AddressBook::Iterator it3; + TDEABC::Addressee::List tmp; bool firstCharIsUnique = true; for ( it3 = addressBook->begin(); it3 != addressBook->end(); ++it3 ) if ( ( (*it3).familyName() == name ) && ( it3 != it ) ) { @@ -584,47 +584,47 @@ void MobileGui::readKabc() // Append Suffix to name if specified in preferences if ( (*mPrefs).useHomeSuff() && - ( phoneNumber.type() & KABC::PhoneNumber::Home ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Home ) ) formatPBName( &name, (*mPrefs).homeSuff() ); else if ( (*mPrefs).useWorkSuff() && - ( phoneNumber.type() & KABC::PhoneNumber::Work ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Work ) ) formatPBName( &name, (*mPrefs).workSuff() ); else if ( (*mPrefs).useMessagingSuff() && - ( phoneNumber.type() & KABC::PhoneNumber::Msg ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Msg ) ) formatPBName( &name, (*mPrefs).messagingSuff() ); else if ( (*mPrefs).useFaxSuff() && - ( phoneNumber.type() & KABC::PhoneNumber::Fax ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Fax ) ) formatPBName( &name, (*mPrefs).faxSuff() ); else if ( (*mPrefs).useCellSuff() && - ( phoneNumber.type() & KABC::PhoneNumber::Cell ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Cell ) ) formatPBName( &name, (*mPrefs).cellSuff() ); else if ( (*mPrefs).useVideoSuff() && - ( phoneNumber.type() & KABC::PhoneNumber::Video ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Video ) ) formatPBName( &name, (*mPrefs).videoSuff() ); else if ( (*mPrefs).useMailboxSuff() && - ( phoneNumber.type() & KABC::PhoneNumber::Bbs ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Bbs ) ) formatPBName( &name, (*mPrefs).mailboxSuff() ); else if ( (*mPrefs).useModemSuff() && - ( phoneNumber.type() & KABC::PhoneNumber::Modem ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Modem ) ) formatPBName( &name, (*mPrefs).modemSuff() ); else if ( (*mPrefs).useCarSuff() && - ( phoneNumber.type() & KABC::PhoneNumber::Car ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Car ) ) formatPBName( &name, (*mPrefs).carSuff() ); else if ( (*mPrefs).useISDNSuff() && - ( phoneNumber.type() & KABC::PhoneNumber::Isdn ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Isdn ) ) formatPBName( &name, (*mPrefs).iSDNSuff() ); else if ( (*mPrefs).usePagerSuff() && - ( phoneNumber.type() & KABC::PhoneNumber::Pager ) ) + ( phoneNumber.type() & TDEABC::PhoneNumber::Pager ) ) formatPBName( &name, (*mPrefs).pagerSuff() ); kabEntry = new SyncEntryKab( true, index, name, phone ); @@ -715,8 +715,8 @@ void MobileGui::writeKabc() if ( mKabState != MODIFIED ) return; - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - KABC::Ticket *ticket = addressBook->requestSaveTicket(); + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); + TDEABC::Ticket *ticket = addressBook->requestSaveTicket(); if ( !ticket ) { kdDebug() << "Error! No ticket to save." << endl; @@ -731,13 +731,13 @@ void MobileGui::writeKabc() if ( kabEntry->mToBeUpdated ) { // Find the entry in the KAB which has to be updated - KABC::AddressBook::Iterator it = addressBook->begin(); + TDEABC::AddressBook::Iterator it = addressBook->begin(); for ( int KABindex = 0; KABindex != kabEntry->mKABindex; it++, KABindex++ ) ; // Find the correct phonenumber of the phonebook entry - KABC::PhoneNumber::List phoneNumbers = (*it).phoneNumbers(); - KABC::PhoneNumber::List::Iterator it2 = phoneNumbers.begin(); + TDEABC::PhoneNumber::List phoneNumbers = (*it).phoneNumbers(); + TDEABC::PhoneNumber::List::Iterator it2 = phoneNumbers.begin(); for ( int phoneNumberIndex = 0; phoneNumberIndex != kabEntry->mPhoneNumberIndex; it2++, phoneNumberIndex++ ) ; @@ -749,7 +749,7 @@ void MobileGui::writeKabc() if ( kabEntry->mToBeInserted ) { int phoneType = 0; bool goon = true; - KABC::AddressBook::Iterator it; + TDEABC::AddressBook::Iterator it; bool equivalentEntryFound = false; TQString name = kabEntry->mName; @@ -761,7 +761,7 @@ void MobileGui::writeKabc() if ( goon && (*mPrefs).useHomeSuff() ) { TQString theSuffix = decodeSuffix( (*mPrefs).homeSuff() ); if ( name.right( theSuffix.length() ) == theSuffix ) { - phoneType = KABC::PhoneNumber::Home; + phoneType = TDEABC::PhoneNumber::Home; name = stripWhiteSpaces( name.left( name.length() - theSuffix.length() ) ); goon = false; @@ -770,7 +770,7 @@ void MobileGui::writeKabc() if ( goon && (*mPrefs).useWorkSuff() ) { TQString theSuffix = decodeSuffix( (*mPrefs).workSuff() ); if ( name.right( theSuffix.length() ) == theSuffix ) { - phoneType = KABC::PhoneNumber::Work; + phoneType = TDEABC::PhoneNumber::Work; name = stripWhiteSpaces( name.left( name.length() - theSuffix.length() ) ); goon = false; @@ -779,7 +779,7 @@ void MobileGui::writeKabc() if ( goon && (*mPrefs).useMessagingSuff() ) { TQString theSuffix = decodeSuffix( (*mPrefs).messagingSuff() ); if ( name.right( theSuffix.length() ) == theSuffix ) { - phoneType = KABC::PhoneNumber::Msg; + phoneType = TDEABC::PhoneNumber::Msg; name = stripWhiteSpaces( name.left( name.length() - theSuffix.length() ) ); goon = false; @@ -788,7 +788,7 @@ void MobileGui::writeKabc() if ( goon && (*mPrefs).useFaxSuff() ) { TQString theSuffix = decodeSuffix( (*mPrefs).faxSuff() ); if ( name.right( theSuffix.length() ) == theSuffix ) { - phoneType = KABC::PhoneNumber::Fax; + phoneType = TDEABC::PhoneNumber::Fax; name = stripWhiteSpaces( name.left( name.length() - theSuffix.length() ) ); goon = false; @@ -797,7 +797,7 @@ void MobileGui::writeKabc() if ( goon && (*mPrefs).useCellSuff() ) { TQString theSuffix = decodeSuffix( (*mPrefs).cellSuff() ); if ( name.right( theSuffix.length() ) == theSuffix ) { - phoneType = KABC::PhoneNumber::Cell; + phoneType = TDEABC::PhoneNumber::Cell; name = stripWhiteSpaces( name.left( name.length() - theSuffix.length() ) ); goon = false; @@ -806,7 +806,7 @@ void MobileGui::writeKabc() if ( goon && (*mPrefs).useVideoSuff() ) { TQString theSuffix = decodeSuffix( (*mPrefs).videoSuff() ); if ( name.right( theSuffix.length() ) == theSuffix ) { - phoneType = KABC::PhoneNumber::Video; + phoneType = TDEABC::PhoneNumber::Video; name = stripWhiteSpaces( name.left( name.length() - theSuffix.length() ) ); goon = false; @@ -815,7 +815,7 @@ void MobileGui::writeKabc() if ( goon && (*mPrefs).useMailboxSuff() ) { TQString theSuffix = decodeSuffix( (*mPrefs).mailboxSuff() ); if ( name.right( theSuffix.length() ) == theSuffix ) { - phoneType = KABC::PhoneNumber::Bbs; + phoneType = TDEABC::PhoneNumber::Bbs; name = stripWhiteSpaces( name.left( name.length() - theSuffix.length() ) ); goon = false; @@ -824,7 +824,7 @@ void MobileGui::writeKabc() if ( goon && (*mPrefs).useModemSuff() ) { TQString theSuffix = decodeSuffix( (*mPrefs).modemSuff() ); if ( name.right( theSuffix.length() ) == theSuffix ) { - phoneType = KABC::PhoneNumber::Modem; + phoneType = TDEABC::PhoneNumber::Modem; name = stripWhiteSpaces( name.left( name.length() - theSuffix.length() ) ); goon = false; @@ -833,7 +833,7 @@ void MobileGui::writeKabc() if ( goon && (*mPrefs).useCarSuff() ) { TQString theSuffix = decodeSuffix( (*mPrefs).carSuff() ); if ( name.right( theSuffix.length() ) == theSuffix ) { - phoneType = KABC::PhoneNumber::Car; + phoneType = TDEABC::PhoneNumber::Car; name = stripWhiteSpaces( name.left( name.length() - theSuffix.length() ) ); goon = false; @@ -842,7 +842,7 @@ void MobileGui::writeKabc() if ( goon && (*mPrefs).useISDNSuff() ) { TQString theSuffix = decodeSuffix( (*mPrefs).iSDNSuff() ); if ( name.right( theSuffix.length() ) == theSuffix ) { - phoneType = KABC::PhoneNumber::Isdn; + phoneType = TDEABC::PhoneNumber::Isdn; name = stripWhiteSpaces( name.left( name.length() - theSuffix.length() ) ); goon = false; @@ -851,7 +851,7 @@ void MobileGui::writeKabc() if ( goon && (*mPrefs).usePagerSuff() ) { TQString theSuffix = decodeSuffix( (*mPrefs).pagerSuff() ); if ( name.right( theSuffix.length() ) == theSuffix ) { - phoneType = KABC::PhoneNumber::Pager; + phoneType = TDEABC::PhoneNumber::Pager; name = stripWhiteSpaces( name.left( name.length() - theSuffix.length() ) ); goon = false; @@ -866,8 +866,8 @@ void MobileGui::writeKabc() for ( it = addressBook->begin(); it != addressBook->end(); it++ ) { TQString kabName = (*it).familyName(); - KABC::AddressBook::Iterator it3; - KABC::Addressee::List tmp; + TDEABC::AddressBook::Iterator it3; + TDEABC::Addressee::List tmp; bool firstCharIsUnique = true; unsigned int minLength; @@ -901,7 +901,7 @@ void MobileGui::writeKabc() minLength = name.length(); if ( name.left( minLength ) == kabName.left( minLength ) ) { - (*it).insertPhoneNumber( KABC::PhoneNumber( phoneNumber, + (*it).insertPhoneNumber( TDEABC::PhoneNumber( phoneNumber, phoneType ) ); equivalentEntryFound = true; @@ -915,7 +915,7 @@ void MobileGui::writeKabc() // if ( !equivalentEntryFound ) { - KABC::Addressee entry; + TDEABC::Addressee entry; TQStringList *fields = new TQStringList; @@ -936,7 +936,7 @@ void MobileGui::writeKabc() // Name string contains only one string without comma. entry.setFamilyName( stripWhiteSpaces( name ) ); - entry.insertPhoneNumber( KABC::PhoneNumber( phoneNumber, phoneType ) ); + entry.insertPhoneNumber( TDEABC::PhoneNumber( phoneNumber, phoneType ) ); addressBook->insertAddressee( entry ); } diff --git a/karm/karmstorage.cpp b/karm/karmstorage.cpp index b9e68e651..1992c0f82 100644 --- a/karm/karmstorage.cpp +++ b/karm/karmstorage.cpp @@ -1227,7 +1227,7 @@ bool KarmStorage::saveCalendar() kdDebug() << evl[i]->summary() << evl[i]->dtStart() << evl[i]->dtEnd() << endl; } #endif - KABC::Lock *lock = _calendar->lock(); + TDEABC::Lock *lock = _calendar->lock(); if ( !lock || !lock->lock() ) return false; diff --git a/kitchensync/src/Makefile.am b/kitchensync/src/Makefile.am index e04755d44..08e458c91 100644 --- a/kitchensync/src/Makefile.am +++ b/kitchensync/src/Makefile.am @@ -33,7 +33,7 @@ libkitchensync_la_SOURCES = aboutpage.cpp mainwidget.cpp groupconfigdialog.cpp \ configguisunbird.cpp libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_TDEHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \ - $(LIB_KABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \ + $(LIB_TDEABC) $(top_builddir)/libtdepim/libtdepim.la $(top_builddir)/libkcal/libkcal.la \ $(LIB_QT) # KPart @@ -41,7 +41,7 @@ kde_module_LTLIBRARIES = libkitchensyncpart.la libkitchensyncpart_la_SOURCES = part.cpp libkitchensyncpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -no-undefined -libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_KABC) $(LIB_TDECORE) $(LIB_TDEUI) +libkitchensyncpart_la_LIBADD = $(LIB_KPARTS) libkitchensync.la $(LIB_QT) $(LIB_KIO) $(LIB_TDEHTML) $(LIB_TDEABC) $(LIB_TDECORE) $(LIB_TDEUI) # Resources kitchensyncdatadir = $(kde_datadir)/kitchensync diff --git a/kitchensync/src/addresseediffalgo.cpp b/kitchensync/src/addresseediffalgo.cpp index f91873bb6..e9847284c 100644 --- a/kitchensync/src/addresseediffalgo.cpp +++ b/kitchensync/src/addresseediffalgo.cpp @@ -33,8 +33,8 @@ static bool compareString( const TQString &left, const TQString &right ) return left == right; } -AddresseeDiffAlgo::AddresseeDiffAlgo( const KABC::Addressee &leftAddressee, - const KABC::Addressee &rightAddressee ) +AddresseeDiffAlgo::AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee, + const TDEABC::Addressee &rightAddressee ) : mLeftAddressee( leftAddressee ), mRightAddressee( rightAddressee ) { } @@ -42,7 +42,7 @@ AddresseeDiffAlgo::AddresseeDiffAlgo( const KABC::Addressee &leftAddressee, AddresseeDiffAlgo::AddresseeDiffAlgo( const TQString &leftAddressee, const TQString &rightAddressee ) { - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; mLeftAddressee = converter.parseVCard( leftAddressee ); mRightAddressee = converter.parseVCard( rightAddressee ); @@ -53,68 +53,68 @@ void AddresseeDiffAlgo::run() begin(); if ( !compareString( mLeftAddressee.uid(), mRightAddressee.uid() ) ) - conflictField( KABC::Addressee::uidLabel(), mLeftAddressee.uid(), mRightAddressee.uid() ); + conflictField( TDEABC::Addressee::uidLabel(), mLeftAddressee.uid(), mRightAddressee.uid() ); if ( !compareString( mLeftAddressee.name(), mRightAddressee.name() ) ) - conflictField( KABC::Addressee::nameLabel(), mLeftAddressee.name(), mRightAddressee.name() ); + conflictField( TDEABC::Addressee::nameLabel(), mLeftAddressee.name(), mRightAddressee.name() ); if ( !compareString( mLeftAddressee.formattedName(), mRightAddressee.formattedName() ) ) - conflictField( KABC::Addressee::formattedNameLabel(), mLeftAddressee.formattedName(), mRightAddressee.formattedName() ); + conflictField( TDEABC::Addressee::formattedNameLabel(), mLeftAddressee.formattedName(), mRightAddressee.formattedName() ); if ( !compareString( mLeftAddressee.familyName(), mRightAddressee.familyName() ) ) - conflictField( KABC::Addressee::familyNameLabel(), mLeftAddressee.familyName(), mRightAddressee.familyName() ); + conflictField( TDEABC::Addressee::familyNameLabel(), mLeftAddressee.familyName(), mRightAddressee.familyName() ); if ( !compareString( mLeftAddressee.givenName(), mRightAddressee.givenName() ) ) - conflictField( KABC::Addressee::givenNameLabel(), mLeftAddressee.givenName(), mRightAddressee.givenName() ); + conflictField( TDEABC::Addressee::givenNameLabel(), mLeftAddressee.givenName(), mRightAddressee.givenName() ); if ( !compareString( mLeftAddressee.additionalName(), mRightAddressee.additionalName() ) ) - conflictField( KABC::Addressee::additionalNameLabel(), mLeftAddressee.additionalName(), mRightAddressee.additionalName() ); + conflictField( TDEABC::Addressee::additionalNameLabel(), mLeftAddressee.additionalName(), mRightAddressee.additionalName() ); if ( !compareString( mLeftAddressee.prefix(), mRightAddressee.prefix() ) ) - conflictField( KABC::Addressee::prefixLabel(), mLeftAddressee.prefix(), mRightAddressee.prefix() ); + conflictField( TDEABC::Addressee::prefixLabel(), mLeftAddressee.prefix(), mRightAddressee.prefix() ); if ( !compareString( mLeftAddressee.suffix(), mRightAddressee.suffix() ) ) - conflictField( KABC::Addressee::suffixLabel(), mLeftAddressee.suffix(), mRightAddressee.suffix() ); + conflictField( TDEABC::Addressee::suffixLabel(), mLeftAddressee.suffix(), mRightAddressee.suffix() ); if ( !compareString( mLeftAddressee.nickName(), mRightAddressee.nickName() ) ) - conflictField( KABC::Addressee::nickNameLabel(), mLeftAddressee.nickName(), mRightAddressee.nickName() ); + conflictField( TDEABC::Addressee::nickNameLabel(), mLeftAddressee.nickName(), mRightAddressee.nickName() ); if ( mLeftAddressee.birthday() != mRightAddressee.birthday() ) - conflictField( KABC::Addressee::birthdayLabel(), mLeftAddressee.birthday().toString(), + conflictField( TDEABC::Addressee::birthdayLabel(), mLeftAddressee.birthday().toString(), mRightAddressee.birthday().toString() ); if ( !compareString( mLeftAddressee.mailer(), mRightAddressee.mailer() ) ) - conflictField( KABC::Addressee::mailerLabel(), mLeftAddressee.mailer(), mRightAddressee.mailer() ); + conflictField( TDEABC::Addressee::mailerLabel(), mLeftAddressee.mailer(), mRightAddressee.mailer() ); if ( mLeftAddressee.timeZone() != mRightAddressee.timeZone() ) - conflictField( KABC::Addressee::timeZoneLabel(), mLeftAddressee.timeZone().asString(), mRightAddressee.timeZone().asString() ); + conflictField( TDEABC::Addressee::timeZoneLabel(), mLeftAddressee.timeZone().asString(), mRightAddressee.timeZone().asString() ); if ( mLeftAddressee.geo() != mRightAddressee.geo() ) - conflictField( KABC::Addressee::geoLabel(), mLeftAddressee.geo().asString(), mRightAddressee.geo().asString() ); + conflictField( TDEABC::Addressee::geoLabel(), mLeftAddressee.geo().asString(), mRightAddressee.geo().asString() ); if ( !compareString( mLeftAddressee.title(), mRightAddressee.title() ) ) - conflictField( KABC::Addressee::titleLabel(), mLeftAddressee.title(), mRightAddressee.title() ); + conflictField( TDEABC::Addressee::titleLabel(), mLeftAddressee.title(), mRightAddressee.title() ); if ( !compareString( mLeftAddressee.role(), mRightAddressee.role() ) ) - conflictField( KABC::Addressee::roleLabel(), mLeftAddressee.role(), mRightAddressee.role() ); + conflictField( TDEABC::Addressee::roleLabel(), mLeftAddressee.role(), mRightAddressee.role() ); if ( !compareString( mLeftAddressee.organization(), mRightAddressee.organization() ) ) - conflictField( KABC::Addressee::organizationLabel(), mLeftAddressee.organization(), mRightAddressee.organization() ); + conflictField( TDEABC::Addressee::organizationLabel(), mLeftAddressee.organization(), mRightAddressee.organization() ); if ( !compareString( mLeftAddressee.note(), mRightAddressee.note() ) ) - conflictField( KABC::Addressee::noteLabel(), mLeftAddressee.note(), mRightAddressee.note() ); + conflictField( TDEABC::Addressee::noteLabel(), mLeftAddressee.note(), mRightAddressee.note() ); if ( !compareString( mLeftAddressee.productId(), mRightAddressee.productId() ) ) - conflictField( KABC::Addressee::productIdLabel(), mLeftAddressee.productId(), mRightAddressee.productId() ); + conflictField( TDEABC::Addressee::productIdLabel(), mLeftAddressee.productId(), mRightAddressee.productId() ); if ( !compareString( mLeftAddressee.sortString(), mRightAddressee.sortString() ) ) - conflictField( KABC::Addressee::sortStringLabel(), mLeftAddressee.sortString(), mRightAddressee.sortString() ); + conflictField( TDEABC::Addressee::sortStringLabel(), mLeftAddressee.sortString(), mRightAddressee.sortString() ); if ( mLeftAddressee.secrecy() != mRightAddressee.secrecy() ) { - conflictField( KABC::Addressee::secrecyLabel(), mLeftAddressee.secrecy().asString(), mRightAddressee.secrecy().asString() ); + conflictField( TDEABC::Addressee::secrecyLabel(), mLeftAddressee.secrecy().asString(), mRightAddressee.secrecy().asString() ); } if ( mLeftAddressee.url()!= mRightAddressee.url() ) - conflictField( KABC::Addressee::urlLabel(), mLeftAddressee.url().prettyURL(), + conflictField( TDEABC::Addressee::urlLabel(), mLeftAddressee.url().prettyURL(), mRightAddressee.url().prettyURL() ); if ( mLeftAddressee.logo() != mRightAddressee.logo() ) { @@ -131,12 +131,12 @@ void AddresseeDiffAlgo::run() end(); } -TQString AddresseeDiffAlgo::toString( const KABC::PhoneNumber &number ) +TQString AddresseeDiffAlgo::toString( const TDEABC::PhoneNumber &number ) { return number.number(); } -TQString AddresseeDiffAlgo::toString( const KABC::Address &addr ) +TQString AddresseeDiffAlgo::toString( const TDEABC::Address &addr ) { return addr.formattedAddress(); } diff --git a/kitchensync/src/addresseediffalgo.h b/kitchensync/src/addresseediffalgo.h index 30154d1b0..2cf33eea8 100644 --- a/kitchensync/src/addresseediffalgo.h +++ b/kitchensync/src/addresseediffalgo.h @@ -32,7 +32,7 @@ namespace KSync { class AddresseeDiffAlgo : public DiffAlgo { public: - AddresseeDiffAlgo( const KABC::Addressee &leftAddressee, const KABC::Addressee &rightAddressee ); + AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee, const TDEABC::Addressee &rightAddressee ); AddresseeDiffAlgo( const TQString &leftAddressee, const TQString &rightAddressee ); void run(); @@ -41,11 +41,11 @@ class AddresseeDiffAlgo : public DiffAlgo template <class L> void diffList( const TQString &id, const TQValueList<L> &left, const TQValueList<L> &right ); - TQString toString( const KABC::PhoneNumber &number ); - TQString toString( const KABC::Address &address ); + TQString toString( const TDEABC::PhoneNumber &number ); + TQString toString( const TDEABC::Address &address ); - KABC::Addressee mLeftAddressee; - KABC::Addressee mRightAddressee; + TDEABC::Addressee mLeftAddressee; + TDEABC::Addressee mRightAddressee; }; } diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp index f54bb8cf9..1b1c3622c 100644 --- a/kitchensync/src/configguildap.cpp +++ b/kitchensync/src/configguildap.cpp @@ -124,14 +124,14 @@ void ConfigGuiLdap::initGUI() TQGridLayout *layout = new TQGridLayout( topLayout(), 12, 4, KDialog::spacingHint() ); layout->setMargin( KDialog::marginHint() ); - mLdapWidget = new KABC::LdapConfigWidget( KABC::LdapConfigWidget::W_HOST | - KABC::LdapConfigWidget::W_PORT | - KABC::LdapConfigWidget::W_USER | - KABC::LdapConfigWidget::W_PASS | - KABC::LdapConfigWidget::W_BINDDN | - KABC::LdapConfigWidget::W_DN | - KABC::LdapConfigWidget::W_FILTER | - KABC::LdapConfigWidget::W_AUTHBOX, this ); + mLdapWidget = new TDEABC::LdapConfigWidget( TDEABC::LdapConfigWidget::W_HOST | + TDEABC::LdapConfigWidget::W_PORT | + TDEABC::LdapConfigWidget::W_USER | + TDEABC::LdapConfigWidget::W_PASS | + TDEABC::LdapConfigWidget::W_BINDDN | + TDEABC::LdapConfigWidget::W_DN | + TDEABC::LdapConfigWidget::W_FILTER | + TDEABC::LdapConfigWidget::W_AUTHBOX, this ); mKeyAttribute = new KLineEdit( this ); mSearchScope = new KComboBox( this ); diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h index a5a76b784..15741c134 100644 --- a/kitchensync/src/configguildap.h +++ b/kitchensync/src/configguildap.h @@ -29,7 +29,7 @@ class TQCheckBox; class TQLabel; class TQSpinBox; -class KABC::LdapConfigWidget; +class TDEABC::LdapConfigWidget; class KComboBox; class KLineEdit; @@ -47,7 +47,7 @@ class ConfigGuiLdap : public ConfigGui private: void initGUI(); - KABC::LdapConfigWidget *mLdapWidget; + TDEABC::LdapConfigWidget *mLdapWidget; KLineEdit *mKeyAttribute; KComboBox *mSearchScope; TQCheckBox *mEncryption; diff --git a/kmail/Makefile.am b/kmail/Makefile.am index 4fc680853..f96fdc40e 100644 --- a/kmail/Makefile.am +++ b/kmail/Makefile.am @@ -32,7 +32,7 @@ libkmailprivate_la_LIBADD = \ ../libksieve/libksieve.la ../libemailfunctions/libemailfunctions.la \ ../certmanager/lib/libkleopatra.la $(INDEXLIB) \ ../libkcal/libkcal.la \ - $(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_KABC) + $(LIB_TDEHTML) $(LIB_KSPELL) $(LIB_TDEABC) kde_module_LTLIBRARIES = kcm_kmail.la libkmailpart.la libkmail_bodypartformatter_application_octetstream.la libkmailpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined @@ -180,7 +180,7 @@ dcoptest_LDADD = $(LIB_KIO) dcoptest_LDFLAGS = $(all_libraries) recipienteditortest_SOURCES = recipientseditortest.cpp -recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_KIO) $(LIB_KABC) +recipienteditortest_LDADD = libkmailprivate.la ../libtdepim/libtdepim.la $(LIB_KIO) $(LIB_TDEABC) recipienteditortest_LDFLAGS = $(all_libraries) kmailIface_DCOPIDLNG = true diff --git a/kmail/distributionlistdialog.cpp b/kmail/distributionlistdialog.cpp index 010fdd9be..031e9108c 100644 --- a/kmail/distributionlistdialog.cpp +++ b/kmail/distributionlistdialog.cpp @@ -51,19 +51,19 @@ class DistributionListItem : public TQCheckListItem { } - void setAddressee( const KABC::Addressee &a, const TQString &email ) + void setAddressee( const TDEABC::Addressee &a, const TQString &email ) { mIsTransient = false; init( a, email ); } - void setTransientAddressee( const KABC::Addressee &a, const TQString &email ) + void setTransientAddressee( const TDEABC::Addressee &a, const TQString &email ) { mIsTransient = true; init( a, email ); } - void init( const KABC::Addressee &a, const TQString &email ) + void init( const TDEABC::Addressee &a, const TQString &email ) { mAddressee = a; mEmail = email; @@ -71,7 +71,7 @@ class DistributionListItem : public TQCheckListItem setText( 2, mEmail ); } - KABC::Addressee addressee() const + TDEABC::Addressee addressee() const { return mAddressee; } @@ -87,7 +87,7 @@ class DistributionListItem : public TQCheckListItem } private: - KABC::Addressee mAddressee; + TDEABC::Addressee mAddressee; TQString mEmail; bool mIsTransient; }; @@ -127,19 +127,19 @@ void DistributionListDialog::setRecipients( const Recipient::List &recipients ) for( it2 = emails.begin(); it2 != emails.end(); ++it2 ) { TQString name; TQString email; - KABC::Addressee::parseEmailAddress( *it2, name, email ); + TDEABC::Addressee::parseEmailAddress( *it2, name, email ); if ( !email.isEmpty() ) { DistributionListItem *item = new DistributionListItem( mRecipientsList ); - KABC::Addressee::List addressees = - KABC::StdAddressBook::self( true )->findByEmail( email ); + TDEABC::Addressee::List addressees = + TDEABC::StdAddressBook::self( true )->findByEmail( email ); if ( addressees.isEmpty() ) { - KABC::Addressee a; + TDEABC::Addressee a; a.setNameFromString( name ); a.insertEmail( email ); item->setTransientAddressee( a, email ); item->setOn( true ); } else { - KABC::Addressee::List::ConstIterator it3; + TDEABC::Addressee::List::ConstIterator it3; for( it3 = addressees.begin(); it3 != addressees.end(); ++it3 ) { item->setAddressee( *it3, email ); if ( it3 == addressees.begin() ) item->setOn( true ); @@ -173,7 +173,7 @@ void DistributionListDialog::slotUser1() } #ifndef TDEPIM_NEW_DISTRLISTS - KABC::DistributionListManager manager( ab ); + TDEABC::DistributionListManager manager( ab ); manager.load(); #endif @@ -187,7 +187,7 @@ void DistributionListDialog::slotUser1() return; } - KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self( true ); #ifdef TDEPIM_NEW_DISTRLISTS if ( !KPIM::DistributionList::findByName( ab, name ).isEmpty() ) { @@ -200,13 +200,13 @@ void DistributionListDialog::slotUser1() return; } - KABC::Resource* const resource = KAddrBookExternal::selectResourceForSaving( ab ); + TDEABC::Resource* const resource = KAddrBookExternal::selectResourceForSaving( ab ); if ( !resource ) return; // Ask for a save ticket here, we use it for inserting the recipients into the addressbook and // also for saving the addressbook, see https://issues.kolab.org/issue4281 - KABC::Ticket *ticket = ab->requestSaveTicket( resource ); + TDEABC::Ticket *ticket = ab->requestSaveTicket( resource ); if ( !ticket ) { kdWarning(5006) << "Unable to get save ticket!" << endl; return; @@ -235,7 +235,7 @@ void DistributionListDialog::slotUser1() resource->insertAddressee( dlist ); #else - KABC::DistributionList *dlist = new KABC::DistributionList( &manager, name ); + TDEABC::DistributionList *dlist = new TDEABC::DistributionList( &manager, name ); i = mRecipientsList->firstChild(); while( i ) { DistributionListItem *item = static_cast<DistributionListItem *>( i ); diff --git a/kmail/folderdiaacltab.cpp b/kmail/folderdiaacltab.cpp index 2f86cdad6..6b2e85fc4 100644 --- a/kmail/folderdiaacltab.cpp +++ b/kmail/folderdiaacltab.cpp @@ -133,7 +133,7 @@ void KMail::ACLEntryDialog::slotChanged() enableButtonOK( !mUserIdLineEdit->text().isEmpty() && mButtonGroup->selected() != 0 ); } -static TQString addresseeToUserId( const KABC::Addressee& addr, IMAPUserIdFormat userIdFormat ) +static TQString addresseeToUserId( const TDEABC::Addressee& addr, IMAPUserIdFormat userIdFormat ) { TQString email = addr.preferredEmail(); if ( userIdFormat == FullEmail ) @@ -156,9 +156,9 @@ void KMail::ACLEntryDialog::slotSelectAddresses() const TQStringList distrLists = dlg.toDistributionLists(); TQString txt = distrLists.join( ", " ); - const KABC::Addressee::List lst = dlg.toAddresses(); + const TDEABC::Addressee::List lst = dlg.toAddresses(); if ( !lst.isEmpty() ) { - for( TQValueList<KABC::Addressee>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { + for( TQValueList<TDEABC::Addressee>::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { if ( !txt.isEmpty() ) txt += ", "; txt += addresseeToUserId( *it, mUserIdFormat ); @@ -205,9 +205,9 @@ public: void load( const ACLListEntry& entry ); void save( ACLList& list, #ifdef TDEPIM_NEW_DISTRLISTS - KABC::AddressBook* abook, + TDEABC::AddressBook* abook, #else - KABC::DistributionListManager& manager, + TDEABC::DistributionListManager& manager, #endif IMAPUserIdFormat userIdFormat ); @@ -271,9 +271,9 @@ void KMail::FolderDiaACLTab::ListViewItem::load( const ACLListEntry& entry ) void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList, #ifdef TDEPIM_NEW_DISTRLISTS - KABC::AddressBook* addressBook, + TDEABC::AddressBook* addressBook, #else - KABC::DistributionListManager& manager, + TDEABC::DistributionListManager& manager, #endif IMAPUserIdFormat userIdFormat ) { @@ -287,11 +287,11 @@ void KMail::FolderDiaACLTab::ListViewItem::save( ACLList& aclList, // (we share for loop with the old-distrlist-code) #else // kaddrbook.cpp has a strange two-pass case-insensitive lookup; is it ok to be case sensitive? - KABC::DistributionList* list = manager.list( userId() ); + TDEABC::DistributionList* list = manager.list( userId() ); if ( list ) { Q_ASSERT( mModified ); // it has to be new, it couldn't be stored as a distr list name.... - KABC::DistributionList::Entry::List entryList = list->entries(); - KABC::DistributionList::Entry::List::ConstIterator it; // nice number of "::"! + TDEABC::DistributionList::Entry::List entryList = list->entries(); + TDEABC::DistributionList::Entry::List::ConstIterator it; // nice number of "::"! #endif for( it = entryList.begin(); it != entryList.end(); ++it ) { TQString email = (*it).email; @@ -674,9 +674,9 @@ bool KMail::FolderDiaACLTab::save() // Now, how to expand them? Playing with listviewitem iterators and inserting // listviewitems at the same time sounds dangerous, so let's just save into // ACLList and reload that. - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); #ifndef TDEPIM_NEW_DISTRLISTS - KABC::DistributionListManager manager( addressBook ); + TDEABC::DistributionListManager manager( addressBook ); manager.load(); #endif ACLList aclList; diff --git a/kmail/headerstyle.cpp b/kmail/headerstyle.cpp index 5f04982d4..7d0d6fc4b 100644 --- a/kmail/headerstyle.cpp +++ b/kmail/headerstyle.cpp @@ -279,8 +279,8 @@ namespace KMail { TQString kabcUid; if ( strategy->showHeader( "status" ) ) { - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - KABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) ); + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); + TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) ); ::KIMProxy *imProxy = KMKernel::self()->imProxy(); kabcUid = addresses[0].uid(); presence = imProxy->presenceString( kabcUid ); @@ -477,8 +477,8 @@ namespace KMail { ::KIMProxy *imProxy = KMKernel::self()->imProxy(); TQString kabcUid; - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - KABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) ); + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); + TDEABC::AddresseeList addresses = addressBook->findByEmail( KPIM::getFirstEmailAddress( message->from() ) ); TQString photoURL; int photoWidth = 60; diff --git a/kmail/keyresolver.cpp b/kmail/keyresolver.cpp index 55459dd2a..1aa6f8772 100644 --- a/kmail/keyresolver.cpp +++ b/kmail/keyresolver.cpp @@ -1769,11 +1769,11 @@ Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreference if ( it != d->mContactPreferencesMap.end() ) return it->second; - KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); - const KABC::Addressee::List res = ab->findByEmail( address ); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self( true ); + const TDEABC::Addressee::List res = ab->findByEmail( address ); ContactPreferences pref; if ( !res.isEmpty() ) { - KABC::Addressee addr = res.first(); + TDEABC::Addressee addr = res.first(); TQString encryptPref = addr.custom( "KADDRESSBOOK", "CRYPTOENCRYPTPREF" ); pref.encryptionPreference = Kleo::stringToEncryptionPreference( encryptPref ); TQString signPref = addr.custom( "KADDRESSBOOK", "CRYPTOSIGNPREF" ); @@ -1791,10 +1791,10 @@ Kleo::KeyResolver::ContactPreferences Kleo::KeyResolver::lookupContactPreference void Kleo::KeyResolver::saveContactPreference( const TQString& email, const ContactPreferences& pref ) const { d->mContactPreferencesMap.insert( std::make_pair( email, pref ) ); - KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); - KABC::Addressee::List res = ab->findByEmail( email ); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self( true ); + TDEABC::Addressee::List res = ab->findByEmail( email ); - KABC::Addressee addr; + TDEABC::Addressee addr; if ( res.isEmpty() ) { bool ok = true; TQString fullName = KInputDialog::getText( i18n( "Name Selection" ), i18n( "Which name shall the contact '%1' have in your addressbook?" ).arg( email ), TQString(), &ok ); @@ -1813,7 +1813,7 @@ void Kleo::KeyResolver::saveContactPreference( const TQString& email, const Cont addr.insertCustom( "KADDRESSBOOK", "SMIMEFP", pref.smimeCertFingerprints.join( "," ) ); ab->insertAddressee( addr ); - KABC::Ticket *ticket = ab->requestSaveTicket( addr.resource() ); + TDEABC::Ticket *ticket = ab->requestSaveTicket( addr.resource() ); if ( ticket ) ab->save( ticket ); diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp index 0772ccfba..6b7747382 100644 --- a/kmail/kmaddrbook.cpp +++ b/kmail/kmaddrbook.cpp @@ -37,8 +37,8 @@ void KabcBridge::addresses(TQStringList& result) // includes lists { KCursorSaver busy(KBusyPtr::busy()); // loading might take a while - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - KABC::AddressBook::ConstIterator it; + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); + TDEABC::AddressBook::ConstIterator it; for( it = addressBook->begin(); it != addressBook->end(); ++it ) { const TQStringList emails = (*it).emails(); TQString n = (*it).prefix() + " " + @@ -76,7 +76,7 @@ void KabcBridge::addresses(TQStringList& result) // includes lists } } } - KABC::DistributionListManager manager( addressBook ); + TDEABC::DistributionListManager manager( addressBook ); manager.load(); result += manager.listNames(); @@ -86,9 +86,9 @@ void KabcBridge::addresses(TQStringList& result) // includes lists TQStringList KabcBridge::addresses() { TQStringList entries; - KABC::AddressBook::ConstIterator it; + TDEABC::AddressBook::ConstIterator it; - const KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); + const TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); for( it = addressBook->begin(); it != addressBook->end(); ++it ) { entries += (*it).fullEmail(); } @@ -102,8 +102,8 @@ TQString KabcBridge::expandNickName( const TQString& nickName ) return TQString(); const TQString lowerNickName = nickName.lower(); - const KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - for( KABC::AddressBook::ConstIterator it = addressBook->begin(); + const TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); + for( TDEABC::AddressBook::ConstIterator it = addressBook->begin(); it != addressBook->end(); ++it ) { if ( (*it).nickName().lower() == lowerNickName ) return (*it).fullEmail(); @@ -116,11 +116,11 @@ TQString KabcBridge::expandNickName( const TQString& nickName ) TQStringList KabcBridge::categories() { - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - KABC::Addressee::List addresses = addressBook->allAddressees(); + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); + TDEABC::Addressee::List addresses = addressBook->allAddressees(); TQStringList allcategories, aux; - for ( KABC::Addressee::List::Iterator it = addresses.begin(); + for ( TDEABC::Addressee::List::Iterator it = addresses.begin(); it != addresses.end(); ++it ) { aux = ( *it ).categories(); for ( TQStringList::ConstIterator itAux = aux.begin(); diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp index 8005ca838..e3be3b119 100644 --- a/kmail/kmcommands.cpp +++ b/kmail/kmcommands.cpp @@ -2986,8 +2986,8 @@ KMCommand::Result KMIMChatCommand::execute() kdDebug( 5006 ) << k_funcinfo << " URL is: " << mUrl << endl; TQString addr = KMMessage::decodeMailtoUrl( mUrl.path() ); // find UID for mail address - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - KABC::AddresseeList addressees = addressBook->findByEmail( KPIM::getEmailAddress( addr ) ) ; + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); + TDEABC::AddresseeList addressees = addressBook->findByEmail( KPIM::getEmailAddress( addr ) ) ; // start chat if( addressees.count() == 1 ) { @@ -3005,8 +3005,8 @@ KMCommand::Result KMIMChatCommand::execute() { apology = i18n( "More than one Address Book entry uses this email address:\n %1\n it is not possible to determine who to chat with." ); TQStringList nameList; - KABC::AddresseeList::const_iterator it = addressees.begin(); - KABC::AddresseeList::const_iterator end = addressees.end(); + TDEABC::AddresseeList::const_iterator it = addressees.begin(); + TDEABC::AddresseeList::const_iterator end = addressees.end(); for ( ; it != end; ++it ) { nameList.append( (*it).realName() ); diff --git a/kmail/kmfawidgets.cpp b/kmail/kmfawidgets.cpp index 80cd3fd95..fdd444b46 100644 --- a/kmail/kmfawidgets.cpp +++ b/kmail/kmfawidgets.cpp @@ -47,14 +47,14 @@ KMFilterActionWithAddressWidget::KMFilterActionWithAddressWidget( TQWidget* pare void KMFilterActionWithAddressWidget::slotAddrBook() { - KABC::Addressee::List lst = KABC::AddresseeDialog::getAddressees( this ); + TDEABC::Addressee::List lst = TDEABC::AddresseeDialog::getAddressees( this ); if ( lst.empty() ) return; TQStringList addrList; - for( KABC::Addressee::List::const_iterator it = lst.begin(); it != lst.end(); ++it ) + for( TDEABC::Addressee::List::const_iterator it = lst.begin(); it != lst.end(); ++it ) addrList << (*it).fullEmail(); TQString txt = mLineEdit->text().stripWhiteSpace(); diff --git a/kmail/kmlineeditspell.cpp b/kmail/kmlineeditspell.cpp index 7d26495a9..20421ec90 100644 --- a/kmail/kmlineeditspell.cpp +++ b/kmail/kmlineeditspell.cpp @@ -91,10 +91,10 @@ void KMLineEdit::dropEvent( TQDropEvent *event ) // Case one: The user dropped a text/directory (i.e. vcard), so decode its // contents if ( KVCardDrag::canDecode( event ) ) { - KABC::Addressee::List list; + TDEABC::Addressee::List list; KVCardDrag::decode( event, list ); - KABC::Addressee::List::Iterator ait; + TDEABC::Addressee::List::Iterator ait; for ( ait = list.begin(); ait != list.end(); ++ait ){ insertEmails( (*ait).emails() ); } @@ -105,19 +105,19 @@ void KMLineEdit::dropEvent( TQDropEvent *event ) // and for other Urls, download the Url and assume it points to a vCard else if ( KURLDrag::decode( event, urls ) ) { KURL::List::Iterator it = urls.begin(); - KABC::Addressee::List list; + TDEABC::Addressee::List list; for ( it = urls.begin(); it != urls.end(); ++it ) { // First, let's deal with mailto Urls. The path() part contains the // email-address. if ( (*it).protocol() == "mailto" ) { - KABC::Addressee addressee; + TDEABC::Addressee addressee; addressee.insertEmail( KMail::StringUtil::decodeMailtoUrl( (*it).path() ), true /* preferred */ ); list += addressee; } // Otherwise, download the vCard to which the Url points else { - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; TQString fileName; if ( TDEIO::NetAccess::download( (*it), fileName, parentWidget() ) ) { TQFile file( fileName ); @@ -137,7 +137,7 @@ void KMLineEdit::dropEvent( TQDropEvent *event ) } } // Now, let the user choose which addressee to add. - KABC::Addressee::List::Iterator ait; + TDEABC::Addressee::List::Iterator ait; for ( ait = list.begin(); ait != list.end(); ++ait ) insertEmails( (*ait).emails() ); } @@ -193,7 +193,7 @@ void KMLineEdit::loadContacts() int weight = config.readEntry( "Recent Addresses", "10" ).toInt(); int idx = addCompletionSource( i18n( "Recent Addresses" ), weight ); for ( ; it != recent.end(); ++it ) { - KABC::Addressee addr; + TDEABC::Addressee addr; KPIM::getNameAndMail(*it, name, email); name = KPIM::quoteNameIfNecessary( name ); if ( ( name[0] == '"' ) && ( name[name.length() - 1] == '"' ) ) { diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp index fc93be5e4..7d370f5ee 100644 --- a/kmail/kmreaderwin.cpp +++ b/kmail/kmreaderwin.cpp @@ -1533,7 +1533,7 @@ void KMReaderWin::parseMsg(KMMessage* aMsg) if( vCardNode ) { // ### FIXME: We should only do this if the vCard belongs to the sender, // ### i.e. if the sender's email address is contained in the vCard. - KABC::VCardConverter t; + TDEABC::VCardConverter t; #if defined(KABC_VCARD_ENCODING_FIX) const TQByteArray vcard = vCardNode->msgPart().bodyDecodedBinary(); if ( !t.parseVCardsRaw( vcard.data() ).empty() ) { diff --git a/kmail/kmsearchpattern.cpp b/kmail/kmsearchpattern.cpp index 90bc22a72..d1d47daf0 100644 --- a/kmail/kmsearchpattern.cpp +++ b/kmail/kmsearchpattern.cpp @@ -449,7 +449,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const return ( TQString::compare( msgContents.lower(), contents().lower() ) >= 0 ); case FuncIsInAddressbook: { - KABC::AddressBook *stdAb = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook *stdAb = TDEABC::StdAddressBook::self( true ); TQStringList addressList = KPIM::splitEmailAddrList( msgContents.lower() ); for( TQStringList::ConstIterator it = addressList.begin(); @@ -462,7 +462,7 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const } case FuncIsNotInAddressbook: { - KABC::AddressBook *stdAb = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook *stdAb = TDEABC::StdAddressBook::self( true ); TQStringList addressList = KPIM::splitEmailAddrList( msgContents.lower() ); for( TQStringList::ConstIterator it = addressList.begin(); @@ -477,13 +477,13 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const case FuncIsInCategory: { TQString category = contents(); TQStringList addressList = KPIM::splitEmailAddrList( msgContents.lower() ); - KABC::AddressBook *stdAb = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook *stdAb = TDEABC::StdAddressBook::self( true ); for( TQStringList::ConstIterator it = addressList.begin(); it != addressList.end(); ++it ) { - KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) ); + TDEABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) ); - for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd ) + for ( TDEABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd ) if ( (*itAd).hasCategory(category) ) return true; @@ -494,13 +494,13 @@ bool KMSearchRuleString::matchesInternal( const TQString & msgContents ) const case FuncIsNotInCategory: { TQString category = contents(); TQStringList addressList = KPIM::splitEmailAddrList( msgContents.lower() ); - KABC::AddressBook *stdAb = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook *stdAb = TDEABC::StdAddressBook::self( true ); for( TQStringList::ConstIterator it = addressList.begin(); it != addressList.end(); ++it ) { - KABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) ); + TDEABC::Addressee::List addresses = stdAb->findByEmail( KPIM::getEmailAddress( *it ) ); - for ( KABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd ) + for ( TDEABC::Addressee::List::Iterator itAd = addresses.begin(); itAd != addresses.end(); ++itAd ) if ( (*itAd).hasCategory(category) ) return false; diff --git a/kmail/recipientspicker.cpp b/kmail/recipientspicker.cpp index 0b43795e8..26fe72135 100644 --- a/kmail/recipientspicker.cpp +++ b/kmail/recipientspicker.cpp @@ -47,7 +47,7 @@ #include <tqlabel.h> #ifdef TDEPIM_NEW_DISTRLISTS -RecipientItem::RecipientItem( KABC::AddressBook *ab ) +RecipientItem::RecipientItem( TDEABC::AddressBook *ab ) : mAddressBook( ab ) { } @@ -76,7 +76,7 @@ void RecipientItem::setDistributionList( KPIM::DistributionList &list ) mTooltip = createTooltip( list ); } #else -void RecipientItem::setDistributionList( KABC::DistributionList *list ) +void RecipientItem::setDistributionList( TDEABC::DistributionList *list ) { mDistributionList = list; @@ -94,7 +94,7 @@ void RecipientItem::setDistributionList( KABC::DistributionList *list ) } #endif -void RecipientItem::setAddressee( const KABC::Addressee &a, +void RecipientItem::setAddressee( const TDEABC::Addressee &a, const TQString &email ) { mAddressee = a; @@ -147,7 +147,7 @@ KPIM::DistributionList& RecipientItem::distributionList() { return mDistributionList; } #else -KABC::DistributionList * RecipientItem::distributionList() { +TDEABC::DistributionList * RecipientItem::distributionList() { return mDistributionList; } #endif @@ -176,14 +176,14 @@ TQString RecipientItem::createTooltip( KPIM::DistributionList &distributionList return txt; } #else -TQString RecipientItem::createTooltip( KABC::DistributionList *distributionList ) const +TQString RecipientItem::createTooltip( TDEABC::DistributionList *distributionList ) const { TQString txt = "<qt>"; txt += "<b>" + i18n("Distribution List %1" ).arg ( distributionList->name() ) + "</b>"; txt += "<ul>"; - KABC::DistributionList::Entry::List entries = distributionList->entries(); - KABC::DistributionList::Entry::List::ConstIterator it; + TDEABC::DistributionList::Entry::List entries = distributionList->entries(); + TDEABC::DistributionList::Entry::List::ConstIterator it; for( it = entries.begin(); it != entries.end(); ++it ) { txt += "<li>"; txt += (*it).addressee.realName() + ' '; @@ -427,8 +427,8 @@ RecipientsPicker::RecipientsPicker( TQWidget *parent ) connect( closeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) ); { - using namespace KABC; - mAddressBook = KABC::StdAddressBook::self( true ); + using namespace TDEABC; + mAddressBook = TDEABC::StdAddressBook::self( true ); connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook * ) ), this, TQT_SLOT( insertAddressBook( AddressBook * ) ) ); } @@ -478,12 +478,12 @@ void RecipientsPicker::initCollections() rebuildAllRecipientsList(); } -void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook ) +void RecipientsPicker::insertAddressBook( TDEABC::AddressBook *addressbook ) { - TQMap<KABC::Resource *,RecipientsCollection *> collectionMap; + TQMap<TDEABC::Resource *,RecipientsCollection *> collectionMap; - TQPtrList<KABC::Resource> resources = addressbook->resources(); - KABC::Resource *res; + TQPtrList<TDEABC::Resource> resources = addressbook->resources(); + TDEABC::Resource *res; for( res = resources.first(); res; res = resources.next() ) { RecipientsCollection *collection = new RecipientsCollection( res->identifier() ); collectionMap.insert( res, collection ); @@ -492,7 +492,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook ) TQMap<TQString,RecipientsCollection *> categoryMap; - KABC::AddressBook::Iterator it; + TDEABC::AddressBook::Iterator it; for( it = addressbook->begin(); it != addressbook->end(); ++it ) { TQStringList emails = (*it).emails(); TQStringList::ConstIterator it3; @@ -504,7 +504,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook ) #endif item->setAddressee( *it, *it3 ); - TQMap<KABC::Resource *,RecipientsCollection *>::ConstIterator collIt; + TQMap<TDEABC::Resource *,RecipientsCollection *>::ConstIterator collIt; collIt = collectionMap.find( it->resource() ); if ( collIt != collectionMap.end() ) { (*collIt)->addItem( item ); @@ -528,7 +528,7 @@ void RecipientsPicker::insertAddressBook( KABC::AddressBook *addressbook ) } } - TQMap<KABC::Resource *,RecipientsCollection *>::ConstIterator it2; + TQMap<TDEABC::Resource *,RecipientsCollection *>::ConstIterator it2; for( it2 = collectionMap.begin(); it2 != collectionMap.end(); ++it2 ) { insertCollection( *it2 ); } @@ -557,7 +557,7 @@ void RecipientsPicker::insertDistributionLists() #else delete mDistributionListManager; mDistributionListManager = - new KABC::DistributionListManager( KABC::StdAddressBook::self( true ) ); + new TDEABC::DistributionListManager( TDEABC::StdAddressBook::self( true ) ); mDistributionListManager->load(); @@ -565,7 +565,7 @@ void RecipientsPicker::insertDistributionLists() TQStringList::Iterator listIt; for ( listIt = lists.begin(); listIt != lists.end(); ++listIt ) { - KABC::DistributionList *list = mDistributionListManager->list( *listIt ); + TDEABC::DistributionList *list = mDistributionListManager->list( *listIt ); RecipientItem *item = new RecipientItem; item->setDistributionList( list ); mDistributionLists->addItem( item ); @@ -578,10 +578,10 @@ void RecipientsPicker::insertRecentAddresses() RecipientsCollection *collection = new RecipientsCollection( i18n("Recent Addresses") ); TDEConfig config( "kmailrc" ); - KABC::Addressee::List recents = + TDEABC::Addressee::List recents = TDERecentAddress::RecentAddresses::self( &config )->kabcAddresses(); - KABC::Addressee::List::ConstIterator it; + TDEABC::Addressee::List::ConstIterator it; for( it = recents.begin(); it != recents.end(); ++it ) { #ifdef TDEPIM_NEW_DISTRLISTS RecipientItem *item = new RecipientItem( mAddressBook ); @@ -654,10 +654,10 @@ void RecipientsPicker::setRecipients( const Recipient::List &recipients ) #endif if ( !item ) { - KABC::Addressee a; + TDEABC::Addressee a; TQString name; TQString email; - KABC::Addressee::parseEmailAddress( (*it).email(), name, email ); + TDEABC::Addressee::parseEmailAddress( (*it).email(), name, email ); a.setNameFromString( name ); a.insertEmail( email ); @@ -862,7 +862,7 @@ void RecipientsPicker::ldapSearchResult() TQString name; TQString email; KPIM::getNameAndMail( (*it), name, email ); - KABC::Addressee ad; + TDEABC::Addressee ad; ad.setNameFromString( name ); ad.insertEmail( email ); #ifdef TDEPIM_NEW_DISTRLISTS diff --git a/kmail/recipientspicker.h b/kmail/recipientspicker.h index 38d36a980..d9dc22930 100644 --- a/kmail/recipientspicker.h +++ b/kmail/recipientspicker.h @@ -39,7 +39,7 @@ class TQComboBox; #ifdef TDEPIM_NEW_DISTRLISTS #include <libtdepim/distributionlist.h> #else -namespace KABC { +namespace TDEABC { class DistributionList; class DistributionListManager; } @@ -55,15 +55,15 @@ class RecipientItem typedef TQValueList<RecipientItem *> List; #ifdef TDEPIM_NEW_DISTRLISTS - RecipientItem( KABC::AddressBook *ab ); + RecipientItem( TDEABC::AddressBook *ab ); void setDistributionList( KPIM::DistributionList& ); KPIM::DistributionList& distributionList(); #else RecipientItem(); - void setDistributionList( KABC::DistributionList * ); - KABC::DistributionList * distributionList(); + void setDistributionList( TDEABC::DistributionList * ); + TDEABC::DistributionList * distributionList(); #endif - void setAddressee( const KABC::Addressee &, const TQString &email ); + void setAddressee( const TDEABC::Addressee &, const TQString &email ); void setRecipientType( const TQString &type ); TQString recipientType() const; @@ -82,18 +82,18 @@ class RecipientItem #ifdef TDEPIM_NEW_DISTRLISTS TQString createTooltip( KPIM::DistributionList & ) const; #else - TQString createTooltip( KABC::DistributionList * ) const; + TQString createTooltip( TDEABC::DistributionList * ) const; #endif - KABC::Addressee mAddressee; + TDEABC::Addressee mAddressee; TQString mName; TQString mEmail; TQString mRecipient; #ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList mDistributionList; - KABC::AddressBook *mAddressBook; + TDEABC::AddressBook *mAddressBook; #else - KABC::DistributionList *mDistributionList; + TDEABC::DistributionList *mDistributionList; #endif TQString mType; TQString mTooltip; @@ -174,7 +174,7 @@ class SearchLine : public TDEListViewSearchLine void keyPressEvent( TQKeyEvent * ); }; -using namespace KABC; +using namespace TDEABC; class RecipientsPicker : public TQDialog { @@ -222,7 +222,7 @@ class RecipientsPicker : public TQDialog void slotSearchLDAP(); void ldapSearchResult(); private: - KABC::StdAddressBook *mAddressBook; + TDEABC::StdAddressBook *mAddressBook; TQComboBox *mCollectionCombo; TDEListView *mRecipientList; @@ -241,7 +241,7 @@ class RecipientsPicker : public TQDialog RecipientsCollection *mSelectedRecipients; #ifndef TDEPIM_NEW_DISTRLISTS - KABC::DistributionListManager *mDistributionListManager; + TDEABC::DistributionListManager *mDistributionListManager; #endif Recipient::Type mDefaultType; diff --git a/kmail/vcardviewer.cpp b/kmail/vcardviewer.cpp index 41d6705c9..c1743b264 100644 --- a/kmail/vcardviewer.cpp +++ b/kmail/vcardviewer.cpp @@ -30,8 +30,8 @@ using KPIM::AddresseeView; #include <tdeabc/vcardconverter.h> #include <tdeabc/addressee.h> -using KABC::VCardConverter; -using KABC::Addressee; +using TDEABC::VCardConverter; +using TDEABC::Addressee; #include <tdelocale.h> diff --git a/kmail/vcardviewer.h b/kmail/vcardviewer.h index a5460f992..abd888203 100644 --- a/kmail/vcardviewer.h +++ b/kmail/vcardviewer.h @@ -53,9 +53,9 @@ class VCardViewer : public KDialogBase private: KPIM::AddresseeView *mAddresseeView; - KABC::Addressee::List mAddresseeList; + TDEABC::Addressee::List mAddresseeList; - TQValueListIterator<KABC::Addressee> itAddresseeList; + TQValueListIterator<TDEABC::Addressee> itAddresseeList; }; } diff --git a/kmail/xfaceconfigurator.cpp b/kmail/xfaceconfigurator.cpp index e27b192ec..ed56b0d59 100644 --- a/kmail/xfaceconfigurator.cpp +++ b/kmail/xfaceconfigurator.cpp @@ -50,7 +50,7 @@ using namespace TDEIO; using namespace KPIM; #include <tdeabc/stdaddressbook.h> #include <tdeabc/addressee.h> -using namespace KABC; +using namespace TDEABC; #include <tqbitmap.h> #include <tqcheckbox.h> diff --git a/kmobile/Makefile.am b/kmobile/Makefile.am index 9b73cf67d..268cd6ab6 100644 --- a/kmobile/Makefile.am +++ b/kmobile/Makefile.am @@ -9,7 +9,7 @@ lib_LTLIBRARIES = libkmobiledevice.la libkmobileclient.la INCLUDES = $(all_includes) kmobile_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kmobile_LDADD = $(LIB_TDEFILE) $(LIB_KABC) libkmobiledevice.la +kmobile_LDADD = $(LIB_TDEFILE) $(LIB_TDEABC) libkmobiledevice.la kmobile_SOURCES = main.cpp kmobile.cpp kmobileview.cpp kmobileitem.cpp\ pref.cpp kmobileiface.skel kmobile_selectiondialog.ui \ systemtray.cpp @@ -21,7 +21,7 @@ noinst_HEADERS = kmobile.h kmobileview.h kmobileitem.h pref.h # the low-level devices driver library libkmobiledevice_la_SOURCES = kmobiledevice.cpp libkmobiledevice_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version -libkmobiledevice_la_LIBADD = $(LIB_KABC) $(LIB_LOCKDEV) ../libkcal/libkcal.la +libkmobiledevice_la_LIBADD = $(LIB_TDEABC) $(LIB_LOCKDEV) ../libkcal/libkcal.la # the KDE application's client library to KMobile libkmobileclient_la_SOURCES = kmobileclient.cpp diff --git a/kmobile/devices/gnokii/gnokii_mobile.cpp b/kmobile/devices/gnokii/gnokii_mobile.cpp index e5629f872..ceadf2416 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.cpp +++ b/kmobile/devices/gnokii/gnokii_mobile.cpp @@ -357,12 +357,12 @@ static int gn_error2tdeio_error( gn_error err ) } } -static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memtype, KABC::Addressee *a ) +static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memtype, TDEABC::Addressee *a ) { gn_phonebook_entry entry; TQStringList addrlist; TQString s, country; - KABC::Address *addr; + TDEABC::Address *addr; gn_error error; // if (index > (memstat.used + memstat.free)) @@ -411,7 +411,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt a->setRevision(datetime); if (!entry.subentries_count) - a->insertPhoneNumber(KABC::PhoneNumber(entry.number, KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref)); + a->insertPhoneNumber(TDEABC::PhoneNumber(entry.number, TDEABC::PhoneNumber::Work | TDEABC::PhoneNumber::Pref)); /* scan sub-entries */ if (entry.subentries_count) @@ -431,7 +431,7 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt break; case GN_PHONEBOOK_ENTRY_Postal: addrlist = TQStringList::split(',', s, true); - addr = new KABC::Address(KABC::Address::Work); + addr = new TDEABC::Address(TDEABC::Address::Work); switch (addrlist.count()) { case 4: addr->setStreet(addrlist[0].simplifyWhiteSpace()); addr->setLocality(addrlist[1].simplifyWhiteSpace()); @@ -457,18 +457,18 @@ static gn_error read_phone_entry_highlevel( int index, const gn_memory_type memt a->setNote(a->note()+s); break; case GN_PHONEBOOK_ENTRY_Number: - enum KABC::PhoneNumber::Types phonetype; + enum TDEABC::PhoneNumber::Types phonetype; switch (entry.subentries[n].number_type) { - case GN_PHONEBOOK_NUMBER_Mobile: phonetype = KABC::PhoneNumber::Cell; break; - case GN_PHONEBOOK_NUMBER_Fax: phonetype = KABC::PhoneNumber::Fax; break; + case GN_PHONEBOOK_NUMBER_Mobile: phonetype = TDEABC::PhoneNumber::Cell; break; + case GN_PHONEBOOK_NUMBER_Fax: phonetype = TDEABC::PhoneNumber::Fax; break; case GN_PHONEBOOK_NUMBER_General: - case GN_PHONEBOOK_NUMBER_Work: phonetype = KABC::PhoneNumber::Work; break; + case GN_PHONEBOOK_NUMBER_Work: phonetype = TDEABC::PhoneNumber::Work; break; default: - case GN_PHONEBOOK_NUMBER_Home: phonetype = KABC::PhoneNumber::Home; break; + case GN_PHONEBOOK_NUMBER_Home: phonetype = TDEABC::PhoneNumber::Home; break; } //if (s == entry.number) - // type = (KABC::PhoneNumber::Types) (phonetype | KABC::PhoneNumber::Pref); - a->insertPhoneNumber(KABC::PhoneNumber(s, phonetype)); + // type = (TDEABC::PhoneNumber::Types) (phonetype | TDEABC::PhoneNumber::Pref); + a->insertPhoneNumber(TDEABC::PhoneNumber(s, phonetype)); break; case GN_PHONEBOOK_ENTRY_URL: a->setUrl(s); @@ -577,7 +577,7 @@ int KMobileGnokii::numAddresses() if (m_numAddresses>0) { // initialize the addrList array m_addrList.clear(); - KABC::Addressee addr; + TDEABC::Addressee addr; for (int i=0; i<=m_numAddresses; i++) m_addrList.append(addr); } @@ -585,7 +585,7 @@ int KMobileGnokii::numAddresses() return m_numAddresses; } -int KMobileGnokii::readAddress( int index, KABC::Addressee &addr ) +int KMobileGnokii::readAddress( int index, TDEABC::Addressee &addr ) { PRINT_DEBUG << TQString("############ GET ADDRESS #%1\n").arg(index); // index is zero-based, but in gnokii the first address starts at 1 @@ -607,7 +607,7 @@ int KMobileGnokii::readAddress( int index, KABC::Addressee &addr ) return gn_error2tdeio_error(err); } -int KMobileGnokii::storeAddress( int, const KABC::Addressee &, bool ) +int KMobileGnokii::storeAddress( int, const TDEABC::Addressee &, bool ) { /* XXX: this is a read-only device */ return TDEIO::ERR_WRITE_ACCESS_DENIED; diff --git a/kmobile/devices/gnokii/gnokii_mobile.h b/kmobile/devices/gnokii/gnokii_mobile.h index 5ace3e0b9..cc55911c1 100644 --- a/kmobile/devices/gnokii/gnokii_mobile.h +++ b/kmobile/devices/gnokii/gnokii_mobile.h @@ -55,8 +55,8 @@ public: * Addressbook / Phonebook support */ int numAddresses(); - int readAddress( int index, KABC::Addressee &adr ); - int storeAddress( int index, const KABC::Addressee &adr, bool append = false ); + int readAddress( int index, TDEABC::Addressee &adr ); + int storeAddress( int index, const TDEABC::Addressee &adr, bool append = false ); /* * Calendar support @@ -88,7 +88,7 @@ private: TQString m_modelnr, m_connection, m_port, m_baud; int m_numAddresses; - KABC::Addressee::List m_addrList; + TDEABC::Addressee::List m_addrList; }; #endif diff --git a/kmobile/devices/skeleton/skeleton.cpp b/kmobile/devices/skeleton/skeleton.cpp index 3593c7f8e..1b70016f7 100644 --- a/kmobile/devices/skeleton/skeleton.cpp +++ b/kmobile/devices/skeleton/skeleton.cpp @@ -105,7 +105,7 @@ int KMobileSkeleton::numAddresses() return 10; /* number of addresses we simulate */ } -int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr ) +int KMobileSkeleton::readAddress( int index, TDEABC::Addressee &addr ) { // index is zero-based if (index<0 || index>=numAddresses()) @@ -122,7 +122,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr ) addr.setNote("the best RDE developer ever"); addr.setUrl(KURL("www.trinitydesktop.org")); addr.insertEmail("peterm@tde.org"); - addr.insertPhoneNumber(KABC::PhoneNumber("+49 6110 12345")); + addr.insertPhoneNumber(TDEABC::PhoneNumber("+49 6110 12345")); // the Revision might be important for syncronisations addr.setRevision(TQDateTime(TQDate(2003,1,1))); @@ -130,7 +130,7 @@ int KMobileSkeleton::readAddress( int index, KABC::Addressee &addr ) return 0; } -int KMobileSkeleton::storeAddress( int, const KABC::Addressee &, bool ) +int KMobileSkeleton::storeAddress( int, const TDEABC::Addressee &, bool ) { /* this is a read-only device */ return TDEIO::ERR_WRITE_ACCESS_DENIED; diff --git a/kmobile/devices/skeleton/skeleton.h b/kmobile/devices/skeleton/skeleton.h index 922565b7e..abd1e8bce 100644 --- a/kmobile/devices/skeleton/skeleton.h +++ b/kmobile/devices/skeleton/skeleton.h @@ -55,8 +55,8 @@ public: * Addressbook / Phonebook support */ int numAddresses(); - int readAddress( int index, KABC::Addressee &adr ); - int storeAddress( int index, const KABC::Addressee &adr, bool append = false ); + int readAddress( int index, TDEABC::Addressee &adr ); + int storeAddress( int index, const TDEABC::Addressee &adr, bool append = false ); /* * Notes support diff --git a/kmobile/kmobiledevice.cpp b/kmobile/kmobiledevice.cpp index e92bbd04e..c408d72d0 100644 --- a/kmobile/kmobiledevice.cpp +++ b/kmobile/kmobiledevice.cpp @@ -191,12 +191,12 @@ int KMobileDevice::numAddresses() return 0; } -int KMobileDevice::readAddress( int, KABC::Addressee & ) +int KMobileDevice::readAddress( int, TDEABC::Addressee & ) { return TDEIO::ERR_UNSUPPORTED_ACTION; } -int KMobileDevice::storeAddress( int, const KABC::Addressee &, bool ) +int KMobileDevice::storeAddress( int, const TDEABC::Addressee &, bool ) { return TDEIO::ERR_UNSUPPORTED_ACTION; } diff --git a/kmobile/kmobiledevice.h b/kmobile/kmobiledevice.h index aad9287c5..d4469d358 100644 --- a/kmobile/kmobiledevice.h +++ b/kmobile/kmobiledevice.h @@ -179,8 +179,8 @@ public: * Addressbook / Phonebook support */ virtual int numAddresses(); - virtual int readAddress( int index, KABC::Addressee &adr ); - virtual int storeAddress( int index, const KABC::Addressee &adr, bool append = false ); + virtual int readAddress( int index, TDEABC::Addressee &adr ); + virtual int storeAddress( int index, const TDEABC::Addressee &adr, bool append = false ); /* * Calendar support diff --git a/kmobile/kmobileview.cpp b/kmobile/kmobileview.cpp index 14f7c0a39..87f691d93 100644 --- a/kmobile/kmobileview.cpp +++ b/kmobile/kmobileview.cpp @@ -291,14 +291,14 @@ TQString KMobileView::readAddress( TQString deviceName, int index ) return TQString(); int err; - KABC::Addressee adr; + TDEABC::Addressee adr; MUTEX_LOCK(dev->m_dev); err = dev->m_dev->readAddress(index, adr); MUTEX_UNLOCK(dev->m_dev); if (err) return TQString(); - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; TQString str = converter.createVCard(adr); if (str.isEmpty()) return TQString(); @@ -315,8 +315,8 @@ bool KMobileView::storeAddress( TQString deviceName, int index, TQString vcard, if (!dev || !dev->driverAvailable()) return false; - KABC::VCardConverter converter; - KABC::Addressee adr = converter.parseVCard(vcard); + TDEABC::VCardConverter converter; + TDEABC::Addressee adr = converter.parseVCard(vcard); if (adr.isEmpty()) return false; diff --git a/knode/Makefile.am b/knode/Makefile.am index c4132709c..610c4f738 100644 --- a/knode/Makefile.am +++ b/knode/Makefile.am @@ -26,7 +26,7 @@ kcm_knode_la_LIBADD = libknodecommon.la $(LIB_TDECORE) knconfigpages.lo: smtpaccountwidget_base.h libknodecommon_la_LDFLAGS = -version-info 3:0:0 -no-undefined $(all_libraries) -libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KSPELL) $(LIB_KABC) $(LIB_TDEFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_TDEHTML) +libknodecommon_la_LIBADD = $(top_builddir)/libkmime/libkmime.la $(top_builddir)/libkpgp/libkpgp.la $(top_builddir)/libtdepim/libtdepim.la $(LIB_KSPELL) $(LIB_TDEABC) $(LIB_TDEFILE) $(LIB_KUTILS) $(LIBRESOLV) $(LIB_TDEHTML) libknodecommon_la_SOURCES = knconfigmanager.cpp \ knconfig.cpp \ knconfigwidgets.cpp \ diff --git a/knode/kncomposer.h b/knode/kncomposer.h index 27cdade41..c966209f6 100644 --- a/knode/kncomposer.h +++ b/knode/kncomposer.h @@ -355,11 +355,11 @@ class KNComposer::AttachmentPropertiesDlg : public KDialogBase { }; //----------------------------------------------------------------------------- -class KNLineEdit : public KABC::AddressLineEdit +class KNLineEdit : public TDEABC::AddressLineEdit { Q_OBJECT - typedef KABC::AddressLineEdit KNLineEditInherited; + typedef TDEABC::AddressLineEdit KNLineEditInherited; public: KNLineEdit(KNComposer::ComposerView *_composerView, bool useCompletion, TQWidget *parent = 0, diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index e91be0c86..ab332c2bf 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -366,13 +366,13 @@ int create( TDECmdLineArgs *args ) TQString authorEmail = args->getOption( "author-email" ); TQString authorName; - KABC::Addressee a; + TDEABC::Addressee a; if ( authorEmail.isEmpty() ) { - a = KABC::StdAddressBook::self()->whoAmI(); + a = TDEABC::StdAddressBook::self()->whoAmI(); authorEmail = a.preferredEmail(); } else { - KABC::Addressee::List as = - KABC::StdAddressBook::self()->findByEmail( authorEmail ); + TDEABC::Addressee::List as = + TDEABC::StdAddressBook::self()->findByEmail( authorEmail ); if ( as.isEmpty() ) { kdDebug() << "Unable to find '" << authorEmail << "' in address book." << endl; diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp index 1fa5fc9fc..faf9f5f1c 100644 --- a/kontact/plugins/kmail/kmail_plugin.cpp +++ b/kontact/plugins/kmail/kmail_plugin.cpp @@ -84,7 +84,7 @@ void KMailPlugin::processDropEvent( TQDropEvent * de ) { kdDebug() << k_funcinfo << endl; CalendarLocal cal( TQString::fromLatin1("UTC") ); - KABC::Addressee::List list; + TDEABC::Addressee::List list; if ( VCalDrag::decode( de, &cal ) || ICalDrag::decode( de, &cal ) ) { KTempFile tmp( locateLocal( "tmp", "incidences-" ), ".ics" ); @@ -92,7 +92,7 @@ void KMailPlugin::processDropEvent( TQDropEvent * de ) openComposer( KURL::fromPathOrURL( tmp.name() ) ); } else if ( KVCardDrag::decode( de, list ) ) { - KABC::Addressee::List::Iterator it; + TDEABC::Addressee::List::Iterator it; TQStringList to; for ( it = list.begin(); it != list.end(); ++it ) { to.append( ( *it ).fullEmail() ); diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp index 8628f4128..b25016aa0 100644 --- a/kontact/plugins/korganizer/korganizerplugin.cpp +++ b/kontact/plugins/korganizer/korganizerplugin.cpp @@ -169,10 +169,10 @@ bool KOrganizerPlugin::canDecodeDrag( TQMimeSource *mimeSource ) void KOrganizerPlugin::processDropEvent( TQDropEvent *event ) { - KABC::Addressee::List list; + TDEABC::Addressee::List list; if ( KVCardDrag::decode( event, list ) ) { TQStringList attendees; - KABC::Addressee::List::Iterator it; + TDEABC::Addressee::List::Iterator it; for ( it = list.begin(); it != list.end(); ++it ) { TQString email = (*it).fullEmail(); if ( email.isEmpty() ) { diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp index b12772c61..885c835a0 100644 --- a/kontact/plugins/korganizer/todoplugin.cpp +++ b/kontact/plugins/korganizer/todoplugin.cpp @@ -161,10 +161,10 @@ bool TodoPlugin::isRunningStandalone() void TodoPlugin::processDropEvent( TQDropEvent *event ) { - KABC::Addressee::List list; + TDEABC::Addressee::List list; if ( KVCardDrag::decode( event, list ) ) { TQStringList attendees; - KABC::Addressee::List::Iterator it; + TDEABC::Addressee::List::Iterator it; for ( it = list.begin(); it != list.end(); ++it ) { TQString email = (*it).fullEmail(); if ( email.isEmpty() ) { diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp index 8918f8c1a..376389f9c 100644 --- a/kontact/plugins/specialdates/sdsummarywidget.cpp +++ b/kontact/plugins/specialdates/sdsummarywidget.cpp @@ -69,7 +69,7 @@ class SDEntry TQString summary; TQString desc; int span; // #days in the special occassion. - KABC::Addressee addressee; + TDEABC::Addressee addressee; bool operator<( const SDEntry &entry ) const { @@ -94,7 +94,7 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent, mLayout->setRowStretch( 6, 1 ); // Setup the Addressbook - KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true ); + TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true ); connect( ab, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), this, TQT_SLOT( updateView() ) ); connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ), @@ -221,7 +221,7 @@ void SDSummaryWidget::updateView() TDEIconLoader loader( "tdepim" ); - KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true ); + TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true ); TQValueList<SDEntry> dates; TQLabel *label = 0; @@ -231,7 +231,7 @@ void SDSummaryWidget::updateView() dateFormat().replace( 'Y', ' ' ) ); // Search for Birthdays and Anniversaries in the Addressbook - KABC::AddressBook::Iterator it; + TDEABC::AddressBook::Iterator it; for ( it = ab->begin(); it != ab->end(); ++it ) { TQDate birthday = (*it).birthday().date(); if ( birthday.isValid() && mShowBirthdaysFromKAB ) { @@ -391,7 +391,7 @@ void SDSummaryWidget::updateView() // Pixmap TQImage icon_img; TQString icon_name; - KABC::Picture pic; + TDEABC::Picture pic; switch( (*addrIt).category ) { case CategoryBirthday: icon_name = "calendarbirthday"; @@ -555,7 +555,7 @@ void SDSummaryWidget::updateView() void SDSummaryWidget::mailContact( const TQString &uid ) { - KABC::StdAddressBook *ab = KABC::StdAddressBook::self( true ); + TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true ); TQString email = ab->findByUid( uid ).fullEmail(); kapp->invokeMailer( email, TQString() ); diff --git a/korganizer/freebusymanager.cpp b/korganizer/freebusymanager.cpp index b3de84ad7..9434a1ec0 100644 --- a/korganizer/freebusymanager.cpp +++ b/korganizer/freebusymanager.cpp @@ -496,8 +496,8 @@ KURL FreeBusyManager::freeBusyUrl( const TQString &email ) } // Try with the url configurated by preferred email in kaddressbook - KABC::Addressee::List list= KABC::StdAddressBook::self( true )->findByEmail( email ); - KABC::Addressee::List::Iterator it; + TDEABC::Addressee::List list= TDEABC::StdAddressBook::self( true )->findByEmail( email ); + TDEABC::Addressee::List::Iterator it; TQString pref; for ( it = list.begin(); it != list.end(); ++it ) { pref = (*it).preferredEmail(); diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index bba8840ac..b1117737b 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -580,9 +580,9 @@ void KOAgendaItem::dropEvent( TQDropEvent *e ) } #ifndef KORG_NOKABC - KABC::Addressee::List list; + TDEABC::Addressee::List list; if ( KVCardDrag::decode( e, list ) ) { - KABC::Addressee::List::Iterator it; + TDEABC::Addressee::List::Iterator it; for ( it = list.begin(); it != list.end(); ++it ) { TQString em( (*it).fullEmail() ); if ( em.isEmpty() ) { diff --git a/korganizer/koattendeeeditor.cpp b/korganizer/koattendeeeditor.cpp index 4411e9666..6345ae622 100644 --- a/korganizer/koattendeeeditor.cpp +++ b/korganizer/koattendeeeditor.cpp @@ -209,8 +209,8 @@ void KOAttendeeEditor::openAddressBook() dia->setShowCC( false ); dia->setShowBCC( false ); if ( dia->exec() ) { - KABC::Addressee::List aList = dia->allToAddressesNoDuplicates(); - for ( KABC::Addressee::List::iterator itr = aList.begin(); + TDEABC::Addressee::List aList = dia->allToAddressesNoDuplicates(); + for ( TDEABC::Addressee::List::iterator itr = aList.begin(); itr != aList.end(); ++itr ) { insertAttendeeFromAddressee( (*itr) ); } @@ -220,7 +220,7 @@ void KOAttendeeEditor::openAddressBook() #endif } -void KOAttendeeEditor::insertAttendeeFromAddressee(const KABC::Addressee &a, const Attendee * at) +void KOAttendeeEditor::insertAttendeeFromAddressee(const TDEABC::Addressee &a, const Attendee * at) { bool myself = KOPrefs::instance()->thatIsMe( a.preferredEmail() ); bool sameAsOrganizer = mOrganizerCombo && @@ -377,10 +377,10 @@ void KOAttendeeEditor::clearAttendeeInput() void KOAttendeeEditor::expandAttendee() { - KABC::Addressee::List aList = expandDistList( mNameEdit->text() ); + TDEABC::Addressee::List aList = expandDistList( mNameEdit->text() ); if ( !aList.isEmpty() ) { int index = selectedIndex(); - for ( KABC::Addressee::List::iterator itr = aList.begin(); itr != aList.end(); ++itr ) { + for ( TDEABC::Addressee::List::iterator itr = aList.begin(); itr != aList.end(); ++itr ) { insertAttendeeFromAddressee( (*itr) ); } setSelected( index ); @@ -555,32 +555,32 @@ bool KOAttendeeEditor::isExampleAttendee( const KCal::Attendee* attendee ) const return false; } -KABC::Addressee::List KOAttendeeEditor::expandDistList( const TQString &text ) const +TDEABC::Addressee::List KOAttendeeEditor::expandDistList( const TQString &text ) const { - KABC::Addressee::List aList; - KABC::AddressBook *abook = KABC::StdAddressBook::self( true ); + TDEABC::Addressee::List aList; + TDEABC::AddressBook *abook = TDEABC::StdAddressBook::self( true ); #ifdef TDEPIM_NEW_DISTRLISTS const TQValueList<KPIM::DistributionList::Entry> eList = KPIM::DistributionList::findByName( abook, text ).entries( abook ); TQValueList<KPIM::DistributionList::Entry>::ConstIterator eit; for ( eit = eList.begin(); eit != eList.end(); ++eit ) { - KABC::Addressee a = (*eit).addressee; + TDEABC::Addressee a = (*eit).addressee; if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) { aList.append( a ) ; } } #else - KABC::DistributionListManager manager( abook ); + TDEABC::DistributionListManager manager( abook ); manager.load(); const TQStringList dList = manager.listNames(); for ( TQStringList::ConstIterator it = dList.begin(); it != dList.end(); ++it ) { if ( (*it) == text ) { - const TQValueList<KABC::DistributionList::Entry> eList = manager.list( *it )->entries(); - TQValueList<KABC::DistributionList::Entry>::ConstIterator eit; + const TQValueList<TDEABC::DistributionList::Entry> eList = manager.list( *it )->entries(); + TQValueList<TDEABC::DistributionList::Entry>::ConstIterator eit; for ( eit = eList.begin(); eit != eList.end(); ++eit ) { - KABC::Addressee a = (*eit).addressee; + TDEABC::Addressee a = (*eit).addressee; if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) { aList.append( a ) ; } diff --git a/korganizer/koattendeeeditor.h b/korganizer/koattendeeeditor.h index abe649595..3454f81d2 100644 --- a/korganizer/koattendeeeditor.h +++ b/korganizer/koattendeeeditor.h @@ -71,12 +71,12 @@ class KOAttendeeEditor : public TQWidget void initOrganizerWidgets( TQWidget *parent, TQBoxLayout *layout ); void initEditWidgets( TQWidget *parent, TQBoxLayout *layout ); - /** Reads values from a KABC::Addressee and inserts a new Attendee + /** Reads values from a TDEABC::Addressee and inserts a new Attendee * item into the listview with those items. Used when adding attendees * from the addressbook and expanding distribution lists. * The optional Attendee parameter can be used to pass in default values * to be used by the new Attendee. */ - void insertAttendeeFromAddressee( const KABC::Addressee &a, const KCal::Attendee* at=0 ); + void insertAttendeeFromAddressee( const TDEABC::Addressee &a, const KCal::Attendee* at=0 ); void fillOrganizerCombo(); virtual TQListViewItem* hasExampleAttendee() const = 0; @@ -122,7 +122,7 @@ class KOAttendeeEditor : public TQWidget TQPtrList<KCal::Attendee> mnewAttendees; private: - KABC::Addressee::List expandDistList( const TQString &text ) const; + TDEABC::Addressee::List expandDistList( const TQString &text ) const; bool mDisableItemUpdate; }; diff --git a/korganizer/koeditorattachments.cpp b/korganizer/koeditorattachments.cpp index 77216a99e..224c7bffb 100644 --- a/korganizer/koeditorattachments.cpp +++ b/korganizer/koeditorattachments.cpp @@ -549,9 +549,9 @@ void KOEditorAttachments::handlePasteOrDrop( TQMimeSource* source ) TQStringList labels; if ( KVCardDrag::canDecode( source ) ) { - KABC::Addressee::List addressees; + TDEABC::Addressee::List addressees; KVCardDrag::decode( source, addressees ); - for ( KABC::Addressee::List::ConstIterator it = addressees.constBegin(); + for ( TDEABC::Addressee::List::ConstIterator it = addressees.constBegin(); it != addressees.constEnd(); ++it ) { urls.append( TDEPIMPROTOCOL_CONTACT + ( *it ).uid() ); // there is some weirdness about realName(), hence fromUtf8 diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 4889906a3..95d211762 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp @@ -155,9 +155,9 @@ void KOAttendeeListView::dropEvent( TQDropEvent *e ) TQString text; #ifndef KORG_NOKABC - KABC::Addressee::List list; + TDEABC::Addressee::List list; if ( KVCardDrag::decode( e, list ) ) { - KABC::Addressee::List::Iterator it; + TDEABC::Addressee::List::Iterator it; for ( it = list.begin(); it != list.end(); ++it ) { TQString em( (*it).fullEmail() ); if ( em.isEmpty() ) { @@ -312,10 +312,10 @@ void KOEditorDetails::writeEvent(Incidence *event) /* Check if the attendee is a distribution list and expand it */ if ( attendee->email().isEmpty() ) { KPIM::DistributionList list = - KPIM::DistributionList::findByName( KABC::StdAddressBook::self(), attendee->name() ); + KPIM::DistributionList::findByName( TDEABC::StdAddressBook::self(), attendee->name() ); if ( !list.isEmpty() ) { toBeDeleted.push_back( item ); // remove it once we are done expanding - KPIM::DistributionList::Entry::List entries = list.entries( KABC::StdAddressBook::self() ); + KPIM::DistributionList::Entry::List entries = list.entries( TDEABC::StdAddressBook::self() ); KPIM::DistributionList::Entry::List::Iterator it( entries.begin() ); while ( it != entries.end() ) { KPIM::DistributionList::Entry &e = ( *it ); diff --git a/korganizer/koeditorfreebusy.cpp b/korganizer/koeditorfreebusy.cpp index ee416efaf..69c1f566f 100644 --- a/korganizer/koeditorfreebusy.cpp +++ b/korganizer/koeditorfreebusy.cpp @@ -766,10 +766,10 @@ void KOEditorFreeBusy::writeEvent(KCal::Event * event) /* Check if the attendee is a distribution list and expand it */ if ( attendee->email().isEmpty() ) { KPIM::DistributionList list = - KPIM::DistributionList::findByName( KABC::StdAddressBook::self(), attendee->name() ); + KPIM::DistributionList::findByName( TDEABC::StdAddressBook::self(), attendee->name() ); if ( !list.isEmpty() ) { toBeDeleted.push_back( item ); // remove it once we are done expanding - KPIM::DistributionList::Entry::List entries = list.entries( KABC::StdAddressBook::self() ); + KPIM::DistributionList::Entry::List entries = list.entries( TDEABC::StdAddressBook::self() ); KPIM::DistributionList::Entry::List::Iterator it( entries.begin() ); while ( it != entries.end() ) { KPIM::DistributionList::Entry &e = ( *it ); diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 0cd128ccd..40851e994 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp @@ -366,7 +366,7 @@ void KOIncidenceEditor::addAttendees( const TQStringList &attendees ) TQStringList::ConstIterator it; for ( it = attendees.begin(); it != attendees.end(); ++it ) { TQString name, email; - KABC::Addressee::parseEmailAddress( *it, name, email ); + TDEABC::Addressee::parseEmailAddress( *it, name, email ); mAttendeeEditor->insertAttendee( new Attendee( name, email, true, Attendee::NeedsAction ) ); } } diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index f5f76e26f..969b62449 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -90,7 +90,7 @@ KOPrefs::KOPrefs() : monthViewFontItem()->setDefaultValue( mDefaultMonthViewFont ); // Load it now, not deep within some painting code - mMyAddrBookMails = KABC::StdAddressBook::self()->whoAmI().emails(); + mMyAddrBookMails = TDEABC::StdAddressBook::self()->whoAmI().emails(); } @@ -380,7 +380,7 @@ TQStringList KOPrefs::fullEmails() fullEmails << TQString("%1 <%2>").arg( fullName() ).arg( *it ); } // Add emails from the user's kaddressbook entry - KABC::Addressee me = KABC::StdAddressBook::self()->whoAmI(); + TDEABC::Addressee me = TDEABC::StdAddressBook::self()->whoAmI(); lst = me.emails(); for ( it = lst.begin(); it != lst.end(); ++it ) { fullEmails << me.fullEmail( *it ); diff --git a/korganizer/publishdialog.cpp b/korganizer/publishdialog.cpp index f4d8ea84f..c8366adda 100644 --- a/korganizer/publishdialog.cpp +++ b/korganizer/publishdialog.cpp @@ -124,10 +124,10 @@ void PublishDialog::removeItem() void PublishDialog::openAddressbook() { #ifndef KORG_NOKABC - KABC::Addressee::List addressList; - addressList = KABC::AddresseeDialog::getAddressees( this ); - //KABC::Addressee a = KABC::AddresseeDialog::getAddressee(this); - KABC::Addressee a = addressList.first(); + TDEABC::Addressee::List addressList; + addressList = TDEABC::AddresseeDialog::getAddressees( this ); + //TDEABC::Addressee a = TDEABC::AddresseeDialog::getAddressee(this); + TDEABC::Addressee a = addressList.first(); if ( !a.isEmpty() ) { uint i; for ( i=0; i<addressList.size(); i++ ) { diff --git a/libkcal/calendarresources.cpp b/libkcal/calendarresources.cpp index b7d73dec1..bfc493ba4 100644 --- a/libkcal/calendarresources.cpp +++ b/libkcal/calendarresources.cpp @@ -827,7 +827,7 @@ CalendarResources::Ticket { kdDebug(5800) << "CalendarResources::requestSaveTicket()" << endl; - KABC::Lock *lock = resource->lock(); + TDEABC::Lock *lock = resource->lock(); if ( !lock ) return 0; if ( lock->lock() ) diff --git a/libkcal/htmlexport.cpp b/libkcal/htmlexport.cpp index 2b538574a..24aa925c4 100644 --- a/libkcal/htmlexport.cpp +++ b/libkcal/htmlexport.cpp @@ -557,10 +557,10 @@ void HtmlExport::formatAttendees( TQTextStream *ts, Incidence *event ) if (attendees.count()) { *ts << "<em>"; #ifndef KORG_NOKABC - KABC::AddressBook *add_book = KABC::StdAddressBook::self( true ); - KABC::Addressee::List addressList; + TDEABC::AddressBook *add_book = TDEABC::StdAddressBook::self( true ); + TDEABC::Addressee::List addressList; addressList = add_book->findByEmail(event->organizer().email()); - KABC::Addressee o = addressList.first(); + TDEABC::Addressee o = addressList.first(); if (!o.isEmpty() && addressList.size()<2) { *ts << "<a href=\"mailto:" << event->organizer().email() << "\">"; *ts << cleanChars(o.formattedName()) << "</a>\n"; diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index 1455a24a0..f8f6fa7c7 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -183,10 +183,10 @@ static TQString displayViewLinkPerson( const TQString& email, TQString name, TQS // Make the search, if there is an email address to search on, // and either name or uid is missing if ( !email.isEmpty() && ( name.isEmpty() || uid.isEmpty() ) ) { - KABC::AddressBook *add_book = KABC::StdAddressBook::self( true ); - KABC::Addressee::List addressList = add_book->findByEmail( email ); + TDEABC::AddressBook *add_book = TDEABC::StdAddressBook::self( true ); + TDEABC::Addressee::List addressList = add_book->findByEmail( email ); if ( !addressList.isEmpty() ) { - KABC::Addressee o = addressList.first(); + TDEABC::Addressee o = addressList.first(); if ( !o.isEmpty() && addressList.size() < 2 ) { if ( name.isEmpty() ) { // No name set, so use the one from the addressbook @@ -1134,10 +1134,10 @@ static TQString invitationPerson( const TQString& email, TQString name, TQString // Make the search, if there is an email address to search on, // and either name or uid is missing if ( !email.isEmpty() && ( name.isEmpty() || uid.isEmpty() ) ) { - KABC::AddressBook *add_book = KABC::StdAddressBook::self( true ); - KABC::Addressee::List addressList = add_book->findByEmail( email ); + TDEABC::AddressBook *add_book = TDEABC::StdAddressBook::self( true ); + TDEABC::Addressee::List addressList = add_book->findByEmail( email ); if ( !addressList.isEmpty() ) { - KABC::Addressee o = addressList.first(); + TDEABC::Addressee o = addressList.first(); if ( !o.isEmpty() && addressList.size() < 2 ) { if ( name.isEmpty() ) { // No name set, so use the one from the addressbook @@ -2832,8 +2832,8 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) KTNEFParser parser; TQBuffer buf( tnef ); CalendarLocal cal ( TQString::fromLatin1( "UTC" ) ); - KABC::Addressee addressee; - KABC::VCardConverter cardConv; + TDEABC::Addressee addressee; + TDEABC::VCardConverter cardConv; ICalFormat calFormat; Event* event = new Event(); @@ -3069,14 +3069,14 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) vPart += stringProp(tnefMsg, "\n","NOTE", ... , "" ); */ - KABC::Address adr; + TDEABC::Address adr; adr.setPostOfficeBox( stringProp( tnefMsg, MAPI_TAG_PR_HOME_ADDRESS_PO_BOX ) ); adr.setStreet( stringProp( tnefMsg, MAPI_TAG_PR_HOME_ADDRESS_STREET ) ); adr.setLocality( stringProp( tnefMsg, MAPI_TAG_PR_HOME_ADDRESS_CITY ) ); adr.setRegion( stringProp( tnefMsg, MAPI_TAG_PR_HOME_ADDRESS_STATE_OR_PROVINCE ) ); adr.setPostalCode( stringProp( tnefMsg, MAPI_TAG_PR_HOME_ADDRESS_POSTAL_CODE ) ); adr.setCountry( stringProp( tnefMsg, MAPI_TAG_PR_HOME_ADDRESS_COUNTRY ) ); - adr.setType(KABC::Address::Home); + adr.setType(TDEABC::Address::Home); addressee.insertAddress(adr); adr.setPostOfficeBox( sNamedProp( tnefMsg, MAPI_TAG_CONTACT_BUSINESSADDRESSPOBOX ) ); @@ -3085,7 +3085,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) adr.setRegion( sNamedProp( tnefMsg, MAPI_TAG_CONTACT_BUSINESSADDRESSSTATE ) ); adr.setPostalCode( sNamedProp( tnefMsg, MAPI_TAG_CONTACT_BUSINESSADDRESSPOSTALCODE ) ); adr.setCountry( sNamedProp( tnefMsg, MAPI_TAG_CONTACT_BUSINESSADDRESSCOUNTRY ) ); - adr.setType( KABC::Address::Work ); + adr.setType( TDEABC::Address::Work ); addressee.insertAddress( adr ); adr.setPostOfficeBox( stringProp( tnefMsg, MAPI_TAG_PR_OTHER_ADDRESS_PO_BOX ) ); @@ -3094,7 +3094,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) adr.setRegion( stringProp(tnefMsg, MAPI_TAG_PR_OTHER_ADDRESS_STATE_OR_PROVINCE ) ); adr.setPostalCode( stringProp(tnefMsg, MAPI_TAG_PR_OTHER_ADDRESS_POSTAL_CODE ) ); adr.setCountry( stringProp(tnefMsg, MAPI_TAG_PR_OTHER_ADDRESS_COUNTRY ) ); - adr.setType( KABC::Address::Dom ); + adr.setType( TDEABC::Address::Dom ); addressee.insertAddress(adr); // problem: the 'other' address was stored by KOrganizer in @@ -3103,15 +3103,15 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) TQString nr; nr = stringProp( tnefMsg, MAPI_TAG_PR_HOME_TELEPHONE_NUMBER ); - addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Home ) ); + addressee.insertPhoneNumber( TDEABC::PhoneNumber( nr, TDEABC::PhoneNumber::Home ) ); nr = stringProp( tnefMsg, MAPI_TAG_PR_BUSINESS_TELEPHONE_NUMBER ); - addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Work ) ); + addressee.insertPhoneNumber( TDEABC::PhoneNumber( nr, TDEABC::PhoneNumber::Work ) ); nr = stringProp( tnefMsg, MAPI_TAG_PR_MOBILE_TELEPHONE_NUMBER ); - addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Cell ) ); + addressee.insertPhoneNumber( TDEABC::PhoneNumber( nr, TDEABC::PhoneNumber::Cell ) ); nr = stringProp( tnefMsg, MAPI_TAG_PR_HOME_FAX_NUMBER ); - addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Home ) ); + addressee.insertPhoneNumber( TDEABC::PhoneNumber( nr, TDEABC::PhoneNumber::Fax | TDEABC::PhoneNumber::Home ) ); nr = stringProp( tnefMsg, MAPI_TAG_PR_BUSINESS_FAX_NUMBER ); - addressee.insertPhoneNumber( KABC::PhoneNumber( nr, KABC::PhoneNumber::Fax | KABC::PhoneNumber::Work ) ); + addressee.insertPhoneNumber( TDEABC::PhoneNumber( nr, TDEABC::PhoneNumber::Fax | TDEABC::PhoneNumber::Work ) ); s = tnefMsg->findProp( MAPI_TAG_PR_BIRTHDAY ) .replace( TQChar( '-' ), TQString() ) @@ -3133,7 +3133,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) return iCal; // Not an iCal - try a vCard - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; return converter.createVCard( addressee ); } @@ -3360,10 +3360,10 @@ static TQString tooltipPerson( const TQString& email, TQString name ) // Make the search, if there is an email address to search on, // and name is missing if ( name.isEmpty() && !email.isEmpty() ) { - KABC::AddressBook *add_book = KABC::StdAddressBook::self( true ); - KABC::Addressee::List addressList = add_book->findByEmail( email ); + TDEABC::AddressBook *add_book = TDEABC::StdAddressBook::self( true ); + TDEABC::Addressee::List addressList = add_book->findByEmail( email ); if ( !addressList.isEmpty() ) { - KABC::Addressee o = addressList.first(); + TDEABC::Addressee o = addressList.first(); if ( !o.isEmpty() && addressList.size() < 2 ) { // use the name from the addressbook name = o.formattedName(); diff --git a/libkcal/person.cpp b/libkcal/person.cpp index d56233bb8..2ef0f7431 100644 --- a/libkcal/person.cpp +++ b/libkcal/person.cpp @@ -61,7 +61,7 @@ TQString Person::fullName() const if( mEmail.isEmpty() ) return mName; else { - // Taken from KABC::Addressee::fullEmail + // Taken from TDEABC::Addressee::fullEmail TQString name = mName; TQRegExp needQuotes( "[^ 0-9A-Za-z\\x0080-\\xFFFF]" ); bool weNeedToQuote = name.find( needQuotes ) != -1; diff --git a/libkcal/resourcecalendar.h b/libkcal/resourcecalendar.h index 80f37f821..f33b7da44 100644 --- a/libkcal/resourcecalendar.h +++ b/libkcal/resourcecalendar.h @@ -138,7 +138,7 @@ class LIBKCAL_EXPORT ResourceCalendar : public KRES::Resource /** Return object for locking the resource. */ - virtual KABC::Lock *lock() = 0; + virtual TDEABC::Lock *lock() = 0; /** Add incidence to resource. diff --git a/libkcal/resourcelocal.cpp b/libkcal/resourcelocal.cpp index aee2ba988..a193b0b78 100644 --- a/libkcal/resourcelocal.cpp +++ b/libkcal/resourcelocal.cpp @@ -118,7 +118,7 @@ void ResourceLocal::init() connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ), TQT_SLOT( reload() ) ); - mLock = new KABC::Lock( mURL.path() ); + mLock = new TDEABC::Lock( mURL.path() ); mDirWatch.addFile( mURL.path() ); mDirWatch.startScan(); @@ -166,7 +166,7 @@ bool ResourceLocal::doSave() return success; } -KABC::Lock *ResourceLocal::lock() +TDEABC::Lock *ResourceLocal::lock() { return mLock; } @@ -213,7 +213,7 @@ bool ResourceLocal::setFileName( const TQString &fileName ) mDirWatch.stopScan(); mDirWatch.removeFile( mURL.path() ); mURL = KURL( fileName ); - mLock = new KABC::Lock( mURL.path() ); + mLock = new TDEABC::Lock( mURL.path() ); mDirWatch.addFile( mURL.path() ); mDirWatch.startScan(); return true; diff --git a/libkcal/resourcelocal.h b/libkcal/resourcelocal.h index a2b6818b9..d13ed2d81 100644 --- a/libkcal/resourcelocal.h +++ b/libkcal/resourcelocal.h @@ -62,7 +62,7 @@ class LIBKCAL_EXPORT ResourceLocal : public ResourceCached virtual void writeConfig( TDEConfig* config ); - KABC::Lock *lock(); + TDEABC::Lock *lock(); TQString fileName() const; bool setFileName( const TQString &fileName ); @@ -94,7 +94,7 @@ class LIBKCAL_EXPORT ResourceLocal : public ResourceCached KDirWatch mDirWatch; - KABC::Lock *mLock; + TDEABC::Lock *mLock; class Private; Private *d; diff --git a/libkcal/resourcelocaldir.cpp b/libkcal/resourcelocaldir.cpp index f51457351..33fa42f73 100644 --- a/libkcal/resourcelocaldir.cpp +++ b/libkcal/resourcelocaldir.cpp @@ -99,7 +99,7 @@ void ResourceLocalDir::init() connect( &mDirWatch, TQT_SIGNAL( deleted( const TQString & ) ), TQT_SLOT( reload( const TQString & ) ) ); - mLock = new KABC::Lock( mURL.path() ); + mLock = new TDEABC::Lock( mURL.path() ); mDirWatch.addDir( mURL.path(), true ); mDirWatch.startScan(); @@ -212,7 +212,7 @@ bool ResourceLocalDir::doSave( Incidence *incidence ) return ret; } -KABC::Lock *ResourceLocalDir::lock() +TDEABC::Lock *ResourceLocalDir::lock() { return mLock; } diff --git a/libkcal/resourcelocaldir.h b/libkcal/resourcelocaldir.h index 0adbf1cb6..6826da6b4 100644 --- a/libkcal/resourcelocaldir.h +++ b/libkcal/resourcelocaldir.h @@ -57,7 +57,7 @@ class LIBKCAL_EXPORT ResourceLocalDir : public ResourceCached void readConfig( const TDEConfig *config ); void writeConfig( TDEConfig* config ); - KABC::Lock *lock(); + TDEABC::Lock *lock(); /** deletes an event from this calendar. */ bool deleteEvent(Event *); @@ -93,7 +93,7 @@ class LIBKCAL_EXPORT ResourceLocalDir : public ResourceCached KDirWatch mDirWatch; - KABC::Lock *mLock; + TDEABC::Lock *mLock; TQPtrList<Incidence>mDeletedIncidences; class Private; diff --git a/libtdepim/Makefile.am b/libtdepim/Makefile.am index 935691b51..b8657d3f8 100644 --- a/libtdepim/Makefile.am +++ b/libtdepim/Makefile.am @@ -45,7 +45,7 @@ AddressBookServiceIface_DIR = $(srcdir)/interfaces libtdepim_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0 $(LIB_QT) -ltdecore libtdepim_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \ $(top_builddir)/libemailfunctions/libemailfunctions.la \ - $(LIB_KIO) $(LIB_KABC) $(LIB_KPARTS) $(LIB_KIMPROXY) $(LIB_POLL) $(LIB_QUI) + $(LIB_KIO) $(LIB_TDEABC) $(LIB_KPARTS) $(LIB_KIMPROXY) $(LIB_POLL) $(LIB_QUI) # $top_builddir)/libtdepim/resources/libkpimresources.la include_HEADERS = tdepimmacros.h kpimprefs.h diff --git a/libtdepim/addresseediffalgo.cpp b/libtdepim/addresseediffalgo.cpp index d36b7ac94..ab1f2eeb0 100644 --- a/libtdepim/addresseediffalgo.cpp +++ b/libtdepim/addresseediffalgo.cpp @@ -31,8 +31,8 @@ static bool compareString( const TQString &left, const TQString &right ) return left == right; } -AddresseeDiffAlgo::AddresseeDiffAlgo( const KABC::Addressee &leftAddressee, - const KABC::Addressee &rightAddressee ) +AddresseeDiffAlgo::AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee, + const TDEABC::Addressee &rightAddressee ) : mLeftAddressee( leftAddressee ), mRightAddressee( rightAddressee ) { } @@ -42,68 +42,68 @@ void AddresseeDiffAlgo::run() begin(); if ( !compareString( mLeftAddressee.uid(), mRightAddressee.uid() ) ) - conflictField( KABC::Addressee::uidLabel(), mLeftAddressee.uid(), mRightAddressee.uid() ); + conflictField( TDEABC::Addressee::uidLabel(), mLeftAddressee.uid(), mRightAddressee.uid() ); if ( !compareString( mLeftAddressee.name(), mRightAddressee.name() ) ) - conflictField( KABC::Addressee::nameLabel(), mLeftAddressee.name(), mRightAddressee.name() ); + conflictField( TDEABC::Addressee::nameLabel(), mLeftAddressee.name(), mRightAddressee.name() ); if ( !compareString( mLeftAddressee.formattedName(), mRightAddressee.formattedName() ) ) - conflictField( KABC::Addressee::formattedNameLabel(), mLeftAddressee.formattedName(), mRightAddressee.formattedName() ); + conflictField( TDEABC::Addressee::formattedNameLabel(), mLeftAddressee.formattedName(), mRightAddressee.formattedName() ); if ( !compareString( mLeftAddressee.familyName(), mRightAddressee.familyName() ) ) - conflictField( KABC::Addressee::familyNameLabel(), mLeftAddressee.familyName(), mRightAddressee.familyName() ); + conflictField( TDEABC::Addressee::familyNameLabel(), mLeftAddressee.familyName(), mRightAddressee.familyName() ); if ( !compareString( mLeftAddressee.givenName(), mRightAddressee.givenName() ) ) - conflictField( KABC::Addressee::givenNameLabel(), mLeftAddressee.givenName(), mRightAddressee.givenName() ); + conflictField( TDEABC::Addressee::givenNameLabel(), mLeftAddressee.givenName(), mRightAddressee.givenName() ); if ( !compareString( mLeftAddressee.additionalName(), mRightAddressee.additionalName() ) ) - conflictField( KABC::Addressee::additionalNameLabel(), mLeftAddressee.additionalName(), mRightAddressee.additionalName() ); + conflictField( TDEABC::Addressee::additionalNameLabel(), mLeftAddressee.additionalName(), mRightAddressee.additionalName() ); if ( !compareString( mLeftAddressee.prefix(), mRightAddressee.prefix() ) ) - conflictField( KABC::Addressee::prefixLabel(), mLeftAddressee.prefix(), mRightAddressee.prefix() ); + conflictField( TDEABC::Addressee::prefixLabel(), mLeftAddressee.prefix(), mRightAddressee.prefix() ); if ( !compareString( mLeftAddressee.suffix(), mRightAddressee.suffix() ) ) - conflictField( KABC::Addressee::suffixLabel(), mLeftAddressee.suffix(), mRightAddressee.suffix() ); + conflictField( TDEABC::Addressee::suffixLabel(), mLeftAddressee.suffix(), mRightAddressee.suffix() ); if ( !compareString( mLeftAddressee.nickName(), mRightAddressee.nickName() ) ) - conflictField( KABC::Addressee::nickNameLabel(), mLeftAddressee.nickName(), mRightAddressee.nickName() ); + conflictField( TDEABC::Addressee::nickNameLabel(), mLeftAddressee.nickName(), mRightAddressee.nickName() ); if ( mLeftAddressee.birthday() != mRightAddressee.birthday() ) - conflictField( KABC::Addressee::birthdayLabel(), mLeftAddressee.birthday().toString(), + conflictField( TDEABC::Addressee::birthdayLabel(), mLeftAddressee.birthday().toString(), mRightAddressee.birthday().toString() ); if ( !compareString( mLeftAddressee.mailer(), mRightAddressee.mailer() ) ) - conflictField( KABC::Addressee::mailerLabel(), mLeftAddressee.mailer(), mRightAddressee.mailer() ); + conflictField( TDEABC::Addressee::mailerLabel(), mLeftAddressee.mailer(), mRightAddressee.mailer() ); if ( mLeftAddressee.timeZone() != mRightAddressee.timeZone() ) - conflictField( KABC::Addressee::timeZoneLabel(), mLeftAddressee.timeZone().asString(), mRightAddressee.timeZone().asString() ); + conflictField( TDEABC::Addressee::timeZoneLabel(), mLeftAddressee.timeZone().asString(), mRightAddressee.timeZone().asString() ); if ( mLeftAddressee.geo() != mRightAddressee.geo() ) - conflictField( KABC::Addressee::geoLabel(), mLeftAddressee.geo().asString(), mRightAddressee.geo().asString() ); + conflictField( TDEABC::Addressee::geoLabel(), mLeftAddressee.geo().asString(), mRightAddressee.geo().asString() ); if ( !compareString( mLeftAddressee.title(), mRightAddressee.title() ) ) - conflictField( KABC::Addressee::titleLabel(), mLeftAddressee.title(), mRightAddressee.title() ); + conflictField( TDEABC::Addressee::titleLabel(), mLeftAddressee.title(), mRightAddressee.title() ); if ( !compareString( mLeftAddressee.role(), mRightAddressee.role() ) ) - conflictField( KABC::Addressee::roleLabel(), mLeftAddressee.role(), mRightAddressee.role() ); + conflictField( TDEABC::Addressee::roleLabel(), mLeftAddressee.role(), mRightAddressee.role() ); if ( !compareString( mLeftAddressee.organization(), mRightAddressee.organization() ) ) - conflictField( KABC::Addressee::organizationLabel(), mLeftAddressee.organization(), mRightAddressee.organization() ); + conflictField( TDEABC::Addressee::organizationLabel(), mLeftAddressee.organization(), mRightAddressee.organization() ); if ( !compareString( mLeftAddressee.note(), mRightAddressee.note() ) ) - conflictField( KABC::Addressee::noteLabel(), mLeftAddressee.note(), mRightAddressee.note() ); + conflictField( TDEABC::Addressee::noteLabel(), mLeftAddressee.note(), mRightAddressee.note() ); if ( !compareString( mLeftAddressee.productId(), mRightAddressee.productId() ) ) - conflictField( KABC::Addressee::productIdLabel(), mLeftAddressee.productId(), mRightAddressee.productId() ); + conflictField( TDEABC::Addressee::productIdLabel(), mLeftAddressee.productId(), mRightAddressee.productId() ); if ( !compareString( mLeftAddressee.sortString(), mRightAddressee.sortString() ) ) - conflictField( KABC::Addressee::sortStringLabel(), mLeftAddressee.sortString(), mRightAddressee.sortString() ); + conflictField( TDEABC::Addressee::sortStringLabel(), mLeftAddressee.sortString(), mRightAddressee.sortString() ); if ( mLeftAddressee.secrecy() != mRightAddressee.secrecy() ) { - conflictField( KABC::Addressee::secrecyLabel(), mLeftAddressee.secrecy().asString(), mRightAddressee.secrecy().asString() ); + conflictField( TDEABC::Addressee::secrecyLabel(), mLeftAddressee.secrecy().asString(), mRightAddressee.secrecy().asString() ); } if ( mLeftAddressee.url()!= mRightAddressee.url() ) - conflictField( KABC::Addressee::urlLabel(), mLeftAddressee.url().prettyURL(), + conflictField( TDEABC::Addressee::urlLabel(), mLeftAddressee.url().prettyURL(), mRightAddressee.url().prettyURL() ); if ( mLeftAddressee.logo() != mRightAddressee.logo() ) { @@ -120,12 +120,12 @@ void AddresseeDiffAlgo::run() end(); } -TQString AddresseeDiffAlgo::toString( const KABC::PhoneNumber &number ) +TQString AddresseeDiffAlgo::toString( const TDEABC::PhoneNumber &number ) { return number.number(); } -TQString AddresseeDiffAlgo::toString( const KABC::Address &addr ) +TQString AddresseeDiffAlgo::toString( const TDEABC::Address &addr ) { return addr.formattedAddress(); } diff --git a/libtdepim/addresseediffalgo.h b/libtdepim/addresseediffalgo.h index 991d46fbd..7b133823d 100644 --- a/libtdepim/addresseediffalgo.h +++ b/libtdepim/addresseediffalgo.h @@ -30,7 +30,7 @@ namespace KPIM { class KDE_EXPORT AddresseeDiffAlgo : public DiffAlgo { public: - AddresseeDiffAlgo( const KABC::Addressee &leftAddressee, const KABC::Addressee &rightAddressee ); + AddresseeDiffAlgo( const TDEABC::Addressee &leftAddressee, const TDEABC::Addressee &rightAddressee ); void run(); @@ -38,11 +38,11 @@ class KDE_EXPORT AddresseeDiffAlgo : public DiffAlgo template <class L> void diffList( const TQString &id, const TQValueList<L> &left, const TQValueList<L> &right ); - TQString toString( const KABC::PhoneNumber &number ); - TQString toString( const KABC::Address &address ); + TQString toString( const TDEABC::PhoneNumber &number ); + TQString toString( const TDEABC::Address &address ); - KABC::Addressee mLeftAddressee; - KABC::Addressee mRightAddressee; + TDEABC::Addressee mLeftAddressee; + TDEABC::Addressee mRightAddressee; }; } diff --git a/libtdepim/addresseeemailselection.cpp b/libtdepim/addresseeemailselection.cpp index 11e9af2c6..4be538e6e 100644 --- a/libtdepim/addresseeemailselection.cpp +++ b/libtdepim/addresseeemailselection.cpp @@ -72,17 +72,17 @@ TQStringList AddresseeEmailSelection::bcc() const return mBccEmailList; } -KABC::Addressee::List AddresseeEmailSelection::toAddresses() const +TDEABC::Addressee::List AddresseeEmailSelection::toAddresses() const { return mToAddresseeList; } -KABC::Addressee::List AddresseeEmailSelection::ccAddresses() const +TDEABC::Addressee::List AddresseeEmailSelection::ccAddresses() const { return mCcAddresseeList; } -KABC::Addressee::List AddresseeEmailSelection::bccAddresses() const +TDEABC::Addressee::List AddresseeEmailSelection::bccAddresses() const { return mBccAddresseeList; } @@ -118,17 +118,17 @@ void AddresseeEmailSelection::setSelectedBCC( const TQStringList &emails ) } -uint AddresseeEmailSelection::itemCount( const KABC::Addressee &addressee ) const +uint AddresseeEmailSelection::itemCount( const TDEABC::Addressee &addressee ) const { return addressee.emails().count(); } -TQString AddresseeEmailSelection::itemText( const KABC::Addressee &addressee, uint index ) const +TQString AddresseeEmailSelection::itemText( const TDEABC::Addressee &addressee, uint index ) const { return addressee.formattedName() + " " + email( addressee, index ); } -TQPixmap AddresseeEmailSelection::itemIcon( const KABC::Addressee &addressee, uint ) const +TQPixmap AddresseeEmailSelection::itemIcon( const TDEABC::Addressee &addressee, uint ) const { if ( !addressee.photo().data().isNull() ) return addressee.photo().data().smoothScale( 16, 16 ); @@ -136,46 +136,46 @@ TQPixmap AddresseeEmailSelection::itemIcon( const KABC::Addressee &addressee, ui return TDEGlobal::iconLoader()->loadIcon( "personal", TDEIcon::Small ); } -bool AddresseeEmailSelection::itemEnabled( const KABC::Addressee &addressee, uint ) const +bool AddresseeEmailSelection::itemEnabled( const TDEABC::Addressee &addressee, uint ) const { return addressee.emails().count() != 0; } -bool AddresseeEmailSelection::itemMatches( const KABC::Addressee &addressee, uint index, const TQString &pattern ) const +bool AddresseeEmailSelection::itemMatches( const TDEABC::Addressee &addressee, uint index, const TQString &pattern ) const { return addressee.formattedName().startsWith( pattern, false ) || email( addressee, index ).startsWith( pattern, false ); } -bool AddresseeEmailSelection::itemEquals( const KABC::Addressee &addressee, uint index, const TQString &pattern ) const +bool AddresseeEmailSelection::itemEquals( const TDEABC::Addressee &addressee, uint index, const TQString &pattern ) const { return (pattern == addressee.formattedName() + " " + email( addressee, index )) || (addressee.emails().contains( pattern )); } -TQString AddresseeEmailSelection::distributionListText( const KABC::DistributionList *distributionList ) const +TQString AddresseeEmailSelection::distributionListText( const TDEABC::DistributionList *distributionList ) const { return distributionList->name(); } -TQPixmap AddresseeEmailSelection::distributionListIcon( const KABC::DistributionList* ) const +TQPixmap AddresseeEmailSelection::distributionListIcon( const TDEABC::DistributionList* ) const { return TDEGlobal::iconLoader()->loadIcon( "tdmconfig", TDEIcon::Small ); } -bool AddresseeEmailSelection::distributionListEnabled( const KABC::DistributionList* ) const +bool AddresseeEmailSelection::distributionListEnabled( const TDEABC::DistributionList* ) const { return true; } -bool AddresseeEmailSelection::distributionListMatches( const KABC::DistributionList *distributionList, +bool AddresseeEmailSelection::distributionListMatches( const TDEABC::DistributionList *distributionList, const TQString &pattern ) const { // check whether the name of the distribution list matches the pattern or one of its entries. bool ok = distributionList->name().startsWith( pattern, false ); - KABC::DistributionList::Entry::List entries = distributionList->entries(); - KABC::DistributionList::Entry::List::ConstIterator it; + TDEABC::DistributionList::Entry::List entries = distributionList->entries(); + TDEABC::DistributionList::Entry::List::ConstIterator it; for ( it = entries.begin(); it != entries.end(); ++it ) { ok = ok || (*it).addressee.formattedName().startsWith( pattern, false ) || (*it).email.startsWith( pattern, false ); @@ -198,17 +198,17 @@ TQString AddresseeEmailSelection::addressBookTitle( uint index ) const return TQString(); } -KABC::Addressee::List AddresseeEmailSelection::addressBookContent( uint index ) const +TDEABC::Addressee::List AddresseeEmailSelection::addressBookContent( uint index ) const { if ( index == 0 ) { TDEConfig config( "kmailrc" ); return RecentAddresses::self( &config )->kabcAddresses(); } else { - return KABC::Addressee::List(); + return TDEABC::Addressee::List(); } } -TQString AddresseeEmailSelection::email( const KABC::Addressee &addressee, uint index ) const +TQString AddresseeEmailSelection::email( const TDEABC::Addressee &addressee, uint index ) const { return addressee.emails()[ index ]; } @@ -217,14 +217,14 @@ void AddresseeEmailSelection::setSelectedItem( uint fieldIndex, const TQStringLi { TQStringList::ConstIterator it; for ( it = emails.begin(); it != emails.end(); ++it ) { - KABC::Addressee addr; + TDEABC::Addressee addr; addr.insertEmail( *it, true ); selector()->setItemSelected( fieldIndex, addr, 0, *it ); } } -void AddresseeEmailSelection::addSelectedAddressees( uint fieldIndex, const KABC::Addressee &addressee, uint itemIndex ) +void AddresseeEmailSelection::addSelectedAddressees( uint fieldIndex, const TDEABC::Addressee &addressee, uint itemIndex ) { switch ( fieldIndex ) { case 0: @@ -245,7 +245,7 @@ void AddresseeEmailSelection::addSelectedAddressees( uint fieldIndex, const KABC } } -void AddresseeEmailSelection::addSelectedDistributionList( uint fieldIndex, const KABC::DistributionList *list ) +void AddresseeEmailSelection::addSelectedDistributionList( uint fieldIndex, const TDEABC::DistributionList *list ) { switch ( fieldIndex ) { case 0: diff --git a/libtdepim/addresseeemailselection.h b/libtdepim/addresseeemailselection.h index 4ecb946e3..f4394a93f 100644 --- a/libtdepim/addresseeemailselection.h +++ b/libtdepim/addresseeemailselection.h @@ -44,52 +44,52 @@ class KDE_EXPORT AddresseeEmailSelection : public Selection /** Returns the number of items for the given addressee. */ - virtual uint itemCount( const KABC::Addressee &addresse ) const; + virtual uint itemCount( const TDEABC::Addressee &addresse ) const; /** Returns the text that's used for the item specified by index. */ - virtual TQString itemText( const KABC::Addressee &addresse, uint index ) const; + virtual TQString itemText( const TDEABC::Addressee &addresse, uint index ) const; /** Returns the icon that's used for the item specified by index. */ - virtual TQPixmap itemIcon( const KABC::Addressee &addresse, uint index ) const; + virtual TQPixmap itemIcon( const TDEABC::Addressee &addresse, uint index ) const; /** Returns whether the item specified by index is enabled. */ - virtual bool itemEnabled( const KABC::Addressee &addresse, uint index ) const; + virtual bool itemEnabled( const TDEABC::Addressee &addresse, uint index ) const; /** Returns whether the item specified by index matches the passed pattern. */ - virtual bool itemMatches( const KABC::Addressee &addresse, uint index, const TQString &pattern ) const; + virtual bool itemMatches( const TDEABC::Addressee &addresse, uint index, const TQString &pattern ) const; /** Returns whether the item specified by index equals the passed pattern. */ - virtual bool itemEquals( const KABC::Addressee &addresse, uint index, const TQString &pattern ) const; + virtual bool itemEquals( const TDEABC::Addressee &addresse, uint index, const TQString &pattern ) const; /** Returns the text that's used for the given distribution list. */ - virtual TQString distributionListText( const KABC::DistributionList *distributionList ) const; + virtual TQString distributionListText( const TDEABC::DistributionList *distributionList ) const; /** Returns the icon that's used for the given distribution list. */ - virtual TQPixmap distributionListIcon( const KABC::DistributionList *distributionList ) const; + virtual TQPixmap distributionListIcon( const TDEABC::DistributionList *distributionList ) const; /** Returns whether the given distribution list is enabled. */ - virtual bool distributionListEnabled( const KABC::DistributionList *distributionList ) const; + virtual bool distributionListEnabled( const TDEABC::DistributionList *distributionList ) const; /** Returns whether the given distribution list matches the passed pattern. */ - virtual bool distributionListMatches( const KABC::DistributionList *distributionList, + virtual bool distributionListMatches( const TDEABC::DistributionList *distributionList, const TQString &pattern ) const; /** @@ -105,15 +105,15 @@ class KDE_EXPORT AddresseeEmailSelection : public Selection /** Returns the content for an additional address book. */ - virtual KABC::Addressee::List addressBookContent( uint index ) const; + virtual TDEABC::Addressee::List addressBookContent( uint index ) const; TQStringList to() const; TQStringList cc() const; TQStringList bcc() const; - KABC::Addressee::List toAddresses() const; - KABC::Addressee::List ccAddresses() const; - KABC::Addressee::List bccAddresses() const; + TDEABC::Addressee::List toAddresses() const; + TDEABC::Addressee::List ccAddresses() const; + TDEABC::Addressee::List bccAddresses() const; TQStringList toDistributionLists() const; TQStringList ccDistributionLists() const; @@ -124,15 +124,15 @@ class KDE_EXPORT AddresseeEmailSelection : public Selection void setSelectedBCC( const TQStringList &emails ); private: - virtual void addSelectedAddressees( uint fieldIndex, const KABC::Addressee&, uint itemIndex ); - virtual void addSelectedDistributionList( uint fieldIndex, const KABC::DistributionList* ); + virtual void addSelectedAddressees( uint fieldIndex, const TDEABC::Addressee&, uint itemIndex ); + virtual void addSelectedDistributionList( uint fieldIndex, const TDEABC::DistributionList* ); - TQString email( const KABC::Addressee&, uint ) const; + TQString email( const TDEABC::Addressee&, uint ) const; void setSelectedItem( uint fieldIndex, const TQStringList& ); - KABC::Addressee::List mToAddresseeList; - KABC::Addressee::List mCcAddresseeList; - KABC::Addressee::List mBccAddresseeList; + TDEABC::Addressee::List mToAddresseeList; + TDEABC::Addressee::List mCcAddresseeList; + TDEABC::Addressee::List mBccAddresseeList; TQStringList mToEmailList; TQStringList mCcEmailList; diff --git a/libtdepim/addresseelineedit.cpp b/libtdepim/addresseelineedit.cpp index 2277182bc..adb3a7300 100644 --- a/libtdepim/addresseelineedit.cpp +++ b/libtdepim/addresseelineedit.cpp @@ -555,16 +555,16 @@ void AddresseeLineEdit::loadContacts() TDEConfig config( "kpimcompletionorder" ); // The weights for non-imap kabc resources is there. config.setGroup( "CompletionWeights" ); - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); // Can't just use the addressbook's iterator, we need to know which subresource // is behind which contact. - TQPtrList<KABC::Resource> resources( addressBook->resources() ); - for( TQPtrListIterator<KABC::Resource> resit( resources ); *resit; ++resit ) { - KABC::Resource* resource = *resit; + TQPtrList<TDEABC::Resource> resources( addressBook->resources() ); + for( TQPtrListIterator<TDEABC::Resource> resit( resources ); *resit; ++resit ) { + TDEABC::Resource* resource = *resit; KPIM::ResourceABC* resabc = dynamic_cast<ResourceABC *>( resource ); if ( resabc ) { // IMAP KABC resource; need to associate each contact with the subresource const TQMap<TQString, TQString> uidToResourceMap = resabc->uidToResourceMap(); - KABC::Resource::Iterator it; + TDEABC::Resource::Iterator it; for ( it = resource->begin(); it != resource->end(); ++it ) { TQString uid = (*it).uid(); TQMap<TQString, TQString>::const_iterator wit = uidToResourceMap.find( uid ); @@ -578,7 +578,7 @@ void AddresseeLineEdit::loadContacts() } else { // KABC non-imap resource int weight = config.readNumEntry( resource->identifier(), 60 ); int sourceIndex = addCompletionSource( resource->resourceName(), weight ); - KABC::Resource::Iterator it; + TDEABC::Resource::Iterator it; for ( it = resource->begin(); it != resource->end(); ++it ) { addContact( *it, weight, sourceIndex ); } @@ -587,7 +587,7 @@ void AddresseeLineEdit::loadContacts() #ifndef TDEPIM_NEW_DISTRLISTS // new distr lists are normal contact, already done above int weight = config.readNumEntry( "DistributionLists", 60 ); - KABC::DistributionListManager manager( addressBook ); + TDEABC::DistributionListManager manager( addressBook ); manager.load(); const TQStringList distLists = manager.listNames(); TQStringList::const_iterator listIt; @@ -612,7 +612,7 @@ void AddresseeLineEdit::loadContacts() } } -void AddresseeLineEdit::addContact( const KABC::Addressee& addr, int weight, int source ) +void AddresseeLineEdit::addContact( const TDEABC::Addressee& addr, int weight, int source ) { #ifdef TDEPIM_NEW_DISTRLISTS if ( KPIM::DistributionList::isDistributionList( addr ) ) { @@ -817,7 +817,7 @@ void AddresseeLineEdit::slotLDAPSearchData( const KPIM::LdapResultList& adrs ) return; for ( KPIM::LdapResultList::ConstIterator it = adrs.begin(); it != adrs.end(); ++it ) { - KABC::Addressee addr; + TDEABC::Addressee addr; addr.setNameFromString( (*it).name ); addr.setEmails( (*it).email ); diff --git a/libtdepim/addresseelineedit.h b/libtdepim/addresseelineedit.h index 169d807e0..278c8e087 100644 --- a/libtdepim/addresseelineedit.h +++ b/libtdepim/addresseelineedit.h @@ -79,7 +79,7 @@ class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject protected slots: virtual void loadContacts(); protected: - void addContact( const KABC::Addressee&, int weight, int source = -1 ); + void addContact( const TDEABC::Addressee&, int weight, int source = -1 ); virtual void keyPressEvent( TQKeyEvent* ); /** * Reimplemented for smart insertion of email addresses. @@ -148,7 +148,7 @@ class KDE_EXPORT AddresseeLineEdit : public ClickLineEdit, public DCOPObject bool m_useSemiColonAsSeparator; bool m_allowDistLists; - //TQMap<TQString, KABC::Addressee> m_contactMap; + //TQMap<TQString, TDEABC::Addressee> m_contactMap; static bool s_addressesDirty; static KMailCompletion *s_completion; diff --git a/libtdepim/addresseeselector.cpp b/libtdepim/addresseeselector.cpp index 30288d0aa..2234b9a75 100644 --- a/libtdepim/addresseeselector.cpp +++ b/libtdepim/addresseeselector.cpp @@ -43,7 +43,7 @@ class AddresseeSelector::AddressBookManager public: TQStringList titles() const; - void addResource( KABC::Resource* ); + void addResource( TDEABC::Resource* ); void addAddressBook( const TQString &title, SelectionItem::List &list ); void clear(); @@ -55,7 +55,7 @@ class AddresseeSelector::AddressBookManager SelectionItem::List list; }; - TQValueList<KABC::Resource*> mResources; + TQValueList<TDEABC::Resource*> mResources; TQValueList<AddressBookEntry> mAddressBooks; }; @@ -66,7 +66,7 @@ TQStringList AddresseeSelector::AddressBookManager::titles() const // we've always an 'all' entry titles.append( i18n( "All" ) ); - TQValueList<KABC::Resource*>::ConstIterator resIt; + TQValueList<TDEABC::Resource*>::ConstIterator resIt; for ( resIt = mResources.begin(); resIt != mResources.end(); ++resIt ) titles.append( (*resIt)->resourceName() ); @@ -77,7 +77,7 @@ TQStringList AddresseeSelector::AddressBookManager::titles() const return titles; } -void AddresseeSelector::AddressBookManager::addResource( KABC::Resource *resource ) +void AddresseeSelector::AddressBookManager::addResource( TDEABC::Resource *resource ) { if ( mResources.find( resource ) == mResources.end() ) mResources.append( resource ); @@ -135,13 +135,13 @@ bool AddresseeSelector::AddressBookManager::contains( uint index, const Selectio } -SelectionItem::SelectionItem( const KABC::Addressee &addressee, uint index ) +SelectionItem::SelectionItem( const TDEABC::Addressee &addressee, uint index ) : mAddressee( addressee ), mDistributionList( 0 ), mIndex( index ) { mField.fill( false, 10 ); } -SelectionItem::SelectionItem( KABC::DistributionList *list, uint index ) +SelectionItem::SelectionItem( TDEABC::DistributionList *list, uint index ) : mDistributionList( list ), mIndex( index ) { mField.fill( false, 10 ); @@ -168,12 +168,12 @@ bool SelectionItem::isInField( int index ) return mField.testBit( index ); } -KABC::Addressee SelectionItem::addressee() const +TDEABC::Addressee SelectionItem::addressee() const { return mAddressee; } -KABC::DistributionList* SelectionItem::distributionList() const +TDEABC::DistributionList* SelectionItem::distributionList() const { return mDistributionList; } @@ -250,7 +250,7 @@ AddresseeSelector::~AddresseeSelector() void AddresseeSelector::init() { - connect( KABC::StdAddressBook::self( true ), TQT_SIGNAL( addressBookChanged( AddressBook* ) ), + connect( TDEABC::StdAddressBook::self( true ), TQT_SIGNAL( addressBookChanged( AddressBook* ) ), this, TQT_SLOT( reloadAddressBook() ) ); connect( mAddresseeFilter, TQT_SIGNAL( textChanged( const TQString& ) ), this, TQT_SLOT( updateAddresseeView() ) ); @@ -400,7 +400,7 @@ void AddresseeSelector::remove( int index ) } } -void AddresseeSelector::setItemSelected( uint fieldIndex, const KABC::Addressee &addr, uint itemIndex ) +void AddresseeSelector::setItemSelected( uint fieldIndex, const TDEABC::Addressee &addr, uint itemIndex ) { bool found = false; @@ -422,7 +422,7 @@ void AddresseeSelector::setItemSelected( uint fieldIndex, const KABC::Addressee updateSelectionView( fieldIndex ); } -void AddresseeSelector::setItemSelected( uint fieldIndex, const KABC::Addressee &addr, +void AddresseeSelector::setItemSelected( uint fieldIndex, const TDEABC::Addressee &addr, uint itemIndex, const TQString &text ) { bool found = false; @@ -466,8 +466,8 @@ void AddresseeSelector::updateSelectionViews() void AddresseeSelector::reloadAddressBook() { // load contacts - KABC::Addressee::List list = KABC::StdAddressBook::self( true )->allAddressees(); - KABC::Addressee::List::Iterator it; + TDEABC::Addressee::List list = TDEABC::StdAddressBook::self( true )->allAddressees(); + TDEABC::Addressee::List::Iterator it; SelectionItem::List selectedItems; @@ -510,7 +510,7 @@ void AddresseeSelector::reloadAddressBook() // load distribution lists delete mManager; - mManager = new KABC::DistributionListManager( KABC::StdAddressBook::self( true ) ); + mManager = new TDEABC::DistributionListManager( TDEABC::StdAddressBook::self( true ) ); mManager->load(); @@ -518,7 +518,7 @@ void AddresseeSelector::reloadAddressBook() TQStringList::Iterator listIt; for ( listIt = lists.begin(); listIt != lists.end(); ++listIt ) { - KABC::DistributionList *list = mManager->list( *listIt ); + TDEABC::DistributionList *list = mManager->list( *listIt ); SelectionItem item( list, 0 ); mSelectionItems.append( item ); } @@ -528,8 +528,8 @@ void AddresseeSelector::reloadAddressBook() // update address book combo mAddressBookCombo->clear(); - TQPtrList<KABC::Resource> resources = KABC::StdAddressBook::self( true )->resources(); - TQPtrListIterator<KABC::Resource> resIt( resources ); + TQPtrList<TDEABC::Resource> resources = TDEABC::StdAddressBook::self( true )->resources(); + TQPtrListIterator<TDEABC::Resource> resIt( resources ); while ( resIt.current() ) { if ( resIt.current()->isActive() ) mAddressBookManager->addResource( resIt ); @@ -540,7 +540,7 @@ void AddresseeSelector::reloadAddressBook() for ( uint i = 0; i < mSelection->addressBookCount(); ++i ) { SelectionItem::List itemList; - KABC::Addressee::List addrList = mSelection->addressBookContent( i ); + TDEABC::Addressee::List addrList = mSelection->addressBookContent( i ); for ( it = addrList.begin(); it != addrList.end(); ++it ) { uint itemCount = mSelection->itemCount( *it ); for ( uint index = 0; index < itemCount; ++index ) { diff --git a/libtdepim/addresseeselector.h b/libtdepim/addresseeselector.h index 92c544789..2fa40f4e4 100644 --- a/libtdepim/addresseeselector.h +++ b/libtdepim/addresseeselector.h @@ -61,52 +61,52 @@ class KDE_EXPORT Selection /** Returns the number of items for the given addressee. */ - virtual uint itemCount( const KABC::Addressee &addresse ) const = 0; + virtual uint itemCount( const TDEABC::Addressee &addresse ) const = 0; /** Returns the text that's used for the item specified by index. */ - virtual TQString itemText( const KABC::Addressee &addresse, uint index ) const = 0; + virtual TQString itemText( const TDEABC::Addressee &addresse, uint index ) const = 0; /** Returns the icon that's used for the item specified by index. */ - virtual TQPixmap itemIcon( const KABC::Addressee &addresse, uint index ) const = 0; + virtual TQPixmap itemIcon( const TDEABC::Addressee &addresse, uint index ) const = 0; /** Returns whether the item specified by index is enabled. */ - virtual bool itemEnabled( const KABC::Addressee &addresse, uint index ) const = 0; + virtual bool itemEnabled( const TDEABC::Addressee &addresse, uint index ) const = 0; /** Returns whether the item specified by index matches the passed pattern. */ - virtual bool itemMatches( const KABC::Addressee &addresse, uint index, const TQString &pattern ) const = 0; + virtual bool itemMatches( const TDEABC::Addressee &addresse, uint index, const TQString &pattern ) const = 0; /** Returns whether the item specified by index equals the passed pattern. */ - virtual bool itemEquals( const KABC::Addressee &addresse, uint index, const TQString &pattern ) const = 0; + virtual bool itemEquals( const TDEABC::Addressee &addresse, uint index, const TQString &pattern ) const = 0; /** Returns the text that's used for the given distribution list. */ - virtual TQString distributionListText( const KABC::DistributionList *distributionList ) const = 0; + virtual TQString distributionListText( const TDEABC::DistributionList *distributionList ) const = 0; /** Returns the icon that's used for the given distribution list. */ - virtual TQPixmap distributionListIcon( const KABC::DistributionList *distributionList ) const = 0; + virtual TQPixmap distributionListIcon( const TDEABC::DistributionList *distributionList ) const = 0; /** Returns whether the given distribution list is enabled. */ - virtual bool distributionListEnabled( const KABC::DistributionList *distributionList ) const = 0; + virtual bool distributionListEnabled( const TDEABC::DistributionList *distributionList ) const = 0; /** Returns whether the given distribution list matches the passed pattern. */ - virtual bool distributionListMatches( const KABC::DistributionList *distributionList, + virtual bool distributionListMatches( const TDEABC::DistributionList *distributionList, const TQString &pattern ) const = 0; /** @@ -122,14 +122,14 @@ class KDE_EXPORT Selection /** Returns the content for an additional address book. */ - virtual KABC::Addressee::List addressBookContent( uint index ) const = 0; + virtual TDEABC::Addressee::List addressBookContent( uint index ) const = 0; protected: AddresseeSelector* selector() { return mSelector; } private: - virtual void addSelectedAddressees( uint fieldIndex, const KABC::Addressee&, uint itemIndex ) = 0; - virtual void addSelectedDistributionList( uint fieldIndex, const KABC::DistributionList* ) = 0; + virtual void addSelectedAddressees( uint fieldIndex, const TDEABC::Addressee&, uint itemIndex ) = 0; + virtual void addSelectedDistributionList( uint fieldIndex, const TDEABC::DistributionList* ) = 0; void setSelector( AddresseeSelector *selector ) { mSelector = selector; } @@ -144,21 +144,21 @@ class SelectionItem public: typedef TQValueList<SelectionItem> List; - SelectionItem( const KABC::Addressee &addressee, uint index ); - SelectionItem( KABC::DistributionList *list, uint index ); + SelectionItem( const TDEABC::Addressee &addressee, uint index ); + SelectionItem( TDEABC::DistributionList *list, uint index ); SelectionItem(); void addToField( int index ); void removeFromField( int index ); bool isInField( int index ); - KABC::Addressee addressee() const; - KABC::DistributionList* distributionList() const; + TDEABC::Addressee addressee() const; + TDEABC::DistributionList* distributionList() const; uint index() const; private: - KABC::Addressee mAddressee; - KABC::DistributionList *mDistributionList; + TDEABC::Addressee mAddressee; + TDEABC::DistributionList *mDistributionList; uint mIndex; TQBitArray mField; }; @@ -178,8 +178,8 @@ class KDE_EXPORT AddresseeSelector : public TQWidget */ void finish(); - void setItemSelected( uint fieldIndex, const KABC::Addressee&, uint itemIndex ); - void setItemSelected( uint fieldIndex, const KABC::Addressee&, + void setItemSelected( uint fieldIndex, const TDEABC::Addressee&, uint itemIndex ); + void setItemSelected( uint fieldIndex, const TDEABC::Addressee&, uint itemIndex, const TQString& ); private slots: @@ -207,7 +207,7 @@ class KDE_EXPORT AddresseeSelector : public TQWidget TQSignalMapper *mMoveMapper; TQSignalMapper *mRemoveMapper; - KABC::DistributionListManager *mManager; + TDEABC::DistributionListManager *mManager; class AddressBookManager; AddressBookManager *mAddressBookManager; diff --git a/libtdepim/addresseeview.cpp b/libtdepim/addresseeview.cpp index aebb108cd..29cbf1c2b 100644 --- a/libtdepim/addresseeview.cpp +++ b/libtdepim/addresseeview.cpp @@ -129,7 +129,7 @@ AddresseeView::~AddresseeView() mKIMProxy = 0; } -void AddresseeView::setAddressee( const KABC::Addressee& addr ) +void AddresseeView::setAddressee( const TDEABC::Addressee& addr ) { mAddressee = addr; @@ -148,7 +148,7 @@ void AddresseeView::enableLinks( int linkMask ) mLinkMask = linkMask; } -TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask, +TQString AddresseeView::vCardAsHTML( const TDEABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask, bool internalLoading, FieldMask fieldMask ) { TQString image = TQString( "contact_%1_image" ).arg( addr.uid() ); @@ -201,7 +201,7 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( !internalLoading ) { - KABC::Picture pic = addr.photo(); + TDEABC::Picture pic = addr.photo(); if ( pic.isIntern() && !pic.data().isNull() ) { image = pixmapAsDataUrl( pic.data() ); } else if ( !pic.url().isEmpty() ) { @@ -216,25 +216,25 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( date.isValid() ) dynamicPart += rowFmtStr - .arg( KABC::Addressee::birthdayLabel() ) + .arg( TDEABC::Addressee::birthdayLabel() ) .arg( TDEGlobal::locale()->formatDate( date, true ) ); } if ( fieldMask & PhoneFields ) { - KABC::PhoneNumber::List phones = addr.phoneNumbers(); - KABC::PhoneNumber::List::ConstIterator phoneIt; + TDEABC::PhoneNumber::List phones = addr.phoneNumbers(); + TDEABC::PhoneNumber::List::ConstIterator phoneIt; for ( phoneIt = phones.begin(); phoneIt != phones.end(); ++phoneIt ) { TQString number = TQStyleSheet::escape( (*phoneIt).number() ); TQString url; - if ( (*phoneIt).type() & KABC::PhoneNumber::Fax ) + if ( (*phoneIt).type() & TDEABC::PhoneNumber::Fax ) url = TQString::fromLatin1( "fax:" ) + number; else url = TQString::fromLatin1( "phone:" ) + number; if ( linkMask & PhoneLinks ) { TQString smsURL; - if ( (*phoneIt).type() & KABC::PhoneNumber::Cell ) + if ( (*phoneIt).type() & TDEABC::PhoneNumber::Cell ) smsURL = TQString(" (<a href=\"sms:%1\">%2</a>)" ).arg( number ).arg( i18n( "SMS") ); dynamicPart += rowFmtStr @@ -289,8 +289,8 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr } if ( fieldMask & AddressFields ) { - KABC::Address::List addresses = addr.addresses(); - KABC::Address::List::ConstIterator addrIt; + TDEABC::Address::List addresses = addr.addresses(); + TDEABC::Address::List::ConstIterator addrIt; for ( addrIt = addresses.begin(); addrIt != addresses.end(); ++addrIt ) { if ( (*addrIt).label().isEmpty() ) { TQString formattedAddress; @@ -303,11 +303,11 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & AddressLinks ) { dynamicPart += rowFmtStr - .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) + .arg( TDEABC::Address::typeLabel( (*addrIt).type() ) ) .arg( link ); } else { dynamicPart += rowFmtStr - .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) + .arg( TDEABC::Address::typeLabel( (*addrIt).type() ) ) .arg( formattedAddress ); } } else { @@ -316,11 +316,11 @@ TQString AddresseeView::vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *pr if ( linkMask & AddressLinks ) { dynamicPart += rowFmtStr - .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) + .arg( TDEABC::Address::typeLabel( (*addrIt).type() ) ) .arg( link ); } else { dynamicPart += rowFmtStr - .arg( KABC::Address::typeLabel( (*addrIt).type() ) ) + .arg( TDEABC::Address::typeLabel( (*addrIt).type() ) ) .arg( (*addrIt).label().replace( '\n', "<br>" ) ); } } @@ -538,7 +538,7 @@ void AddresseeView::updateView() TQString imageURL = TQString( "contact_%1_image" ).arg( mAddressee.uid() ); - KABC::Picture picture = mAddressee.photo(); + TDEABC::Picture picture = mAddressee.photo(); if ( picture.isIntern() && !picture.data().isNull() ) TQMimeSourceFactory::defaultFactory()->setImage( imageURL, picture.data() ); else { @@ -562,7 +562,7 @@ void AddresseeView::updateView() setText( strAddr ); } -KABC::Addressee AddresseeView::addressee() const +TDEABC::Addressee AddresseeView::addressee() const { return mAddressee; } diff --git a/libtdepim/addresseeview.h b/libtdepim/addresseeview.h index af7ee4b19..fd8c900b6 100644 --- a/libtdepim/addresseeview.h +++ b/libtdepim/addresseeview.h @@ -61,12 +61,12 @@ class KDE_EXPORT AddresseeView : public KTextBrowser @param addr The addressee object. */ - void setAddressee( const KABC::Addressee& addr ); + void setAddressee( const TDEABC::Addressee& addr ); /** Returns the current addressee object. */ - KABC::Addressee addressee() const; + TDEABC::Addressee addressee() const; /** @@ -128,7 +128,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser @param fieldMask The mask for which fields of the contact will be displayed. */ - static TQString vCardAsHTML( const KABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask = DefaultLinks, + static TQString vCardAsHTML( const TDEABC::Addressee& addr, ::KIMProxy *proxy, LinkMask linkMask = DefaultLinks, bool internalLoading = true, FieldMask fieldMask = DefaultFields ); /** @@ -192,7 +192,7 @@ class KDE_EXPORT AddresseeView : public KTextBrowser TDEToggleAction *mActionShowIMAddresses; TDEToggleAction *mActionShowCustomFields; - KABC::Addressee mAddressee; + TDEABC::Addressee mAddressee; int mLinkMask; class AddresseeViewPrivate; diff --git a/libtdepim/addressesdialog.cpp b/libtdepim/addressesdialog.cpp index aa52f4625..3083cdf46 100644 --- a/libtdepim/addressesdialog.cpp +++ b/libtdepim/addressesdialog.cpp @@ -61,9 +61,9 @@ namespace KPIM { // private start : struct AddresseeViewItem::AddresseeViewItemPrivate { - KABC::Addressee address; + TDEABC::Addressee address; AddresseeViewItem::Category category; - KABC::Addressee::List addresses; + TDEABC::Addressee::List addresses; }; struct AddressesDialog::AddressesDialogPrivate { @@ -86,12 +86,12 @@ struct AddressesDialog::AddressesDialogPrivate { TQDict<AddresseeViewItem> groupDict; - KABC::Addressee::List recentAddresses; + TDEABC::Addressee::List recentAddresses; LDAPSearchDialog *ldapSearchDialog; }; // privates end -AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr, +AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TDEABC::Addressee& addr, int emailIndex ) : TQObject( 0 ), TDEListViewItem( parent, addr.realName(), ( emailIndex == 0 ? addr.preferredEmail() : addr.emails()[ emailIndex ] ) ) @@ -121,7 +121,7 @@ AddresseeViewItem::AddresseeViewItem( TDEListView *lv, const TQString& name, Cat } AddresseeViewItem::AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, - const KABC::Addressee::List &lst ) + const TDEABC::Addressee::List &lst ) : TQObject(0), TDEListViewItem( parent, name, i18n("<group>") ) { d = new AddresseeViewItemPrivate; @@ -144,13 +144,13 @@ AddresseeViewItem::~AddresseeViewItem() d = 0; } -KABC::Addressee +TDEABC::Addressee AddresseeViewItem::addressee() const { return d->address; } -KABC::Addressee::List +TDEABC::Addressee::List AddresseeViewItem::addresses() const { return d->addresses; @@ -220,7 +220,7 @@ AddressesDialog::AddressesDialog( TQWidget *widget, const char *name ) d = new AddressesDialogPrivate; d->ui = new AddressPickerUI( page ); - KABC::StdAddressBook::self( true ); + TDEABC::StdAddressBook::self( true ); updateAvailableAddressees(); initConnections(); @@ -274,8 +274,8 @@ AddressesDialog::setSelectedTo( const TQStringList& l ) { TQString name, email; for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { - KABC::Addressee addr; - KABC::Addressee::parseEmailAddress( *it, name, email ); + TDEABC::Addressee addr; + TDEABC::Addressee::parseEmailAddress( *it, name, email ); addr.setNameFromString( name ); addr.insertEmail( email ); addAddresseeToSelected( addr, selectedToItem() ); @@ -287,8 +287,8 @@ AddressesDialog::setSelectedCC( const TQStringList& l ) { TQString name, email; for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { - KABC::Addressee addr; - KABC::Addressee::parseEmailAddress( *it, name, email ); + TDEABC::Addressee addr; + TDEABC::Addressee::parseEmailAddress( *it, name, email ); addr.setNameFromString( name ); addr.insertEmail( email ); addAddresseeToSelected( addr, selectedCcItem() ); @@ -300,8 +300,8 @@ AddressesDialog::setSelectedBCC( const TQStringList& l ) { TQString name, email; for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { - KABC::Addressee addr; - KABC::Addressee::parseEmailAddress( *it, name, email ); + TDEABC::Addressee addr; + TDEABC::Addressee::parseEmailAddress( *it, name, email ); addr.setNameFromString( name ); addr.insertEmail( email ); addAddresseeToSelected( addr, selectedBccItem() ); @@ -309,7 +309,7 @@ AddressesDialog::setSelectedBCC( const TQStringList& l ) } void -AddressesDialog::setRecentAddresses( const KABC::Addressee::List& list ) +AddressesDialog::setRecentAddresses( const TDEABC::Addressee::List& list ) { d->recentAddresses = list; @@ -331,7 +331,7 @@ AddressesDialog::updateRecentAddresses() d->groupDict.insert( recentGroup, d->recent ); } - KABC::Addressee::List::ConstIterator it; + TDEABC::Addressee::List::ConstIterator it; for ( it = d->recentAddresses.begin(); it != d->recentAddresses.end(); ++it ) addAddresseeToAvailable( *it, d->recent ); @@ -357,7 +357,7 @@ TQStringList AddressesDialog::to() const { TQStringList emails = allDistributionLists( d->toItem ); - KABC::Addressee::List l = toAddresses(); + TDEABC::Addressee::List l = toAddresses(); emails += entryToString( l ); return emails; @@ -367,7 +367,7 @@ TQStringList AddressesDialog::cc() const { TQStringList emails = allDistributionLists( d->ccItem ); - KABC::Addressee::List l = ccAddresses(); + TDEABC::Addressee::List l = ccAddresses(); emails += entryToString( l ); return emails; @@ -378,43 +378,43 @@ AddressesDialog::bcc() const { TQStringList emails = allDistributionLists( d->bccItem ); - KABC::Addressee::List l = bccAddresses(); + TDEABC::Addressee::List l = bccAddresses(); emails += entryToString( l ); return emails; } -KABC::Addressee::List +TDEABC::Addressee::List AddressesDialog::toAddresses() const { return allAddressee( d->toItem ); } -KABC::Addressee::List +TDEABC::Addressee::List AddressesDialog::allToAddressesNoDuplicates() const { - KABC::Addressee::List aList = allAddressee( d->toItem ); + TDEABC::Addressee::List aList = allAddressee( d->toItem ); const TQStringList dList = toDistributionLists(); - KABC::AddressBook* abook = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook* abook = TDEABC::StdAddressBook::self( true ); #ifdef TDEPIM_NEW_DISTRLISTS for ( TQStringList::ConstIterator it = dList.begin(); it != dList.end(); ++it ) { const TQValueList<KPIM::DistributionList::Entry> eList = KPIM::DistributionList::findByName(abook, *it).entries(abook); TQValueList<KPIM::DistributionList::Entry>::ConstIterator eit; for( eit = eList.begin(); eit != eList.end(); ++eit ) { - KABC::Addressee a = (*eit).addressee; + TDEABC::Addressee a = (*eit).addressee; if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) { aList.append( a ) ; } } } #else - KABC::DistributionListManager manager( abook ); + TDEABC::DistributionListManager manager( abook ); manager.load(); for ( TQStringList::ConstIterator it = dList.begin(); it != dList.end(); ++it ) { - const TQValueList<KABC::DistributionList::Entry> eList = manager.list( *it )->entries(); - TQValueList<KABC::DistributionList::Entry>::ConstIterator eit; + const TQValueList<TDEABC::DistributionList::Entry> eList = manager.list( *it )->entries(); + TQValueList<TDEABC::DistributionList::Entry>::ConstIterator eit; for( eit = eList.begin(); eit != eList.end(); ++eit ) { - KABC::Addressee a = (*eit).addressee; + TDEABC::Addressee a = (*eit).addressee; if ( !a.preferredEmail().isEmpty() && aList.find( a ) == aList.end() ) { aList.append( a ) ; } @@ -424,13 +424,13 @@ AddressesDialog::allToAddressesNoDuplicates() const return aList; } -KABC::Addressee::List +TDEABC::Addressee::List AddressesDialog::ccAddresses() const { return allAddressee( d->ccItem ); } -KABC::Addressee::List +TDEABC::Addressee::List AddressesDialog::bccAddresses() const { return allAddressee( d->bccItem ); @@ -469,8 +469,8 @@ AddressesDialog::updateAvailableAddressees() d->personal->setVisible( false ); d->groupDict.insert( personalGroup, d->personal ); - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - for( KABC::AddressBook::Iterator it = addressBook->begin(); + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); + for( TDEABC::AddressBook::Iterator it = addressBook->begin(); it != addressBook->end(); ++it ) { addAddresseeToAvailable( *it, d->personal ); } @@ -594,16 +594,16 @@ AddressesDialog::initConnections() TQT_SLOT(removeEntry()) ); #ifndef TDEPIM_NEW_DISTRLISTS - connect( KABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ), + connect( TDEABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ), this, TQT_SLOT( updateAvailableAddressees() ) ); #endif - connect( KABC::StdAddressBook::self( true ), TQT_SIGNAL( addressBookChanged(AddressBook*) ), + connect( TDEABC::StdAddressBook::self( true ), TQT_SIGNAL( addressBookChanged(AddressBook*) ), this, TQT_SLOT( updateAvailableAddressees() ) ); } void -AddressesDialog::addAddresseeToAvailable( const KABC::Addressee& addr, AddresseeViewItem* defaultParent, bool useCategory ) +AddressesDialog::addAddresseeToAvailable( const TDEABC::Addressee& addr, AddresseeViewItem* defaultParent, bool useCategory ) { if ( addr.preferredEmail().isEmpty() ) return; @@ -640,7 +640,7 @@ AddressesDialog::addAddresseeToAvailable( const KABC::Addressee& addr, Addressee } void -AddressesDialog::addAddresseeToSelected( const KABC::Addressee& addr, AddresseeViewItem* defaultParent ) +AddressesDialog::addAddresseeToSelected( const TDEABC::Addressee& addr, AddresseeViewItem* defaultParent ) { if ( addr.preferredEmail().isEmpty() ) return; @@ -709,11 +709,11 @@ AddressesDialog::addAddresseesToSelected( AddresseeViewItem *parent, } TQStringList -AddressesDialog::entryToString( const KABC::Addressee::List& l ) const +AddressesDialog::entryToString( const TDEABC::Addressee::List& l ) const { TQStringList entries; - for( KABC::Addressee::List::ConstIterator it = l.begin(); it != l.end(); ++it ) { + for( TDEABC::Addressee::List::ConstIterator it = l.begin(); it != l.end(); ++it ) { entries += (*it).fullEmail(); } return entries; @@ -854,13 +854,13 @@ AddressesDialog::removeEntry() // copied from kabcore.cpp :( // KDE4: should be in libkabc I think -static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *parent ) +static TDEABC::Resource *requestResource( TDEABC::AddressBook* abook, TQWidget *parent ) { - TQPtrList<KABC::Resource> kabcResources = abook->resources(); + TQPtrList<TDEABC::Resource> kabcResources = abook->resources(); TQPtrList<KRES::Resource> kresResources; - TQPtrListIterator<KABC::Resource> resIt( kabcResources ); - KABC::Resource *resource; + TQPtrListIterator<TDEABC::Resource> resIt( kabcResources ); + TDEABC::Resource *resource; while ( ( resource = resIt.current() ) != 0 ) { ++resIt; if ( !resource->readOnly() ) { @@ -871,7 +871,7 @@ static KABC::Resource *requestResource( KABC::AddressBook* abook, TQWidget *pare } KRES::Resource *res = KRES::SelectDialog::getResource( kresResources, parent ); - return static_cast<KABC::Resource*>( res ); + return static_cast<TDEABC::Resource*>( res ); } #endif @@ -879,7 +879,7 @@ void AddressesDialog::saveAs() { #ifndef TDEPIM_NEW_DISTRLISTS - KABC::DistributionListManager manager( KABC::StdAddressBook::self( true ) ); + TDEABC::DistributionListManager manager( TDEABC::StdAddressBook::self( true ) ); manager.load(); #endif @@ -901,7 +901,7 @@ AddressesDialog::saveAs() bool alreadyExists = false; #ifdef TDEPIM_NEW_DISTRLISTS - KABC::AddressBook* abook = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook* abook = TDEABC::StdAddressBook::self( true ); KPIM::DistributionList dlist = KPIM::DistributionList::findByName( abook, name ); alreadyExists = !dlist.isEmpty(); #else @@ -917,22 +917,22 @@ AddressesDialog::saveAs() } #ifdef TDEPIM_NEW_DISTRLISTS - KABC::Resource* resource = requestResource( abook, this ); + TDEABC::Resource* resource = requestResource( abook, this ); if ( !resource ) return; dlist.setResource( resource ); dlist.setName( name ); - KABC::Addressee::List addrl = allAddressee( d->ui->mSelectedView, false ); - for ( KABC::Addressee::List::iterator itr = addrl.begin(); + TDEABC::Addressee::List addrl = allAddressee( d->ui->mSelectedView, false ); + for ( TDEABC::Addressee::List::iterator itr = addrl.begin(); itr != addrl.end(); ++itr ) { dlist.insertEntry( *itr ); } abook->insertAddressee( dlist ); #else - KABC::DistributionList *dlist = new KABC::DistributionList( &manager, name ); - KABC::Addressee::List addrl = allAddressee( d->ui->mSelectedView, false ); - for ( KABC::Addressee::List::iterator itr = addrl.begin(); + TDEABC::DistributionList *dlist = new TDEABC::DistributionList( &manager, name ); + TDEABC::Addressee::List addrl = allAddressee( d->ui->mSelectedView, false ); + for ( TDEABC::Addressee::List::iterator itr = addrl.begin(); itr != addrl.end(); ++itr ) { dlist->insertEntry( *itr ); } @@ -962,7 +962,7 @@ AddressesDialog::ldapSearchResult() TQString name; TQString email; KPIM::getNameAndMail( (*it), name, email ); - KABC::Addressee ad; + TDEABC::Addressee ad; ad.setNameFromString( name ); ad.insertEmail( email ); addAddresseeToSelected( ad, selectedToItem() ); @@ -1062,10 +1062,10 @@ AddressesDialog::filterChanged( const TQString& txt ) } } -KABC::Addressee::List +TDEABC::Addressee::List AddressesDialog::allAddressee( TDEListView* view, bool onlySelected ) const { - KABC::Addressee::List lst; + TDEABC::Addressee::List lst; TQListViewItemIterator it( view ); while ( it.current() ) { AddresseeViewItem* item = static_cast<AddresseeViewItem*>( it.current() ); @@ -1086,10 +1086,10 @@ AddressesDialog::allAddressee( TDEListView* view, bool onlySelected ) const return lst; } -KABC::Addressee::List +TDEABC::Addressee::List AddressesDialog::allAddressee( AddresseeViewItem* parent ) const { - KABC::Addressee::List lst; + TDEABC::Addressee::List lst; if ( !parent ) return lst; @@ -1133,13 +1133,13 @@ AddressesDialog::allDistributionLists( AddresseeViewItem* parent ) const void AddressesDialog::addDistributionLists() { - KABC::AddressBook* abook = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook* abook = TDEABC::StdAddressBook::self( true ); #ifdef TDEPIM_NEW_DISTRLISTS const TQValueList<KPIM::DistributionList> distLists = KPIM::DistributionList::allDistributionLists( abook ); #else - KABC::DistributionListManager manager( abook ); + TDEABC::DistributionListManager manager( abook ); manager.load(); TQStringList distLists = manager.listNames(); @@ -1163,8 +1163,8 @@ AddressesDialog::addDistributionLists() KPIM::DistributionList dlist = *listIt; KPIM::DistributionList::Entry::List entries = dlist.entries(abook); #else - KABC::DistributionList& dlist = *manager.list( *listIt ); - KABC::DistributionList::Entry::List entries = dlist.entries(); + TDEABC::DistributionList& dlist = *manager.list( *listIt ); + TDEABC::DistributionList::Entry::List entries = dlist.entries(); #endif AddresseeViewItem *item = new AddresseeViewItem( d->topdist, dlist.name() ); @@ -1175,7 +1175,7 @@ AddressesDialog::addDistributionLists() #ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList::Entry::List::Iterator itemIt; #else - KABC::DistributionList::Entry::List::Iterator itemIt; + TDEABC::DistributionList::Entry::List::Iterator itemIt; #endif for ( itemIt = entries.begin(); itemIt != entries.end(); ++itemIt ) { addAddresseeToAvailable( (*itemIt).addressee, item, false ); diff --git a/libtdepim/addressesdialog.h b/libtdepim/addressesdialog.h index c27ed68bf..1cc383b21 100644 --- a/libtdepim/addressesdialog.h +++ b/libtdepim/addressesdialog.h @@ -50,14 +50,14 @@ namespace KPIM { FilledGroup =5, DistList =6 }; - AddresseeViewItem( AddresseeViewItem *parent, const KABC::Addressee& addr, int emailIndex = 0 ); + AddresseeViewItem( AddresseeViewItem *parent, const TDEABC::Addressee& addr, int emailIndex = 0 ); AddresseeViewItem( TDEListView *lv, const TQString& name, Category cat=Group ); - AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, const KABC::Addressee::List &lst ); + AddresseeViewItem( AddresseeViewItem *parent, const TQString& name, const TDEABC::Addressee::List &lst ); AddresseeViewItem( AddresseeViewItem *parent, const TQString& name ); ~AddresseeViewItem(); - KABC::Addressee addressee() const; - KABC::Addressee::List addresses() const; + TDEABC::Addressee addressee() const; + TDEABC::Addressee::List addresses() const; Category category() const; TQString name() const; @@ -98,26 +98,26 @@ namespace KPIM { TQStringList bcc() const; /** - * Returns the list of picked "To" addresses as KABC::Addressee::List. + * Returns the list of picked "To" addresses as TDEABC::Addressee::List. * Note that this doesn't include the distribution lists */ - KABC::Addressee::List toAddresses() const; + TDEABC::Addressee::List toAddresses() const; /** - * Returns the list of picked "To" addresses as KABC::Addressee::List. + * Returns the list of picked "To" addresses as TDEABC::Addressee::List. * Note that this does include the distribution lists * Multiple Addressees are removed */ - KABC::Addressee::List allToAddressesNoDuplicates() const; + TDEABC::Addressee::List allToAddressesNoDuplicates() const; /** - * Returns the list of picked "CC" addresses as KABC::Addressee::List. + * Returns the list of picked "CC" addresses as TDEABC::Addressee::List. * Note that this doesn't include the distribution lists */ - KABC::Addressee::List ccAddresses() const; + TDEABC::Addressee::List ccAddresses() const; /** - * Returns the list of picked "BCC" addresses as KABC::Addressee::List. + * Returns the list of picked "BCC" addresses as TDEABC::Addressee::List. * Note that this doesn't include the distribution lists */ - KABC::Addressee::List bccAddresses() const; + TDEABC::Addressee::List bccAddresses() const; /** * Returns the list of picked "To" distribution lists. @@ -150,7 +150,7 @@ namespace KPIM { * If called adds "Recent Addresses" item to the picker list view, * with the addresses given in @p addr. */ - void setRecentAddresses( const KABC::Addressee::List& addr ); + void setRecentAddresses( const TDEABC::Addressee::List& addr ); /** * Adds addresses in @p l to the selected "To" group. */ @@ -190,15 +190,15 @@ namespace KPIM { void initConnections(); void addDistributionLists(); - void addAddresseeToAvailable( const KABC::Addressee& addr, + void addAddresseeToAvailable( const TDEABC::Addressee& addr, AddresseeViewItem* defaultParent=0, bool useCategory=true ); - void addAddresseeToSelected( const KABC::Addressee& addr, + void addAddresseeToSelected( const TDEABC::Addressee& addr, AddresseeViewItem* defaultParent=0 ); void addAddresseesToSelected( AddresseeViewItem *parent, const TQPtrList<AddresseeViewItem>& addresses ); - TQStringList entryToString( const KABC::Addressee::List& l ) const; - KABC::Addressee::List allAddressee( AddresseeViewItem* parent ) const; - KABC::Addressee::List allAddressee( TDEListView* view, bool onlySelected = true ) const; + TQStringList entryToString( const TDEABC::Addressee::List& l ) const; + TDEABC::Addressee::List allAddressee( AddresseeViewItem* parent ) const; + TDEABC::Addressee::List allAddressee( TDEListView* view, bool onlySelected = true ) const; TQStringList allDistributionLists( AddresseeViewItem* parent ) const; private: diff --git a/libtdepim/completionordereditor.cpp b/libtdepim/completionordereditor.cpp index a94b62217..7b82ad5ba 100644 --- a/libtdepim/completionordereditor.cpp +++ b/libtdepim/completionordereditor.cpp @@ -128,7 +128,7 @@ private: void SimpleCompletionItem::save( CompletionOrderEditor* editor ) { - // Maybe KABC::Resource could have a completionWeight setting (for readConfig/writeConfig) + // Maybe TDEABC::Resource could have a completionWeight setting (for readConfig/writeConfig) // But for tdelibs-3.2 compat purposes I can't do that. TDEConfigGroup group( editor->configFile(), "CompletionWeights" ); group.writeEntry( mIdentifier, mWeight ); @@ -184,9 +184,9 @@ CompletionOrderEditor::CompletionOrderEditor( KPIM::LdapSearch* ldapSearch, //kdDebug(5300) << "LDAP: host " << (*it)->host() << " weight " << (*it)->completionWeight() << endl; mItems.append( new LDAPCompletionItem( *it ) ); } - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - TQPtrList<KABC::Resource> resources = addressBook->resources(); - for( TQPtrListIterator<KABC::Resource> resit( resources ); *resit; ++resit ) { + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); + TQPtrList<TDEABC::Resource> resources = addressBook->resources(); + for( TQPtrListIterator<TDEABC::Resource> resit( resources ); *resit; ++resit ) { //kdDebug(5300) << "KABC Resource: " << (*resit)->className() << endl; ResourceABC* res = dynamic_cast<ResourceABC *>( *resit ); if ( res ) { // IMAP KABC resource diff --git a/libtdepim/distributionlist.cpp b/libtdepim/distributionlist.cpp index f5742a144..2fd50f5ac 100644 --- a/libtdepim/distributionlist.cpp +++ b/libtdepim/distributionlist.cpp @@ -4,13 +4,13 @@ static const char* s_customFieldName = "DistributionList"; KPIM::DistributionList::DistributionList() - : KABC::Addressee() + : TDEABC::Addressee() { // can't insert the custom entry here, we need to remain a null addressee } -KPIM::DistributionList::DistributionList( const KABC::Addressee& addr ) - : KABC::Addressee( addr ) +KPIM::DistributionList::DistributionList( const TDEABC::Addressee& addr ) + : TDEABC::Addressee( addr ) { } @@ -91,19 +91,19 @@ void KPIM::DistributionList::removeEntry( const TQString& uid, const TQString& e insertCustom( "KADDRESSBOOK", s_customFieldName, str ); // replace old value } -bool KPIM::DistributionList::isDistributionList( const KABC::Addressee& addr ) +bool KPIM::DistributionList::isDistributionList( const TDEABC::Addressee& addr ) { const TQString str = addr.custom( "KADDRESSBOOK", s_customFieldName ); return !str.isEmpty(); } -// ###### KDE4: add findByFormattedName to KABC::AddressBook -static KABC::Addressee::List findByFormattedName( KABC::AddressBook* book, +// ###### KDE4: add findByFormattedName to TDEABC::AddressBook +static TDEABC::Addressee::List findByFormattedName( TDEABC::AddressBook* book, const TQString& name, bool caseSensitive = true ) { - KABC::Addressee::List res; - KABC::AddressBook::Iterator abIt; + TDEABC::Addressee::List res; + TDEABC::AddressBook::Iterator abIt; for ( abIt = book->begin(); abIt != book->end(); ++abIt ) { if ( caseSensitive && (*abIt).formattedName() == name ) @@ -114,11 +114,11 @@ static KABC::Addressee::List findByFormattedName( KABC::AddressBook* book, return res; } -KPIM::DistributionList KPIM::DistributionList::findByName( KABC::AddressBook* book, +KPIM::DistributionList KPIM::DistributionList::findByName( TDEABC::AddressBook* book, const TQString& name, bool caseSensitive ) { - KABC::AddressBook::Iterator abIt; + TDEABC::AddressBook::Iterator abIt; for ( abIt = book->begin(); abIt != book->end(); ++abIt ) { if ( isDistributionList( *abIt ) ) { @@ -131,16 +131,16 @@ KPIM::DistributionList KPIM::DistributionList::findByName( KABC::AddressBook* bo return DistributionList(); } -static KABC::Addressee findByUidOrName( KABC::AddressBook* book, const TQString& uidOrName, const TQString& email ) +static TDEABC::Addressee findByUidOrName( TDEABC::AddressBook* book, const TQString& uidOrName, const TQString& email ) { - KABC::Addressee a = book->findByUid( uidOrName ); + TDEABC::Addressee a = book->findByUid( uidOrName ); if ( a.isEmpty() ) { // UID not found, maybe it is a name instead. // If we have an email, let's use that for the lookup. // [This is used by e.g. the Kolab resource] if ( !email.isEmpty() ) { - KABC::Addressee::List lst = book->findByEmail( email ); - KABC::Addressee::List::ConstIterator listit = lst.begin(); + TDEABC::Addressee::List lst = book->findByEmail( email ); + TDEABC::Addressee::List::ConstIterator listit = lst.begin(); for ( ; listit != lst.end(); ++listit ) if ( (*listit).formattedName() == uidOrName ) { a = *listit; @@ -153,7 +153,7 @@ static KABC::Addressee findByUidOrName( KABC::AddressBook* book, const TQString& // If we don't have an email, or if we didn't find any match for it, look up by full name if ( a.isEmpty() ) { // (But this has to be done here, since when loading we might not have the entries yet) - KABC::Addressee::List lst = findByFormattedName( book, uidOrName ); + TDEABC::Addressee::List lst = findByFormattedName( book, uidOrName ); if ( !lst.isEmpty() ) a = lst.first(); } @@ -161,7 +161,7 @@ static KABC::Addressee findByUidOrName( KABC::AddressBook* book, const TQString& return a; } -KPIM::DistributionList::Entry::List KPIM::DistributionList::entries( KABC::AddressBook* book ) const +KPIM::DistributionList::Entry::List KPIM::DistributionList::entries( TDEABC::AddressBook* book ) const { Entry::List res; const TQString str = custom( "KADDRESSBOOK", s_customFieldName ); @@ -170,7 +170,7 @@ KPIM::DistributionList::Entry::List KPIM::DistributionList::entries( KABC::Addre const TQString uid = (*it).first; const TQString email = (*it).second; // look up contact - KABC::Addressee a = findByUidOrName( book, uid, email ); + TDEABC::Addressee a = findByUidOrName( book, uid, email ); if ( a.isEmpty() ) { // ## The old DistributionListManager had a "missing entries" list... kdWarning() << "Addressee not found: " << uid << endl; @@ -181,7 +181,7 @@ KPIM::DistributionList::Entry::List KPIM::DistributionList::entries( KABC::Addre return res; } -TQStringList KPIM::DistributionList::emails( KABC::AddressBook* book ) const +TQStringList KPIM::DistributionList::emails( TDEABC::AddressBook* book ) const { TQStringList emails; @@ -192,7 +192,7 @@ TQStringList KPIM::DistributionList::emails( KABC::AddressBook* book ) const const TQString thisEmail = (*it).second; // look up contact - KABC::Addressee a = findByUidOrName( book, thisUid, thisEmail ); + TDEABC::Addressee a = findByUidOrName( book, thisUid, thisEmail ); if ( a.isEmpty() ) { // ## The old DistributionListManager had a "missing entries" list... continue; @@ -209,10 +209,10 @@ TQStringList KPIM::DistributionList::emails( KABC::AddressBook* book ) const } TQValueList<KPIM::DistributionList> - KPIM::DistributionList::allDistributionLists( KABC::AddressBook* book ) + KPIM::DistributionList::allDistributionLists( TDEABC::AddressBook* book ) { TQValueList<KPIM::DistributionList> lst; - KABC::AddressBook::Iterator abIt; + TDEABC::AddressBook::Iterator abIt; for ( abIt = book->begin(); abIt != book->end(); ++abIt ) { if ( isDistributionList( *abIt ) ) { diff --git a/libtdepim/distributionlist.h b/libtdepim/distributionlist.h index 433e95b5c..6a96a7c53 100644 --- a/libtdepim/distributionlist.h +++ b/libtdepim/distributionlist.h @@ -23,7 +23,7 @@ #include <tdeabc/addressee.h> -namespace KABC { +namespace TDEABC { class AddressBook; } @@ -40,7 +40,7 @@ namespace KPIM { * * @author David Faure <faure@kde.org> */ -class DistributionList : public KABC::Addressee +class DistributionList : public TDEABC::Addressee { public: /** @@ -72,7 +72,7 @@ class DistributionList : public KABC::Addressee * Create a distribution list from an addressee object * (this is a kind of down-cast) */ - DistributionList( const KABC::Addressee& addr ); + DistributionList( const TDEABC::Addressee& addr ); /** * Destructor. @@ -108,26 +108,26 @@ class DistributionList : public KABC::Addressee These addresses can be directly used by e.g. a mail client. @param book necessary to look up entries */ - TQStringList emails( KABC::AddressBook* book ) const; + TQStringList emails( TDEABC::AddressBook* book ) const; /** Return list of entries belonging to this distribution list. This function is mainly useful for a distribution list editor. @param book necessary to look up entries */ - Entry::List entries( KABC::AddressBook* book ) const; + Entry::List entries( TDEABC::AddressBook* book ) const; // KDE4: should be a method of Addressee - static bool isDistributionList( const KABC::Addressee& addr ); + static bool isDistributionList( const TDEABC::Addressee& addr ); // KDE4: should be a method of AddressBook - static DistributionList findByName( KABC::AddressBook* book, + static DistributionList findByName( TDEABC::AddressBook* book, const TQString& name, bool caseSensitive = true ); // KDE4: should be a method of AddressBook // A bit slow (but no more than findByName). // From KAddressbook, use Core::distributionLists() instead. - static TQValueList<DistributionList> allDistributionLists( KABC::AddressBook* book ); + static TQValueList<DistributionList> allDistributionLists( TDEABC::AddressBook* book ); private: diff --git a/libtdepim/kaddrbook.cpp b/libtdepim/kaddrbook.cpp index 291669216..2befdded5 100644 --- a/libtdepim/kaddrbook.cpp +++ b/libtdepim/kaddrbook.cpp @@ -36,9 +36,9 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { TQString email; TQString name; - KABC::Addressee::parseEmailAddress( addr, name, email ); + TDEABC::Addressee::parseEmailAddress( addr, name, email ); - KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self( true ); // force a reload of the address book file so that changes that were made // by other programs are loaded @@ -56,7 +56,7 @@ void KAddrBookExternal::openEmail( const TQString &addr, TQWidget *parent ) { } #endif - KABC::Addressee::List addressees = ab->findByEmail( email ); + TDEABC::Addressee::List addressees = ab->findByEmail( email ); if ( addressees.count() > 0 ) { if ( kapp->dcopClient()->isApplicationRegistered( "kaddressbook" ) ){ @@ -87,11 +87,11 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { TQString email; TQString name; - KABC::Addressee::parseEmailAddress( addr, name, email ); + TDEABC::Addressee::parseEmailAddress( addr, name, email ); - KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self( true ); - ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) ); + ab->setErrorHandler( new TDEABC::GuiErrorHandler( parent ) ); // force a reload of the address book file so that changes that were made // by other programs are loaded @@ -109,10 +109,10 @@ void KAddrBookExternal::addEmail( const TQString& addr, TQWidget *parent) { } #endif - KABC::Addressee::List addressees = ab->findByEmail( email ); + TDEABC::Addressee::List addressees = ab->findByEmail( email ); if ( addressees.isEmpty() ) { - KABC::Addressee a; + TDEABC::Addressee a; a.setNameFromString( name ); a.insertEmail( email, true ); @@ -173,14 +173,14 @@ void KAddrBookExternal::addNewAddressee( TQWidget* ) call.send("newContact()"); } -bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *parent ) +bool KAddrBookExternal::addVCard( const TDEABC::Addressee& addressee, TQWidget *parent ) { - KABC::AddressBook *ab = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self( true ); bool inserted = false; - ab->setErrorHandler( new KABC::GuiErrorHandler( parent ) ); + ab->setErrorHandler( new TDEABC::GuiErrorHandler( parent ) ); - KABC::Addressee::List addressees = + TDEABC::Addressee::List addressees = ab->findByEmail( addressee.preferredEmail() ); if ( addressees.isEmpty() ) { @@ -204,16 +204,16 @@ bool KAddrBookExternal::addVCard( const KABC::Addressee& addressee, TQWidget *pa return inserted; } -bool KAddrBookExternal::addAddressee( const KABC::Addressee& addr ) +bool KAddrBookExternal::addAddressee( const TDEABC::Addressee& addr ) { - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); - KABC::Resource *kabcResource = selectResourceForSaving( addressBook ); + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); + TDEABC::Resource *kabcResource = selectResourceForSaving( addressBook ); if( !kabcResource ) return false; - KABC::Ticket *ticket = addressBook->requestSaveTicket( kabcResource ); + TDEABC::Ticket *ticket = addressBook->requestSaveTicket( kabcResource ); bool saved = false; if ( ticket ) { - KABC::Addressee addressee( addr ); + TDEABC::Addressee addressee( addr ); addressee.setResource( kabcResource ); addressBook->insertAddressee( addressee ); saved = addressBook->save( ticket ); @@ -232,14 +232,14 @@ TQString KAddrBookExternal::expandDistributionList( const TQString& listName ) return TQString(); const TQString lowerListName = listName.lower(); - KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true ); + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self( true ); #ifdef TDEPIM_NEW_DISTRLISTS KPIM::DistributionList distrList = KPIM::DistributionList::findByName( addressBook, lowerListName, false ); if ( !distrList.isEmpty() ) { return distrList.emails( addressBook ).join( ", " ); } #else - KABC::DistributionListManager manager( addressBook ); + TDEABC::DistributionListManager manager( addressBook ); manager.load(); const TQStringList listNames = manager.listNames(); @@ -254,7 +254,7 @@ TQString KAddrBookExternal::expandDistributionList( const TQString& listName ) return TQString(); } -KABC::Resource* KAddrBookExternal::selectResourceForSaving( KABC::AddressBook *addressBook ) +TDEABC::Resource* KAddrBookExternal::selectResourceForSaving( TDEABC::AddressBook *addressBook ) { #if KDE_IS_VERSION(3,4,89) // This ugly hack will be removed in 4.0 @@ -267,11 +267,11 @@ KABC::Resource* KAddrBookExternal::selectResourceForSaving( KABC::AddressBook *a #endif // Select a resource - TQPtrList<KABC::Resource> kabcResources = addressBook->resources(); + TQPtrList<TDEABC::Resource> kabcResources = addressBook->resources(); TQPtrList<KRES::Resource> kresResources; - TQPtrListIterator<KABC::Resource> resIt( kabcResources ); - KABC::Resource *kabcResource; + TQPtrListIterator<TDEABC::Resource> resIt( kabcResources ); + TDEABC::Resource *kabcResource; while ( ( kabcResource = resIt.current() ) != 0 ) { ++resIt; if ( !kabcResource->readOnly() ) { @@ -281,5 +281,5 @@ KABC::Resource* KAddrBookExternal::selectResourceForSaving( KABC::AddressBook *a } } - return static_cast<KABC::Resource*>( KRES::SelectDialog::getResource( kresResources, 0 ) ); + return static_cast<TDEABC::Resource*>( KRES::SelectDialog::getResource( kresResources, 0 ) ); } diff --git a/libtdepim/kaddrbook.h b/libtdepim/kaddrbook.h index 10b896098..a9e2c8c57 100644 --- a/libtdepim/kaddrbook.h +++ b/libtdepim/kaddrbook.h @@ -11,7 +11,7 @@ #include <tdeabc/addressee.h> #include <tdepimmacros.h> -namespace KABC { +namespace TDEABC { class AddressBook; } @@ -24,7 +24,7 @@ public: static void openEmail( const TQString &addr, TQWidget *parent ); static void openAddressBook( TQWidget *parent ); - static bool addVCard( const KABC::Addressee& addressee, TQWidget *parent ); + static bool addVCard( const TDEABC::Addressee& addressee, TQWidget *parent ); static TQString expandDistributionList( const TQString& listName ); @@ -36,10 +36,10 @@ public: * async and loading is not yet finished, this method will run an eventloop until the * addressbook is loaded. */ - static KABC::Resource* selectResourceForSaving( KABC::AddressBook *addressBook ); + static TDEABC::Resource* selectResourceForSaving( TDEABC::AddressBook *addressBook ); private: - static bool addAddressee( const KABC::Addressee& addressee ); + static bool addAddressee( const TDEABC::Addressee& addressee ); }; #endif /*KAddrBook_h*/ diff --git a/libtdepim/kvcarddrag.cpp b/libtdepim/kvcarddrag.cpp index 285224497..0cc168b42 100644 --- a/libtdepim/kvcarddrag.cpp +++ b/libtdepim/kvcarddrag.cpp @@ -82,15 +82,15 @@ bool KVCardDrag::decode( TQMimeSource *e, TQString &content ) } #endif -bool KVCardDrag::decode( TQMimeSource *e, KABC::Addressee::List& addressees ) +bool KVCardDrag::decode( TQMimeSource *e, TDEABC::Addressee::List& addressees ) { if ( !canDecode( e ) ) { return false; } #if defined(KABC_VCARD_ENCODING_FIX) - addressees = KABC::VCardConverter().parseVCardsRaw( e->encodedData( vcard_mime_string ).data() ); + addressees = TDEABC::VCardConverter().parseVCardsRaw( e->encodedData( vcard_mime_string ).data() ); #else - addressees = KABC::VCardConverter().parseVCards( e->encodedData( vcard_mime_string ) ); + addressees = TDEABC::VCardConverter().parseVCards( e->encodedData( vcard_mime_string ) ); #endif return true; } diff --git a/libtdepim/kvcarddrag.h b/libtdepim/kvcarddrag.h index 83c7f3e50..40263ac55 100644 --- a/libtdepim/kvcarddrag.h +++ b/libtdepim/kvcarddrag.h @@ -83,7 +83,7 @@ class KDE_EXPORT KVCardDrag : public TQStoredDrag /** * Decodes the MIME source @p e and puts the resulting vcard into @p addresseess. */ - static bool decode( TQMimeSource *e, KABC::Addressee::List& addressees ); + static bool decode( TQMimeSource *e, TDEABC::Addressee::List& addressees ); protected: virtual void virtual_hook( int id, void* data ); diff --git a/libtdepim/ldapclient.cpp b/libtdepim/ldapclient.cpp index 290238403..8e4783882 100644 --- a/libtdepim/ldapclient.cpp +++ b/libtdepim/ldapclient.cpp @@ -53,7 +53,7 @@ TQString LdapObject::toString() const for ( LdapAttrMap::ConstIterator it = attrs.begin(); it != attrs.end(); ++it ) { TQString attr = it.key(); for ( LdapAttrValue::ConstIterator it2 = (*it).begin(); it2 != (*it).end(); ++it2 ) { - result += TQString::fromUtf8( KABC::LDIF::assembleLine( attr, *it2, 76 ) ) + "\n"; + result += TQString::fromUtf8( TDEABC::LDIF::assembleLine( attr, *it2, 76 ) ) + "\n"; } } @@ -105,7 +105,7 @@ void LdapClient::setAttrs( const TQStringList& attrs ) void LdapClient::startQuery( const TQString& filter ) { cancelQuery(); - KABC::LDAPUrl url; + TDEABC::LDAPUrl url; url.setProtocol( ( mServer.security() == LdapServer::SSL ) ? "ldaps" : "ldap" ); if ( mServer.auth() != LdapServer::Anonymous ) { @@ -129,7 +129,7 @@ void LdapClient::startQuery( const TQString& filter ) TQString::number( mServer.sizeLimit() ) ); url.setAttributes( mAttrs ); - url.setScope( mScope == "one" ? KABC::LDAPUrl::One : KABC::LDAPUrl::Sub ); + url.setScope( mScope == "one" ? TDEABC::LDAPUrl::One : TDEABC::LDAPUrl::Sub ); url.setFilter( "("+filter+")" ); kdDebug(5300) << "LdapClient: Doing query: " << url.prettyURL() << endl; @@ -232,12 +232,12 @@ void LdapClient::parseLDIF( const TQByteArray& data ) mLdif.endLDIF(); } - KABC::LDIF::ParseVal ret; + TDEABC::LDIF::ParseVal ret; TQString name; do { ret = mLdif.nextItem(); switch ( ret ) { - case KABC::LDIF::Item: + case TDEABC::LDIF::Item: { name = mLdif.attr(); // Must make a copy! TQByteArray is explicitely shared @@ -250,13 +250,13 @@ void LdapClient::parseLDIF( const TQByteArray& data ) //kdDebug(5300) << "LdapClient::parseLDIF(): name=" << name << " value=" << TQCString(value.data(), value.size()+1) << endl; } break; - case KABC::LDIF::EndEntry: + case TDEABC::LDIF::EndEntry: finishCurrentObject(); break; default: break; } - } while ( ret != KABC::LDIF::MoreData ); + } while ( ret != TDEABC::LDIF::MoreData ); } int LdapClient::clientNumber() const diff --git a/libtdepim/ldapclient.h b/libtdepim/ldapclient.h index 51701272b..3b8d737a8 100644 --- a/libtdepim/ldapclient.h +++ b/libtdepim/ldapclient.h @@ -216,7 +216,7 @@ class KDE_EXPORT LdapClient : public TQObject LdapObject mCurrentObject; private: - KABC::LDIF mLdif; + TDEABC::LDIF mLdif; int mClientNumber; int mCompletionWeight; diff --git a/libtdepim/ldapsearchdialog.cpp b/libtdepim/ldapsearchdialog.cpp index b6e49c8a2..87b84bae9 100644 --- a/libtdepim/ldapsearchdialog.cpp +++ b/libtdepim/ldapsearchdialog.cpp @@ -227,7 +227,7 @@ void LDAPSearchDialog::restoreSettings() // then read the config file and register all selected // server in the list - TDEConfig* config = KABC::AddressLineEdit::config(); // singleton kabldaprc config object + TDEConfig* config = TDEABC::AddressLineEdit::config(); // singleton kabldaprc config object TDEConfigGroupSaver saver( config, "LDAP" ); mNumHosts = config->readUnsignedNumEntry( "NumSelectedHosts" ); if ( !mNumHosts ) { diff --git a/libtdepim/recentaddresses.cpp b/libtdepim/recentaddresses.cpp index 6698b263d..a3ed83d7d 100644 --- a/libtdepim/recentaddresses.cpp +++ b/libtdepim/recentaddresses.cpp @@ -79,9 +79,9 @@ void RecentAddresses::load( TDEConfig *config ) m_maxCount = config->readNumEntry( "Maximum Recent Addresses", 40 ); addresses = config->readListEntry( "Recent Addresses" ); for ( TQStringList::Iterator it = addresses.begin(); it != addresses.end(); ++it ) { - KABC::Addressee::parseEmailAddress( *it, name, email ); + TDEABC::Addressee::parseEmailAddress( *it, name, email ); if ( !email.isEmpty() ) { - KABC::Addressee addr; + TDEABC::Addressee addr; addr.setNameFromString( name ); addr.insertEmail( email, true ); m_addresseeList.append( addr ); @@ -107,11 +107,11 @@ void RecentAddresses::add( const TQString& entry ) continue; TQString email; TQString fullName; - KABC::Addressee addr; + TDEABC::Addressee addr; - KABC::Addressee::parseEmailAddress( *e_it, fullName, email ); + TDEABC::Addressee::parseEmailAddress( *e_it, fullName, email ); - for ( KABC::Addressee::List::Iterator it = m_addresseeList.begin(); + for ( TDEABC::Addressee::List::Iterator it = m_addresseeList.begin(); it != m_addresseeList.end(); ++it ) { if ( email == (*it).preferredEmail() ) { @@ -149,7 +149,7 @@ void RecentAddresses::clear() TQStringList RecentAddresses::addresses() const { TQStringList addresses; - for ( KABC::Addressee::List::ConstIterator it = m_addresseeList.begin(); + for ( TDEABC::Addressee::List::ConstIterator it = m_addresseeList.begin(); it != m_addresseeList.end(); ++it ) { addresses.append( (*it).fullEmail() ); diff --git a/libtdepim/recentaddresses.h b/libtdepim/recentaddresses.h index 547986370..9a6281e23 100644 --- a/libtdepim/recentaddresses.h +++ b/libtdepim/recentaddresses.h @@ -78,7 +78,7 @@ public: * like "Foo <foo@bar.org>, Bar Baz <bar@baz.org>". */ TQStringList addresses() const; - const KABC::Addressee::List& kabcAddresses() const { return m_addresseeList; } + const TDEABC::Addressee::List& kabcAddresses() const { return m_addresseeList; } /** * Adds an entry to the list. @@ -118,7 +118,7 @@ public: private: RecentAddresses(TDEConfig *config = 0L); - KABC::Addressee::List m_addresseeList; + TDEABC::Addressee::List m_addresseeList; void adjustSize(); diff --git a/libtdepim/resourceabc.cpp b/libtdepim/resourceabc.cpp index 16eeadc5b..81d677927 100644 --- a/libtdepim/resourceabc.cpp +++ b/libtdepim/resourceabc.cpp @@ -27,7 +27,7 @@ using namespace KPIM; ResourceABC::ResourceABC( const TDEConfig* config ) - : KABC::Resource( config ) + : TDEABC::Resource( config ) { } diff --git a/libtdepim/resourceabc.h b/libtdepim/resourceabc.h index ccd350f5f..54a2843cb 100644 --- a/libtdepim/resourceabc.h +++ b/libtdepim/resourceabc.h @@ -41,7 +41,7 @@ namespace KPIM { * handle subresources. */ -class KDE_EXPORT ResourceABC : public KABC::Resource +class KDE_EXPORT ResourceABC : public TDEABC::Resource { Q_OBJECT diff --git a/libtdepim/tdeabcresourcecached.cpp b/libtdepim/tdeabcresourcecached.cpp index 4cb4901a8..3bb96112d 100644 --- a/libtdepim/tdeabcresourcecached.cpp +++ b/libtdepim/tdeabcresourcecached.cpp @@ -27,10 +27,10 @@ #include "tdeabcresourcecached.h" -using namespace KABC; +using namespace TDEABC; ResourceCached::ResourceCached( const TDEConfig *config ) - : KABC::Resource( config ), mIdMapper( "tdeabc/uidmaps/" ), + : TDEABC::Resource( config ), mIdMapper( "tdeabc/uidmaps/" ), mReloadPolicy( ReloadInterval ), mReloadInterval( 10 ), mKABCReloadTimer( 0, "mKABCReloadTimer" ), mReloaded( false ), mSavePolicy( SaveDelayed ), mSaveInterval( 10 ), @@ -102,7 +102,7 @@ void ResourceCached::writeConfig( TDEConfig *config ) config->writeEntry( "LastLoad", mLastLoad ); config->writeEntry( "LastSave", mLastSave ); - KABC::Resource::writeConfig( config ); + TDEABC::Resource::writeConfig( config ); } void ResourceCached::readConfig( TDEConfig *config ) @@ -157,7 +157,7 @@ void ResourceCached::slotKABCSave() kdDebug(5800) << "ResourceCached::slotKABCSave()" << endl; - KABC::Ticket *ticket = requestSaveTicket(); + TDEABC::Ticket *ticket = requestSaveTicket(); if ( ticket ) { save( ticket ); } @@ -178,7 +178,7 @@ void ResourceCached::insertAddressee( const Addressee &addr ) mAddrMap.insert( addr.uid(), addr ); mAddedAddressees.insert( addr.uid(), addr ); } else { - KABC::Addressee oldAddressee = mAddrMap.find( addr.uid() ).data(); + TDEABC::Addressee oldAddressee = mAddrMap.find( addr.uid() ).data(); if ( oldAddressee != addr ) { mAddrMap.remove( addr.uid() ); mAddrMap.insert( addr.uid(), addr ); @@ -213,13 +213,13 @@ void ResourceCached::loadCache() return; - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; #if defined(KABC_VCARD_ENCODING_FIX) - KABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); + TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); #else - KABC::Addressee::List list = converter.parseVCards( TQString::fromUtf8( file.readAll() ) ); + TDEABC::Addressee::List list = converter.parseVCards( TQString::fromUtf8( file.readAll() ) ); #endif - KABC::Addressee::List::Iterator it; + TDEABC::Addressee::List::Iterator it; for ( it = list.begin(); it != list.end(); ++it ) { (*it).setResource( this ); @@ -240,9 +240,9 @@ void ResourceCached::saveCache() if ( !file.open( IO_WriteOnly ) ) return; - KABC::Addressee::List list = mAddrMap.values(); + TDEABC::Addressee::List list = mAddrMap.values(); - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; #if defined(KABC_VCARD_ENCODING_FIX) TQCString vCard = converter.createVCardsRaw( list ); file.writeBlock( vCard, vCard.length() ); @@ -259,7 +259,7 @@ void ResourceCached::clearCache() mAddrMap.clear(); } -void ResourceCached::cleanUpCache( const KABC::Addressee::List &addrList ) +void ResourceCached::cleanUpCache( const TDEABC::Addressee::List &addrList ) { // load cache TQFile file( cacheFile() ); @@ -267,14 +267,14 @@ void ResourceCached::cleanUpCache( const KABC::Addressee::List &addrList ) return; - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; #if defined(KABC_VCARD_ENCODING_FIX) - KABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); + TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); #else - KABC::Addressee::List list = converter.parseVCards( TQString::fromUtf8( file.readAll() ) ); + TDEABC::Addressee::List list = converter.parseVCards( TQString::fromUtf8( file.readAll() ) ); #endif - KABC::Addressee::List::Iterator cacheIt; - KABC::Addressee::List::ConstIterator it; + TDEABC::Addressee::List::Iterator cacheIt; + TDEABC::Addressee::List::ConstIterator it; for ( cacheIt = list.begin(); cacheIt != list.end(); ++cacheIt ) { bool found = false; @@ -311,7 +311,7 @@ void ResourceCached::clearChanges() mDeletedAddressees.clear(); } -void ResourceCached::clearChange( const KABC::Addressee &addr ) +void ResourceCached::clearChange( const TDEABC::Addressee &addr ) { mAddedAddressees.remove( addr.uid() ); mChangedAddressees.remove( addr.uid() ); @@ -325,17 +325,17 @@ void ResourceCached::clearChange( const TQString &uid ) mDeletedAddressees.remove( uid ); } -KABC::Addressee::List ResourceCached::addedAddressees() const +TDEABC::Addressee::List ResourceCached::addedAddressees() const { return mAddedAddressees.values(); } -KABC::Addressee::List ResourceCached::changedAddressees() const +TDEABC::Addressee::List ResourceCached::changedAddressees() const { return mChangedAddressees.values(); } -KABC::Addressee::List ResourceCached::deletedAddressees() const +TDEABC::Addressee::List ResourceCached::deletedAddressees() const { return mDeletedAddressees.values(); } @@ -350,11 +350,11 @@ TQString ResourceCached::changesCacheFile( const TQString &type ) const return locateLocal( "cache", "tdeabc/changescache/" + identifier() + "_" + type ); } -void ResourceCached::saveChangesCache( const TQMap<TQString, KABC::Addressee> &map, const TQString &type ) +void ResourceCached::saveChangesCache( const TQMap<TQString, TDEABC::Addressee> &map, const TQString &type ) { TQFile file( changesCacheFile( type ) ); - const KABC::Addressee::List list = map.values(); + const TDEABC::Addressee::List list = map.values(); if ( list.isEmpty() ) { file.remove(); } else { @@ -363,7 +363,7 @@ void ResourceCached::saveChangesCache( const TQMap<TQString, KABC::Addressee> &m return; } - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; #if defined(KABC_VCARD_ENCODING_FIX) const TQCString vCards = converter.createVCardsRaw( list ); file.writeBlock( vCards, vCards.length() ); @@ -382,20 +382,20 @@ void ResourceCached::saveChangesCache() saveChangesCache( mChangedAddressees, "changed" ); } -void ResourceCached::loadChangesCache( TQMap<TQString, KABC::Addressee> &map, const TQString &type ) +void ResourceCached::loadChangesCache( TQMap<TQString, TDEABC::Addressee> &map, const TQString &type ) { TQFile file( changesCacheFile( type ) ); if ( !file.open( IO_ReadOnly ) ) return; - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; #if defined(KABC_VCARD_ENCODING_FIX) - const KABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); + const TDEABC::Addressee::List list = converter.parseVCardsRaw( file.readAll().data() ); #else - const KABC::Addressee::List list = converter.parseVCards( TQString::fromUtf8( file.readAll() ) ); + const TDEABC::Addressee::List list = converter.parseVCards( TQString::fromUtf8( file.readAll() ) ); #endif - KABC::Addressee::List::ConstIterator it; + TDEABC::Addressee::List::ConstIterator it; for ( it = list.begin(); it != list.end(); ++it ) map.insert( (*it).uid(), *it ); diff --git a/libtdepim/tdeabcresourcecached.h b/libtdepim/tdeabcresourcecached.h index aab4a192a..b187b6fb0 100644 --- a/libtdepim/tdeabcresourcecached.h +++ b/libtdepim/tdeabcresourcecached.h @@ -29,7 +29,7 @@ #include "libemailfunctions/idmapper.h" -namespace KABC { +namespace TDEABC { class KDE_EXPORT ResourceCached : public Resource { @@ -133,7 +133,7 @@ class KDE_EXPORT ResourceCached : public Resource void loadCache(); void saveCache(); void clearCache(); - void cleanUpCache( const KABC::Addressee::List &list ); + void cleanUpCache( const TDEABC::Addressee::List &list ); /** Returns a reference to the id mapper. @@ -142,12 +142,12 @@ class KDE_EXPORT ResourceCached : public Resource bool hasChanges() const; void clearChanges(); - void clearChange( const KABC::Addressee& ); + void clearChange( const TDEABC::Addressee& ); void clearChange( const TQString& ); - KABC::Addressee::List addedAddressees() const; - KABC::Addressee::List changedAddressees() const; - KABC::Addressee::List deletedAddressees() const; + TDEABC::Addressee::List addedAddressees() const; + TDEABC::Addressee::List changedAddressees() const; + TDEABC::Addressee::List deletedAddressees() const; protected: virtual TQString cacheFile() const; @@ -156,17 +156,17 @@ class KDE_EXPORT ResourceCached : public Resource Functions for keeping the changes persistent. */ virtual TQString changesCacheFile( const TQString& ) const; - void loadChangesCache( TQMap<TQString, KABC::Addressee>&, const TQString& ); + void loadChangesCache( TQMap<TQString, TDEABC::Addressee>&, const TQString& ); void loadChangesCache(); - void saveChangesCache( const TQMap<TQString, KABC::Addressee>&, const TQString& ); + void saveChangesCache( const TQMap<TQString, TDEABC::Addressee>&, const TQString& ); void saveChangesCache(); void setIdMapperIdentifier(); private: - TQMap<TQString, KABC::Addressee> mAddedAddressees; - TQMap<TQString, KABC::Addressee> mChangedAddressees; - TQMap<TQString, KABC::Addressee> mDeletedAddressees; + TQMap<TQString, TDEABC::Addressee> mAddedAddressees; + TQMap<TQString, TDEABC::Addressee> mChangedAddressees; + TQMap<TQString, TDEABC::Addressee> mDeletedAddressees; KPIM::IdMapper mIdMapper; diff --git a/libtdepim/tdeabcresourcenull.h b/libtdepim/tdeabcresourcenull.h index dfc731f79..043a10cf1 100644 --- a/libtdepim/tdeabcresourcenull.h +++ b/libtdepim/tdeabcresourcenull.h @@ -23,7 +23,7 @@ #include <tdeabc/resource.h> -namespace KABC { +namespace TDEABC { /** This resource does nothing. diff --git a/libtdepim/tests/testdistrlist.cpp b/libtdepim/tests/testdistrlist.cpp index 0bbb536d7..f2d6b68b1 100644 --- a/libtdepim/tests/testdistrlist.cpp +++ b/libtdepim/tests/testdistrlist.cpp @@ -61,11 +61,11 @@ int main(int argc, char *argv[]) void TestDistrList::setup() { // We need a std addressbook - KABC::AddressBook *ab = KABC::StdAddressBook::self(); - KABC::StdAddressBook::setAutomaticSave( false ); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self(); + TDEABC::StdAddressBook::setAutomaticSave( false ); // and two contacts - KABC::Addressee addr1; + TDEABC::Addressee addr1; addr1.setName( "addr1" ); addr1.setFormattedName( "addr1" ); addr1.insertEmail( "addr1@kde.org", true ); @@ -73,7 +73,7 @@ void TestDistrList::setup() ab->insertAddressee( addr1 ); assert( addr1.emails().count() == 2 ); - KABC::Addressee addr2; + TDEABC::Addressee addr2; addr2.setName( "addr2" ); addr2.insertEmail( "addr2@kde.org", true ); addr2.insertEmail( "addr2-alternate@kde.org" ); @@ -146,9 +146,9 @@ static bool removeDirAndContentsRecursively( const TQString & path ) void TestDistrList::cleanup() { kdDebug() << k_funcinfo << endl; - KABC::AddressBook *ab = KABC::StdAddressBook::self(); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self(); ab->clear(); - KABC::StdAddressBook::close(); + TDEABC::StdAddressBook::close(); TQString tdehome = TQFile::decodeName( getenv("TDEHOME") ); KURL urltdehome; urltdehome.setPath( tdehome ); @@ -173,17 +173,17 @@ void TestDistrList::testNewList() check( "name set", dl.formattedName(), "foo" ); assert( DistributionList::isDistributionList( dl ) ); - KABC::AddressBook *ab = KABC::StdAddressBook::self(); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self(); ab->insertAddressee( dl ); -#if 0 // can't do that until we have KABC::AddressBook::findByFormattedName, or we use setName() - KABC::Addressee::List addrList = ab->findByName( "foo" ); +#if 0 // can't do that until we have TDEABC::AddressBook::findByFormattedName, or we use setName() + TDEABC::Addressee::List addrList = ab->findByName( "foo" ); assert( addrList.count() == 1 ); - KABC::Addressee addr = addrList.first(); + TDEABC::Addressee addr = addrList.first(); assert( !addr.isEmpty() ); check( "correct name", addr.name(), "foo" ); assert( DistributionList::isDistributionList( addr ) ); #else - KABC::Addressee addr = dl; + TDEABC::Addressee addr = dl; #endif DistributionList dl2 = DistributionList::findByName( ab, "foo" ); @@ -201,19 +201,19 @@ void TestDistrList::testNewList() void TestDistrList::testInsertEntry() { kdDebug() << k_funcinfo << endl; - KABC::AddressBook *ab = KABC::StdAddressBook::self(); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self(); DistributionList dl = DistributionList::findByName( ab, "foo" ); assert( !dl.isEmpty() ); #if 0 // the usual method - KABC::Addressee addr1 = ab->findByName( "addr1" ).first(); + TDEABC::Addressee addr1 = ab->findByName( "addr1" ).first(); assert( !addr1.isEmpty() ); dl.insertEntry( addr1 ); #else // the kolab-resource method dl.insertEntry( "addr1" ); #endif - KABC::Addressee addr2 = ab->findByName( "addr2" ).first(); + TDEABC::Addressee addr2 = ab->findByName( "addr2" ).first(); assert( !addr2.isEmpty() ); dl.insertEntry( addr2, "addr2-alternate@kde.org" ); @@ -248,17 +248,17 @@ void TestDistrList::testInsertEntry() void TestDistrList::testRemoveEntry() { kdDebug() << k_funcinfo << endl; - KABC::AddressBook *ab = KABC::StdAddressBook::self(); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self(); DistributionList dl = DistributionList::findByName( ab, "foo" ); assert( !dl.isEmpty() ); DistributionList::Entry::List entries = dl.entries( ab ); check( "entries count before removeEntry", TQString::number( entries.count() ), "3" ); // Removing an empty entry shouldn't do anything - dl.removeEntry( KABC::Addressee() ); + dl.removeEntry( TDEABC::Addressee() ); check( "entries count after removing empty entry", TQString::number( dl.entries(ab).count() ), "3" ); - KABC::Addressee addr1 = ab->findByName( "addr1" ).first(); + TDEABC::Addressee addr1 = ab->findByName( "addr1" ).first(); assert( !addr1.isEmpty() ); // Removing an entry with the wrong email passed, shouldn't do anything dl.removeEntry( addr1, "foo@foobar.com" ); @@ -272,7 +272,7 @@ void TestDistrList::testRemoveEntry() check( "first email", emails[0], "addr2 <addr2-alternate@kde.org>" ); // Now move on to addr2. First remove with no or a wrong email (nothing should happen) - KABC::Addressee addr2 = ab->findByName( "addr2" ).first(); + TDEABC::Addressee addr2 = ab->findByName( "addr2" ).first(); assert( !addr2.isEmpty() ); dl.removeEntry( addr2 ); check( "entries count after removing entry with no email", TQString::number( dl.entries(ab).count() ), "2" ); @@ -293,14 +293,14 @@ void TestDistrList::testDuplicate() { kdDebug() << k_funcinfo << endl; // This is a special test for the case where we have a contact and a distr list with the same name - KABC::AddressBook *ab = KABC::StdAddressBook::self(); - KABC::Addressee addr; + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self(); + TDEABC::Addressee addr; addr.setName( "foo" ); addr.insertEmail( "foo@kde.org", true ); ab->insertAddressee( addr ); #if 0 // we need a findByFormattedName - KABC::Addressee::List addrList = ab->findByName( "foo" ); + TDEABC::Addressee::List addrList = ab->findByName( "foo" ); assert( addrList.count() == 2 ); bool a = DistributionList::isDistributionList( addrList.first() ); @@ -321,7 +321,7 @@ void TestDistrList::testDeleteList() { kdDebug() << k_funcinfo << endl; - KABC::AddressBook *ab = KABC::StdAddressBook::self(); + TDEABC::AddressBook *ab = TDEABC::StdAddressBook::self(); DistributionList dl = DistributionList::findByName( ab, "foo" ); assert( !dl.isEmpty() ); ab->removeAddressee( dl ); diff --git a/plugins/kmail/bodypartformatter/Makefile.am b/plugins/kmail/bodypartformatter/Makefile.am index b768cb56c..5c546eff6 100644 --- a/plugins/kmail/bodypartformatter/Makefile.am +++ b/plugins/kmail/bodypartformatter/Makefile.am @@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = libkmail_bodypartformatter_text_vcard.la \ libkmail_bodypartformatter_text_vcard_la_SOURCES = text_vcard.cpp libkmail_bodypartformatter_text_vcard_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -libkmail_bodypartformatter_text_vcard_la_LIBADD = $(LIB_QT) $(LIB_KABC) \ +libkmail_bodypartformatter_text_vcard_la_LIBADD = $(LIB_QT) $(LIB_TDEABC) \ ../../../libtdepim/libtdepim.la \ ../../../libkmime/libkmime.la \ ../../../libemailfunctions/libemailfunctions.la @@ -30,7 +30,7 @@ libkmail_bodypartformatter_text_calendar_la_SOURCES = \ kcalendariface.stub libkmail_bodypartformatter_text_calendar_la_LDFLAGS = \ $(all_libraries) -module $(KDE_PLUGIN) -no-undefined -libkmail_bodypartformatter_text_calendar_la_LIBADD = $(LIB_QT) $(LIB_KABC) \ +libkmail_bodypartformatter_text_calendar_la_LIBADD = $(LIB_QT) $(LIB_TDEABC) \ $(top_builddir)/libkcal/libkcal.la $(top_builddir)/kmail/libkmailprivate.la kcalendariface_DIR = $(top_srcdir)/korganizer diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp index 61a254c4b..3f0f9014f 100644 --- a/plugins/kmail/bodypartformatter/text_vcard.cpp +++ b/plugins/kmail/bodypartformatter/text_vcard.cpp @@ -57,8 +57,8 @@ using KMail::Interface::BodyPart; #include <tdeabc/vcardconverter.h> #include <tdeabc/addressee.h> -using KABC::VCardConverter; -using KABC::Addressee; +using TDEABC::VCardConverter; +using TDEABC::Addressee; #include "addresseeview.h" using KPIM::AddresseeView; @@ -94,10 +94,10 @@ namespace { "</h2></div>" ); - TQValueListIterator<KABC::Addressee> it = al.begin(); + TQValueListIterator<TDEABC::Addressee> it = al.begin(); int count = 0; for ( ; it != al.end(); ++it ) { - KABC::Addressee a = (*it); + TDEABC::Addressee a = (*it); if ( a.isEmpty() ) return AsIcon; TQString contact = AddresseeView::vCardAsHTML( a, 0L, AddresseeView::NoLinks, false, AddresseeView::DefaultFields ); @@ -135,13 +135,13 @@ namespace { #endif int index = path.right( path.length() - path.findRev( ":" ) - 1 ).toInt(); if ( index == -1 ) return true; - KABC::Addressee a = al[index]; + TDEABC::Addressee a = al[index]; if ( a.isEmpty() ) return true; KAddrBookExternal::addVCard( a, 0 ); return true; } - static KABC::Addressee findAddressee( BodyPart *part, const TQString &path ) + static TDEABC::Addressee findAddressee( BodyPart *part, const TQString &path ) { const TQString vCard = part->asText(); if ( !vCard.isEmpty() ) { @@ -156,7 +156,7 @@ namespace { return al[index]; } } - return KABC::Addressee(); + return TDEABC::Addressee(); } bool handleContextMenuRequest( KMail::Interface::BodyPart *part, @@ -167,7 +167,7 @@ namespace { if ( vCard.isEmpty() ) { return true; } - KABC::Addressee a = findAddressee( part, path ); + TDEABC::Addressee a = findAddressee( part, path ); if ( a.isEmpty() ) { return true; } @@ -191,7 +191,7 @@ namespace { TQString statusBarMessage( BodyPart *part, const TQString &path ) const { - KABC::Addressee a = findAddressee( part, path ); + TDEABC::Addressee a = findAddressee( part, path ); if ( a.realName().isEmpty() ) { return i18n( "Add this contact to the address book." ); } else { @@ -199,7 +199,7 @@ namespace { } } - bool openVCard( const KABC::Addressee &a, const TQString &vCard ) const + bool openVCard( const TDEABC::Addressee &a, const TQString &vCard ) const { Q_UNUSED( vCard ); AddresseeView *view = new AddresseeView( 0 ); @@ -214,7 +214,7 @@ namespace { return true; } - bool saveAsVCard( const KABC::Addressee &a, const TQString &vCard ) const + bool saveAsVCard( const TDEABC::Addressee &a, const TQString &vCard ) const { TQString fileName = a.givenName() + '_' + a.familyName() + ".vcf"; diff --git a/tdefile-plugins/vcf/Makefile.am b/tdefile-plugins/vcf/Makefile.am index 61b306d5f..fd21fb80b 100644 --- a/tdefile-plugins/vcf/Makefile.am +++ b/tdefile-plugins/vcf/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = tdefile_vcf.la tdefile_vcf_la_SOURCES = tdefile_vcf.cpp tdefile_vcf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -tdefile_vcf_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KABC) +tdefile_vcf_la_LIBADD = $(LIB_KSYCOCA) $(LIB_TDEABC) # let automoc handle all of the meta source files (moc) METASOURCES = AUTO diff --git a/tdefile-plugins/vcf/tdefile_vcf.cpp b/tdefile-plugins/vcf/tdefile_vcf.cpp index 3b70960da..c75962792 100644 --- a/tdefile-plugins/vcf/tdefile_vcf.cpp +++ b/tdefile-plugins/vcf/tdefile_vcf.cpp @@ -67,11 +67,11 @@ bool KVcfPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ ) TQString contents = file.readAll(); file.close(); - KABC::VCardConverter converter; + TDEABC::VCardConverter converter; #if defined(KABC_VCARD_ENCODING_FIX) - KABC::Addressee addr = converter.parseVCardRaw( contents.utf8() ); + TDEABC::Addressee addr = converter.parseVCardRaw( contents.utf8() ); #else - KABC::Addressee addr = converter.parseVCard( contents ); + TDEABC::Addressee addr = converter.parseVCard( contents ); #endif KFileMetaInfoGroup group = appendGroup(info, "Technical"); @@ -87,7 +87,7 @@ bool KVcfPlugin::readInfo( KFileMetaInfo& info, uint /*what*/ ) if ( ! addr.preferredEmail().isEmpty() ) appendItem(group, "Email", addr.preferredEmail()); - KABC::PhoneNumber::List pnList = addr.phoneNumbers(); + TDEABC::PhoneNumber::List pnList = addr.phoneNumbers(); TQStringList phoneNumbers; for (unsigned int no=0; no<pnList.count(); ++no) { TQString pn = pnList[no].number().simplifyWhiteSpace(); diff --git a/tdeioslaves/opengroupware/opengroupware.cpp b/tdeioslaves/opengroupware/opengroupware.cpp index 6ff1d6b5a..304ff225f 100644 --- a/tdeioslaves/opengroupware/opengroupware.cpp +++ b/tdeioslaves/opengroupware/opengroupware.cpp @@ -47,7 +47,7 @@ #include <tdepimmacros.h> -namespace KABC { +namespace TDEABC { class ResourceMemory : public ResourceCached { 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; diff --git a/wizards/egroupwarewizard.cpp b/wizards/egroupwarewizard.cpp index a23762049..fc4f68a12 100644 --- a/wizards/egroupwarewizard.cpp +++ b/wizards/egroupwarewizard.cpp @@ -67,12 +67,12 @@ class CreateEGroupwareKabcResource : public TDEConfigPropagator::Change { kdDebug() << "Create eGroupware Addressbook Resource" << endl; - KRES::Manager<KABC::Resource> manager( "contact" ); + KRES::Manager<TDEABC::Resource> manager( "contact" ); manager.readConfig(); TQString url = createURL( EGroupwareConfig::self()->server(), EGroupwareConfig::self()->useSSLConnection(), EGroupwareConfig::self()->xmlrpc_location() ); - KABC::ResourceXMLRPC *resource = new KABC::ResourceXMLRPC( url, EGroupwareConfig::self()->domain(), + TDEABC::ResourceXMLRPC *resource = new TDEABC::ResourceXMLRPC( url, EGroupwareConfig::self()->domain(), EGroupwareConfig::self()->user(), EGroupwareConfig::self()->password() ); resource->setResourceName( i18n( "eGroupware" ) ); @@ -95,13 +95,13 @@ class ChangeEGroupwareKabcResource : public TDEConfigPropagator::Change { kdDebug() << "Change eGroupware Addressbook Resource" << endl; - KRES::Manager<KABC::Resource> manager( "contact" ); + KRES::Manager<TDEABC::Resource> manager( "contact" ); manager.readConfig(); - KRES::Manager<KABC::Resource>::Iterator it; + KRES::Manager<TDEABC::Resource>::Iterator it; for ( it = manager.begin(); it != manager.end(); ++it ) { if ( (*it)->identifier() == mIdentifier ) { - KABC::ResourceXMLRPC *resource = static_cast<KABC::ResourceXMLRPC*>( *it ); + TDEABC::ResourceXMLRPC *resource = static_cast<TDEABC::ResourceXMLRPC*>( *it ); resource->prefs()->setUrl( createURL( EGroupwareConfig::self()->server(), EGroupwareConfig::self()->useSSLConnection(), EGroupwareConfig::self()->xmlrpc_location() ) ); @@ -273,9 +273,9 @@ class EGroupwarePropagator : public TDEConfigPropagator changes.append( new ChangeEGroupwareKcalResource( (*kcalIt)->identifier() ) ); } - KRES::Manager<KABC::Resource> kabcManager( "contact" ); + KRES::Manager<TDEABC::Resource> kabcManager( "contact" ); kabcManager.readConfig(); - KRES::Manager<KABC::Resource>::Iterator kabcIt; + KRES::Manager<TDEABC::Resource>::Iterator kabcIt; for ( kabcIt = kabcManager.begin(); kabcIt != kabcManager.end(); ++kabcIt ) { if ( (*kabcIt)->type() == "xmlrpc" ) break; } diff --git a/wizards/exchangewizard.cpp b/wizards/exchangewizard.cpp index 79e982682..58ca94004 100644 --- a/wizards/exchangewizard.cpp +++ b/wizards/exchangewizard.cpp @@ -118,14 +118,14 @@ class CreateExchangeKabcResource : public TDEConfigPropagator::Change void apply() { #if 0 - KRES::Manager<KABC::Resource> m( "contact" ); + KRES::Manager<TDEABC::Resource> m( "contact" ); m.readConfig(); KURL url( exchangeUrl() ); TQString user( ExchangeConfig::self()->user() ); TQString password( ExchangeConfig::self()->password() ); - KABC::ResourceExchange *r = new KABC::ResourceExchange( url, user, password ); + TDEABC::ResourceExchange *r = new TDEABC::ResourceExchange( url, user, password ); r->setResourceName( i18n("Exchange Server") ); m.add( r ); m.writeConfig(); @@ -146,15 +146,15 @@ class UpdateExchangeKabcResource : public TDEConfigPropagator::Change void apply() { # if 0 - KRES::Manager<KABC::Resource> m( "contact" ); + KRES::Manager<TDEABC::Resource> m( "contact" ); m.readConfig(); KURL url( exchangeUrl() ); - KRES::Manager<KABC::Resource>::Iterator it; + KRES::Manager<TDEABC::Resource>::Iterator it; for ( it = m.begin(); it != m.end(); ++it ) { if ( (*it)->identifier() == ExchangeConfig::kabcResource() ) { - KABC::ResourceExchange *r = static_cast<KABC::ResourceExchange *>( *it ); + TDEABC::ResourceExchange *r = static_cast<TDEABC::ResourceExchange *>( *it ); r->prefs()->setUrl( url.url() ); r->prefs()->setUser( ExchangeConfig::self()->user() ); r->prefs()->setPassword( ExchangeConfig::self()->password() ); @@ -201,9 +201,9 @@ class ExchangePropagator : public TDEConfigPropagator } } } - KRES::Manager<KABC::Resource> m2( "contact" ); + KRES::Manager<TDEABC::Resource> m2( "contact" ); m2.readConfig(); - KRES::Manager<KABC::Resource>::Iterator it2; + KRES::Manager<TDEABC::Resource>::Iterator it2; for ( it2 = m2.begin(); it2 != m2.end(); ++it2 ) { if ( (*it2)->type() == "exchange" ) break; } @@ -211,7 +211,7 @@ class ExchangePropagator : public TDEConfigPropagator changes.append( new CreateExchangeKabcResource ); } else { if ( (*it2)->identifier() == ExchangeConfig::kabcResource() ) { - KABC::ExchangePrefs *prefs = static_cast<KABC::ResourceExchange *>( *it2 )->prefs(); + TDEABC::ExchangePrefs *prefs = static_cast<TDEABC::ResourceExchange *>( *it2 )->prefs(); if ( prefs->url() != exchangeUrl() || prefs->user() != ExchangeConfig::user() || prefs->password() != ExchangeConfig::password() ) { diff --git a/wizards/groupwisewizard.cpp b/wizards/groupwisewizard.cpp index 52df469b4..44a962925 100644 --- a/wizards/groupwisewizard.cpp +++ b/wizards/groupwisewizard.cpp @@ -119,14 +119,14 @@ class CreateGroupwiseKabcResource : public TDEConfigPropagator::Change void apply() { - KRES::Manager<KABC::Resource> m( "contact" ); + KRES::Manager<TDEABC::Resource> m( "contact" ); m.readConfig(); TQString url = serverUrl(); TQString user( GroupwiseConfig::self()->user() ); TQString password( GroupwiseConfig::self()->password() ); - KABC::ResourceGroupwise *r = new KABC::ResourceGroupwise( url, user, + TDEABC::ResourceGroupwise *r = new TDEABC::ResourceGroupwise( url, user, password, TQStringList(), TQString() ); @@ -148,13 +148,13 @@ class UpdateGroupwiseKabcResource : public TDEConfigPropagator::Change void apply() { - KRES::Manager<KABC::Resource> m( "contact" ); + KRES::Manager<TDEABC::Resource> m( "contact" ); m.readConfig(); - KRES::Manager<KABC::Resource>::Iterator it; + KRES::Manager<TDEABC::Resource>::Iterator it; for ( it = m.begin(); it != m.end(); ++it ) { if ( (*it)->identifier() == GroupwiseConfig::kabcResource() ) { - KABC::ResourceGroupwise *r = static_cast<KABC::ResourceGroupwise *>( *it ); + TDEABC::ResourceGroupwise *r = static_cast<TDEABC::ResourceGroupwise *>( *it ); r->prefs()->setUrl( serverUrl() ); r->prefs()->setUser( GroupwiseConfig::self()->user() ); r->prefs()->setPassword( GroupwiseConfig::self()->password() ); @@ -221,9 +221,9 @@ class GroupwisePropagator : public TDEConfigPropagator } } - KRES::Manager<KABC::Resource> m2( "contact" ); + KRES::Manager<TDEABC::Resource> m2( "contact" ); m2.readConfig(); - KRES::Manager<KABC::Resource>::Iterator it2; + KRES::Manager<TDEABC::Resource>::Iterator it2; for ( it2 = m2.begin(); it2 != m2.end(); ++it2 ) { if ( (*it2)->type() == "groupwise" ) break; } @@ -231,7 +231,7 @@ class GroupwisePropagator : public TDEConfigPropagator changes.append( new CreateGroupwiseKabcResource ); } else { if ( (*it2)->identifier() == GroupwiseConfig::kabcResource() ) { - KABC::GroupwisePrefs *prefs = static_cast<KABC::ResourceGroupwise *>( *it2 )->prefs(); + TDEABC::GroupwisePrefs *prefs = static_cast<TDEABC::ResourceGroupwise *>( *it2 )->prefs(); if ( prefs->url() != serverUrl() || prefs->user() != GroupwiseConfig::user() || prefs->password() != GroupwiseConfig::password() ) { diff --git a/wizards/kolabwizard.cpp b/wizards/kolabwizard.cpp index f781917fd..ca338d664 100644 --- a/wizards/kolabwizard.cpp +++ b/wizards/kolabwizard.cpp @@ -123,9 +123,9 @@ class CreateContactImapResource : public TDEConfigPropagator::Change void apply() { - KRES::Manager<KABC::Resource> m( "contact" ); + KRES::Manager<TDEABC::Resource> m( "contact" ); m.readConfig(); - KABC::ResourceKolab *r = new KABC::ResourceKolab( 0 ); + TDEABC::ResourceKolab *r = new TDEABC::ResourceKolab( 0 ); r->setResourceName( i18n("Kolab Server") ); m.add( r ); m.setStandardResource( r ); diff --git a/wizards/scalixwizard.cpp b/wizards/scalixwizard.cpp index 59c38766a..cb89e298c 100644 --- a/wizards/scalixwizard.cpp +++ b/wizards/scalixwizard.cpp @@ -179,9 +179,9 @@ class CreateContactImapResource : public TDEConfigPropagator::Change void apply() { - KRES::Manager<KABC::Resource> m( "contact" ); + KRES::Manager<TDEABC::Resource> m( "contact" ); m.readConfig(); - KABC::ResourceScalix *r = new KABC::ResourceScalix( 0 ); + TDEABC::ResourceScalix *r = new TDEABC::ResourceScalix( 0 ); r->setResourceName( i18n("Scalix Server") ); m.add( r ); m.setStandardResource( r ); diff --git a/wizards/sloxwizard.cpp b/wizards/sloxwizard.cpp index 8486a74fc..6107f75ce 100644 --- a/wizards/sloxwizard.cpp +++ b/wizards/sloxwizard.cpp @@ -118,14 +118,14 @@ class CreateSloxKabcResource : public TDEConfigPropagator::Change void apply() { - KRES::Manager<KABC::Resource> m( "contact" ); + KRES::Manager<TDEABC::Resource> m( "contact" ); m.readConfig(); KURL url( sloxUrl() ); TQString user( SloxConfig::self()->user() ); TQString password( SloxConfig::self()->password() ); - KABC::ResourceSlox *r = new KABC::ResourceSlox( url, user, password ); + TDEABC::ResourceSlox *r = new TDEABC::ResourceSlox( url, user, password ); r->setResourceName( i18n("Openexchange Server") ); m.add( r ); m.writeConfig(); @@ -144,15 +144,15 @@ class UpdateSloxKabcResource : public TDEConfigPropagator::Change void apply() { - KRES::Manager<KABC::Resource> m( "contact" ); + KRES::Manager<TDEABC::Resource> m( "contact" ); m.readConfig(); KURL url( sloxUrl() ); - KRES::Manager<KABC::Resource>::Iterator it; + KRES::Manager<TDEABC::Resource>::Iterator it; for ( it = m.begin(); it != m.end(); ++it ) { if ( (*it)->identifier() == SloxConfig::kabcResource() ) { - KABC::ResourceSlox *r = static_cast<KABC::ResourceSlox *>( *it ); + TDEABC::ResourceSlox *r = static_cast<TDEABC::ResourceSlox *>( *it ); r->prefs()->setUrl( url.url() ); r->prefs()->setUser( SloxConfig::self()->user() ); r->prefs()->setPassword( SloxConfig::self()->password() ); @@ -198,9 +198,9 @@ class SloxPropagator : public TDEConfigPropagator } } - KRES::Manager<KABC::Resource> m2( "contact" ); + KRES::Manager<TDEABC::Resource> m2( "contact" ); m2.readConfig(); - KRES::Manager<KABC::Resource>::Iterator it2; + KRES::Manager<TDEABC::Resource>::Iterator it2; for ( it2 = m2.begin(); it2 != m2.end(); ++it2 ) { if ( (*it2)->type() == "slox" ) break; } @@ -208,7 +208,7 @@ class SloxPropagator : public TDEConfigPropagator changes.append( new CreateSloxKabcResource ); } else { if ( (*it2)->identifier() == SloxConfig::kabcResource() ) { - KABC::SloxPrefs *prefs = static_cast<KABC::ResourceSlox *>( *it2 )->prefs(); + TDEABC::SloxPrefs *prefs = static_cast<TDEABC::ResourceSlox *>( *it2 )->prefs(); if ( prefs->url() != sloxUrl() || prefs->user() != SloxConfig::user() || prefs->password() != SloxConfig::password() ) { |