commit 27c4aa55b33d3a3836cf70c8f7094bce1c5ead8c
author Chris Masone <cmasone@chromium.org> Sat Jul 02 13:10:14 2011 -0700
committer Chris Masone <cmasone@chromium.org> Sun Jul 03 10:58:05 2011 -0700
tree 2df1c92826d2608bf8dd5b5f8cdb99c6ab443035
parent 43b48a1c94665d9f3c14694cf6a4429e5ab3fa30

[shill] Use composition instead of inheritance with PropertyStore

Instead of having Device, Manager, etc all inherit from PropertyStore
and have it be difficult to follow the getting/setting property code,
have each include a PropertyStore as a data member.  Provide an
accessor so that RPC adaptor classes can get and set properties
directly and continue to handle any necessary type conversion
themselves.

BUG=None
TEST=unit tests

Change-Id: I34781bde4de0e152550ca636e28d472abde756af
Reviewed-on: http://gerrit.chromium.org/gerrit/3616
Tested-by: Chris Masone <cmasone@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>

cellular.cc

diff --git a/cellular.cc b/cellular.cc
index 8740103..acb6edc 100644
--- a/cellular.cc
+++ b/cellular.cc
@@ -35,22 +35,24 @@
                                    this,
                                    "service-" + link)),
       service_registered_(false) {
-  RegisterConstBool(flimflam::kScanningProperty, &scanning_);
-  RegisterUint16(flimflam::kScanIntervalProperty, &scan_interval_);
+  store_.RegisterConstBool(flimflam::kScanningProperty, &scanning_);
+  store_.RegisterUint16(flimflam::kScanIntervalProperty, &scan_interval_);
 
-  RegisterBool(flimflam::kCellularAllowRoamingProperty, &allow_roaming_);
-  RegisterConstString(flimflam::kCarrierProperty, &carrier_);
-  RegisterConstString(flimflam::kMeidProperty, &meid_);
-  RegisterConstString(flimflam::kImeiProperty, &imei_);
-  RegisterConstString(flimflam::kImsiProperty, &imsi_);
-  RegisterConstString(flimflam::kEsnProperty, &esn_);
-  RegisterConstString(flimflam::kMdnProperty, &mdn_);
-  RegisterConstString(flimflam::kMinProperty, &min_);
-  RegisterConstString(flimflam::kModelIDProperty, &model_id_);
-  RegisterConstString(flimflam::kManufacturerProperty, &manufacturer_);
-  RegisterConstString(flimflam::kFirmwareRevisionProperty, &firmware_revision_);
-  RegisterConstString(flimflam::kHardwareRevisionProperty, &hardware_revision_);
-  RegisterConstInt16(flimflam::kPRLVersionProperty, &prl_version_);
+  store_.RegisterBool(flimflam::kCellularAllowRoamingProperty, &allow_roaming_);
+  store_.RegisterConstString(flimflam::kCarrierProperty, &carrier_);
+  store_.RegisterConstString(flimflam::kMeidProperty, &meid_);
+  store_.RegisterConstString(flimflam::kImeiProperty, &imei_);
+  store_.RegisterConstString(flimflam::kImsiProperty, &imsi_);
+  store_.RegisterConstString(flimflam::kEsnProperty, &esn_);
+  store_.RegisterConstString(flimflam::kMdnProperty, &mdn_);
+  store_.RegisterConstString(flimflam::kMinProperty, &min_);
+  store_.RegisterConstString(flimflam::kModelIDProperty, &model_id_);
+  store_.RegisterConstString(flimflam::kManufacturerProperty, &manufacturer_);
+  store_.RegisterConstString(flimflam::kFirmwareRevisionProperty,
+                             &firmware_revision_);
+  store_.RegisterConstString(flimflam::kHardwareRevisionProperty,
+                             &hardware_revision_);
+  store_.RegisterConstInt16(flimflam::kPRLVersionProperty, &prl_version_);
 
   // TODO(cmasone): Deal with these compound properties
   // known_properties_.push_back(flimflam::kSIMLockStatusProperty);