1 files changed, 23 insertions, 5 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index e241281..31ce1d6 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1,93 +1,95 @@
 /*** Warning! This file has been generated by the script makeaddressee ***/
 /*
     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.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kconfig.h>
 
 #include <ksharedptr.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kidmanager.h>
 //US
 #include <kstandarddirs.h>
 #include <libkcal/syncdefines.h>
 
 //US #include "resource.h"
 #include "addressee.h"
 
 using namespace KABC;
 
 static bool matchBinaryPattern( int value, int pattern );
+static bool matchBinaryPatternA( int value, int pattern );
+static bool matchBinaryPatternP( int value, int pattern );
 
 struct Addressee::AddresseeData : public KShared
 {
   QString uid;
   QString name;
   QString formattedName;
   QString familyName;
   QString givenName;
   QString additionalName;
   QString prefix;
   QString suffix;
   QString nickName;
   QDateTime birthday;
   QString mailer;
   TimeZone timeZone;
   Geo geo;
   QString title;
   QString role;
   QString organization;
   QString note;
   QString productId;
   QDateTime revision;
   QString sortString;
   QString externalUID;
   QString originalExternalUID;
   KURL url;
   Secrecy secrecy;
   Picture logo;
   Picture photo;
   Sound sound;
   Agent agent;
   QString mExternalId;
   PhoneNumber::List phoneNumbers;
   Address::List addresses;
   Key::List keys;
   QStringList emails;
   QStringList categories;
   QStringList custom;
   int mTempSyncStat;
   Resource *resource;
 
   bool empty    :1;
   bool changed  :1;
 };
 
 Addressee::Addressee()
 {
   mData = new AddresseeData;
@@ -336,110 +338,110 @@ int Addressee::tempSyncStat() const
 }
 
 QString Addressee::getID( const QString &  prof)
 {
     return KIdManager::getId ( mData->mExternalId, prof ); 
 }
 
 void Addressee::setCsum( const QString & prof , const QString & id )
 {
     detach();
     //qDebug("setcsum1 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() );
     mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id );
     //qDebug("setcsum2 %s ",mData->mExternalId.latin1() );
 }
 
 QString Addressee::getCsum( const QString &  prof)
 {
     return KIdManager::getCsum ( mData->mExternalId, prof ); 
 }
 
 void Addressee::setIDStr( const QString & s )
 { 
     detach();
     mData->mExternalId = s;
 }
 
 QString Addressee::IDStr() const
 {
     return mData->mExternalId;
 }
 
 void Addressee::setExternalUID( const QString &id )
 {
   if ( id == mData->externalUID ) return;
   detach();
   mData->empty = false;
   mData->externalUID = id;
 }
 
 QString Addressee::externalUID() const
 {
   return mData->externalUID;
 }
 void Addressee::setOriginalExternalUID( const QString &id )
 {
   if ( id == mData->originalExternalUID ) return;
   detach();
   mData->empty = false;
-  qDebug("*******Set orig uid %s ", id.latin1());
+  //qDebug("*******Set orig uid %s ", id.latin1());
   mData->originalExternalUID = id;
 }
 
 QString Addressee::originalExternalUID() const
 {
   return mData->originalExternalUID;
 }
 
 void Addressee::setUid( const QString &id )
 {
   if ( id == mData->uid ) return;
   detach();
-  qDebug("****setuid %s ", id.latin1());
+  //qDebug("****setuid %s ", id.latin1());
   mData->empty = false;
   mData->uid = id;
 }
 
 QString Addressee::uid() const
 {
   if ( mData->uid.isEmpty() )
     mData->uid = KApplication::randomString( 10 );
 
   return mData->uid;
 }
 
 QString Addressee::uidLabel()
 {
   return i18n("Unique Identifier");
 }
 
 void Addressee::setName( const QString &name )
 {
   if ( name == mData->name ) return;
   detach();
   mData->empty = false;
   mData->name = name;
 }
 
 QString Addressee::name() const
 {
   return mData->name;
 }
 
 QString Addressee::nameLabel()
 {
   return i18n("Name");
 }
 
 
 void Addressee::setFormattedName( const QString &formattedName )
 {
   if ( formattedName == mData->formattedName ) return;
   detach();
   mData->empty = false;
   mData->formattedName = formattedName;
 }
 
 QString Addressee::formattedName() const
 {
   return mData->formattedName;
 }
@@ -1245,97 +1247,97 @@ void Addressee::removeEmail( const QString &email )
 
 QString Addressee::preferredEmail() const
 {
   if ( mData->emails.count() == 0 ) return QString::null;
   else return mData->emails.first();
 }
 
 QStringList Addressee::emails() const
 {
   return mData->emails;
 }
 void Addressee::setEmails( const QStringList& emails ) {
     detach();
     mData->emails = emails;
 }
 void Addressee::insertPhoneNumber( const PhoneNumber &phoneNumber )
 {
   detach();
   mData->empty = false;
 
   PhoneNumber::List::Iterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == phoneNumber.id() ) {
       *it = phoneNumber;
       return;
     }
   }
   mData->phoneNumbers.append( phoneNumber );
 }
 
 void Addressee::removePhoneNumber( const PhoneNumber &phoneNumber )
 {
   detach();
 
   PhoneNumber::List::Iterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == phoneNumber.id() ) {
       mData->phoneNumbers.remove( it );
       return;
     }
   }
 }
 
 PhoneNumber Addressee::phoneNumber( int type ) const
 {
   PhoneNumber phoneNumber( "", type );
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
-    if ( matchBinaryPattern( (*it).type(), type ) ) {
+    if ( matchBinaryPatternP( (*it).type(), type ) ) {
       if ( (*it).type() & PhoneNumber::Pref )
         return (*it);
       else if ( phoneNumber.number().isEmpty() )
         phoneNumber = (*it);
     }
   }
 
   return phoneNumber;
 }
 
 PhoneNumber::List Addressee::phoneNumbers() const
 {
   return mData->phoneNumbers;
 }
 
 PhoneNumber::List Addressee::phoneNumbers( int type ) const
 {
   PhoneNumber::List list;
 
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( matchBinaryPattern( (*it).type(), type ) ) {
       list.append( *it );
     }
   }
   return list;
 }
 
 PhoneNumber Addressee::findPhoneNumber( const QString &id ) const
 {
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == id ) {
       return *it;
     }
   }
   return PhoneNumber();
 }
 
 void Addressee::insertKey( const Key &key )
 {
   detach();
   mData->empty = false;
 
   Key::List::Iterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).id() == key.id() ) {
       *it = key;
@@ -1482,97 +1484,97 @@ void Addressee::dump() const
 
   kdDebug(5700) << "  Keys {" << endl;
   Key::List k = keys();
   Key::List::ConstIterator it4;
   for( it4 = k.begin(); it4 != k.end(); ++it4 ) {
     kdDebug(5700) << "    Type: " << int((*it4).type()) <<
                      " Key: " << (*it4).textData() <<
                      " CustomString: " << (*it4).customTypeString() << endl;
   }
   kdDebug(5700) << "  }" << endl;
 
   kdDebug(5700) << "}" << endl;
 }
 
 
 void Addressee::insertAddress( const Address &address )
 {
   detach();
   mData->empty = false;
 
   Address::List::Iterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( (*it).id() == address.id() ) {
       *it = address;
       return;
     }
   }
   mData->addresses.append( address );
 }
 
 void Addressee::removeAddress( const Address &address )
 {
   detach();
 
   Address::List::Iterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( (*it).id() == address.id() ) {
       mData->addresses.remove( it );
       return;
     }
   }
 }
 
 Address Addressee::address( int type ) const
 {
   Address address( type );
   Address::List::ConstIterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
-    if ( matchBinaryPattern( (*it).type(), type ) ) {
+    if ( matchBinaryPatternA( (*it).type(), type ) ) {
       if ( (*it).type() & Address::Pref )
         return (*it);
       else if ( address.isEmpty() )
         address = (*it);
     }
   }
 
   return address;
 }
 
 Address::List Addressee::addresses() const
 {
   return mData->addresses;
 }
 
 Address::List Addressee::addresses( int type ) const
 {
   Address::List list;
 
   Address::List::ConstIterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( matchBinaryPattern( (*it).type(), type ) ) {
       list.append( *it );
     }
   }
 
   return list;
 }
 
 Address Addressee::findAddress( const QString &id ) const
 {
   Address::List::ConstIterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( (*it).id() == id ) {
       return *it;
     }
   }
   return Address();
 }
 
 void Addressee::insertCategory( const QString &c )
 {
   detach();
   mData->empty = false;
 
   if ( mData->categories.contains( c ) ) return;
 
   mData->categories.append( c );
@@ -1790,62 +1792,78 @@ QDataStream &KABC::operator<<( QDataStream &s, const Addressee &a )
   s << a.mData->categories;
   s << a.mData->custom;
   s << a.mData->keys;
   return s;
 }
 
 QDataStream &KABC::operator>>( QDataStream &s, Addressee &a )
 {
   if (!a.mData) return s;
 
   s >> a.mData->uid;
 
   s >> a.mData->name;
   s >> a.mData->formattedName;
   s >> a.mData->familyName;
   s >> a.mData->givenName;
   s >> a.mData->additionalName;
   s >> a.mData->prefix;
   s >> a.mData->suffix;
   s >> a.mData->nickName;
   s >> a.mData->birthday;
   s >> a.mData->mailer;
   s >> a.mData->timeZone;
   s >> a.mData->geo;
   s >> a.mData->title;
   s >> a.mData->role;
   s >> a.mData->organization;
   s >> a.mData->note;
   s >> a.mData->productId;
   s >> a.mData->revision;
   s >> a.mData->sortString;
   s >> a.mData->url;
   s >> a.mData->secrecy;
   s >> a.mData->logo;
   s >> a.mData->photo;
   s >> a.mData->sound;
   s >> a.mData->agent;
   s >> a.mData->phoneNumbers;
   s >> a.mData->addresses;
   s >> a.mData->emails;
   s >> a.mData->categories;
   s >> a.mData->custom;
   s >> a.mData->keys;
 
   a.mData->empty = false;
 
   return s;
 }
-
 bool matchBinaryPattern( int value, int pattern )
 {
   /**
     We want to match all telephonnumbers/addresses which have the bits in the
     pattern set. More are allowed.
     if pattern == 0 we have a special handling, then we want only those with
     exactly no bit set.
    */
   if ( pattern == 0 )
     return ( value == 0 );
   else
     return ( pattern == ( pattern & value ) );
 }
+
+bool matchBinaryPatternP( int value, int pattern )
+{
+  
+  if ( pattern == 0 )
+    return ( value == 0 );
+  else
+      return ( (pattern |PhoneNumber::Pref ) == ( value |PhoneNumber::Pref ) );
+}
+bool matchBinaryPatternA( int value, int pattern )
+{
+ 
+  if ( pattern == 0 )
+    return ( value == 0 );
+  else
+      return ( (pattern | Address::Pref) == ( value | Address::Pref ) );
+}