summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-07 16:38:40 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2014-10-07 16:38:40 -0500
commitc1098677d4c3f93108a3a0d9dd56388f887416c8 (patch)
tree559cff6f7b314fe014ed4f2828f65ae962700149
parentf8790c70f8b1ce1f143719c19131c50031fd051a (diff)
downloadtdelibs-c1098677d4c3f93108a3a0d9dd56388f887416c8.tar.gz
tdelibs-c1098677d4c3f93108a3a0d9dd56388f887416c8.zip
Add the following patch from Bug 1499
tdelibs: add postofficebox suppot in tdeabc
-rw-r--r--tdeabc/scripts/entrylist2
-rw-r--r--tdeabc/scripts/field.src.cpp18
2 files changed, 20 insertions, 0 deletions
diff --git a/tdeabc/scripts/entrylist b/tdeabc/scripts/entrylist
index 87c342a06..c48124162 100644
--- a/tdeabc/scripts/entrylist
+++ b/tdeabc/scripts/entrylist
@@ -29,6 +29,7 @@ ALFE,birthday,,TQDateTime,birthday,Personal,.toString()
#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 country,,TQString,homeAddressCountry,Address|Personal
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 b7eb3ea5d..f8f126b83 100644
--- a/tdeabc/scripts/field.src.cpp
+++ b/tdeabc/scripts/field.src.cpp
@@ -184,6 +184,8 @@ TQString Field::value( const TDEABC::Addressee &a )
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 @@ TQString Field::value( const TDEABC::Addressee &a )
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 @@ bool Field::setValue( TDEABC::Addressee &a, const TQString &value )
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 @@ bool Field::setValue( TDEABC::Addressee &a, const TQString &value )
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 );