remove unused parameter of unSetChangedCallback

remove userData parameter

diff --git a/app/AppActionLaunch.cpp b/app/AppActionLaunch.cpp
index c8f4bc060f316b9b258cd109171e53a543cf95c5..fb26e96a9ff54b6eac0407b2c6106dd7cce2595f 100644 (file)
--- a/app/AppActionLaunch.cpp
+++ b/app/AppActionLaunch.cpp
@@ -115,7 +115,7 @@ int AppActionLaunch::setChangedCallback(valueChangedCB callback, void *userData)
        return MODES_ERROR_NONE;
 }
 
-void AppActionLaunch::unSetChangedCallback(valueChangedCB callback, void *userData)
+void AppActionLaunch::unSetChangedCallback(valueChangedCB callback)
 {
        int ret = app_manager_unset_app_context_status_cb(appContextStatusCB, requestVal.c_str());
        if (APP_MANAGER_ERROR_NONE != ret)

diff --git a/app/AppActionLaunch.h b/app/AppActionLaunch.h
index d735d273158753fdd1b365b60ed91a50e781d129..8e52cfbb5fe13b5444a7119b868e7e0ce7da4c5c 100644 (file)
--- a/app/AppActionLaunch.h
+++ b/app/AppActionLaunch.h
@@ -34,7 +34,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
-       void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+       void unSetChangedCallback(valueChangedCB callback) override;
 private:
        static void appContextStatusCB(app_context_h app_context, app_context_status_e status, void *user_data);
        std::string requestVal;

diff --git a/bluetooth/BtActionAudioConnect.cpp b/bluetooth/BtActionAudioConnect.cpp
index 80c475201338e75944e42d35053647ed864f19bf..065cc51f3ac02ca896f00e33a3ccb641547ee722 100644 (file)
--- a/bluetooth/BtActionAudioConnect.cpp
+++ b/bluetooth/BtActionAudioConnect.cpp
@@ -110,7 +110,7 @@ int BtActionAudioConnect::setChangedCallback(valueChangedCB callback, void *user
        return MODES_ERROR_NONE;
 }
 
-void BtActionAudioConnect::unSetChangedCallback(valueChangedCB callback, void *userData)
+void BtActionAudioConnect::unSetChangedCallback(valueChangedCB callback)
 {
        RET_IF(nullptr == callback);
 

diff --git a/bluetooth/BtActionAudioConnect.h b/bluetooth/BtActionAudioConnect.h
index 266b4db12753a069760d907fcd6516dbb2c78e82..5b749f8aeabbdc124d40202d9d7a80bfd3f5bd79 100644 (file)
--- a/bluetooth/BtActionAudioConnect.h
+++ b/bluetooth/BtActionAudioConnect.h
@@ -34,7 +34,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData);
-       void unSetChangedCallback(valueChangedCB callback, void *userData);
+       void unSetChangedCallback(valueChangedCB callback);
 private:
        static void connStateChangedCb(int result, bool connected, const char *address, bt_audio_profile_type_e type, void *userData);
        static void bondCreatedCB(int result, bt_device_info_s *devInfo, void *userData);

diff --git a/bluetooth/BtActionPower.cpp b/bluetooth/BtActionPower.cpp
index 671907be97680e77ba06a5352c15d29e621d9201..fdbe6305ef2464a045176b6237ac81d52a79b294 100644 (file)
--- a/bluetooth/BtActionPower.cpp
+++ b/bluetooth/BtActionPower.cpp
@@ -102,7 +102,7 @@ int BtActionPower::setChangedCallback(valueChangedCB callback, void *userData)
        return MODES_ERROR_NONE;
 }
 
-void BtActionPower::unSetChangedCallback(valueChangedCB callback, void *userData)
+void BtActionPower::unSetChangedCallback(valueChangedCB callback)
 {
        RET_IF(nullptr == callback);
 

diff --git a/bluetooth/BtActionPower.h b/bluetooth/BtActionPower.h
index dc085f0436d03b92196b9725c6749bcadc5178a8..1a1103332bde8980e2c54f27a30d09f0701437c5 100644 (file)
--- a/bluetooth/BtActionPower.h
+++ b/bluetooth/BtActionPower.h
@@ -32,7 +32,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData);
-       void unSetChangedCallback(valueChangedCB callback, void *userData);
+       void unSetChangedCallback(valueChangedCB callback);
 private:
        static void stateChangedCB(int result, bt_adapter_state_e state, void *user_data);
        bool requestVal;

