Return observers as a const reference instead of a value

Change-Id: I3f8aad8fa2502959a4bcf94703d547ae32eec608

diff --git a/plugins/wakeup-manager/inc/wakeup_settings.h b/plugins/wakeup-manager/inc/wakeup_settings.h
index 6804209..7155c33 100644 (file)
--- a/plugins/wakeup-manager/inc/wakeup_settings.h
+++ b/plugins/wakeup-manager/inc/wakeup_settings.h
@@ -63,7 +63,7 @@ public:
 
        void subscribe(ISettingsEventObserver *observer);
        void unsubscribe(ISettingsEventObserver *observer);
-       vector<ISettingsEventObserver*> get_observers();
+       const vector<ISettingsEventObserver*>& get_observers();
 
        string get_default_assistant_appid();
        bool get_ui_panel_enabled();

diff --git a/plugins/wakeup-manager/src/wakeup_settings.cpp b/plugins/wakeup-manager/src/wakeup_settings.cpp
index 96a006f..7324838 100644 (file)
--- a/plugins/wakeup-manager/src/wakeup_settings.cpp
+++ b/plugins/wakeup-manager/src/wakeup_settings.cpp
@@ -34,7 +34,7 @@ static void wakeup_setting_input_language_changed_cb(keynode_t* node, void* data
 
        if (VCONF_TYPE_STRING == node->type) {
                const char* value = static_cast<const char*>(node->value.s);
-               vector<ISettingsEventObserver*> observers = settings->get_observers();
+               const auto& observers = settings->get_observers();
                for (const auto& observer : observers) {
                        if (observer) {
                                if (!observer->on_voice_input_language_changed(value)) {
@@ -82,7 +82,7 @@ static void wakeup_setting_enabled_assistants_changed_cb(keynode_t* node, void*
                        }
                }
 
-               vector<ISettingsEventObserver*> observers = settings->get_observers();
+               const auto& observers = settings->get_observers();
                for (const auto& observer : observers) {
                        if (observer) {
                                for (const auto& assistant : newlyAddedAssistants) {
@@ -112,7 +112,7 @@ static void wakeup_setting_default_assistant_appid_changed_cb(keynode_t* node, v
 
        if (VCONF_TYPE_STRING == node->type) {
                const char* value = static_cast<const char*>(node->value.s);
-               vector<ISettingsEventObserver*> observers = settings->get_observers();
+               const auto& observers = settings->get_observers();
                for (const auto& observer : observers) {
                        if (observer) {
                                if (!observer->on_default_assistant_appid_changed(value)) {
@@ -251,7 +251,7 @@ void CWakeupSettings::unsubscribe(ISettingsEventObserver *observer)
        }
 }
 
-vector<ISettingsEventObserver*> CWakeupSettings::get_observers()
+const vector<ISettingsEventObserver*>& CWakeupSettings::get_observers()
 {
        return mObservers;
 }