const fixes

4 files changed, 13 insertions, 13 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 4de7da2..9e61261 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -867,195 +867,195 @@ void AddressBook::removeSyncAddressees( bool removeDeleted )
             ++it;
             removeAddressee( it2 );
         } else  {
             //qDebug("skipping %s ",(*it).uid().latin1() );
             if ( removeDeleted ) {
                 // we have no postprocessing in the resource, we have to do it here
                 // we have to compute csum for all, because it could be the first sync
                 (*it).setTempSyncStat( SYNC_TEMPSTATE_NEW_ID );
             }
             ++it;
         }
     }
     deleteRemovedAddressees();
 }
 
 void AddressBook::removeAddressee( const Iterator &it )
 {
   d->mRemovedAddressees.append( (*it) );
   d->mAddressees.remove( it.d->mIt );
 }
 
 AddressBook::Iterator AddressBook::find( const Addressee &a )
 {
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( a.uid() == (*it).uid() ) {
       return it;
     }
   }
   return end();
 }
 
 Addressee AddressBook::findByUid( const QString &uid )
 {
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( uid == (*it).uid() ) {
       return *it;
     }
   }
   return Addressee();
 }
 void AddressBook::preExternSync( AddressBook* aBook, const QString& csd , bool isSubset )
 {
     //qDebug("AddressBook::preExternSync ");
     AddressBook::Iterator it;  
     for ( it = begin(); it != end(); ++it ) {
         (*it).setID( csd, (*it).externalUID() );
         (*it).computeCsum( csd );
     }
     mergeAB( aBook ,csd, isSubset );  
 }
 void AddressBook::postExternSync( AddressBook* aBook , const QString& csd, bool setID)
 {
     //qDebug("AddressBook::postExternSync ");
     AddressBook::Iterator it;  
     int foundEmpty = 0;
     for ( it = begin(); it != end(); ++it ) {
         //qDebug("check uid %s ", (*it).uid().latin1() );
         if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ||
              (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ||
              (*it).tempSyncStat() == SYNC_TEMPSTATE_ADDED_EXTERNAL) {
             Addressee ad = aBook->findByUid( ( (*it).uid() ));
             if ( ad.isEmpty() ) {
                 ++foundEmpty;
                 //qDebug("postExternSync:addressee is empty: %s ", (*it).uid().latin1());
                 //qDebug("-- formatted name %s ",(*it).formattedName().latin1() );
             } else {
                 (*it).setIDStr(":");
                 if ( setID ) {
                     if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID )
                         ad.setID( csd, (*it).externalUID() );
                 } else
                     ad.setID( csd, (*it).uid() );
                 (*it).computeCsum( csd );
                 ad.setCsum( csd, (*it).getCsum( csd ) );
                 //qDebug("CSUM %s ",(*it).getCsum( csd ).latin1() );
                 aBook->insertAddressee( ad , false);
             }
         }
     }
     if ( foundEmpty ) {
         qDebug("postExternSync:%d empty addressees found:\n  probably filtered out by incoming sync filter.",foundEmpty  );
     }
         
 }
 
 bool   AddressBook::containsExternalUid( const QString& uid  )
 {
     Iterator it;
     for ( it = begin(); it != end(); ++it ) {
         if ( uid == (*it).externalUID( ) )
             return true;
     }
     return false;
 }
