TSAM-8380 App be automatically closed when tapping on prediction contact for the... 60/90960/1
authorEugene Kurzberg <i.kurtsberg@samsung.com>
Wed, 5 Oct 2016 07:11:21 +0000 (10:11 +0300)
committerEugene Kurzberg <i.kurtsberg@samsung.com>
Wed, 5 Oct 2016 07:11:21 +0000 (10:11 +0300)
Change-Id: Ie3e84916ffb4d56ef25043c29fc77dbf8365aa49
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>
lib-phone/inc/Phone/Dialer/SearchResultsPopup.h
lib-phone/src/Phone/Dialer/SearchResultsControl.cpp
lib-phone/src/Phone/Dialer/SearchResultsPopup.cpp

index 0fcb214..30e9fdd 100644 (file)
@@ -37,14 +37,14 @@ namespace Phone
                         * @brief Constructor
                         * @param[in]   result  Search results
                         */
-                       SearchResultsPopup(const SearchResults *results);
+                       SearchResultsPopup(SearchResults results);
 
                private:
                        virtual void onCreated() override;
                        virtual char *getItemText(void *data, const char *part) override;
                        virtual Evas_Object *getItemContent(void *data, const char *part) override;
 
-                       const SearchResults *m_Results;
+                       SearchResults m_Results;
                };
        }
 }
index 1413113..0eae870 100644 (file)
@@ -176,7 +176,7 @@ void SearchResultsControl::onResultPressed()
 
 void SearchResultsControl::onShowResultsPressed()
 {
-       SearchResultsPopup *popup = new SearchResultsPopup(m_Results);
+       SearchResultsPopup *popup = new SearchResultsPopup(*m_Results);
        popup->create(getEvasObject());
        popup->setSelectCallback([this](void *data) {
                m_OnSelected(*(SearchResultPtr *) data);
index 0e260b1..f612335 100644 (file)
 
 using namespace Phone::Dialer;
 
-SearchResultsPopup::SearchResultsPopup(const SearchResults *results)
-       : m_Results(results)
+SearchResultsPopup::SearchResultsPopup(SearchResults results)
+       : m_Results(std::move(results))
 {
 }
 
 void SearchResultsPopup::onCreated()
 {
        char buffer[TITLE_BUFFER_SIZE];
-       snprintf(buffer, sizeof(buffer), _("IDS_KPD_HEADER_SEARCH_RESULTS_HPD_ABB"), m_Results->size());
+       snprintf(buffer, sizeof(buffer), _("IDS_KPD_HEADER_SEARCH_RESULTS_HPD_ABB"), m_Results.size());
        setTitle(buffer);
 
-       for (auto &&result : *m_Results) {
+       for (auto &&result : m_Results) {
                addItem((void *) &result);
        }
 }