2 files changed, 49 insertions, 56 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
@@ -5,13 +5,13 @@ TARGET = microkaddrbk_sharpdtm_xxport
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR = $(QPEDIR)/lib
 
 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
 LIBS += -lmicrokde 
 LIBS += -lmicrokabc
 LIBS += -lqpe
 LIBS += -lqte
 LIBS += -lzdtm
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
@@ -50,13 +50,13 @@ $Id$
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurl.h>
 */
 
 #include "xxportmanager.h"
-//#include "qtopiaconverter.h"
+#include "sharpdtmconverter.h"
 
 #include "sharpdtm_xxport.h"
 
 
 class SharpDTMXXPortFactory : public XXPortFactory
 {
@@ -87,120 +87,113 @@ SharpDTMXXPort::SharpDTMXXPort( KABC::AddressBook *ab, QWidget *parent, const ch
 bool SharpDTMXXPort::exportContacts( const KABC::AddresseeList &list, const QString &data )
 {
   // we can not choose the filename. Therefore use the default to display
   QString fileName = SlZDataBase::addressbookFileName();
 
    SlZDataBase* access = new SlZDataBase(fileName,
-                        SlZDataBase::addressbookItems()); 
-        
+                        SlZDataBase::addressbookItems());
+
   if ( !access ) {
     QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) );
     qDebug(text.latin1());
     KMessageBox::error( parentWidget(), text );
     addressBook()->error( text );
     return false;
   }
 
-//  KABC::QtopiaConverter mConverter;
-  
-//  bool res = mConverter.init();
-  bool res = true;
+  KABC::SharpDTMConverter mConverter;
+
+  bool res = mConverter.init();
   if (!res)
   {
     QString text( i18n( "Unable to initialize sharpdtm converter.<br>Most likely a problem with the category file." ) );
     qDebug(text);
     KMessageBox::error( parentWidget(), text );
     delete access;
-    return false;  
+    return false;
   }
-  
+
   //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)
-    {
-      QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) );
-      if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) {
-        // Clean the database..
-
-        AddressBookIterator it2(*access);
-        for (it2.toFirst(); it2.current(); ++it2) {
-          access->removeContact(*it2.current());
-        }
-      }
+  if (access->count() > 0)
+  {
+    QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) );
+    if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) {
+      // Clean the database..
+      access->deleteCard(0, SlZDataBase::AllCard );
     }
   }
-      
+
   KABC::Addressee::List::ConstIterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
-    PimContact c;
-    KABC::Addressee addressee = (*it);
-    
-    res = mConverter.addresseeToQtopia( *it, c );
+    CardId c;
+    res = access->editNewCard();
+
     if (res == true)
     {
-      access->addContact(c);
-    }
+            res = mConverter.addresseeToSharp( *it, access, c );
+
+        if (res == true)
+          access->finishEditCard(&c);
+        else
+          access->cancelEditCard();
+        }
   }
-*/  
+
   delete access;
-      
+
   return true;
 }
 
 KABC::AddresseeList SharpDTMXXPort::importContacts( const QString& ) const
 {
   KABC::AddresseeList adrlst;
-  
+
   QString fileName = SlZDataBase::addressbookFileName();
-  
+
+  // the last parameter in the SlZDataBase constructor means "readonly"
   SlZDataBase* access = new SlZDataBase(fileName,
-                        SlZDataBase::addressbookItems());
+                        SlZDataBase::addressbookItems(), NULL, true);
+
 
-        
   if ( !access ) {
     QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) );
     qDebug(text.latin1());
     addressBook()->error( text );
     KMessageBox::error( parentWidget(), text );
     return KABC::AddresseeList();
   }
-/*US  
-  KABC::QtopiaConverter mConverter;
+
+  KABC::SharpDTMConverter mConverter;
 
   bool res = mConverter.init();
   if (!res)
   {
     QString text( i18n( "Unable to initialize sharp converter.<br>Most likely a problem with the category file." ) );
     qDebug(text);
     KMessageBox::error( parentWidget(), text );
     delete access;
     return KABC::AddresseeList();
   }
-  
-  
-        
-  { //create a new scope 
-    AddressBookIterator it(*access);
-
-    for (it.toFirst(); it.current(); ++it) {
-      const PimContact*contact = it.current();
-    
+
+
+  { //create a new scope
+    CardId id;
+
+    for (bool res=access->first(); res == true; res=access->next()) {
+      id = access->cardId();
+
       KABC::Addressee addressee;
-    
-      res = mConverter.qtopiaToAddressee( (*contact), addressee );    
-    
+
+      res = mConverter.sharpToAddressee( id, access, addressee );
+
       if ( !addressee.isEmpty() && res )
       {
         adrlst.append( addressee );
       }
     }
   }
-*/
-  
+
   delete access;
-  
+
   return adrlst;
-  
+
 }