summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Timko <marek.timko@ixonos.com>2013-12-01 21:38:23 +0100
committerMarek Timko <marek.timko@ixonos.com>2013-12-01 21:38:23 +0100
commit7adc1aa2be4c03f89577ad3d798b34a7ad61ec66 (patch)
treed6ca9e59e323ef1b744113939339f4a65bd1c458
parent9e436563607021c43d3944651234a6c86ee53c89 (diff)
downloadautomotive-message-broker-7adc1aa2be4c03f89577ad3d798b34a7ad61ec66.tar.gz
Fixed crasher in varianttype, whitespaces inconsistency
Signed-off-by: Marek Timko <marek.timko@ixonos.com>
-rw-r--r--lib/abstractroutingengine.h2
-rw-r--r--lib/vehicleproperty.h7
-rw-r--r--plugins/dbus/varianttype.cpp6
3 files changed, 6 insertions, 9 deletions
diff --git a/lib/abstractroutingengine.h b/lib/abstractroutingengine.h
index 46e2a093..489a9abf 100644
--- a/lib/abstractroutingengine.h
+++ b/lib/abstractroutingengine.h
@@ -50,7 +50,7 @@ class AsyncPropertyRequest
{
public:
AsyncPropertyRequest()
- :property(VehicleProperty::NoValue),timeout(10000)
+ :property(VehicleProperty::NoValue),zoneFilter(Zone::None), timeout(10000)
{
}
diff --git a/lib/vehicleproperty.h b/lib/vehicleproperty.h
index 86b5ff83..876ce223 100644
--- a/lib/vehicleproperty.h
+++ b/lib/vehicleproperty.h
@@ -274,11 +274,12 @@ public:
* \brief factory constructs a static instance of VehicleProperty. This should be called once before VehicleProperty is used in the app
*/
static void factory();
+
/*!
*
- * \brief destroys static instance of VehicleProperty. This should be called at application shutdown
- */
- static void shutdown();
+ * \brief destroys static instance of VehicleProperty. This should be called at application shutdown
+ */
+ static void shutdown();
typedef std::string Property;
diff --git a/plugins/dbus/varianttype.cpp b/plugins/dbus/varianttype.cpp
index 047c6e78..b7138209 100644
--- a/plugins/dbus/varianttype.cpp
+++ b/plugins/dbus/varianttype.cpp
@@ -44,11 +44,7 @@ GVariant *VariantType::toGVariant()
{
if(!value())
{
- AbstractPropertyType* v = VehicleProperty::getPropertyTypeForPropertyNameValue(mAmbPropertyName);
-
- setValue(v);
-
- delete v; //TODO: Needs to be veriefied if it will CRASH here. Does setValue() take ownership ???
+ setValue(VehicleProperty::getPropertyTypeForPropertyNameValue(mAmbPropertyName));
}
auto v = value();