| author | zautrix <zautrix> | 2004-10-13 13:18:51 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-13 13:18:51 (UTC) |
| commit | d41893fb0a49fbb080326a4c1fd98e1a032a182a (patch) (unidiff) | |
| 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 | |||
| @@ -301,11 +301,11 @@ class AddressBook : public QObject | |||
| 301 | void resetTempSyncStat(); | 301 | void resetTempSyncStat(); |
| 302 | QStringList uidList(); | 302 | QStringList uidList(); |
| 303 | void removeSyncAddressees( bool removeDeleted = false ); | 303 | void removeSyncAddressees( bool removeDeleted = false ); |
| 304 | void mergeAB( AddressBook *aBook, const QString& profile ); | 304 | void mergeAB( AddressBook *aBook, const QString& profile, bool isSubset ); |
| 305 | Addressee findByExternUid( const QString& uid , const QString& profile ); | 305 | Addressee findByExternUid( const QString& uid , const QString& profile ); |
| 306 | bool containsExternalUid( const QString& uid ); | 306 | bool containsExternalUid( const QString& uid ); |
| 307 | 307 | ||
| 308 | void preExternSync( AddressBook* aBook, const QString& csd ); | 308 | void preExternSync( AddressBook* aBook, const QString& csd, bool isSubset ); |
| 309 | void postExternSync( AddressBook* aBook, const QString& csd ); | 309 | void postExternSync( AddressBook* aBook, const QString& csd ); |
| 310 | signals: | 310 | signals: |
| 311 | /** | 311 | /** |