| author | zautrix <zautrix> | 2004-10-14 09:28:50 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2004-10-14 09:28:50 (UTC) |
| commit | 3d79ab275374292196c7d032ffd2e321841c8cb0 (patch) (side-by-side diff) | |
| tree | 6ceaba2a5f375cfebc88189000221fe456e6f9d2 /kabc | |
| parent | 57bd80b04dddd40a897dce8b6902d1046d71c631 (diff) | |
| download | kdepimpi-3d79ab275374292196c7d032ffd2e321841c8cb0.zip kdepimpi-3d79ab275374292196c7d032ffd2e321841c8cb0.tar.gz kdepimpi-3d79ab275374292196c7d032ffd2e321841c8cb0.tar.bz2 | |
umlaute phone fixes
| -rw-r--r-- | kabc/addressbook.cpp | 3 | ||||
| -rw-r--r-- | kabc/addressbook.h | 2 | ||||
| -rw-r--r-- | kabc/plugins/sharpdtm/resourcesharpdtm.cpp | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index c584c35..3641c0c 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp @@ -479,3 +479,3 @@ bool AddressBook::export2PhoneFormat( QStringList uids ,QString fileName ) } -void AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld ) +int AddressBook::importFromFile( QString fileName, bool replaceLabel, bool removeOld ) { @@ -512,2 +512,3 @@ void AddressBook::importFromFile( QString fileName, bool replaceLabel, bool rem removeUntagged(); + return list.count(); } diff --git a/kabc/addressbook.h b/kabc/addressbook.h index 23bba02..5edca06 100644 --- a/kabc/addressbook.h +++ b/kabc/addressbook.h @@ -149,3 +149,3 @@ class AddressBook : public QObject 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 ); 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 @@ -74,4 +74,4 @@ ResourceSharpDTM::ResourceSharpDTM( const KConfig *config ) -ResourceSharpDTM::ResourceSharpDTM( const QString &fileName, bool syncable ) - : Resource( 0, syncable ) +ResourceSharpDTM::ResourceSharpDTM( const QString &fileName ) + : Resource( 0 ) { |