diff --git a/display/DisplayActVconf.cpp b/display/DisplayActVconf.cpp
index 4500b754aa06af7d7b9a4b5f3d81cc3b31013239..3bf79f33a177df93b0534b90d3edb44abd376f3e 100644 (file)
--- a/display/DisplayActVconf.cpp
+++ b/display/DisplayActVconf.cpp
@@ -106,7 +106,7 @@ int DisplayActVconf::setChangedCallback(valueChangedCB callback, void *userData)
        return MODES_ERROR_NONE;
 }
 
-void DisplayActVconf::unSetChangedCallback(valueChangedCB callback, void *userData)
+void DisplayActVconf::unSetChangedCallback(valueChangedCB callback)
 {
        RET_IF(nullptr == callback);
 

diff --git a/display/DisplayActVconf.h b/display/DisplayActVconf.h
index 323b4cfaec8a03fca765fdea78403abb4ee77c70..ab0ebef2ecf18962bb69b4954b840cabb3c9a3a1 100644 (file)
--- a/display/DisplayActVconf.h
+++ b/display/DisplayActVconf.h
@@ -33,7 +33,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
-       void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+       void unSetChangedCallback(valueChangedCB callback) override;
 
        static const std::string NAME[2];
        static const char* const KEY[2];

diff --git a/display/DisplayBrightness.cpp b/display/DisplayBrightness.cpp
index 0acb6c56bd022b240cfbb230d9f8ea9b386a7fde..5e99de6a6e02869f711308c69e7f9c135b5e6b4d 100644 (file)
--- a/display/DisplayBrightness.cpp
+++ b/display/DisplayBrightness.cpp
@@ -136,7 +136,7 @@ int DisplayBrightness::setChangedCallback(valueChangedCB callback, void *userDat
        return MODES_ERROR_NONE;
 }
 
-void DisplayBrightness::unSetChangedCallback(valueChangedCB callback, void *userData)
+void DisplayBrightness::unSetChangedCallback(valueChangedCB callback)
 {
        RET_IF(nullptr == callback);
 

diff --git a/display/DisplayBrightness.h b/display/DisplayBrightness.h
index 5eaea1f2fd6a19adac3a49c1a73b4d24cd899c65..3fc187c2dca581dcb5a9239cd32bd8e3ab6068f9 100644 (file)
--- a/display/DisplayBrightness.h
+++ b/display/DisplayBrightness.h
@@ -34,7 +34,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
-       void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+       void unSetChangedCallback(valueChangedCB callback) override;
 
        static const std::string NAME;
        static const char* const KEY;

diff --git a/display/DisplayDenyPalmTouch.cpp b/display/DisplayDenyPalmTouch.cpp
index 6666b97425b224935fa22c8647eb728b3981e68d..a3fa98c96bd8cf9270d8ae8330e3c039738a5cde 100644 (file)
--- a/display/DisplayDenyPalmTouch.cpp
+++ b/display/DisplayDenyPalmTouch.cpp
@@ -86,7 +86,7 @@ int DisplayDenyPalmTouch::setChangedCallback(valueChangedCB callback, void *user
        return MODES_ERROR_NOT_SUPPORTED;
 }
 
-void DisplayDenyPalmTouch::unSetChangedCallback(valueChangedCB callback, void *userData)
+void DisplayDenyPalmTouch::unSetChangedCallback(valueChangedCB callback)
 {
        WARN("Not Support Changed Callback");
 }

diff --git a/display/DisplayDenyPalmTouch.h b/display/DisplayDenyPalmTouch.h
index f9474ff044e571e4e5791896f896e37f485e18ca..283ffedcccbde6bb5dd7ff77fa8c77eea157fbd4 100644 (file)
--- a/display/DisplayDenyPalmTouch.h
+++ b/display/DisplayDenyPalmTouch.h
@@ -31,7 +31,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
-       void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+       void unSetChangedCallback(valueChangedCB callback) override;
 
        static const std::string NAME;
 private:

diff --git a/media/MediaPlayer.cpp b/media/MediaPlayer.cpp
index 574006621ddbc6dace81c68c7f28d1ad157033c9..81e5c863f5d0de1c94857fa1f8d88171f5b32832 100644 (file)
--- a/media/MediaPlayer.cpp
+++ b/media/MediaPlayer.cpp
@@ -116,7 +116,7 @@ int MediaPlayer::setChangedCallback(valueChangedCB callback, void *userData)
        return MODES_ERROR_NONE;
 }
 
-void MediaPlayer::unSetChangedCallback(valueChangedCB callback, void *userData)
+void MediaPlayer::unSetChangedCallback(valueChangedCB callback)
 {
        RET_IF(nullptr == callback);
 

diff --git a/media/MediaPlayer.h b/media/MediaPlayer.h
index 3ab948fc101b44c53dfc20cc7c9c84efc08df6ab..bf270902deed8dca45ef200c44b7165b66f74e59 100644 (file)
--- a/media/MediaPlayer.h
+++ b/media/MediaPlayer.h
@@ -32,7 +32,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
-       void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+       void unSetChangedCallback(valueChangedCB callback) override;
 
        static const std::string NAME;
 private:

diff --git a/media/SoundVolume.cpp b/media/SoundVolume.cpp
index 7d6fd85cb264462002986e11e5f990cb2c7cb861..4fc59f3093c8cea186b6c91b2a0c3a7f6f111d06 100644 (file)
--- a/media/SoundVolume.cpp
+++ b/media/SoundVolume.cpp
@@ -124,7 +124,7 @@ int SoundVolume::setChangedCallback(valueChangedCB callback, void *userData)
        return MODES_ERROR_NONE;
 }
 
-void SoundVolume::unSetChangedCallback(valueChangedCB callback, void *userData)
+void SoundVolume::unSetChangedCallback(valueChangedCB callback)
 {
        RET_IF(nullptr == callback);
 

diff --git a/media/SoundVolume.h b/media/SoundVolume.h
index ba6ac2f90d505ef5765349b1117776c1184cafb5..f86b95b91579eea5a2d76eae596cdc4260aad319 100644 (file)
--- a/media/SoundVolume.h
+++ b/media/SoundVolume.h
@@ -33,7 +33,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
-       void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+       void unSetChangedCallback(valueChangedCB callback) override;
 
        static const std::string NAME[4];
 private:

diff --git a/pkg/PkgEnableSupportMode.cpp b/pkg/PkgEnableSupportMode.cpp
index 7895de2be01e20781d056147d30a5a5db1cc75fc..21e05e16861f8cc3f3bab67c21f8a3037dcbc78a 100644 (file)
--- a/pkg/PkgEnableSupportMode.cpp
+++ b/pkg/PkgEnableSupportMode.cpp
@@ -122,7 +122,7 @@ int PkgSupportMode::setChangedCallback(valueChangedCB callback, void *userData)
        return MODES_ERROR_NOT_SUPPORTED;
 }
 
-void PkgSupportMode::unSetChangedCallback(valueChangedCB callback, void *userData)
+void PkgSupportMode::unSetChangedCallback(valueChangedCB callback)
 {
        ERR("Not Support Changed Callback");
 }

diff --git a/pkg/PkgEnableSupportMode.h b/pkg/PkgEnableSupportMode.h
index 3c9f93b5a6361fe2107abe4d7bb8b4d2ca1a3f02..a47c3f446192d5e302ce2e35cc67122a123a7b48 100644 (file)
--- a/pkg/PkgEnableSupportMode.h
+++ b/pkg/PkgEnableSupportMode.h
@@ -32,7 +32,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;
 
        static const std::string NAME;
 private:

diff --git a/unittests/mdsp_test_vconf.cpp b/unittests/mdsp_test_vconf.cpp
index c6f2230da5554bfc6e8ce085d8db3a61766810df..13fc138266c38926c053b55ed6c7ad01027bcd38 100644 (file)
--- a/unittests/mdsp_test_vconf.cpp
+++ b/unittests/mdsp_test_vconf.cpp
@@ -42,7 +42,7 @@ protected:
                cb2Called = false;
        }
 
