3 files changed, 30 insertions, 31 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
@@ -41,5 +41,5 @@ namespace KABC {
 
 class ResourceConfigWidget;
-class QtopiaConverter;
+class SharpDTMConverter;
 
 /**
@@ -84,5 +84,5 @@ public:
    */
   virtual void doClose();
-  
+
   /**
    * Requests a save ticket, that is used by @ref save()
@@ -136,10 +136,10 @@ protected:
 
 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
@@ -4,5 +4,5 @@ CONFIG += qt warn_on
 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 
 
 
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
@@ -89,7 +89,7 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
   // we can not choose the filename. Therefore use the default to display
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
- 
+
   AddressBookAccess* access = new AddressBookAccess();
-        
+
   if ( !access ) {
     QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) );
@@ -101,5 +101,5 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
 
   KABC::QtopiaConverter mConverter;
-  
+
   bool res = mConverter.init();
   if (!res)
@@ -109,9 +109,9 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
     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.
-  { //create a new scope 
+  { //create a new scope
     AddressBookIterator it(*access);
     const PimContact* firstcontact = it.toFirst();
@@ -129,10 +129,9 @@ 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)
@@ -141,7 +140,7 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
     }
   }
-  
+
   delete access;
-      
+
   return true;
 }
@@ -150,9 +149,9 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
 {
   KABC::AddresseeList adrlst;
-  
+
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
 
   AddressBookAccess* access = new AddressBookAccess();
-        
+
   if ( !access ) {
     QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) );
@@ -162,5 +161,5 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
     return KABC::AddresseeList();
   }
-  
+
   KABC::QtopiaConverter mConverter;
 
@@ -174,17 +173,17 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
     return KABC::AddresseeList();
   }
-  
-  
-        
-  { //create a new scope 
+
+
+
+  { //create a new scope
     AddressBookIterator it(*access);
 
     for (it.toFirst(); it.current(); ++it) {
       const PimContact*contact = it.current();
-    
+
       KABC::Addressee addressee;
-    
-      res = mConverter.qtopiaToAddressee( (*contact), addressee );    
-    
+
+      res = mConverter.qtopiaToAddressee( (*contact), addressee );
+
       if ( !addressee.isEmpty() && res )
       {
@@ -193,9 +192,9 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
     }
   }
-  
+
   delete access;
 //US the deletion of the access object deletes the backend object as well.
-  
+
   return adrlst;
-  
+
 }