remove unused parameter of unSetChangedCallback

remove userData parameter

diff --git a/include/PluginAction.h b/include/PluginAction.h
index e42c77ea1fda8a0f13186ed1f5538ca1e113c7c9..d31ca331bcbced3846a16d6846b4193cc0460cd1 100644 (file)
--- a/include/PluginAction.h
+++ b/include/PluginAction.h
@@ -88,7 +88,7 @@ namespace ModeSupervisorNamespace {
                        // The callback should be called when the value is changed(Not Same).
                        return MODES_ERROR_NOT_SUPPORTED;
                }
-               virtual void unSetChangedCallback(valueChangedCB callback, void *userData)
+               virtual void unSetChangedCallback(valueChangedCB callback)
                {
                }
        protected:

diff --git a/plugin/TestPluginAction.cpp b/plugin/TestPluginAction.cpp
index 8cc008e8d0e8623e0eedda81155402413b2b05fa..6fcc114fa21696157b588c1bcb0965270e22ca8d 100644 (file)
--- a/plugin/TestPluginAction.cpp
+++ b/plugin/TestPluginAction.cpp
@@ -130,7 +130,7 @@ int TestPluginAction::setChangedCallback(valueChangedCB callback, void *userData
        return MODES_ERROR_NONE;
 }
 
-void TestPluginAction::unSetChangedCallback(valueChangedCB callback, void *userData)
+void TestPluginAction::unSetChangedCallback(valueChangedCB callback)
 {
        cb = NULL;
        cbData = NULL;

diff --git a/plugin/TestPluginAction.h b/plugin/TestPluginAction.h
index c44e45cf1d9d2aaa988ae6fef2b6dd2e87a2504f..c847c54975e506d2f21b74790182fa15103f480c 100644 (file)
--- a/plugin/TestPluginAction.h
+++ b/plugin/TestPluginAction.h
@@ -38,7 +38,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &data) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
-       void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+       void unSetChangedCallback(valueChangedCB callback) override;
        void callChangedCB();
 private:
        static gboolean changeTimeout(gpointer data);

diff --git a/supervisor/Action.cpp b/supervisor/Action.cpp
index feec0b49dd9fc44d606a091ccae53d3f9770a530..7f422d5998d1eecd5730c7052e22b148f5a1cce9 100644 (file)
--- a/supervisor/Action.cpp
+++ b/supervisor/Action.cpp
@@ -167,7 +167,7 @@ void Action::unsubscribeChanges()
                return;
 
        subscribed = false;
-       piAction->unSetChangedCallback(valueChangedCallback, this);
+       piAction->unSetChangedCallback(valueChangedCallback);
        subscribedActions.erase(ruleName);
 }