diff options
Diffstat (limited to 'kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp')
| -rw-r--r-- | kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp index a75a8417..fcb4e7c4 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp +++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp @@ -360,7 +360,7 @@ void KWMailMergeKABCConfig::removeSelectedContacts() void KWMailMergeKABCConfig::saveDistributionList() { - KABC::DistributionListManager dlm( KABC::StdAddressBook::self() ); + TDEABC::DistributionListManager dlm( TDEABC::StdAddressBook::self() ); dlm.load(); bool ok = false; @@ -379,7 +379,7 @@ void KWMailMergeKABCConfig::saveDistributionList() .arg( listName ) ); return; } - KABC::DistributionList *distList = new KABC::DistributionList( &dlm, listName ); + TDEABC::DistributionList *distList = new TDEABC::DistributionList( &dlm, listName ); TQListViewItem* newListItem = new TQListViewItem( _ui->mSelectedView->findItem( i18n("Distribution Lists"),0 , TQt::ExactMatch), listName ); @@ -396,7 +396,7 @@ void KWMailMergeKABCConfig::saveDistributionList() { distList->insertEntry( item->addressee() ); - KABC::Addressee addr = item->addressee(); + TDEABC::Addressee addr = item->addressee(); TQString formattedName = addr.formattedName(); TQListViewItem* newItem = new TQListViewItem( newListItem, item->addressee().formattedName() ); @@ -434,8 +434,8 @@ void KWMailMergeKABCConfig::updateAvailable() TQStringList& categories = _usedCategories ; categories.clear(); - KABC::AddressBook *addressBook = KABC::StdAddressBook::self(); - for( KABC::AddressBook::Iterator itAddr = addressBook->begin(); + TDEABC::AddressBook *addressBook = TDEABC::StdAddressBook::self(); + for( TDEABC::AddressBook::Iterator itAddr = addressBook->begin(); itAddr != addressBook->end(); ++itAddr ) { @@ -475,7 +475,7 @@ void KWMailMergeKABCConfig::updateAvailable() // // Now append the distribution lists // - KABC::DistributionListManager dlm ( addressBook ); + TDEABC::DistributionListManager dlm ( addressBook ); dlm.load(); TQStringList distributionLists = dlm.listNames(); @@ -487,14 +487,14 @@ void KWMailMergeKABCConfig::updateAvailable() for( itDistributionLists = distributionLists.begin(); itDistributionLists != distributionLists.end(); ++itDistributionLists ) { - KABC::DistributionList* list = dlm.list( *itDistributionLists ); + TDEABC::DistributionList* list = dlm.list( *itDistributionLists ); - KABC::DistributionList::Entry::List entries = list->entries(); + TDEABC::DistributionList::Entry::List entries = list->entries(); TQListViewItem* listItem = new TQListViewItem( distributionListsItem, *itDistributionLists ); - KABC::DistributionList::Entry::List::Iterator itList; + TDEABC::DistributionList::Entry::List::Iterator itList; for ( itList = entries.begin(); itList != entries.end(); ++itList ) { // Create a normal TQListViewItem and disable it, because this is not a @@ -510,14 +510,14 @@ void KWMailMergeKABCConfig::updateAvailable() KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListView *parent, - const KABC::Addressee& addressEntry ) : TQListViewItem( parent ) + const TDEABC::Addressee& addressEntry ) : TQListViewItem( parent ) { setText( 0, addressEntry.formattedName() ); _addressEntry = addressEntry; } KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListViewItem *parent, - const KABC::Addressee& addressEntry ) : TQListViewItem( parent ) + const TDEABC::Addressee& addressEntry ) : TQListViewItem( parent ) { setText( 0, addressEntry.formattedName() ); _addressEntry = addressEntry; @@ -526,7 +526,7 @@ KWMailMergeKABCConfigListItem::KWMailMergeKABCConfigListItem( TQListViewItem *pa KWMailMergeKABCConfigListItem::~KWMailMergeKABCConfigListItem() {} -KABC::Addressee KWMailMergeKABCConfigListItem::addressee() const +TDEABC::Addressee KWMailMergeKABCConfigListItem::addressee() const { return _addressEntry; } |