author | ulf69 <ulf69> | 2004-07-06 04:04:56 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-06 04:04:56 (UTC) |
commit | c4bd138c16e8d34294502c9da5706e21337ba53d (patch) (unidiff) | |
tree | 08f15d9575264b04bcb0135077918175e2cd1650 /kaddressbook | |
parent | 6a826e654102e78abb6d14f80a3679575e5d3c9a (diff) | |
download | kdepimpi-c4bd138c16e8d34294502c9da5706e21337ba53d.zip kdepimpi-c4bd138c16e8d34294502c9da5706e21337ba53d.tar.gz kdepimpi-c4bd138c16e8d34294502c9da5706e21337ba53d.tar.bz2 |
ok button of dialog works now. import of vcards works now, export of opie resources too.
-rw-r--r-- | kaddressbook/xxport/opie/opie_xxport.cpp | 4 | ||||
-rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp index f30a205..d1def18 100644 --- a/kaddressbook/xxport/opie/opie_xxport.cpp +++ b/kaddressbook/xxport/opie/opie_xxport.cpp | |||
@@ -144,3 +144,3 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString | |||
144 | delete access; | 144 | delete access; |
145 | delete backend; | 145 | //US the deletion of the access object deletes the backend object as well. |
146 | 146 | ||
@@ -197,3 +197,3 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const | |||
197 | delete access; | 197 | delete access; |
198 | delete backend; | 198 | //US the deletion of the access object deletes the backend object as well. |
199 | 199 | ||
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp index c017f5b..54d0cbd 100644 --- a/kaddressbook/xxport/vcard_xxport.cpp +++ b/kaddressbook/xxport/vcard_xxport.cpp | |||
@@ -181,2 +181,5 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
181 | fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); | 181 | fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() ); |
182 | if ( fileName.isEmpty() ) | ||
183 | return addrList; | ||
184 | |||
182 | } | 185 | } |
@@ -186,4 +189,2 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
186 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); | 189 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); |
187 | } | ||
188 | |||
189 | if ( url.isEmpty() ) | 190 | if ( url.isEmpty() ) |
@@ -191,2 +192,5 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
191 | 192 | ||
193 | } | ||
194 | |||
195 | |||
192 | QFile file( fileName ); | 196 | QFile file( fileName ); |