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

List:       kde-commits
Subject:    KDE/kdepim/kaddressbook
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-06-17 21:24:10
Message-ID: 20100617212410.B08F2AC8D7 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1139252 by tokoe:

Add Post Office Box field for home and work address

BUG: 240635


 M  +30 -0     contactfields.cpp  
 M  +2 -0      contactfields.h  


--- trunk/KDE/kdepim/kaddressbook/contactfields.cpp #1139251:1139252
@@ -36,12 +36,14 @@
     case Birthday: return KABC::Addressee::birthdayLabel(); break;
     case Anniversary: return i18n( "Anniversary" ); break;
     case HomeAddressStreet: return KABC::Addressee::homeAddressStreetLabel(); break;
+    case HomeAddressPostOfficeBox: return \
                KABC::Addressee::homeAddressPostOfficeBoxLabel(); break;
     case HomeAddressLocality: return KABC::Addressee::homeAddressLocalityLabel(); \
                break;
     case HomeAddressRegion: return KABC::Addressee::homeAddressRegionLabel(); break;
     case HomeAddressPostalCode: return \
                KABC::Addressee::homeAddressPostalCodeLabel(); break;
     case HomeAddressCountry: return KABC::Addressee::homeAddressCountryLabel(); \
                break;
     case HomeAddressLabel: return KABC::Addressee::homeAddressLabelLabel(); break;
     case BusinessAddressStreet: return \
KABC::Addressee::businessAddressStreetLabel(); break; +    case \
BusinessAddressPostOfficeBox: return \
                KABC::Addressee::businessAddressPostOfficeBoxLabel(); break;
     case BusinessAddressLocality: return \
                KABC::Addressee::businessAddressLocalityLabel(); break;
     case BusinessAddressRegion: return \
                KABC::Addressee::businessAddressRegionLabel(); break;
     case BusinessAddressPostalCode: return \
KABC::Addressee::businessAddressPostalCodeLabel(); break; @@ -89,12 +91,14 @@
          << Email3
          << Email4
          << HomeAddressStreet
+         << HomeAddressPostOfficeBox
          << HomeAddressLocality
          << HomeAddressRegion
          << HomeAddressPostalCode
          << HomeAddressCountry
          << HomeAddressLabel
          << BusinessAddressStreet
+         << BusinessAddressPostOfficeBox
          << BusinessAddressLocality
          << BusinessAddressRegion
          << BusinessAddressPostalCode
@@ -246,6 +250,13 @@
         contact.insertAddress( address );
       }
       break;
+    case ContactFields::HomeAddressPostOfficeBox:
+      {
+        KABC::Address address = contact.address( KABC::Address::Home );
+        address.setPostOfficeBox( value );
+        contact.insertAddress( address );
+      }
+      break;
     case ContactFields::HomeAddressLocality:
       {
         KABC::Address address = contact.address( KABC::Address::Home );
@@ -288,6 +299,13 @@
         contact.insertAddress( address );
       }
       break;
+    case ContactFields::BusinessAddressPostOfficeBox:
+      {
+        KABC::Address address = contact.address( KABC::Address::Work );
+        address.setPostOfficeBox( value );
+        contact.insertAddress( address );
+      }
+      break;
     case ContactFields::BusinessAddressLocality:
       {
         KABC::Address address = contact.address( KABC::Address::Work );
@@ -353,6 +371,12 @@
         return address.street();
       }
       break;
+    case HomeAddressPostOfficeBox:
+      {
+        const KABC::Address address = contact.address( KABC::Address::Home );
+        return address.postOfficeBox();
+      }
+      break;
     case HomeAddressLocality:
       {
         const KABC::Address address = contact.address( KABC::Address::Home );
@@ -389,6 +413,12 @@
         return address.street();
       }
       break;
+    case BusinessAddressPostOfficeBox:
+      {
+        const KABC::Address address = contact.address( KABC::Address::Work );
+        return address.postOfficeBox();
+      }
+      break;
     case BusinessAddressLocality:
       {
         const KABC::Address address = contact.address( KABC::Address::Work );
--- trunk/KDE/kdepim/kaddressbook/contactfields.h #1139251:1139252
@@ -45,6 +45,7 @@
       Anniversary,
 
       HomeAddressStreet,
+      HomeAddressPostOfficeBox,
       HomeAddressLocality,
       HomeAddressRegion,
       HomeAddressPostalCode,
@@ -52,6 +53,7 @@
       HomeAddressLabel,
 
       BusinessAddressStreet,
+      BusinessAddressPostOfficeBox,
       BusinessAddressLocality,
       BusinessAddressRegion,
       BusinessAddressPostalCode,


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