-       static void shoudNotBeCalled(void *userData)
+       static void shouldNotBeCalled(void *userData)
        {
                ERR("This Callback(%s) should not be called", (char*)userData);
                g_main_loop_quit(loop);
@@ -61,7 +61,7 @@ protected:
                DBG("%s changed callback called!", action->getKey().c_str());
 
                //In practice, it is handled by Action. refer to Action.cpp
-               action->unSetChangedCallback(callback1, nullptr);
+               action->unSetChangedCallback(callback1);
 
                cb1Called = true;
        }
@@ -179,11 +179,11 @@ TEST_F(VconfPluginTest, callbackPluginVconf)
        g_main_loop_run(loop);
 
        // It should be removed by the changed callback procedure.
-       action->unSetChangedCallback(valChangedCb, (void*)key);
+       action->unSetChangedCallback(valChangedCb);
 
-       ret = action->setChangedCallback(shoudNotBeCalled, (void*)key);
+       ret = action->setChangedCallback(shouldNotBeCalled, (void*)key);
        EXPECT_EQ(ret, MODES_ERROR_NONE);
-       action->unSetChangedCallback(shoudNotBeCalled, (void*)key);
+       action->unSetChangedCallback(shouldNotBeCalled);
        plugin->deleteAction(action);
        vconf_set_int("db/setting/psmode", oldVal);
 }

