4 files changed, 41 insertions, 4 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 1050f55..ff05f7e 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -403,12 +403,13 @@ void  AddressBook::export2File( QString fileName )
   t <<  "\r\n\r\n";
   outFile.close(); 
 }
-void  AddressBook::importFromFile( QString fileName, bool replaceLabel )
+void  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld  )
 {
 
+    if ( removeOld )
+        setUntagged();
   KABC::Addressee::List list;
   QFile file( fileName );
-
   file.open( IO_ReadOnly );
   QByteArray rawData = file.readAll();
   file.close();
@@ -426,11 +427,30 @@ void  AddressBook::importFromFile( QString fileName, bool replaceLabel )
       (*it).setResource( 0 );
       if ( replaceLabel )
           (*it).removeVoice();
+        if ( removeOld )
+            (*it).setTagged( true );
       insertAddressee( (*it), false, true );
   }
-
+    if ( removeOld )
+        removeUntagged();
+}
+void AddressBook::setUntagged()
+{
+    Iterator ait;
+    for ( ait = begin(); ait != end(); ++ait ) {
+        (*ait).setTagged( false );
+    }
+}
+void AddressBook::removeUntagged()
+{
+  Iterator ait;
+  for ( ait = begin(); ait != end(); ++ait ) {
+      if (!(*ait).tagged())
+          removeAddressee( ait );
 }
 
+  deleteRemovedAddressees();
+}
 bool AddressBook::saveAB()
 {
   bool ok = true;
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index cea1b03..532e05d 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -143,7 +143,9 @@ class AddressBook : public QObject
     bool save( Ticket *ticket );
     bool saveAB( );
     void export2File( QString fileName );
-    void importFromFile( QString fileName,  bool replaceLabel = false );
+    void importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false );
+    void setUntagged();
+    void removeUntagged();
     /**
       Returns a iterator for first entry of address book.
     */
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 3f3d5c0..607ae26 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -88,6 +88,7 @@ struct Addressee::AddresseeData : public KShared
 
   bool empty    :1;
   bool changed  :1;
+  bool tagged   :1;
 };
 
 Addressee::Addressee()
@@ -1821,6 +1822,17 @@ bool Addressee::changed() const
     return mData->changed;
 }
 
+void Addressee::setTagged( bool value )
+{
+    detach();
+    mData->tagged = value;
+}
+
+bool Addressee::tagged() const
+{
+    return mData->tagged;
+}
+
 QDataStream &KABC::operator<<( QDataStream &s, const Addressee &a )
 {
   if (!a.mData) return s;
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 9336edc..0aa2c51 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -833,6 +833,9 @@ class Addressee
            */
           bool changed() const;
 
+    void setTagged( bool value );
+    bool tagged() const;
+
   private:
     Addressee copy();
     void detach();