summaryrefslogtreecommitdiffstats
path: root/kmail/folderdiaacltab.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/folderdiaacltab.cpp')
-rw-r--r--kmail/folderdiaacltab.cpp24
1 files changed, 12 insertions, 12 deletions
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;