summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/converter/opie/opieE.pro2
-rw-r--r--kabc/plugins/opie/resourceopie.cpp7
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,8 +1,8 @@
TEMPLATE = lib
-INCLUDEPATH += . ../.. ../../../microkde ../../../microkde/kdecore $(OPIEDIR)/include $(OPEDIR)/include
+INCLUDEPATH += . ../.. ../../../microkde ../../../microkde/kdecore $(OPIEDIR)/include
#CONFIG += staticlib
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
#for static linkage, put it here
#DESTDIR=../../lib/$(PLATFORM)
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
@@ -30,13 +30,12 @@ $Id$
#include <unistd.h>
#include <qdir.h>
#include <qfile.h>
#include <qfileinfo.h>
#include <qregexp.h>
-#include <qtimer.h>
#include <kapplication.h>
#include <kconfig.h>
#include <kdebug.h>
#include <klocale.h>
//US #include <ksavefile.h>
@@ -45,13 +44,12 @@ $Id$
//US #include "formatfactory.h"
//US #include <qpe/qpeapplication.h>
#include <opie/ocontactaccess.h>
#include <opie/ocontactaccessbackend_xml.h>
-#include "resource.h"
#include "resourceopieconfig.h"
#include "stdaddressbook.h"
#include "opieconverter.h"
#include "resourceopie.h"
@@ -108,15 +106,12 @@ ResourceOpie::~ResourceOpie()
if (mConverter != 0)
delete mConverter;
}
void ResourceOpie::writeConfig( KConfig *config )
{
- //US opie addressbook is always readonly
-//US setReadOnly( true );
-
Resource::writeConfig( config );
config->writeEntry( "FileName", mFileName );
// qDebug("ResourceFile::writeConfig format %s, %s", mFileName.latin1(), mFormatName.latin1());
@@ -210,13 +205,13 @@ bool ResourceOpie::load()
OContactAccess::List::Iterator it;
OContactAccess::List allList = access->allRecords();
for ( it = allList.begin(); it != allList.end(); ++it )
{
- OContact c = (*it);
+ const OContact c = (*it);
KABC::Addressee addressee;
res = mConverter->opieToAddressee( c, addressee );
if ( !addressee.isEmpty() && res )