summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/plugins/sharpdtm/resourcesharpdtm.h4
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmE.pro2
-rw-r--r--kaddressbook/xxport/qtopia/qtopia_xxport.cpp1
3 files changed, 3 insertions, 4 deletions
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.h b/kabc/plugins/sharpdtm/resourcesharpdtm.h
index 32d0be1..d2e2a52 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.h
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.h
@@ -37,13 +37,13 @@ $Id$
#include "resource.h"
namespace KABC {
class ResourceConfigWidget;
-class QtopiaConverter;
+class SharpDTMConverter;
/**
@internal
*/
class ResourceSharpDTM : public Resource
{
@@ -132,13 +132,13 @@ protected:
void init( const QString &fileName );
bool lock( const QString &fileName );
void unlock( const QString &fileName );
private:
- QtopiaConverter* mConverter;
+ SharpDTMConverter* mConverter;
QString mFileName;
QString mLockUniqueName;
KDirWatch mDirWatch;
diff --git a/kabc/plugins/sharpdtm/sharpdtmE.pro b/kabc/plugins/sharpdtm/sharpdtmE.pro
index f29be2f..7c7a6d5 100644
--- a/kabc/plugins/sharpdtm/sharpdtmE.pro
+++ b/kabc/plugins/sharpdtm/sharpdtmE.pro
@@ -1,12 +1,12 @@
TEMPLATE = lib
CONFIG += qt warn_on
#release debug
TARGET = microkabc_sharpdtm
-INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../converter/qtopia ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include
+INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../converter/sharpdtm ../../../microkde ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../microkde/kio/kio ../../../qtcompat $(QPEDIR)/include
OBJECTS_DIR = obj/$(PLATFORM)
MOC_DIR = moc/$(PLATFORM)
DESTDIR = $(QPEDIR)/lib
LIBS += -lmicrokde
diff --git a/kaddressbook/xxport/qtopia/qtopia_xxport.cpp b/kaddressbook/xxport/qtopia/qtopia_xxport.cpp
index bf39fdb..c1ed03e 100644
--- a/kaddressbook/xxport/qtopia/qtopia_xxport.cpp
+++ b/kaddressbook/xxport/qtopia/qtopia_xxport.cpp
@@ -129,13 +129,12 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
}
}
KABC::Addressee::List::ConstIterator it;
for ( it = list.begin(); it != list.end(); ++it ) {
PimContact c;
- KABC::Addressee addressee = (*it);
res = mConverter.addresseeToQtopia( *it, c );
if (res == true)
{
access->addContact(c);
}