From c2165f4e14bc2f7ab2ef19f5c35497dde5e87a0d Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Sat, 09 Oct 2004 02:17:06 +0000
Subject: import ir fixes

---
(limited to 'kabc')

diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index dc3cda1..bf6d053 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -402,22 +402,30 @@ void  AddressBook::export2File( QString fileName )
   t <<  "\r\n\r\n";
   outFile.close(); 
 }
-void  AddressBook::importFromFile( QString fileName )
+void  AddressBook::importFromFile( QString fileName, bool replaceLabel )
 {
 
-    KABC::Addressee::List list;
+  KABC::Addressee::List list;
   QFile file( fileName );
 
   file.open( IO_ReadOnly );
   QByteArray rawData = file.readAll();
   file.close();
-  
-  QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
+  qDebug("AddressBook::importFromFile ");
+  QString data;
+  if ( replaceLabel ) { 
+      data = QString::fromLatin1( rawData.data(), rawData.size() + 1 ); 
+      data.replace ( QRegExp("LABEL") , "ADR" );
+      data.replace ( QRegExp("CHARSET=ISO-8859-1") , "" );
+  } else
+      data = QString::fromUtf8( rawData.data(), rawData.size() + 1 ); 
   KABC::VCardTool tool;
   list =  tool.parseVCards( data );
   KABC::Addressee::List::Iterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
       (*it).setResource( 0 );
+      if ( replaceLabel )
+          (*it).removeVoice();
       insertAddressee( (*it), false, true );
   }
 
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 3603ec1..cea1b03 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -143,7 +143,7 @@ class AddressBook : public QObject
     bool save( Ticket *ticket );
     bool saveAB( );
     void export2File( QString fileName );
-    void importFromFile( QString fileName );
+    void importFromFile( QString fileName,  bool replaceLabel = false );
     /**
       Returns a iterator for first entry of address book.
     */
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 19a1845..3f3d5c0 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -315,6 +315,23 @@ void Addressee::mergeContact( const Addressee& ad )
     setRevision( ad.revision() );
 }
 
+bool Addressee::removeVoice()
+{
+    PhoneNumber::List phoneN = phoneNumbers();
+    PhoneNumber::List::Iterator phoneIt;
+    bool found = false;
+    for ( phoneIt = phoneN.begin(); phoneIt != phoneN.end(); ++phoneIt ) {
+        if ( (*phoneIt).type() & PhoneNumber::Voice) { // voice found
+            if ((*phoneIt).type() - PhoneNumber::Voice ) {
+                (*phoneIt).setType((*phoneIt).type() - PhoneNumber::Voice );
+                insertPhoneNumber( (*phoneIt) );
+                found = true;
+            }
+        }
+        
+    }
+    return found;
+}
 void Addressee::simplifyAddresses()
 {
     if ( mData->addresses.count() < 3 ) return ;
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 44f0629..9336edc 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -121,6 +121,7 @@ class Addressee
     void simplifyAddresses();
     void simplifyPhoneNumbers();
     void simplifyPhoneNumberTypes();
+    bool removeVoice();
     
     /**
       Set unique identifier.
--
cgit v0.9.0.2