author | ulf69 <ulf69> | 2004-07-15 15:15:52 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-15 15:15:52 (UTC) |
commit | ec8315212b05c128c8d5650cf5daff2b1d6b84dd (patch) (unidiff) | |
tree | ae4ffd799c19caa18c1b0964783f915395769a24 /kaddressbook | |
parent | 59f727076930aada485db6531d4084f2bfe0b928 (diff) | |
download | kdepimpi-ec8315212b05c128c8d5650cf5daff2b1d6b84dd.zip kdepimpi-ec8315212b05c128c8d5650cf5daff2b1d6b84dd.tar.gz kdepimpi-ec8315212b05c128c8d5650cf5daff2b1d6b84dd.tar.bz2 |
resolved crash during import of opie and qtopia addressbooks
-rw-r--r-- | kaddressbook/xxport/opie/opie_xxport.cpp | 11 | ||||
-rw-r--r-- | kaddressbook/xxport/qtopia/qtopia_xxport.cpp | 12 |
2 files changed, 21 insertions, 2 deletions
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp index 12c83af..db30d34 100644 --- a/kaddressbook/xxport/opie/opie_xxport.cpp +++ b/kaddressbook/xxport/opie/opie_xxport.cpp | |||
@@ -183,10 +183,19 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const | |||
183 | 183 | ||
184 | access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available | 184 | access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available |
185 | 185 | ||
186 | KABC::OpieConverter mConverter; | 186 | KABC::OpieConverter mConverter; |
187 | bool res = false; | ||
188 | 187 | ||
188 | bool res = mConverter.init(); | ||
189 | if (!res) | ||
190 | { | ||
191 | QString text( i18n( "Unable to initialize opie converter.<br>Most likely a problem with the category file." ) ); | ||
192 | qDebug(text); | ||
193 | KMessageBox::error( parentWidget(), text ); | ||
194 | delete access; | ||
195 | return KABC::AddresseeList(); | ||
196 | } | ||
197 | |||
189 | 198 | ||
190 | OContactAccess::List::Iterator it; | 199 | OContactAccess::List::Iterator it; |
191 | OContactAccess::List allList = access->allRecords(); | 200 | OContactAccess::List allList = access->allRecords(); |
192 | for ( it = allList.begin(); it != allList.end(); ++it ) | 201 | for ( it = allList.begin(); it != allList.end(); ++it ) |
diff --git a/kaddressbook/xxport/qtopia/qtopia_xxport.cpp b/kaddressbook/xxport/qtopia/qtopia_xxport.cpp index 3d830df..bf39fdb 100644 --- a/kaddressbook/xxport/qtopia/qtopia_xxport.cpp +++ b/kaddressbook/xxport/qtopia/qtopia_xxport.cpp | |||
@@ -162,10 +162,20 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const | |||
162 | return KABC::AddresseeList(); | 162 | return KABC::AddresseeList(); |
163 | } | 163 | } |
164 | 164 | ||
165 | KABC::QtopiaConverter mConverter; | 165 | KABC::QtopiaConverter mConverter; |
166 | bool res = false; | ||
167 | 166 | ||
167 | bool res = mConverter.init(); | ||
168 | if (!res) | ||
169 | { | ||
170 | QString text( i18n( "Unable to initialize qtopia converter.<br>Most likely a problem with the category file." ) ); | ||
171 | qDebug(text); | ||
172 | KMessageBox::error( parentWidget(), text ); | ||
173 | delete access; | ||
174 | return KABC::AddresseeList(); | ||
175 | } | ||
176 | |||
177 | |||
168 | 178 | ||
169 | { //create a new scope | 179 | { //create a new scope |
170 | AddressBookIterator it(*access); | 180 | AddressBookIterator it(*access); |
171 | 181 | ||