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
@@ -42,3 +42,3 @@ namespace KABC {
 class ResourceConfigWidget;
-class QtopiaConverter;
+class SharpDTMConverter;
 
@@ -85,3 +85,3 @@ public:
   virtual void doClose();
-  
+
   /**
@@ -137,4 +137,4 @@ protected:
 private:
-  QtopiaConverter* mConverter;
-  
+  SharpDTMConverter* mConverter;
+
   QString mFileName;
@@ -142,3 +142,3 @@ private:
   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
@@ -5,3 +5,3 @@ 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
@@ -90,5 +90,5 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
- 
+
   AddressBookAccess* access = new AddressBookAccess();
-        
+
   if ( !access ) {
@@ -102,3 +102,3 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
   KABC::QtopiaConverter mConverter;
-  
+
   bool res = mConverter.init();
@@ -110,7 +110,7 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
     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);
@@ -130,3 +130,3 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
   }
-      
+
   KABC::Addressee::List::ConstIterator it;
@@ -134,4 +134,3 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
     PimContact c;
-    KABC::Addressee addressee = (*it);
-    
+
     res = mConverter.addresseeToQtopia( *it, c );
@@ -142,5 +141,5 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
   }
-  
+
   delete access;
-      
+
   return true;
@@ -151,3 +150,3 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
   KABC::AddresseeList adrlst;
-  
+
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
@@ -155,3 +154,3 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
   AddressBookAccess* access = new AddressBookAccess();
-        
+
   if ( !access ) {
@@ -163,3 +162,3 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
   }
-  
+
   KABC::QtopiaConverter mConverter;
@@ -175,6 +174,6 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
   }
-  
-  
-        
-  { //create a new scope 
+
+
+
+  { //create a new scope
     AddressBookIterator it(*access);
@@ -183,7 +182,7 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
       const PimContact*contact = it.current();
-    
+
       KABC::Addressee addressee;
-    
-      res = mConverter.qtopiaToAddressee( (*contact), addressee );    
-    
+
+      res = mConverter.qtopiaToAddressee( (*contact), addressee );
+
       if ( !addressee.isEmpty() && res )
@@ -194,8 +193,8 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
   }
-  
+
   delete access;
 //US the deletion of the access object deletes the backend object as well.
-  
+
   return adrlst;
-  
+
 }