fixed compile errors in various plugins

diff --git a/build/plugins/cansimplugin/CMakeFiles/cansimplugin.dir/cansimplugin.cpp.o b/build/plugins/cansimplugin/CMakeFiles/cansimplugin.dir/cansimplugin.cpp.o
index 3fb73a2..96511bb 100644 (file)
Binary files a/build/plugins/cansimplugin/CMakeFiles/cansimplugin.dir/cansimplugin.cpp.o and b/build/plugins/cansimplugin/CMakeFiles/cansimplugin.dir/cansimplugin.cpp.o differ

diff --git a/build/plugins/cansimplugin/cansimplugin.so b/build/plugins/cansimplugin/cansimplugin.so
index 2e19431..21eb263 100755 (executable)
Binary files a/build/plugins/cansimplugin/cansimplugin.so and b/build/plugins/cansimplugin/cansimplugin.so differ

diff --git a/plugins/common/ambplugin.h b/plugins/common/ambplugin.h
index bb1728d..7afa9f9 100644 (file)
--- a/plugins/common/ambplugin.h
+++ b/plugins/common/ambplugin.h
@@ -186,9 +186,7 @@ AmbPlugin<T>::AmbPlugin(AbstractRoutingEngine* re, const std::map<std::string, s
     AbstractSource(re, config),
     d(new T(re, config, *this))
 {
-    AbstractSource* source = dynamic_cast<AbstractSource*>(this);
-    if(source && re)
-        re->setSupported(supported(), source);
+
 }
 
 template<typename T>

diff --git a/plugins/database/databasesink.cpp b/plugins/database/databasesink.cpp
index 1d7c5c1..6cc0405 100644 (file)
--- a/plugins/database/databasesink.cpp
+++ b/plugins/database/databasesink.cpp
@@ -170,7 +170,7 @@ DatabaseSink::DatabaseSink(AbstractRoutingEngine *engine, map<std::string, std::
        mSupported.push_back(DatabaseLogging);
        mSupported.push_back(DatabasePlayback);
 
-       routingEngine->setSupported(supported(), this);
+       routingEngine->updateSupported(supported(), PropertyList(), this);
 
        if(config.find("startOnLoad")!= config.end())
        {
@@ -384,7 +384,7 @@ void DatabaseSink::setDatabaseFileName(string filename)
        delete shared;
        shared = NULL;
 
-       routingEngine->setSupported(mSupported, this);
+       routingEngine->updateSupported(mSupported, PropertyList(), this);
 }
 
 void DatabaseSink::propertyChanged(AbstractPropertyType *value)
@@ -397,7 +397,7 @@ void DatabaseSink::propertyChanged(AbstractPropertyType *value)
        if(!ListPlusPlus<VehicleProperty::Property>(&mSupported).contains(property))
        {
                mSupported.push_back(property);
-               routingEngine->setSupported(mSupported, this);
+               routingEngine->updateSupported(mSupported, PropertyList(), this);
        }
 
        DBObject obj;

diff --git a/plugins/murphyplugin/murphysource.cpp b/plugins/murphyplugin/murphysource.cpp
index fca35c7..de3fb4a 100644 (file)
--- a/plugins/murphyplugin/murphysource.cpp
+++ b/plugins/murphyplugin/murphysource.cpp
@@ -49,7 +49,7 @@ void MurphySource::processValue(string propertyName, AbstractPropertyType *prop)
     }
     else {
         murphyProperties[propertyName] = prop;
-        m_re->setSupported(supported(), this);
+               m_re->updateSupported(supported(), PropertyList(), this);
     }
 
     // cout << "updating property!" << endl;
@@ -378,7 +378,7 @@ void MurphySource::setConfiguration(map<string, string> config)
     }
 
     // TODO: read supported values from configuration?
-    m_re->setSupported(supported(), this);
+       m_re->updateSupported(supported(), PropertyList(), this);
 
     // set up the connection with Murphy
     if (!m_address.empty())

diff --git a/plugins/obd2plugin/obd2source.cpp b/plugins/obd2plugin/obd2source.cpp
index 746d2d1..50d338d 100644 (file)
--- a/plugins/obd2plugin/obd2source.cpp
+++ b/plugins/obd2plugin/obd2source.cpp
@@ -630,11 +630,8 @@ OBD2Source::OBD2Source(AbstractRoutingEngine *re, map<string, string> config)
 
        m_supportedProperties.push_back(Obd2Connected);
 
-       re->setSupported(supported(), this);
-       /*if (openPort(std::string("/dev/pts/7"),115200))
-       {
-         printf("Error opening OBD2 port\n");
-       }*/
+       re->updateSupported(supported(), PropertyList(), this);
+
        statusQueue = g_async_queue_new();
        commandQueue = g_async_queue_new();
        subscriptionAddQueue = g_async_queue_new();