summaryrefslogtreecommitdiff
path: root/dbus_adaptor.h
diff options
context:
space:
mode:
authorChris Masone <cmasone@chromium.org>2011-07-02 13:10:14 -0700
committerChris Masone <cmasone@chromium.org>2011-07-03 10:58:05 -0700
commit27c4aa55b33d3a3836cf70c8f7094bce1c5ead8c (patch)
tree2df1c92826d2608bf8dd5b5f8cdb99c6ab443035 /dbus_adaptor.h
parent43b48a1c94665d9f3c14694cf6a4429e5ab3fa30 (diff)
downloadshill-27c4aa55b33d3a3836cf70c8f7094bce1c5ead8c.tar.gz
[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>
Diffstat (limited to 'dbus_adaptor.h')
-rw-r--r--dbus_adaptor.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/dbus_adaptor.h b/dbus_adaptor.h
index 42c8d48a..994fddd6 100644
--- a/dbus_adaptor.h
+++ b/dbus_adaptor.h
@@ -55,12 +55,14 @@ class DBusAdaptor : public DBus::ObjectAdaptor {
static bool IsPath(::DBus::Signature signature);
static bool IsString(::DBus::Signature signature);
static bool IsStringmap(::DBus::Signature signature);
+ static bool IsStringmaps(::DBus::Signature signature);
static bool IsStrings(::DBus::Signature signature);
static bool IsUint16(::DBus::Signature signature);
static bool IsUint32(::DBus::Signature signature);
private:
static const char kStringmapSig[];
+ static const char kStringmapsSig[];
static const char kStringsSig[];
DISALLOW_COPY_AND_ASSIGN(DBusAdaptor);
};