| author | zautrix <zautrix> | 2004-10-09 02:17:06 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-09 02:17:06 (UTC) |
| commit | c2165f4e14bc2f7ab2ef19f5c35497dde5e87a0d (patch) (side-by-side diff) | |
| tree | b83f7cfe5d4bb681b756fe95446e5e3fc193bc36 /kabc/addressbook.cpp | |
| parent | 07fdef2c2ea1153d39d7114b3d5bd4abc4f4c861 (diff) | |
| download | kdepimpi-c2165f4e14bc2f7ab2ef19f5c35497dde5e87a0d.zip kdepimpi-c2165f4e14bc2f7ab2ef19f5c35497dde5e87a0d.tar.gz kdepimpi-c2165f4e14bc2f7ab2ef19f5c35497dde5e87a0d.tar.bz2 | |
import ir fixes
| -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 ) } -void AddressBook::importFromFile( QString fileName ) +void AddressBook::importFromFile( QString fileName, bool replaceLabel ) { - KABC::Addressee::List list; + KABC::Addressee::List list; QFile file( fileName ); @@ -413,4 +413,10 @@ void AddressBook::importFromFile( QString fileName ) file.close(); - - QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); + qDebug("AddressBook::importFromFile "); + 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; @@ -420,2 +426,4 @@ void AddressBook::importFromFile( QString fileName ) (*it).setResource( 0 ); + if ( replaceLabel ) + (*it).removeVoice(); insertAddressee( (*it), false, true ); |