diff --git a/vconf/VconfBool.cpp b/vconf/VconfBool.cpp
index 78199099e087a87c801fc48e96e407d2ca85ab2c..a7a124946cefebbc1b9f84e63ae09977d3e6ed24 100644 (file)
--- a/vconf/VconfBool.cpp
+++ b/vconf/VconfBool.cpp
@@ -97,7 +97,7 @@ int VconfBool::setChangedCallback(valueChangedCB callback, void *userData)
        return MODES_ERROR_NONE;
 }
 
-void VconfBool::unSetChangedCallback(valueChangedCB callback, void *userData)
+void VconfBool::unSetChangedCallback(valueChangedCB callback)
 {
        RET_IF(nullptr == callback);
 

diff --git a/vconf/VconfBool.h b/vconf/VconfBool.h
index 9566fb1acc4ab276ec4380f05d6460413ed77e1c..d38857399755812bf273cac715cffd517f5ea1d6 100644 (file)
--- a/vconf/VconfBool.h
+++ b/vconf/VconfBool.h
@@ -32,7 +32,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
-       void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+       void unSetChangedCallback(valueChangedCB callback) override;
 private:
        void changedCB(keynode_t *node);
        static void vconfChangedCB(keynode_t *node, void *userData);

diff --git a/vconf/VconfDbl.cpp b/vconf/VconfDbl.cpp
index a63985ffcda1e0467e75022a2d4d80ce5cf2cb8f..434d85afea2290d1de9b1f5263285361cf261861 100644 (file)
--- a/vconf/VconfDbl.cpp
+++ b/vconf/VconfDbl.cpp
@@ -95,7 +95,7 @@ int VconfDbl::setChangedCallback(valueChangedCB callback, void *userData)
        return MODES_ERROR_NONE;
 }
 
-void VconfDbl::unSetChangedCallback(valueChangedCB callback, void *userData)
+void VconfDbl::unSetChangedCallback(valueChangedCB callback)
 {
        RET_IF(nullptr == callback);
 

diff --git a/vconf/VconfDbl.h b/vconf/VconfDbl.h
index b8f733db052168350682460918da0b3c81bfee46..fcb673b72216271f2ef2c20e0e3fd7df57e56bae 100644 (file)
--- a/vconf/VconfDbl.h
+++ b/vconf/VconfDbl.h
@@ -32,7 +32,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
-       void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+       void unSetChangedCallback(valueChangedCB callback) override;
 private:
        void changedCB(keynode_t *node);
        static void vconfChangedCB(keynode_t *node, void *userData);

diff --git a/vconf/VconfInt.cpp b/vconf/VconfInt.cpp
index 43cfb4f47b22160ed04f7e7b4e69d610b524ae23..19d0bc9372886281889be620dac7ae9a2a6b9ba9 100644 (file)
--- a/vconf/VconfInt.cpp
+++ b/vconf/VconfInt.cpp
@@ -95,7 +95,7 @@ int VconfInt::setChangedCallback(valueChangedCB callback, void *userData)
        return MODES_ERROR_NONE;
 }
 
