summaryrefslogtreecommitdiffabout
path: root/kaddressbook/xxport/opie/opie_xxport.cpp
Unidiff
Diffstat (limited to 'kaddressbook/xxport/opie/opie_xxport.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--kaddressbook/xxport/opie/opie_xxport.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp
index f30a205..d1def18 100644
--- a/kaddressbook/xxport/opie/opie_xxport.cpp
+++ b/kaddressbook/xxport/opie/opie_xxport.cpp
@@ -121,49 +121,49 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
121 KABC::OpieConverter mConverter; 121 KABC::OpieConverter mConverter;
122 bool res; 122 bool res;
123 123
124 KABC::Addressee::List::ConstIterator it; 124 KABC::Addressee::List::ConstIterator it;
125 for ( it = list.begin(); it != list.end(); ++it ) { 125 for ( it = list.begin(); it != list.end(); ++it ) {
126 OContact c; 126 OContact c;
127 KABC::Addressee addressee = (*it); 127 KABC::Addressee addressee = (*it);
128 128
129 res = mConverter.addresseeToOpie( *it, c ); 129 res = mConverter.addresseeToOpie( *it, c );
130 if (res == true) 130 if (res == true)
131 { 131 {
132 res = access->add(c); 132 res = access->add(c);
133 if (res == false) 133 if (res == false)
134 qDebug("Unable to append Contact %s", c.fullName().latin1()); 134 qDebug("Unable to append Contact %s", c.fullName().latin1());
135 } 135 }
136 else 136 else
137 { 137 {
138 qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1()); 138 qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
139 } 139 }
140 } 140 }
141 141
142 access->save(); 142 access->save();
143 143
144 delete access; 144 delete access;
145 delete backend; 145//US the deletion of the access object deletes the backend object as well.
146 146
147 return true; 147 return true;
148} 148}
149 149
150KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const 150KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
151{ 151{
152 KABC::AddresseeList adrlst; 152 KABC::AddresseeList adrlst;
153 153
154 QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml"; 154 QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
155 155
156#ifndef KAB_EMBEDDED 156#ifndef KAB_EMBEDDED
157 QString fileName = KFileDialog::getOpenFileName( name ); 157 QString fileName = KFileDialog::getOpenFileName( name );
158#else //KAB_EMBEDDED 158#else //KAB_EMBEDDED
159 QString fileName = KFileDialog::getOpenFileName( name, i18n("Load file"), parentWidget() ); 159 QString fileName = KFileDialog::getOpenFileName( name, i18n("Load file"), parentWidget() );
160#endif //KAB_EMBEDDED 160#endif //KAB_EMBEDDED
161 161
162 if ( fileName.isEmpty() ) 162 if ( fileName.isEmpty() )
163 return KABC::AddresseeList(); 163 return KABC::AddresseeList();
164 164
165 OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName ); 165 OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName );
166 OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false); 166 OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false);
167 167
168 if ( !access ) { 168 if ( !access ) {
169 qDebug("Unable to access file() %s", fileName.latin1()); 169 qDebug("Unable to access file() %s", fileName.latin1());
@@ -174,29 +174,29 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
174 access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available 174 access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available
175 175
176 KABC::OpieConverter mConverter; 176 KABC::OpieConverter mConverter;
177 bool res = false; 177 bool res = false;
178 178
179 179
180 OContactAccess::List::Iterator it; 180 OContactAccess::List::Iterator it;
181 OContactAccess::List allList = access->allRecords(); 181 OContactAccess::List allList = access->allRecords();
182 for ( it = allList.begin(); it != allList.end(); ++it ) 182 for ( it = allList.begin(); it != allList.end(); ++it )
183 { 183 {
184 OContact c = (*it); 184 OContact c = (*it);
185 185
186 KABC::Addressee addressee; 186 KABC::Addressee addressee;
187 187
188 res = mConverter.opieToAddressee( c, addressee ); 188 res = mConverter.opieToAddressee( c, addressee );
189 189
190 if ( !addressee.isEmpty() && res ) { 190 if ( !addressee.isEmpty() && res ) {
191 adrlst.append( addressee ); 191 adrlst.append( addressee );
192 } 192 }
193 193
194// qDebug("found %s", c.fullName().latin1()); 194// qDebug("found %s", c.fullName().latin1());
195 } 195 }
196 196
197 delete access; 197 delete access;
198 delete backend; 198//US the deletion of the access object deletes the backend object as well.
199 199
200 return adrlst; 200 return adrlst;
201 201
202} 202}