[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/trinity/kdelibs
From:       Timothy Pearson <kb9vqf () pearsoncomputing ! net>
Date:       2010-09-01 0:59:34
Message-ID: 20100901005934.AC547AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1170467 by tpearson:

* Synchronized with enterprise branch


 A             LAST_ENTERPRISE_SYNC  
 M  +0 -2      kabc/scripts/entrylist  
 M  +0 -18     kabc/scripts/field.src.cpp  


--- branches/trinity/kdelibs/kabc/scripts/entrylist #1170466:1170467
@@ -29,7 +29,6 @@
 
 #Address address
 LF,home address street,,QString,homeAddressStreet,Address|Personal
-LF,home address post office box,,QString,homeAddressPostOfficeBox,Address|Personal
 LF,home address city,,QString,homeAddressLocality,Address|Personal
 LF,home address state,,QString,homeAddressRegion,Address|Personal
 LF,home address zip code,,QString,homeAddressPostalCode,Address|Personal
@@ -37,7 +36,6 @@
 LF,home address label,,QString,homeAddressLabel,Address|Personal
 
 LF,business address street,,QString,businessAddressStreet,Address|Organization
-LF,business address post office box,,QString,businessAddressPostOfficeBox,Address|Organization
 LF,business address city,,QString,businessAddressLocality,Address|Organization
 LF,business address state,,QString,businessAddressRegion,Address|Organization
 LF,business address zip code,,QString,businessAddressPostalCode,Address|Organization
--- branches/trinity/kdelibs/kabc/scripts/field.src.cpp #1170466:1170467
@@ -184,8 +184,6 @@
       return a.phoneNumber( PhoneNumber::Pager ).number();
     case FieldImpl::HomeAddressStreet:
       return a.address( Address::Home ).street();
-    case FieldImpl::HomeAddressPostOfficeBox:
-      return a.address( Address::Home ).postOfficeBox();
     case FieldImpl::HomeAddressLocality:
       return a.address( Address::Home ).locality();
     case FieldImpl::HomeAddressRegion:
@@ -198,8 +196,6 @@
       return a.address( Address::Home ).label();
     case FieldImpl::BusinessAddressStreet:
       return a.address( Address::Work ).street();
-    case FieldImpl::BusinessAddressPostOfficeBox:
-      return a.address( Address::Work ).postOfficeBox();
     case FieldImpl::BusinessAddressLocality:
       return a.address( Address::Work ).locality();
     case FieldImpl::BusinessAddressRegion:
@@ -270,13 +266,6 @@
         a.insertAddress( address );
         return true;
       }
-    case FieldImpl::HomeAddressPostOfficeBox:
-      {
-        KABC::Address address = a.address( Address::Home );
-        address.setPostOfficeBox( value );
-        a.insertAddress( address );
-        return true;
-      }
     case FieldImpl::HomeAddressLocality:
       {
         KABC::Address address = a.address( Address::Home );
@@ -319,13 +308,6 @@
         a.insertAddress( address );
         return true;
       }
-    case FieldImpl::BusinessAddressPostOfficeBox:
-      {
-        KABC::Address address = a.address( Address::Work );
-        address.setPostOfficeBox( value );
-        a.insertAddress( address );
-        return true;
-      }
     case FieldImpl::BusinessAddressLocality:
       {
         KABC::Address address = a.address( Address::Work );
[prev in list] [next in list] [prev in thread] [next in thread]