From 3d79ab275374292196c7d032ffd2e321841c8cb0 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Thu, 14 Oct 2004 09:28:50 +0000
Subject: umlaute phone fixes

---
(limited to 'kabc')

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index c584c35..3641c0c 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -477,7 +477,7 @@ bool  AddressBook::export2PhoneFormat( QStringList uids ,QString fileName )
   return true;
 
 }
-void  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld  )
+int  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld  )
 {
 
     if ( removeOld )
@@ -510,6 +510,7 @@ void  AddressBook::importFromFile( QString fileName, bool replaceLabel, bool rem
     }
     if ( removeOld )
         removeUntagged();
+    return list.count();
 }
 void AddressBook::setUntagged(bool setNonSyncTagged) // = false)
 {
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 23bba02..5edca06 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -147,7 +147,7 @@ class AddressBook : public QObject
     void preparePhoneSync( QString currentSyncDevice, bool isPreSync );
     void export2File( QString fileName );
     bool export2PhoneFormat(  QStringList uids ,QString fileName );
-    void importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false );
+    int importFromFile( QString fileName,  bool replaceLabel = false, bool removeOld = false );
     void setUntagged( bool setNonSyncTagged = false );
     void removeUntagged();
     void findNewExtIds(  QString fileName, QString currentSyncDevice  );
diff --git a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
index 2cdf4bf..ba17c50 100644
--- a/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
+++ b/kabc/plugins/sharpdtm/resourcesharpdtm.cpp
@@ -72,8 +72,8 @@ ResourceSharpDTM::ResourceSharpDTM( const KConfig *config  )
   init( fileName );
 }
 
-ResourceSharpDTM::ResourceSharpDTM( const QString &fileName, bool syncable  )
-  : Resource( 0, syncable )
+ResourceSharpDTM::ResourceSharpDTM( const QString &fileName  )
+  : Resource( 0 )
 {
   init( fileName );
 }
--
cgit v0.9.0.2