| -rw-r--r-- | kabc/addressbook.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index dc3cda1..bf6d053 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
| @@ -404,6 +404,6 @@ void AddressBook::export2File( QString fileName ) | |||
| 404 | } | 404 | } |
| 405 | void AddressBook::importFromFile( QString fileName ) | 405 | void AddressBook::importFromFile( QString fileName, bool replaceLabel ) |
| 406 | { | 406 | { |
| 407 | 407 | ||
| 408 | KABC::Addressee::List list; | 408 | KABC::Addressee::List list; |
| 409 | QFile file( fileName ); | 409 | QFile file( fileName ); |
| @@ -413,4 +413,10 @@ void AddressBook::importFromFile( QString fileName ) | |||
| 413 | file.close(); | 413 | file.close(); |
| 414 | 414 | qDebug("AddressBook::importFromFile "); | |
| 415 | QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); | 415 | QString data; |
| 416 | if ( replaceLabel ) { | ||
| 417 | data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); | ||
| 418 | data.replace ( QRegExp("LABEL") , "ADR" ); | ||
| 419 | data.replace ( QRegExp("CHARSET=ISO-8859-1") , "" ); | ||
| 420 | } else | ||
| 421 | data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); | ||
| 416 | KABC::VCardTool tool; | 422 | KABC::VCardTool tool; |
| @@ -420,2 +426,4 @@ void AddressBook::importFromFile( QString fileName ) | |||
| 420 | (*it).setResource( 0 ); | 426 | (*it).setResource( 0 ); |
| 427 | if ( replaceLabel ) | ||
| 428 | (*it).removeVoice(); | ||
| 421 | insertAddressee( (*it), false, true ); | 429 | insertAddressee( (*it), false, true ); |