Branch: master

c1098677 2014-10-07 16:38:40 Timothy Pearson
Add the following patch from Bug 1499
 tdelibs: add postofficebox suppot in tdeabc
M tdeabc/scripts/entrylist
M tdeabc/scripts/field.src.cpp
diff --git a/tdeabc/scripts/entrylist b/tdeabc/scripts/entrylist
index 87c342a..c481241 100644
--- a/tdeabc/scripts/entrylist
+++ b/tdeabc/scripts/entrylist
@@ -29,6 +29,7 @@
 
 #Address address
 LF,home address street,,TQString,homeAddressStreet,Address|Personal
+LF,home address post office box,,TQString,homeAddressPostOfficeBox,Address|Personal
 LF,home address city,,TQString,homeAddressLocality,Address|Personal
 LF,home address state,,TQString,homeAddressRegion,Address|Personal
 LF,home address zip code,,TQString,homeAddressPostalCode,Address|Personal
@@ -36,6 +37,7 @@
 LF,home address label,,TQString,homeAddressLabel,Address|Personal
 
 LF,business address street,,TQString,businessAddressStreet,Address|Organization
+LF,business address post office box,,TQString,businessAddressPostOfficeBox,Address|Organization
 LF,business address city,,TQString,businessAddressLocality,Address|Organization
 LF,business address state,,TQString,businessAddressRegion,Address|Organization
 LF,business address zip code,,TQString,businessAddressPostalCode,Address|Organization
diff --git a/tdeabc/scripts/field.src.cpp b/tdeabc/scripts/field.src.cpp
index b7eb3ea..f8f126b 100644
--- a/tdeabc/scripts/field.src.cpp
+++ b/tdeabc/scripts/field.src.cpp
@@ -184,6 +184,8 @@
       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:
@@ -196,6 +198,8 @@
       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:
@@ -266,6 +270,13 @@
         a.insertAddress( address );
         return true;
       }
+    case FieldImpl::HomeAddressPostOfficeBox:
+      {
+        TDEABC::Address address = a.address( Address::Home );
+        address.setPostOfficeBox( value );
+        a.insertAddress( address );
+        return true;
+      }
     case FieldImpl::HomeAddressLocality:
       {
         TDEABC::Address address = a.address( Address::Home );
@@ -308,6 +319,13 @@
         a.insertAddress( address );
         return true;
       }
+    case FieldImpl::BusinessAddressPostOfficeBox:
+      {
+        TDEABC::Address address = a.address( Address::Work );
+        address.setPostOfficeBox( value );
+        a.insertAddress( address );
+        return true;
+      }
     case FieldImpl::BusinessAddressLocality:
       {
         TDEABC::Address address = a.address( Address::Work );