summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/plugins/opie/resourceopie.cpp9
-rw-r--r--kaddressbook/xxport/opie/opie_xxport.cpp12
2 files changed, 16 insertions, 5 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
@@ -46,6 +46,7 @@ $Id$
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"
@@ -179,8 +180,11 @@ 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());
@@ -215,6 +219,7 @@ bool ResourceOpie::load()
215 } 219 }
216 220
217 delete access; 221 delete access;
222 delete backend;
218 223
219 return true; 224 return true;
220} 225}
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,7 +142,8 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
139 access->save(); 142 access->save();
140 143
141 delete access; 144 delete access;
142 145 delete backend;
146
143 return true; 147 return true;
144} 148}
145 149
@@ -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