-Addressee   AddressBook::findByExternUid( const QString& uid , const QString& profile  )
+const Addressee   AddressBook::findByExternUid( const QString& uid , const QString& profile  ) const
 {
-    Iterator it;
+    ConstIterator it;
     for ( it = begin(); it != end(); ++it ) {
         if ( uid == (*it).getID( profile ) )
             return (*it);
     }
     return Addressee();
 }
 void  AddressBook::mergeAB( AddressBook *aBook, const QString& profile , bool isSubset )
 {
     Iterator it;
     Addressee ad;
     for ( it = begin(); it != end(); ++it ) {
         ad = aBook->findByExternUid( (*it).externalUID(), profile );
             if ( !ad.isEmpty() ) {
                 (*it).mergeContact( ad ,isSubset);
             }
     }
 #if 0 
     // test only
     for ( it = begin(); it != end(); ++it ) {
         
         qDebug("uid %s ", (*it).uid().latin1());
     }
 #endif
 }
 
 #if 0
 Addressee::List AddressBook::getExternLastSyncAddressees()
 {
     Addressee::List results;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( (*it).uid().left( 19 ) == "last-syncAddressee-"  ) {
         if ( (*it).familyName().left(4) == "!E: " )
             results.append( *it );
     }
   }
 
   return results;
 }
 #endif
 void AddressBook::resetTempSyncStat()
 {
     Iterator it;
   for ( it = begin(); it != end(); ++it ) {
       (*it).setTempSyncStat ( SYNC_TEMPSTATE_INITIAL );
   }
 
 }
  
 QStringList AddressBook:: uidList()
 {
     QStringList results;
     Iterator it;
     for ( it = begin(); it != end(); ++it ) {
         results.append( (*it).uid() );
     }
     return results;
 }
 
 
 Addressee::List AddressBook::allAddressees()
 {
    return d->mAddressees; 
  
 }
 
 Addressee::List AddressBook::findByName( const QString &name )
 {
   Addressee::List results;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( name == (*it).realName() ) {
       results.append( *it );
     }
   }
 
   return results;
 }
 
 Addressee::List AddressBook::findByEmail( const QString &email )
 {
   Addressee::List results;
   QStringList mailList;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     mailList = (*it).emails();
     for ( QStringList::Iterator ite = mailList.begin(); ite != mailList.end(); ++ite ) {
       if ( email == (*ite) ) {
         results.append( *it );
       }
     }
   }
 
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 2351add..18c03b5 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -211,140 +211,140 @@ class AddressBook : public QObject
     /**
       Returns a list of all addressees in the address book. This list can
       be sorted with @ref KABC::AddresseeList for example.
     */
     Addressee::List allAddressees();
 
     /**
       Find all entries with the specified name in the address book. Returns
       an empty list, if no entries could be found.
     */
     Addressee::List findByName( const QString & );
 
     /**
       Find all entries with the specified email address  in the address book.
       Returns an empty list, if no entries could be found.
     */
     Addressee::List findByEmail( const QString & );
 
     /**
       Find all entries wich have the specified category in the address book.
       Returns an empty list, if no entries could be found.
     */
     Addressee::List findByCategory( const QString & );
 
     /**
       Return a string identifying this addressbook.
     */
     virtual QString identifier();
 
     /**
       Used for debug output.
     */
     void dump() const;
 
     void emitAddressBookLocked() { emit addressBookLocked( this ); }
     void emitAddressBookUnlocked() { emit addressBookUnlocked( this ); }
     void emitAddressBookChanged() { emit addressBookChanged( this ); }
 
     /**
       Return list of all Fields known to the address book which are associated
       with the given field category.
     */
     Field::List fields( int category = Field::All );
 
     /**
       Add custom field to address book.
 
       @param label    User visible label of the field.
       @param category Ored list of field categories.
       @param key      Identifier used as key for reading and writing the field.
       @param app      String used as application key for reading and writing
                       the field.
     */
     bool addCustomField( const QString &label, int category = Field::All,
                          const QString &key = QString::null,
                          const QString &app = QString::null );
 
 
     /**
       Add address book resource.
     */
     bool addResource( Resource * );
 
     /**
       Remove address book resource.
     */
     void removeResources();
     bool removeResource( Resource * );
 
     /**
       Return pointer list of all resources.
     */
     QPtrList<Resource> resources();
 
     /**
       Set the @p ErrorHandler, that is used by @ref error() to
       provide gui-independend error messages.
     */
     void setErrorHandler( ErrorHandler * );
 
     /**
       Shows gui independend error messages.
     */
     void error( const QString& );
 
     /**
       Query all resources to clean up their lock files
      */
     void cleanUp();
 
     // sync stuff 
     //Addressee::List getExternLastSyncAddressees();
     void resetTempSyncStat(); 
     QStringList uidList(); 
     void removeSyncAddressees( bool removeDeleted = false );
     void  mergeAB( AddressBook *aBook, const QString& profile, bool isSubset );
