Diffstat (limited to 'kaddressbook/xxport/qtopia/qtopia_xxport.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | kaddressbook/xxport/qtopia/qtopia_xxport.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
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 | |||
@@ -150,34 +150,44 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const | |||
150 | { | 150 | { |
151 | KABC::AddresseeList adrlst; | 151 | KABC::AddresseeList adrlst; |
152 | 152 | ||
153 | QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; | 153 | QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; |
154 | 154 | ||
155 | AddressBookAccess* access = new AddressBookAccess(); | 155 | AddressBookAccess* access = new AddressBookAccess(); |
156 | 156 | ||
157 | if ( !access ) { | 157 | if ( !access ) { |
158 | QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) ); | 158 | QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) ); |
159 | qDebug(text.latin1()); | 159 | qDebug(text.latin1()); |
160 | addressBook()->error( text ); | 160 | addressBook()->error( text ); |
161 | KMessageBox::error( parentWidget(), text ); | 161 | KMessageBox::error( parentWidget(), text ); |
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 | ||
172 | for (it.toFirst(); it.current(); ++it) { | 182 | for (it.toFirst(); it.current(); ++it) { |
173 | const PimContact*contact = it.current(); | 183 | const PimContact*contact = it.current(); |
174 | 184 | ||
175 | KABC::Addressee addressee; | 185 | KABC::Addressee addressee; |
176 | 186 | ||
177 | res = mConverter.qtopiaToAddressee( (*contact), addressee ); | 187 | res = mConverter.qtopiaToAddressee( (*contact), addressee ); |
178 | 188 | ||
179 | if ( !addressee.isEmpty() && res ) | 189 | if ( !addressee.isEmpty() && res ) |
180 | { | 190 | { |
181 | adrlst.append( addressee ); | 191 | adrlst.append( addressee ); |
182 | } | 192 | } |
183 | } | 193 | } |