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 | |
parent | 65848bf858dae95799ec8ed883c23faa48ff8566 (diff) | |
download | kdepimpi-2450dd81505b6212ec5bf59c168b53c52bd08f53.zip kdepimpi-2450dd81505b6212ec5bf59c168b53c52bd08f53.tar.gz kdepimpi-2450dd81505b6212ec5bf59c168b53c52bd08f53.tar.bz2 |
cleanup of code
-rw-r--r-- | kabc/converter/opie/opieE.pro | 2 | ||||
-rw-r--r-- | kabc/plugins/opie/resourceopie.cpp | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/kabc/converter/opie/opieE.pro b/kabc/converter/opie/opieE.pro index e026f2a..131c398 100644 --- a/kabc/converter/opie/opieE.pro +++ b/kabc/converter/opie/opieE.pro | |||
@@ -1,6 +1,6 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | INCLUDEPATH += . ../.. ../../../microkde ../../../microkde/kdecore $(OPIEDIR)/include $(OPEDIR)/include | 2 | INCLUDEPATH += . ../.. ../../../microkde ../../../microkde/kdecore $(OPIEDIR)/include |
3 | #CONFIG += staticlib | 3 | #CONFIG += staticlib |
4 | OBJECTS_DIR = obj/$(PLATFORM) | 4 | OBJECTS_DIR = obj/$(PLATFORM) |
5 | MOC_DIR = moc/$(PLATFORM) | 5 | MOC_DIR = moc/$(PLATFORM) |
6 | 6 | ||
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 | |||
@@ -32,9 +32,8 @@ $Id$ | |||
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> |
@@ -47,9 +46,8 @@ $Id$ | |||
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" |
@@ -110,11 +108,8 @@ ResourceOpie::~ResourceOpie() | |||
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 | ||
@@ -212,9 +207,9 @@ bool ResourceOpie::load() | |||
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 ); |