| author | zautrix <zautrix> | 2004-10-13 13:18:51 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-13 13:18:51 (UTC) |
| commit | d41893fb0a49fbb080326a4c1fd98e1a032a182a (patch) (side-by-side diff) | |
| tree | 9b95603ff93801accaa94de4b73d88ea9c5c9386 /kabc/addressbook.h | |
| parent | efdd0735bda81dcd82dfb6d6dc0d0c143f249336 (diff) | |
| download | kdepimpi-d41893fb0a49fbb080326a4c1fd98e1a032a182a.zip kdepimpi-d41893fb0a49fbb080326a4c1fd98e1a032a182a.tar.gz kdepimpi-d41893fb0a49fbb080326a4c1fd98e1a032a182a.tar.bz2 | |
merge contact fixes
| -rw-r--r-- | kabc/addressbook.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kabc/addressbook.h b/kabc/addressbook.h index df9048b..a6bf451 100644 --- a/kabc/addressbook.h +++ b/kabc/addressbook.h @@ -296,21 +296,21 @@ class AddressBook : public QObject */ void cleanUp(); // sync stuff //Addressee::List getExternLastSyncAddressees(); void resetTempSyncStat(); QStringList uidList(); void removeSyncAddressees( bool removeDeleted = false ); - void mergeAB( AddressBook *aBook, const QString& profile ); + void mergeAB( AddressBook *aBook, const QString& profile, bool isSubset ); Addressee findByExternUid( const QString& uid , const QString& profile ); bool containsExternalUid( const QString& uid ); - void preExternSync( AddressBook* aBook, const QString& csd ); + void preExternSync( AddressBook* aBook, const QString& csd, bool isSubset ); void postExternSync( AddressBook* aBook, const QString& csd ); signals: /** Emitted, when the address book has changed on disk. */ void addressBookChanged( AddressBook * ); /** |