From 10a0e05cc4962d9412a7a5faf3d69a3caf6d1c34 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 08 Oct 2004 20:03:23 +0000
Subject: added contact phone support

---
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 25c77f6..e571980 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -315,6 +315,38 @@ void Addressee::mergeContact( const Addressee& ad )
     setRevision( ad.revision() );
 }
 
+// removes all emails but the first 
+// needed by phone sync
+void Addressee::simplifyEmails()
+{ 
+    if ( mData->emails.count() == 0 ) return ;
+    QString email = mData->emails.first();
+    detach();
+    mData->emails.clear();
+    mData->emails.append( email );
+}
+
+void Addressee::simplifyPhoneNumbers()
+{
+    KABC::PhoneNumber::List removeNumbers;
+    KABC::PhoneNumber::List::Iterator phoneIter;
+    for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
+          ++phoneIter ) {
+        if ( ! ( *phoneIter ).simplifyNumber() )
+            removeNumbers.append( ( *phoneIter ) );
+    }
+    for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end();
+          ++phoneIter ) {
+        removePhoneNumber(( *phoneIter ));
+    }
+}
+void Addressee::simplifyPhoneNumberTypes()
+{
+    KABC::PhoneNumber::List::Iterator phoneIter;
+    for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
+          ++phoneIter )
+        ( *phoneIter ).simplifyType();
+}
 void Addressee::removeID(const QString &prof)
 {
     detach();
diff --git a/kabc/addressee.h b/kabc/addressee.h
index 8baa888..4cafa86 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -117,6 +117,10 @@ class Addressee
     void setOriginalExternalUID( const QString &id );
     QString originalExternalUID() const;
     void mergeContact(  const Addressee& ad ); 
+    void simplifyEmails();
+    void simplifyPhoneNumbers();
+    void simplifyPhoneNumberTypes();
+    
     /**
       Set unique identifier.
      */
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 7aeb2ee..e5abc0e 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -66,6 +66,29 @@ bool PhoneNumber::operator!=( const PhoneNumber &p ) const
   return !( p == *this );
 }
 
+bool PhoneNumber::simplifyNumber()
+{
+    QString Number;
+    int i;
+    Number = mNumber.stripWhiteSpace ();
+    mNumber = "";
+    if ( Number.at(0) == '+' )
+        mNumber += "+";
+    for ( i = 0; i < Number.length(); ++i) {
+        if ( Number.at(i).isDigit() )
+            mNumber += Number.at(i);
+    }
+    return ( mNumber.length() > 0 );
+}
+// make cellphone compatible
+void PhoneNumber::simplifyType()
+{
+ if ( mType & Fax ) mType = Fax;
+ else if ( mType & Cell ) mType = Cell;
+ else if ( mType & Work  ) mType = Work  ;
+ else if ( mType & Home ) mType = Home;
+ else  mType = Pref;
+}
 void PhoneNumber::setId( const QString &id )
 {
   mId = id;
diff --git a/kabc/phonenumber.h b/kabc/phonenumber.h
index 1df344f..410a52f 100644
--- a/kabc/phonenumber.h
+++ b/kabc/phonenumber.h
@@ -148,6 +148,8 @@ class PhoneNumber
       @obsolete
     */
     static QString label( int type );
+    bool simplifyNumber();
+    void simplifyType();
 
   private:
     void init();
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index c5406bf..939296f 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -699,11 +699,14 @@ void KABCore::export2phone()
 
       if ( a.isEmpty() )
           continue;
+      a.simplifyEmails();
+      a.simplifyPhoneNumbers();
+      a.simplifyPhoneNumberTypes();
 
       if (description.isEmpty())
           description = a.formattedName();
-
       QString vcard;
+      QString vcardnew;
       converter.addresseeToVCard( a, vcard );
       int start = 0;
       int next;
@@ -715,11 +718,23 @@ void KABCore::export2phone()
               sep = semi ;
           else
               sep = dopp;
-          datastream +=vcard.mid( start, next - start);
-          datastream +=vcard.mid( next+5,sep -next -5 ).upper();
+          vcardnew +=vcard.mid( start, next - start);
+          vcardnew +=vcard.mid( next+5,sep -next -5 ).upper();
           start = sep;
       }
-      datastream += vcard.mid( start,vcard.length() );
+      vcardnew += vcard.mid( start,vcard.length() );
+      vcard = "";
+      start = 0;
+      while ( (next = vcardnew.find("ADR", start) )>= 0 ) {
+          int sep = vcardnew.find(":", next);
+          vcard +=vcardnew.mid( start, next - start+3);
+          start = sep;
+      }
+      vcard += vcardnew.mid( start,vcardnew.length() );
+      vcard.replace ( QRegExp(";;;") , "" );
+      vcard.replace ( QRegExp(";;") , "" );
+      datastream += vcard;
+     
   }
   QFile outFile(fileName);
   if ( outFile.open(IO_WriteOnly) ) { 
--
cgit v0.9.0.2