-void VconfInt::unSetChangedCallback(valueChangedCB callback, void *userData)
+void VconfInt::unSetChangedCallback(valueChangedCB callback)
 {
        RET_IF(nullptr == callback);
 

diff --git a/vconf/VconfInt.h b/vconf/VconfInt.h
index c48e3ed7671a97093779f59689152698bffdf9ec..becbcbdf4f2bb5fd7c0ea0496cc8b835bb24f5fb 100644 (file)
--- a/vconf/VconfInt.h
+++ b/vconf/VconfInt.h
@@ -32,7 +32,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
-       void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+       void unSetChangedCallback(valueChangedCB callback) override;
 private:
        void changedCB(keynode_t *node);
        static void vconfChangedCB(keynode_t *node, void *userData);

diff --git a/vconf/VconfStr.cpp b/vconf/VconfStr.cpp
index 215a135f4a96a9002a4f24396a8e023b52cea351..9f680db5d23b89aa43a703d23e096ebc74082487 100644 (file)
--- a/vconf/VconfStr.cpp
+++ b/vconf/VconfStr.cpp
@@ -90,7 +90,7 @@ int VconfStr::setChangedCallback(valueChangedCB callback, void *userData)
        return MODES_ERROR_NONE;
 }
 
-void VconfStr::unSetChangedCallback(valueChangedCB callback, void *userData)
+void VconfStr::unSetChangedCallback(valueChangedCB callback)
 {
        RET_IF(nullptr == callback);
 

diff --git a/vconf/VconfStr.h b/vconf/VconfStr.h
index 7dc8d579c52ada49c7df31e16d4bb5c3b83d648a..90b2b5cbc9f5ea6679f9383e121f8db855189b93 100644 (file)
--- a/vconf/VconfStr.h
+++ b/vconf/VconfStr.h
@@ -32,7 +32,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
-       void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+       void unSetChangedCallback(valueChangedCB callback) override;
 private:
        void changedCB(keynode_t *node);
        static void vconfChangedCB(keynode_t *node, void *userData);

diff --git a/wifi/WifiActionPower.cpp b/wifi/WifiActionPower.cpp
index 69c4e235b06ee6bef4cb7ac0cfb42b5bad4accf6..898514728a99fb59a4b63d959220f82a6783df1b 100644 (file)
--- a/wifi/WifiActionPower.cpp
+++ b/wifi/WifiActionPower.cpp
@@ -97,7 +97,7 @@ int WifiActionPower::setChangedCallback(valueChangedCB callback, void *userData)
        return MODES_ERROR_NONE;
 }
 
-void WifiActionPower::unSetChangedCallback(valueChangedCB callback, void *userData)
+void WifiActionPower::unSetChangedCallback(valueChangedCB callback)
 {
        RET_IF(nullptr == callback);
 

diff --git a/wifi/WifiActionPower.h b/wifi/WifiActionPower.h
index 032b2be3b280cef2e962a2276474eefa498648de..dbf6b570ffd73f184d6e067c266cf2ad0c334c0e 100644 (file)
--- a/wifi/WifiActionPower.h
+++ b/wifi/WifiActionPower.h
@@ -30,7 +30,7 @@ public:
        std::string getUndoInfo() override;
        int setUndoInfo(const std::string &info) override;
        int setChangedCallback(valueChangedCB callback, void *userData) override;
-       void unSetChangedCallback(valueChangedCB callback, void *userData) override;
+       void unSetChangedCallback(valueChangedCB callback) override;
 
        static const std::string NAME;
 private: