| -rw-r--r-- | kabc/addressbook.cpp | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index 1050f55..ff05f7e 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -404,10 +404,11 @@ void AddressBook::export2File( QString fileName ) 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(); @@ -427,9 +428,28 @@ void AddressBook::importFromFile( QString fileName, bool replaceLabel ) 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() { |