author | ulf69 <ulf69> | 2004-07-02 15:38:16 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-02 15:38:16 (UTC) |
commit | 30988fc010930d5c43ca7bc51ba64d57210c3985 (patch) (unidiff) | |
tree | 360ccd0055cb11d669f03baa350843e864746785 /kabc/plugins | |
parent | ead0dcba2c607297137e2b47418eb17864e0caaa (diff) | |
download | kdepimpi-30988fc010930d5c43ca7bc51ba64d57210c3985.zip kdepimpi-30988fc010930d5c43ca7bc51ba64d57210c3985.tar.gz kdepimpi-30988fc010930d5c43ca7bc51ba64d57210c3985.tar.bz2 |
bugfix: choosen filenames where not used while import/export and for resources
-rw-r--r-- | kabc/plugins/opie/resourceopie.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp index f992301..a4f8d8a 100644 --- a/kabc/plugins/opie/resourceopie.cpp +++ b/kabc/plugins/opie/resourceopie.cpp | |||
@@ -43,12 +43,13 @@ $Id$ | |||
43 | #include <kstandarddirs.h> | 43 | #include <kstandarddirs.h> |
44 | 44 | ||
45 | //US #include "formatfactory.h" | 45 | //US #include "formatfactory.h" |
46 | //US #include <qpe/qpeapplication.h> | 46 | //US #include <qpe/qpeapplication.h> |
47 | 47 | ||
48 | #include <opie/ocontactaccess.h> | 48 | #include <opie/ocontactaccess.h> |
49 | #include <opie/ocontactaccessbackend_xml.h> | ||
49 | 50 | ||
50 | #include "resource.h" | 51 | #include "resource.h" |
51 | #include "resourceopieconfig.h" | 52 | #include "resourceopieconfig.h" |
52 | #include "stdaddressbook.h" | 53 | #include "stdaddressbook.h" |
53 | 54 | ||
54 | #include "opieconverter.h" | 55 | #include "opieconverter.h" |
@@ -176,14 +177,17 @@ void ResourceOpie::doClose() | |||
176 | } | 177 | } |
177 | 178 | ||
178 | bool ResourceOpie::load() | 179 | bool ResourceOpie::load() |
179 | { | 180 | { |
180 | // qDebug("ResourceOpie::load() %s", mFileName.latin1()); | 181 | // qDebug("ResourceOpie::load() %s", mFileName.latin1()); |
181 | kdDebug(5700) << "ResourceOpie::load(): '" << mFileName << "'" << endl; | 182 | kdDebug(5700) << "ResourceOpie::load(): '" << mFileName << "'" << endl; |
182 | 183 | ||
183 | OContactAccess* access = new OContactAccess("KDEPim/Pi", mFileName, 0l, false); | 184 | qDebug("ResourceOpie::load: Try to load file() %s", mFileName.latin1()); |
185 | |||
186 | OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KDEPim/Pi", mFileName ); | ||
187 | OContactAccess* access = new OContactAccess("KDEPim/Pi", 0l, backend, false); | ||
184 | 188 | ||
185 | if ( !access ) { | 189 | if ( !access ) { |
186 | qDebug("Unable to load file() %s", mFileName.latin1()); | 190 | qDebug("Unable to load file() %s", mFileName.latin1()); |
187 | addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) ); | 191 | addressBook()->error( i18n( "Unable to load file '%1'." ).arg( mFileName ) ); |
188 | return false; | 192 | return false; |
189 | } | 193 | } |
@@ -212,12 +216,13 @@ bool ResourceOpie::load() | |||
212 | } | 216 | } |
213 | 217 | ||
214 | // qDebug("found %s", c.fullName().latin1()); | 218 | // qDebug("found %s", c.fullName().latin1()); |
215 | } | 219 | } |
216 | 220 | ||
217 | delete access; | 221 | delete access; |
222 | delete backend; | ||
218 | 223 | ||
219 | return true; | 224 | return true; |
220 | } | 225 | } |
221 | 226 | ||
222 | bool ResourceOpie::save( Ticket *ticket ) | 227 | bool ResourceOpie::save( Ticket *ticket ) |
223 | { | 228 | { |