-    Addressee findByExternUid( const QString& uid , const QString& profile  );
+    const Addressee findByExternUid( const QString& uid , const QString& profile  ) const;
     bool   containsExternalUid( const QString& uid  );
 
     void preExternSync( AddressBook* aBook, const QString& csd, bool isSubset );
     void postExternSync( AddressBook* aBook, const QString& csd , bool setID );
   signals:
     /**
       Emitted, when the address book has changed on disk.
     */
     void addressBookChanged( AddressBook * );
 
     /**
       Emitted, when the address book has been locked for writing.
     */
     void addressBookLocked( AddressBook * );
 
     /**
       Emitted, when the address book has been unlocked.
     */
     void addressBookUnlocked( AddressBook * );
 
   protected:
     void deleteRemovedAddressees();
     void setStandardResource( Resource * );
     Resource *standardResource();
     KRES::Manager<Resource> *resourceManager();
 
     void init(const QString &config, const QString &family);
 
   private:
 //US    QPtrList<Resource> mDummy; // Remove in KDE 4
 
 
     struct AddressBookData;
     AddressBookData *d;
     bool blockLSEchange;
 };
 
 QDataStream &operator<<( QDataStream &, const AddressBook & );
 QDataStream &operator>>( QDataStream &, AddressBook & );
 
 }
 
 #endif
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index d60cd6b..3b238f5 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -496,257 +496,257 @@ void Addressee::simplifyAddresses()
     }
 }
 
 // removes all emails but the first 
 // needed by phone sync
 void Addressee::simplifyEmails()
 { 
     if ( mData->emails.count() == 0 ) return ;
     QString email = mData->emails.first();
     detach();
     mData->emails.clear();
     mData->emails.append( email );
 }
 
 void Addressee::simplifyPhoneNumbers()
 {
     int max = 4;
     int inList = mData->phoneNumbers.count();
     KABC::PhoneNumber::List removeNumbers;
     KABC::PhoneNumber::List::Iterator phoneIter;
     if ( inList > max ) {
         // delete non-preferred numbers
         for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
               ++phoneIter ) {
             if ( inList > max ) {
                 if ( ! (( *phoneIter ).type() &  PhoneNumber::Pref )) {
                     removeNumbers.append( ( *phoneIter ) );
                     --inList;
                 }
             } else
                 break;
         }
         for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end();
               ++phoneIter ) {
             removePhoneNumber(( *phoneIter ));
         }
         // delete preferred numbers
         if ( inList > max ) {
             for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
                   ++phoneIter ) {
                 if ( inList > max ) {
                         removeNumbers.append( ( *phoneIter ) );
                         --inList;
                 } else
                     break;
             }
             for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end();
                   ++phoneIter ) {
                 removePhoneNumber(( *phoneIter ));
             }
         }
     }
     // remove non-numeric characters
     for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
           ++phoneIter ) {
         if ( ! ( *phoneIter ).simplifyNumber() )
             removeNumbers.append( ( *phoneIter ) );
     }
     for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end();
           ++phoneIter ) {
         removePhoneNumber(( *phoneIter ));
     }
 }
 void Addressee::simplifyPhoneNumberTypes()
 {
     KABC::PhoneNumber::List::Iterator phoneIter;
     for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
           ++phoneIter )
         ( *phoneIter ).simplifyType();
 }
 void Addressee::removeID(const QString &prof)
 {
     detach();
     if ( prof.isEmpty() )
         mData->mExternalId = ":";
     else
         mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof);
     
 }
 void Addressee::setID( const QString & prof , const QString & id )
 {
     detach();
     mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id );
     //qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() );
 }
 void Addressee::setTempSyncStat( int id )
 {
     if ( mData->mTempSyncStat == id ) return;
     detach();
     mData->mTempSyncStat = id;
 }
 int Addressee::tempSyncStat() const
 {
     return mData->mTempSyncStat;
 }
 
-QString Addressee::getID( const QString &  prof)
+const QString Addressee::getID( const QString &  prof) const
 {
     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)
+const QString Addressee::getCsum( const QString &  prof) const 
 {
     return KIdManager::getCsum ( mData->mExternalId, prof ); 
 }
 
 void Addressee::setIDStr( const QString & s )
 { 
     detach();
     mData->mExternalId = s;
 }
 
-QString Addressee::IDStr() const
+const 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
+const 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());
   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());
   mData->empty = false;
   mData->uid = id;
 }
 
