From d41893fb0a49fbb080326a4c1fd98e1a032a182a Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Wed, 13 Oct 2004 13:18:51 +0000
Subject: merge contact fixes

---
(limited to 'kabc/addressbook.h')

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
     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:
     /**
--
cgit v0.9.0.2