summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevron Rees <tripzero.kev@gmail.com>2015-04-15 15:42:21 -0700
committerKevron Rees <tripzero.kev@gmail.com>2015-04-15 15:42:21 -0700
commit1f6dc5bdf71ead74fbf77c95430d568d1740ff13 (patch)
tree36d8b8e370435c1cc5687f1e5e50d3964b694fd2
parent3dedf2e2364a554b11a6ce96035232d20df411b7 (diff)
downloadautomotive-message-broker-1f6dc5bdf71ead74fbf77c95430d568d1740ff13.tar.gz
[dbus] add overload 'value' for custom dbus property types
-rw-r--r--README.md6
-rw-r--r--docs/ambd.in.md6
-rw-r--r--plugins/dbus/custompropertyinterface.cpp10
-rw-r--r--plugins/dbus/custompropertyinterface.h1
4 files changed, 12 insertions, 11 deletions
diff --git a/README.md b/README.md
index 9acbb841..625aeb09 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Automotive Message Broker Daemon {#ambd}
-Version 0.14.802
+Version 0.15
## Introduction
@@ -11,7 +11,7 @@ Automotive Message Broker is built using CMake and requires libltdl (libtool), l
## Git
About the Git Tree:
-master is expected to be unstable and may not even compile. If you want something more stable, checkout one of the
+'master' is expected to be unstable and may not even compile. If you want something more stable, checkout one of the
release branches (ie, 0.9.0, 0.10, etc)
## Building
@@ -60,7 +60,7 @@ You will also need to edit your config to enable the Qt-based mainloop:
~~~~~~~~~~~~~{.json}
{
- "mainloop" : "/usr/lib/x86_64-linux-gnu/automotive-message-broker/qtmainloopplugin.so",
+ "mainloop" : "/PLUGIN_INSTALL_PATH/qtmainloopplugin.so",
"plugins" : "/etc/ambd/plugins.d"
}
~~~~~~~~~~~~~
diff --git a/docs/ambd.in.md b/docs/ambd.in.md
index 020454c5..326a50d4 100644
--- a/docs/ambd.in.md
+++ b/docs/ambd.in.md
@@ -1,6 +1,6 @@
# Automotive Message Broker Daemon {#ambd}
-Version @PROJECT_VERSION@
+Version @PROJECT_SERIES@
## Introduction
@@ -11,7 +11,7 @@ Automotive Message Broker is built using CMake and requires libltdl (libtool), l
## Git
About the Git Tree:
-master is expected to be unstable and may not even compile. If you want something more stable, checkout one of the
+'master' is expected to be unstable and may not even compile. If you want something more stable, checkout one of the
release branches (ie, 0.9.0, 0.10, etc)
## Building
@@ -60,7 +60,7 @@ You will also need to edit your config to enable the Qt-based mainloop:
~~~~~~~~~~~~~{.json}
{
- "mainloop" : "@PLUGIN_INSTALL_PATH@/qtmainloopplugin.so",
+ "mainloop" : "/PLUGIN_INSTALL_PATH/qtmainloopplugin.so",
"plugins" : "@PLUGIN_SEGMENT_INSTALL_PATH@"
}
~~~~~~~~~~~~~
diff --git a/plugins/dbus/custompropertyinterface.cpp b/plugins/dbus/custompropertyinterface.cpp
index 3c93db3f..00626f36 100644
--- a/plugins/dbus/custompropertyinterface.cpp
+++ b/plugins/dbus/custompropertyinterface.cpp
@@ -17,14 +17,14 @@ CustomPropertyInterface::CustomPropertyInterface(VehicleProperty::Property prop,
throw std::runtime_error("Cannot create custom property: " + prop);
}
- GVariant* var = temp->toVariant();
- std::string signature = g_variant_get_type_string(var);
- g_variant_unref(var);
-
- propertyDBusMap.push_back( new VariantType(re, prop, prop, VariantType::ReadWrite));
+ propertyDBusMap.push_back(new VariantType(re, prop, prop, VariantType::ReadWrite));
+ propertyDBusMap.push_back(new VariantType(re, prop, "Value", VariantType::ReadWrite));
delete temp;
}
+}
+CustomPropertyInterface::~CustomPropertyInterface()
+{
}
diff --git a/plugins/dbus/custompropertyinterface.h b/plugins/dbus/custompropertyinterface.h
index 39eb383e..8c0f8d50 100644
--- a/plugins/dbus/custompropertyinterface.h
+++ b/plugins/dbus/custompropertyinterface.h
@@ -7,6 +7,7 @@ class CustomPropertyInterface: public DBusSink
{
public:
CustomPropertyInterface(VehicleProperty::Property, AbstractRoutingEngine* re, GDBusConnection* connection);
+ virtual ~CustomPropertyInterface();
};