1 files changed, 46 insertions, 26 deletions

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 1050f55..ff05f7e 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -398,44 +398,64 @@ void  AddressBook::export2File( QString fileName )
     QString vcard; 
     //Resource *resource() const;
     converter.addresseeToVCard( *it, vcard, version );
     t << vcard << "\r\n";
   }
   t <<  "\r\n\r\n";
   outFile.close(); 
 }
-void  AddressBook::importFromFile( QString fileName, bool replaceLabel )
-{
-
-  KABC::Addressee::List list;
-  QFile file( fileName );
-
-  file.open( IO_ReadOnly );
-  QByteArray rawData = file.readAll();
-  file.close();
-  QString data;
-  if ( replaceLabel ) { 
-      data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); 
-      data.replace ( QRegExp("LABEL") , "ADR" );
-      data.replace ( QRegExp("CHARSET=ISO-8859-1") , "" );
-  } else
-      data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
-  KABC::VCardTool tool;
-  list =  tool.parseVCards( data );
-  KABC::Addressee::List::Iterator it;
-  for ( it = list.begin(); it != list.end(); ++it ) {
-      (*it).setResource( 0 );
-      if ( replaceLabel )
-          (*it).removeVoice();
-      insertAddressee( (*it), false, true );
+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();
+    QString data;
+    if ( replaceLabel ) { 
+        data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); 
+        data.replace ( QRegExp("LABEL") , "ADR" );
+        data.replace ( QRegExp("CHARSET=ISO-8859-1") , "" );
+    } else
+        data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
+    KABC::VCardTool tool;
+    list =  tool.parseVCards( data );
+    KABC::Addressee::List::Iterator it;
+    for ( it = list.begin(); it != list.end(); ++it ) {
+        (*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;
 
   deleteRemovedAddressees();
   Iterator ait;
   for ( ait = begin(); ait != end(); ++ait ) {
       if ( !(*ait).IDStr().isEmpty() ) {