-rw-r--r-- | kabc/distributionlist.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kabc/distributionlist.cpp b/kabc/distributionlist.cpp index d34ba0b..cf5afa6 100644 --- a/kabc/distributionlist.cpp +++ b/kabc/distributionlist.cpp @@ -1,141 +1,143 @@ /* This file is part of libkabc. Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kdebug.h> #include "distributionlist.h" +//Added by qt3to4: +#include <Q3ValueList> using namespace KABC; DistributionList::DistributionList( DistributionListManager *manager, const QString &name ) : mManager( manager ), mName( name ) { mManager->insert( this ); } DistributionList::~DistributionList() { mManager->remove( this ); } void DistributionList::setName( const QString &name ) { mName = name; } QString DistributionList::name() const { return mName; } void DistributionList::insertEntry( const Addressee &a, const QString &email ) { QString em = email; if (em.isNull() ) em = a.preferredEmail(); Entry e( a, em ); - QValueList<Entry>::Iterator it; + Q3ValueList<Entry>::Iterator it; for( it = mEntries.begin(); it != mEntries.end(); ++it ) { if ( (*it).addressee.uid() == a.uid() ) { /** We have to check if both email addresses contains no data, a simple 'email1 == email2' wont work here */ if ( ( (*it).email.isNull() && em.isEmpty() ) || ( (*it).email.isEmpty() && em.isNull() ) || ( (*it).email == em ) ) { //*it = e; return; } } } mEntries.append( e ); } void DistributionList::removeEntry( const Addressee &a, const QString &email ) { - QValueList<Entry>::Iterator it; + Q3ValueList<Entry>::Iterator it; for( it = mEntries.begin(); it != mEntries.end(); ++it ) { if ( (*it).addressee.uid() == a.uid() && (*it).email == email ) { mEntries.remove( it ); return; } } } QStringList DistributionList::emails() const { QStringList emails; Entry::List::ConstIterator it; for( it = mEntries.begin(); it != mEntries.end(); ++it ) { Addressee a = (*it).addressee; QString email = (*it).email.isEmpty() ? a.fullEmail() : a.fullEmail( (*it).email ); if ( !email.isEmpty() ) { emails.append( email ); } } return emails; } DistributionList::Entry::List DistributionList::entries() const { return mEntries; } DistributionListManager::DistributionListManager( AddressBook *ab ) : mAddressBook( ab ) { } DistributionListManager::~DistributionListManager() { } DistributionList *DistributionListManager::list( const QString &name ) { DistributionList *list; for( list = mLists.first(); list; list = mLists.next() ) { if ( list->name() == name ) return list; } return 0; } void DistributionListManager::insert( DistributionList *l ) { DistributionList *list; for( list = mLists.first(); list; list = mLists.next() ) { if ( list->name() == l->name() ) { mLists.remove( list ); break; } } mLists.append( l ); } void DistributionListManager::remove( DistributionList *l ) |