-QString Addressee::uid() const
+const 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;
 }
 
 QString Addressee::formattedNameLabel()
 {
   return i18n("Formatted Name");
 }
 
 
 void Addressee::setFamilyName( const QString &familyName )
 {
   if ( familyName == mData->familyName ) return;
   detach();
   mData->empty = false;
   mData->familyName = familyName;
 }
 
 QString Addressee::familyName() const
 {
   return mData->familyName;
 }
 
 QString Addressee::familyNameLabel()
 {
   return i18n("Family Name");
 }
 
 
 void Addressee::setGivenName( const QString &givenName )
 {
   if ( givenName == mData->givenName ) return;
   detach();
   mData->empty = false;
   mData->givenName = givenName;
 }
 
 QString Addressee::givenName() const
 {
   return mData->givenName;
 }
 
 QString Addressee::givenNameLabel()
 {
   return i18n("Given Name");
 }
 
 
 void Addressee::setAdditionalName( const QString &additionalName )
 {
   if ( additionalName == mData->additionalName ) return;
   detach();
   mData->empty = false;
   mData->additionalName = additionalName;
 }
 
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 08d2f56..8051fec 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -7,224 +7,224 @@
     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$
 */
 
 #ifndef KABC_ADDRESSEE_H
 #define KABC_ADDRESSEE_H
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 
 #include <ksharedptr.h>
 #include <kurl.h>
 
 #include "address.h"
 #include "agent.h"
 #include "geo.h"
 #include "key.h"
 #include "phonenumber.h"
 #include "picture.h"
 #include "secrecy.h"
 #include "sound.h"
 #include "timezone.h"
 
 namespace KABC {
 
 class Resource;
 
 /**
   @short address book entry
 
   This class represents an entry in the address book.
 
   The data of this class is implicitly shared. You can pass this class by value.
 
   If you need the name of a field for presenting it to the user you should use
   the functions ending in Label(). They return a translated string which can be
   used as label for the corresponding field.
 
   About the name fields:
 
   givenName() is the first name and familyName() the last name. In some
   countries the family name comes first, that's the reason for the
   naming. formattedName() is the full name with the correct formatting.
   It is used as an override, when the correct formatting can't be generated
   from the other name fields automatically.
 
   realName() returns a fully formatted name(). It uses formattedName, if set,
   otherwise it constucts the name from the name fields. As fallback, if
   nothing else is set it uses name().
 
   name() is the NAME type of RFC2426. It can be used as internal name for the
   data enty, but shouldn't be used for displaying the data to the user.
  */
 class Addressee
 {
     friend QDataStream &operator<<( QDataStream &, const Addressee & );
     friend QDataStream &operator>>( QDataStream &, Addressee & );
 
   public:
     typedef QValueList<Addressee> List;
 
     /**
       Construct an empty address book entry.
      */
     Addressee();
     ~Addressee();
 
     Addressee( const Addressee & );
     Addressee &operator=( const Addressee & );
 
     bool operator==( const Addressee & ) const;
     bool operator!=( const Addressee & ) const;
     // sync stuff
     void setTempSyncStat(int id);
     int tempSyncStat() const;
     void setIDStr( const QString & );
-    QString IDStr() const;
+    const QString IDStr() const;
     void setID( const QString &, const QString & );
-    QString  getID( const QString & );
+    const QString  getID( const QString & ) const;
     void setCsum( const QString &, const QString & );
-    QString getCsum( const QString & );
+    const QString getCsum( const QString & ) const ;
     void removeID(const QString &);
     void computeCsum(const QString &dev);
     ulong getCsum4List( const QStringList &  attList);
     /**
       Return, if the address book entry is empty.
      */
     bool isEmpty() const;
     void setExternalUID( const QString &id );
-    QString externalUID() const;
+    const QString externalUID() const;
     void setOriginalExternalUID( const QString &id );
     QString originalExternalUID() const;
     void mergeContact(  const Addressee& ad, bool isSubSet ); 
     void simplifyEmails();
     void simplifyAddresses();
     void simplifyPhoneNumbers();
     void simplifyPhoneNumberTypes();
     bool removeVoice();
     bool containsAdr(const Addressee& addr );
     
     /**
       Set unique identifier.
      */
     void setUid( const QString &uid );
     /**
       Return unique identifier.
      */
-    QString uid() const;
+    const QString uid() const;
     /**
       Return translated label for uid field.
      */
     static QString uidLabel();
 
     /**
       Set name.
      */
     void setName( const QString &name );
     /**
       Return name.
      */
     QString name() const;
     /**
       Return translated label for name field.
      */
     static QString nameLabel();
 
     /**
       Set formatted name.
      */
     void setFormattedName( const QString &formattedName );
     /**
       Return formatted name.
      */
     QString formattedName() const;
     /**
       Return translated label for formattedName field.
      */
     static QString formattedNameLabel();
 
     /**
       Set family name.
      */
     void setFamilyName( const QString &familyName );
     /**
       Return family name.
      */
     QString familyName() const;
     /**
       Return translated label for familyName field.
      */
     static QString familyNameLabel();
 
     /**
       Set given name.
      */
     void setGivenName( const QString &givenName );
     /**
       Return given name.
      */
     QString givenName() const;
     /**
       Return translated label for givenName field.
      */
     static QString givenNameLabel();
 
     /**
       Set additional names.
      */
     void setAdditionalName( const QString &additionalName );
     /**
       Return additional names.
      */
     QString additionalName() const;
     /**
       Return translated label for additionalName field.
      */
     static QString additionalNameLabel();
 
     /**
       Set honorific prefixes.
      */
     void setPrefix( const QString &prefix );
     /**
       Return honorific prefixes.
      */
     QString prefix() const;
     /**
       Return translated label for prefix field.
      */
     static QString prefixLabel();
 
     /**
       Set honorific suffixes.
      */
     void setSuffix( const QString &suffix );
     /**
       Return honorific suffixes.
      */
     QString suffix() const;
     /**
       Return translated label for suffix field.
      */
     static QString suffixLabel();