2 files changed, 23 insertions, 30 deletions

diff --git a/kaddressbook/xxport/sharpdtm/sharpdtmE.pro b/kaddressbook/xxport/sharpdtm/sharpdtmE.pro
index 6e83853..0425c42 100644
--- a/kaddressbook/xxport/sharpdtm/sharpdtmE.pro
+++ b/kaddressbook/xxport/sharpdtm/sharpdtmE.pro
@@ -10,3 +10,3 @@ DEFINES += KAB_EMBEDDED
 
-INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../..  ../../../kabc ../../../kabc/converter/qtopia ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include
+INCLUDEPATH += ../.. ../../../external/sharpdtm/include ../../..  ../../../kabc ../../../kabc/converter/sharpdtm ../../../microkde ../../../microkde/kdeui ../../../microkde/kdecore ../../../microkde/kio/kfile ../../../qtcompat $(QPEDIR)/include
 LIBS += -L$(QPEDIR)/lib
diff --git a/kaddressbook/xxport/sharpdtm/sharpdtm_xxport.cpp b/kaddressbook/xxport/sharpdtm/sharpdtm_xxport.cpp
index 4e6a504..8593814 100644
--- a/kaddressbook/xxport/sharpdtm/sharpdtm_xxport.cpp
+++ b/kaddressbook/xxport/sharpdtm/sharpdtm_xxport.cpp
@@ -55,3 +55,3 @@ $Id$
 #include "xxportmanager.h"
-//#include "qtopiaconverter.h"
+#include "sharpdtmconverter.h"
 
@@ -102,6 +102,5 @@ bool SharpDTMXXPort::exportContacts( const KABC::AddresseeList &list, const QStr
 
-//  KABC::QtopiaConverter mConverter;
+  KABC::SharpDTMConverter mConverter;
   
-//  bool res = mConverter.init();
-  bool res = true;
+  bool res = mConverter.init();
   if (!res)
@@ -116,7 +115,3 @@ bool SharpDTMXXPort::exportContacts( const KABC::AddresseeList &list, const QStr
   //Now check if the file has already entries, and ask the user if he wants to delete them first.
-/*US
-  { //create a new scope 
-    AddressBookIterator it(*access);
-    const PimContact* firstcontact = it.toFirst();
-    if (firstcontact)
+  if (access->count() > 0)
     {
@@ -125,8 +120,3 @@ bool SharpDTMXXPort::exportContacts( const KABC::AddresseeList &list, const QStr
         // Clean the database..
-
-        AddressBookIterator it2(*access);
-        for (it2.toFirst(); it2.current(); ++it2) {
-          access->removeContact(*it2.current());
-        }
-      }
+      access->deleteCard(0, SlZDataBase::AllCard );
     }
@@ -136,12 +126,16 @@ bool SharpDTMXXPort::exportContacts( const KABC::AddresseeList &list, const QStr
   for ( it = list.begin(); it != list.end(); ++it ) {
-    PimContact c;
-    KABC::Addressee addressee = (*it);
+    CardId c;
+    res = access->editNewCard();
     
-    res = mConverter.addresseeToQtopia( *it, c );
     if (res == true)
     {
-      access->addContact(c);
+            res = mConverter.addresseeToSharp( *it, access, c );
+
+        if (res == true)
+          access->finishEditCard(&c);
+        else
+          access->cancelEditCard();
     }
   }
-*/  
+
   delete access;
@@ -157,4 +151,5 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
   
+  // the last parameter in the SlZDataBase constructor means "readonly"
   SlZDataBase* access = new SlZDataBase(fileName,
-                        SlZDataBase::addressbookItems());
+                        SlZDataBase::addressbookItems(), NULL, true);
 
@@ -168,4 +163,4 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
   }
-/*US  
-  KABC::QtopiaConverter mConverter;
+
+  KABC::SharpDTMConverter mConverter;
 
@@ -182,8 +177,7 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
   
-        
   { //create a new scope 
-    AddressBookIterator it(*access);
+    CardId id;
 
-    for (it.toFirst(); it.current(); ++it) {
-      const PimContact*contact = it.current();
+    for (bool res=access->first(); res == true; res=access->next()) {
+      id = access->cardId();
     
@@ -191,3 +185,3 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
     
-      res = mConverter.qtopiaToAddressee( (*contact), addressee );    
+      res = mConverter.sharpToAddressee( id, access, addressee );
     
@@ -199,3 +193,2 @@ KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
   }
-*/