author | ulf69 <ulf69> | 2004-07-13 15:02:13 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-13 15:02:13 (UTC) |
commit | 2450dd81505b6212ec5bf59c168b53c52bd08f53 (patch) (unidiff) | |
tree | 9425fb7d8f9ba270f75cb711fb19aecb5d92495e /kabc/plugins | |
parent | 65848bf858dae95799ec8ed883c23faa48ff8566 (diff) | |
download | kdepimpi-2450dd81505b6212ec5bf59c168b53c52bd08f53.zip kdepimpi-2450dd81505b6212ec5bf59c168b53c52bd08f53.tar.gz kdepimpi-2450dd81505b6212ec5bf59c168b53c52bd08f53.tar.bz2 |
cleanup of code
-rw-r--r-- | kabc/plugins/opie/resourceopie.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kabc/plugins/opie/resourceopie.cpp b/kabc/plugins/opie/resourceopie.cpp index a7d271f..3a40ea2 100644 --- a/kabc/plugins/opie/resourceopie.cpp +++ b/kabc/plugins/opie/resourceopie.cpp | |||
@@ -24,40 +24,38 @@ Copyright (c) 2004 Ulf Schenk | |||
24 | 24 | ||
25 | $Id$ | 25 | $Id$ |
26 | */ | 26 | */ |
27 | 27 | ||
28 | #include <sys/types.h> | 28 | #include <sys/types.h> |
29 | #include <sys/stat.h> | 29 | #include <sys/stat.h> |
30 | #include <unistd.h> | 30 | #include <unistd.h> |
31 | 31 | ||
32 | #include <qdir.h> | 32 | #include <qdir.h> |
33 | #include <qfile.h> | 33 | #include <qfile.h> |
34 | #include <qfileinfo.h> | 34 | #include <qfileinfo.h> |
35 | #include <qregexp.h> | 35 | #include <qregexp.h> |
36 | #include <qtimer.h> | ||
37 | 36 | ||
38 | #include <kapplication.h> | 37 | #include <kapplication.h> |
39 | #include <kconfig.h> | 38 | #include <kconfig.h> |
40 | #include <kdebug.h> | 39 | #include <kdebug.h> |
41 | #include <klocale.h> | 40 | #include <klocale.h> |
42 | //US #include <ksavefile.h> | 41 | //US #include <ksavefile.h> |
43 | #include <kstandarddirs.h> | 42 | #include <kstandarddirs.h> |
44 | 43 | ||
45 | //US #include "formatfactory.h" | 44 | //US #include "formatfactory.h" |
46 | //US #include <qpe/qpeapplication.h> | 45 | //US #include <qpe/qpeapplication.h> |
47 | 46 | ||
48 | #include <opie/ocontactaccess.h> | 47 | #include <opie/ocontactaccess.h> |
49 | #include <opie/ocontactaccessbackend_xml.h> | 48 | #include <opie/ocontactaccessbackend_xml.h> |
50 | 49 | ||
51 | #include "resource.h" | ||
52 | #include "resourceopieconfig.h" | 50 | #include "resourceopieconfig.h" |
53 | #include "stdaddressbook.h" | 51 | #include "stdaddressbook.h" |
54 | 52 | ||
55 | #include "opieconverter.h" | 53 | #include "opieconverter.h" |
56 | 54 | ||
57 | #include "resourceopie.h" | 55 | #include "resourceopie.h" |
58 | 56 | ||
59 | using namespace KABC; | 57 | using namespace KABC; |
60 | extern "C" | 58 | extern "C" |
61 | { | 59 | { |
62 | void *init_microkabc_opie() | 60 | void *init_microkabc_opie() |
63 | { | 61 | { |
@@ -102,27 +100,24 @@ void ResourceOpie::init( const QString &fileName ) | |||
102 | setFileName( fileName ); | 100 | setFileName( fileName ); |
103 | 101 | ||
104 | } | 102 | } |
105 | 103 | ||
106 | ResourceOpie::~ResourceOpie() | 104 | ResourceOpie::~ResourceOpie() |
107 | { | 105 | { |
108 | if (mConverter != 0) | 106 | if (mConverter != 0) |
109 | delete mConverter; | 107 | delete mConverter; |
110 | } | 108 | } |
111 | 109 | ||
112 | void ResourceOpie::writeConfig( KConfig *config ) | 110 | void ResourceOpie::writeConfig( KConfig *config ) |
113 | { | 111 | { |
114 | //US opie addressbook is always readonly | ||
115 | //US setReadOnly( true ); | ||
116 | |||
117 | Resource::writeConfig( config ); | 112 | Resource::writeConfig( config ); |
118 | 113 | ||
119 | config->writeEntry( "FileName", mFileName ); | 114 | config->writeEntry( "FileName", mFileName ); |
120 | 115 | ||
121 | // qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1()); | 116 | // qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1()); |
122 | 117 | ||
123 | } | 118 | } |
124 | 119 | ||
125 | Ticket *ResourceOpie::requestSaveTicket() | 120 | Ticket *ResourceOpie::requestSaveTicket() |
126 | { | 121 | { |
127 | kdDebug(5700) << "ResourceOpie::requestSaveTicket()" << endl; | 122 | kdDebug(5700) << "ResourceOpie::requestSaveTicket()" << endl; |
128 | 123 | ||
@@ -204,25 +199,25 @@ bool ResourceOpie::load() | |||
204 | qDebug("Unable to initialize opie converter. Most likely a problem with the category file"); | 199 | qDebug("Unable to initialize opie converter. Most likely a problem with the category file"); |
205 | addressBook()->error( i18n( "Unable to initialize opie converter. Most likely a problem with the category file" ) ); | 200 | addressBook()->error( i18n( "Unable to initialize opie converter. Most likely a problem with the category file" ) ); |
206 | delete access; | 201 | delete access; |
207 | return false; | 202 | return false; |
208 | } | 203 | } |
209 | } | 204 | } |
210 | 205 | ||
211 | 206 | ||
212 | OContactAccess::List::Iterator it; | 207 | OContactAccess::List::Iterator it; |
213 | OContactAccess::List allList = access->allRecords(); | 208 | OContactAccess::List allList = access->allRecords(); |
214 | for ( it = allList.begin(); it != allList.end(); ++it ) | 209 | for ( it = allList.begin(); it != allList.end(); ++it ) |
215 | { | 210 | { |
216 | OContact c = (*it); | 211 | const OContact c = (*it); |
217 | 212 | ||
218 | KABC::Addressee addressee; | 213 | KABC::Addressee addressee; |
219 | 214 | ||
220 | res = mConverter->opieToAddressee( c, addressee ); | 215 | res = mConverter->opieToAddressee( c, addressee ); |
221 | 216 | ||
222 | if ( !addressee.isEmpty() && res ) | 217 | if ( !addressee.isEmpty() && res ) |
223 | { | 218 | { |
224 | addressee.setResource( this ); | 219 | addressee.setResource( this ); |
225 | addressBook()->insertAddressee( addressee ); | 220 | addressBook()->insertAddressee( addressee ); |
226 | } | 221 | } |
227 | 222 | ||
228 | // qDebug("found %s", c.fullName().latin1()); | 223 | // qDebug("found %s", c.fullName().latin1()); |