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 /kaddressbook | |
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-- | kaddressbook/xxport/opie/opie_xxport.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp index 90d05cd..f30a205 100644 --- a/kaddressbook/xxport/opie/opie_xxport.cpp +++ b/kaddressbook/xxport/opie/opie_xxport.cpp | |||
@@ -34,6 +34,8 @@ $Id$ | |||
34 | #include <kmessagebox.h> | 34 | #include <kmessagebox.h> |
35 | 35 | ||
36 | #include <opie/ocontactaccess.h> | 36 | #include <opie/ocontactaccess.h> |
37 | #include <opie/ocontactaccessbackend_xml.h> | ||
38 | |||
37 | #include "stdaddressbook.h" | 39 | #include "stdaddressbook.h" |
38 | 40 | ||
39 | /*US | 41 | /*US |
@@ -96,7 +98,8 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString | |||
96 | if ( fileName.isEmpty() ) | 98 | if ( fileName.isEmpty() ) |
97 | return true; | 99 | return true; |
98 | 100 | ||
99 | OContactAccess* access = new OContactAccess("KA/Pi", fileName, 0l, false); | 101 | OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName ); |
102 | OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); | ||
100 | 103 | ||
101 | if ( !access ) { | 104 | if ( !access ) { |
102 | qDebug("Unable to access file() %s", fileName.latin1()); | 105 | qDebug("Unable to access file() %s", fileName.latin1()); |
@@ -139,6 +142,7 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString | |||
139 | access->save(); | 142 | access->save(); |
140 | 143 | ||
141 | delete access; | 144 | delete access; |
145 | delete backend; | ||
142 | 146 | ||
143 | return true; | 147 | return true; |
144 | } | 148 | } |
@@ -158,7 +162,8 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const | |||
158 | if ( fileName.isEmpty() ) | 162 | if ( fileName.isEmpty() ) |
159 | return KABC::AddresseeList(); | 163 | return KABC::AddresseeList(); |
160 | 164 | ||
161 | OContactAccess* access = new OContactAccess("KA/Pi", fileName, 0l, false); | 165 | OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName ); |
166 | OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); | ||
162 | 167 | ||
163 | if ( !access ) { | 168 | if ( !access ) { |
164 | qDebug("Unable to access file() %s", fileName.latin1()); | 169 | qDebug("Unable to access file() %s", fileName.latin1()); |
@@ -190,6 +195,7 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const | |||
190 | } | 195 | } |
191 | 196 | ||
192 | delete access; | 197 | delete access; |
198 | delete backend; | ||
193 | 199 | ||
194 | return adrlst; | 200 | return adrlst; |
195 | 201 | ||