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/xxport | |
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 | |||
@@ -137,17 +137,17 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString | |||
137 | { | 137 | { |
138 | qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1()); | 138 | qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1()); |
139 | } | 139 | } |
140 | } | 140 | } |
141 | 141 | ||
142 | access->save(); | 142 | access->save(); |
143 | 143 | ||
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 | ||
147 | return true; | 147 | return true; |
148 | } | 148 | } |
149 | 149 | ||
150 | KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const | 150 | KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const |
151 | { | 151 | { |
152 | KABC::AddresseeList adrlst; | 152 | KABC::AddresseeList adrlst; |
153 | 153 | ||
@@ -190,13 +190,13 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const | |||
190 | if ( !addressee.isEmpty() && res ) { | 190 | if ( !addressee.isEmpty() && res ) { |
191 | adrlst.append( addressee ); | 191 | adrlst.append( addressee ); |
192 | } | 192 | } |
193 | 193 | ||
194 | // qDebug("found %s", c.fullName().latin1()); | 194 | // qDebug("found %s", c.fullName().latin1()); |
195 | } | 195 | } |
196 | 196 | ||
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 | ||
200 | return adrlst; | 200 | return adrlst; |
201 | 201 | ||
202 | } | 202 | } |
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 | |||
@@ -174,25 +174,29 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const | |||
174 | 174 | ||
175 | 175 | ||
176 | if ( !XXPortManager::importData.isEmpty() ) | 176 | if ( !XXPortManager::importData.isEmpty() ) |
177 | addrList = parseVCard( XXPortManager::importData ); | 177 | addrList = parseVCard( XXPortManager::importData ); |
178 | else { | 178 | else { |
179 | if ( XXPortManager::importURL.isEmpty() ) | 179 | if ( XXPortManager::importURL.isEmpty() ) |
180 | { | 180 | { |
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 | } |
183 | else | 186 | else |
184 | { | 187 | { |
185 | //US url = XXPortManager::importURL; | 188 | //US url = XXPortManager::importURL; |
186 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); | 189 | qDebug("VCardXXPort::importContacts Urls at the moment not supported"); |
190 | if ( url.isEmpty() ) | ||
191 | return addrList; | ||
192 | |||
187 | } | 193 | } |
188 | 194 | ||
189 | if ( url.isEmpty() ) | ||
190 | return addrList; | ||
191 | 195 | ||
192 | QFile file( fileName ); | 196 | QFile file( fileName ); |
193 | 197 | ||
194 | file.open( IO_ReadOnly ); | 198 | file.open( IO_ReadOnly ); |
195 | QByteArray rawData = file.readAll(); | 199 | QByteArray rawData = file.readAll(); |
196 | file.close(); | 200 | file.close(); |
197 | 201 | ||
198 | QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); | 202 | QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); |