Moved and renamed ContactDataList type and related methods.

Change-Id: Ide5a36c1fb961d23702889c1e61d08f4bc4728f1
Signed-off-by: Eugene Kurzberg <i.kurtsberg@samsung.com>

diff --git a/lib-common/inc/Contacts/Model/ContactData.h b/lib-common/inc/Contacts/Model/ContactData.h
index 66d67da..f838427 100644 (file)
--- a/lib-common/inc/Contacts/Model/ContactData.h
+++ b/lib-common/inc/Contacts/Model/ContactData.h
@@ -26,11 +26,6 @@ namespace Contacts
 {
        namespace Model
        {
-               class ContactData;
-
-               typedef std::unique_ptr<ContactData> ContactDataPtr;
-               typedef std::list<ContactData *> ContactDataList;
-
                class EXPORT_API ContactData
                {
                public:

diff --git a/lib-common/inc/Contacts/Model/ContactDataProvider.h b/lib-common/inc/Contacts/Model/ContactDataProvider.h
index a49544a..2de8dbc 100644 (file)
--- a/lib-common/inc/Contacts/Model/ContactDataProvider.h
+++ b/lib-common/inc/Contacts/Model/ContactDataProvider.h
@@ -30,6 +30,8 @@ namespace Contacts
                class EXPORT_API ContactDataProvider
                {
                public:
+                       typedef std::list<ContactData *> DataList;
+
                        /**
                         * @brief Insert callback
                         * @param[in] Contact data
@@ -41,12 +43,12 @@ namespace Contacts
                        /**
                         * @return Contact data list
                         */
-                       virtual const ContactDataList &getContactDataList() = 0;
+                       virtual const DataList &getDataList() = 0;
 
                        /**
                         * @brief Clear contact data list
                         */
-                       virtual void clearContactDataList() { }
+                       virtual void clearDataList() { }
 
                        /**
                         * @brief Set insert callback

diff --git a/lib-common/inc/Contacts/Model/ContactRecordProvider.h b/lib-common/inc/Contacts/Model/ContactRecordProvider.h
index 9d9c5b2..f9e67f0 100644 (file)
--- a/lib-common/inc/Contacts/Model/ContactRecordProvider.h
+++ b/lib-common/inc/Contacts/Model/ContactRecordProvider.h
@@ -32,14 +32,14 @@ namespace Contacts
                        virtual ~ContactRecordProvider() override;
 
                        /**
-                        * @see ContactDataProvider::getContactDataList()
+                        * @see ContactDataProvider::getDataList()
                         */
-                       virtual const ContactDataList &getContactDataList() override;
+                       virtual const DataList &getDataList() override;
 
                        /**
-                        * @see ContactDataProvider::clearContactDataList()
+                        * @see ContactDataProvider::clearDataList()
                         */
-                       virtual void clearContactDataList() override;
+                       virtual void clearDataList() override;
 
                protected:
                        using ContactDataProvider::onInserted;
@@ -69,7 +69,7 @@ namespace Contacts
                        /**
                         * @return contact list
                         */
-                       const ContactDataList &getContactList();
+                       const DataList &getContactList();
 
                        /**
                         * @brief Contact inserted callback
@@ -84,7 +84,7 @@ namespace Contacts
                         * @param[in]   id          Contact ID
                         * @param[in]   changeType  Contact change type (Updated/Deleted)
                         */
-                       void onChanged(ContactDataList::iterator contactIt, int id, contacts_changed_e changeType);
+                       void onChanged(DataList::iterator contactIt, int id, contacts_changed_e changeType);
 
                private:
                        /**
@@ -94,10 +94,10 @@ namespace Contacts
                         */
                        virtual bool shouldUpdateChangedCallback() { return false; }
 
-                       void updateChangedCallback(ContactDataList::iterator it);
+                       void updateChangedCallback(DataList::iterator it);
 
                        DbChangeObserver::CallbackHandle m_Handle;
-                       ContactDataList m_ContactList;
+                       DataList m_ContactList;
                };
        }
 }

diff --git a/lib-common/inc/Contacts/Model/SearchEngine.h b/lib-common/inc/Contacts/Model/SearchEngine.h
index 25093c4..56b831d 100644 (file)
--- a/lib-common/inc/Contacts/Model/SearchEngine.h
+++ b/lib-common/inc/Contacts/Model/SearchEngine.h
@@ -18,7 +18,7 @@
 #ifndef PHONE_DIALER_SEARCH_ENGINE_H
 #define PHONE_DIALER_SEARCH_ENGINE_H
 
-#include "Contacts/Model/ContactData.h"
+#include "Contacts/Model/ContactDataProvider.h"
 #include <string>
 #include <vector>
 
@@ -34,6 +34,8 @@ namespace Contacts
                class SearchEngine
                {
                public:
+                       typedef ContactDataProvider::DataList DataList;
+
                        explicit SearchEngine(SearchProvider &searchProvider);
 
                        /**
@@ -46,7 +48,7 @@ namespace Contacts
                         * @brief Retrieves result list
                         * @return Result list or nullptr on empty list
                         */
-                       const ContactDataList *getSearchResult() const;
+                       const DataList *getSearchResult() const;
 
                        /**
                         * @return true if there is no results, otherwise false
@@ -54,7 +56,7 @@ namespace Contacts
                        bool empty() const;
 
                private:
-                       typedef std::vector<ContactDataList> SearchHistory;
+                       typedef std::vector<DataList> SearchHistory;
 
                        void firstSearch(const std::string &query);
                        void chooseSearch(const std::string &query);

diff --git a/lib-common/inc/Contacts/Model/SearchProvider.h b/lib-common/inc/Contacts/Model/SearchProvider.h
index 154b58c..ff0e814 100644 (file)
--- a/lib-common/inc/Contacts/Model/SearchProvider.h
+++ b/lib-common/inc/Contacts/Model/SearchProvider.h
@@ -35,9 +35,9 @@ namespace Contacts
                        virtual ~SearchProvider() override;
 
                        /**
-                        * @see ContactDataProvider::getContactDataList()
+                        * @see ContactDataProvider::getDataList()
                         */
-                       virtual const ContactDataList &getContactDataList() override;
+                       virtual const DataList &getDataList() override;
 
                        /**
                         * @brief Add @a provider to search provider
@@ -46,17 +46,17 @@ namespace Contacts
                        void addProvider(ContactDataProvider *provider);
 
                private:
-                       typedef std::unordered_map<ContactDataProvider *, ContactDataList::const_iterator> SubProviders;
+                       typedef std::unordered_map<ContactDataProvider *, DataList::const_iterator> SubProviders;
                        using ContactDataProvider::onInserted;
 
-                       ContactData &insertContact(ContactDataList::const_iterator position, ContactData &contact,
+                       ContactData &insertContact(DataList::const_iterator position, ContactData &contact,
                                        ContactDataProvider *provider);
 
                        void onInserted(ContactData &contactData, ContactDataProvider *provider);
                        void onUpdated(SearchData &searchData, int changes);
-                       void onDeleted(ContactDataList::iterator contactIt, ContactDataProvider *provider);
+                       void onDeleted(DataList::iterator contactIt, ContactDataProvider *provider);
 
-                       ContactDataList m_ContactList;
+                       DataList m_ContactList;
                        SubProviders m_SubProviders;
                };
        }

diff --git a/lib-common/src/Contacts/Model/ContactRecordProvider.cpp b/lib-common/src/Contacts/Model/ContactRecordProvider.cpp
index 3796dfe..ac4fca0 100644 (file)
--- a/lib-common/src/Contacts/Model/ContactRecordProvider.cpp
+++ b/lib-common/src/Contacts/Model/ContactRecordProvider.cpp
@@ -42,7 +42,7 @@ ContactRecordProvider::~ContactRecordProvider()
        }
 }
 
-const ContactDataList &ContactRecordProvider::getContactDataList()
+const ContactRecordProvider::DataList &ContactRecordProvider::getDataList()
 {
        if (!m_ContactList.empty()) {
                return m_ContactList;
@@ -61,7 +61,7 @@ const ContactDataList &ContactRecordProvider::getContactDataList()
        return m_ContactList;
 }
 
-void ContactRecordProvider::clearContactDataList()
+void ContactRecordProvider::clearDataList()
 {
        for (auto &&contact : m_ContactList) {
                delete contact;
@@ -91,7 +91,7 @@ contacts_record_h ContactRecordProvider::getRecord(int id)
        return record;
 }
 
-const ContactDataList &ContactRecordProvider::getContactList()
+const ContactRecordProvider::DataList &ContactRecordProvider::getContactList()
 {
        return m_ContactList;
 }
@@ -107,7 +107,7 @@ void ContactRecordProvider::onInserted(int id, contacts_changed_e changeType)
        }
 }
 
-void ContactRecordProvider::onChanged(ContactDataList::iterator contactIt, int id, contacts_changed_e changeType)
+void ContactRecordProvider::onChanged(DataList::iterator contactIt, int id, contacts_changed_e changeType)
 {
        auto contact = static_cast<ContactRecordData *>(*contactIt);
 
@@ -128,7 +128,7 @@ void ContactRecordProvider::onChanged(ContactDataList::iterator contactIt, int i
        delete contact;
 }
 
-void ContactRecordProvider::updateChangedCallback(ContactDataList::iterator it)
+void ContactRecordProvider::updateChangedCallback(DataList::iterator it)
 {
        auto contactData = static_cast<ContactRecordData *>(*it);
 

diff --git a/lib-common/src/Contacts/Model/SearchEngine.cpp b/lib-common/src/Contacts/Model/SearchEngine.cpp
index 03761cb..608c2e6 100644 (file)
--- a/lib-common/src/Contacts/Model/SearchEngine.cpp
+++ b/lib-common/src/Contacts/Model/SearchEngine.cpp
@@ -39,7 +39,7 @@ void SearchEngine::search(const std::string &query)
        m_Query = query;
 }
 
-const ContactDataList *SearchEngine::getSearchResult() const
+const SearchEngine::DataList *SearchEngine::getSearchResult() const
 {
        if (!m_Cache.empty()) {
                return &m_Cache.back();
@@ -57,8 +57,7 @@ void SearchEngine::firstSearch(const std::string &query)
 {
        clear();
 
-       const ContactDataList searchList = m_SearchProvider.getContactDataList();
-
+       auto &searchList = m_SearchProvider.getDataList();
        if (!searchList.empty()) {
                m_Cache.resize(query.size());
                m_Cache.front() = std::move(searchList);
@@ -93,7 +92,7 @@ void SearchEngine::chooseSearch(const std::string &query)
 
 bool SearchEngine::searchInCache(SearchHistory::iterator from, const std::string &query)
 {
-       ContactDataList searchRes;
+       DataList searchRes;
        /* for (auto &&contactData : *from) {  Todo: Compare
        } */
 

diff --git a/lib-common/src/Contacts/Model/SearchProvider.cpp b/lib-common/src/Contacts/Model/SearchProvider.cpp
index f63ac8e..fdcecbb 100644 (file)
--- a/lib-common/src/Contacts/Model/SearchProvider.cpp
+++ b/lib-common/src/Contacts/Model/SearchProvider.cpp
@@ -34,14 +34,14 @@ SearchProvider::~SearchProvider()
        }
 }
 
-const ContactDataList &SearchProvider::getContactDataList()
+const SearchProvider::DataList &SearchProvider::getDataList()
 {
        return m_ContactList;//Todo: Return filtered list by search engine instead of all contacts
 }
 
 void SearchProvider::addProvider(ContactDataProvider *provider)
 {
-       const ContactDataList &list = provider->getContactDataList();
+       const DataList &list = provider->getDataList();
        for (auto it = list.begin(); it != list.end(); ++it) {
                insertContact(m_ContactList.end(), **it, provider);
        }
@@ -53,13 +53,13 @@ void SearchProvider::addProvider(ContactDataProvider *provider)
                });
 }
 
-ContactData &SearchProvider::insertContact(ContactDataList::const_iterator position, ContactData &contact,
+ContactData &SearchProvider::insertContact(DataList::const_iterator position, ContactData &contact,
                ContactDataProvider *provider)
 {
        auto searchData = new SearchData(contact);
        auto newDataIt = m_ContactList.insert(position, searchData);
 
-       ContactDataList::iterator contactIt = --m_ContactList.end();
+       DataList::iterator contactIt = --m_ContactList.end();
 
        contact.setUpdateCallback(std::bind(&SearchProvider::onUpdated, this, std::ref(*searchData), _1));
        contact.setDeleteCallback(std::bind(&SearchProvider::onDeleted, this, contactIt, provider));
@@ -83,15 +83,15 @@ void SearchProvider::onUpdated(SearchData &searchData, int changes)
        searchData.onUpdated(changes);
 }
 
-void SearchProvider::onDeleted(ContactDataList::iterator contactIt, ContactDataProvider *provider)
+void SearchProvider::onDeleted(DataList::iterator contactIt, ContactDataProvider *provider)
 {
        SearchData *searchData = static_cast<SearchData *>(*contactIt);
        searchData->onDeleted();
 
        delete searchData;
-       ContactDataList::const_iterator newBound = m_ContactList.erase(contactIt);
+       DataList::const_iterator newBound = m_ContactList.erase(contactIt);
 
-       ContactDataList::const_iterator &oldBound = m_SubProviders[provider];
+       DataList::const_iterator &oldBound = m_SubProviders[provider];
        if (oldBound == contactIt) {
                oldBound = Utils::advance(newBound, -1);
        }

diff --git a/lib-contacts/inc/Contacts/List/Model/PersonProvider.h b/lib-contacts/inc/Contacts/List/Model/PersonProvider.h
index beb25b5..1e973c9 100644 (file)
--- a/lib-contacts/inc/Contacts/List/Model/PersonProvider.h
+++ b/lib-contacts/inc/Contacts/List/Model/PersonProvider.h
@@ -49,7 +49,7 @@ namespace Contacts
                                 * @brief Get person list
                                 * @return List of contact objects
                                 */
-                               virtual const Contacts::Model::ContactDataList &getContactDataList() override;
+                               virtual const DataList &getDataList() override;
 
                        protected:
                                /**

diff --git a/lib-contacts/inc/Contacts/List/Model/VcardProvider.h b/lib-contacts/inc/Contacts/List/Model/VcardProvider.h
index 7c4482d..214d77b 100644 (file)
--- a/lib-contacts/inc/Contacts/List/Model/VcardProvider.h
+++ b/lib-contacts/inc/Contacts/List/Model/VcardProvider.h
@@ -44,13 +44,13 @@ namespace Contacts
                                VcardProvider &operator=(const VcardProvider &contact) = delete;
 
                                /**
-                                * @see ContactDataProvider::getContactDataList()
+                                * @see ContactDataProvider::getDataList()
                                 * @return Contact data list
                                 */
-                               virtual const Contacts::Model::ContactDataList &getContactDataList() override;
+                               virtual const DataList &getDataList() override;
 
                        private:
-                               Contacts::Model::ContactDataList m_ContactsList;
+                               DataList m_ContactsList;
                        };
                }
        }

diff --git a/lib-contacts/src/Contacts/List/ListView.cpp b/lib-contacts/src/Contacts/List/ListView.cpp
index 4f0dff9..de255af 100644 (file)
--- a/lib-contacts/src/Contacts/List/ListView.cpp
+++ b/lib-contacts/src/Contacts/List/ListView.cpp
@@ -182,7 +182,7 @@ void ListView::onNameSortingOrderChanged(contacts_name_sorting_order_e sortingOr
                        delete personGroup.second;
                }
                view->m_PersonGroups.clear();
-               view->m_Provider.clearContactDataList();
+               view->m_Provider.clearDataList();
 
                elm_index_item_clear(view->m_Index);
                elm_index_level_go(view->m_Index, 0);
@@ -233,7 +233,7 @@ void ListView::fillPersonList()
        if (m_PersonGroups.empty()) {
                PersonGroupItem *group = nullptr;
 
-               for (auto &&contactData : m_Provider.getContactDataList()) {
+               for (auto &&contactData : m_Provider.getDataList()) {
                        Person &person = static_cast<Person &>(*contactData);
 
                        const UniString &nextLetter = person.getIndexLetter();
@@ -315,8 +315,7 @@ void ListView::hideNoContentLayout()
 
 void ListView::updateNoContentLayout()
 {
-       ContactDataList list = m_Provider.getContactDataList();
-       list.size() > 0 ? hideNoContentLayout() : showNoContentLayout();
+       m_Provider.getDataList().size() > 0 ? hideNoContentLayout() : showNoContentLayout();
 }
 
 void ListView::setFavouriteItemsMode(SelectMode selectMode)

diff --git a/lib-contacts/src/Contacts/List/Model/PersonProvider.cpp b/lib-contacts/src/Contacts/List/Model/PersonProvider.cpp
index 243041e..acf7af1 100644 (file)
--- a/lib-contacts/src/Contacts/List/Model/PersonProvider.cpp
+++ b/lib-contacts/src/Contacts/List/Model/PersonProvider.cpp
@@ -51,7 +51,7 @@ PersonProvider::~PersonProvider()
                        makeCallbackWithLastParam(&PersonProvider::onNameFormatChanged), this);
 }
 
-const ContactDataList &PersonProvider::getContactDataList()
+const PersonProvider::DataList &PersonProvider::getDataList()
 {
        auto &contactList = getContactList();
        if (!contactList.empty()) {
@@ -161,7 +161,7 @@ bool PersonProvider::shouldUpdateChangedCallback()
 
 void PersonProvider::onNameFormatChanged(contacts_name_display_order_e order)
 {
-       for (auto &&contactData : getContactDataList()) {
+       for (auto &&contactData : getDataList()) {
                Person *person = static_cast<Person *>(contactData);
                person->update();
        }

diff --git a/lib-contacts/src/Contacts/List/Model/VcardProvider.cpp b/lib-contacts/src/Contacts/List/Model/VcardProvider.cpp
index e0ac52a..97cc360 100644 (file)
--- a/lib-contacts/src/Contacts/List/Model/VcardProvider.cpp
+++ b/lib-contacts/src/Contacts/List/Model/VcardProvider.cpp
@@ -27,7 +27,7 @@ VcardProvider::VcardProvider(std::string vcardPath)
 {
        int err = contacts_vcard_parse_to_contact_foreach(vcardPath.c_str(), [](contacts_record_h record, void *data)->bool {
                RETVM_IF(!record || !data, true, "invalid data");
-               ContactDataList *list = (ContactDataList *)data;
+               DataList *list = (DataList *)data;
 
                contacts_record_h recordClone;
                contacts_record_clone(record, &recordClone);
@@ -47,7 +47,7 @@ VcardProvider::~VcardProvider()
        }
 }
 
-const ContactDataList &VcardProvider::getContactDataList()
+const VcardProvider::DataList &VcardProvider::getDataList()
 {
        return m_ContactsList;
 }

diff --git a/lib-contacts/src/Contacts/List/VcardView.cpp b/lib-contacts/src/Contacts/List/VcardView.cpp
index 8bbce91..fc2a0b4 100644 (file)
--- a/lib-contacts/src/Contacts/List/VcardView.cpp
+++ b/lib-contacts/src/Contacts/List/VcardView.cpp
@@ -50,7 +50,7 @@ Evas_Object *VcardView::onCreate(Evas_Object *parent)
        m_Genlist = new Ui::Genlist();
        m_Genlist->create(parent);
 
-       for (auto &&contact : m_Provider.getContactDataList()) {
+       for (auto &&contact : m_Provider.getDataList()) {
                ContactItem *item = new ContactItem(static_cast<ContactRecordData &>(*contact));
                m_Genlist->insert(item);
                onItemInserted(item);

diff --git a/lib-logs/inc/Logs/Model/LogProvider.h b/lib-logs/inc/Logs/Model/LogProvider.h
index 8a744f5..1fd2128 100644 (file)
--- a/lib-logs/inc/Logs/Model/LogProvider.h
+++ b/lib-logs/inc/Logs/Model/LogProvider.h
@@ -59,7 +59,7 @@ namespace Logs
                        /**
                         * @brief Log iterator.
                         */
-                       typedef Contacts::Model::ContactDataList::iterator LogIterator;
+                       typedef DataList::iterator LogIterator;
 
                        /**
                         * @brief Group iterator.
@@ -92,7 +92,7 @@ namespace Logs
                         * @brief Get log group list
                         * @return List of log group objects
                         */
-                       virtual const Contacts::Model::ContactDataList &getContactDataList() override;
+                       virtual const DataList &getDataList() override;
 
                        /**
                         * @brief Reset log group list
@@ -136,7 +136,7 @@ namespace Logs
                        int m_DbVersion;
 
                        LogGroupList m_Groups;
-                       Contacts::Model::ContactDataList m_Logs;
+                       DataList m_Logs;
 
                        InsertCallback m_InsertCallback;
                };

diff --git a/lib-logs/src/Logs/Model/LogProvider.cpp b/lib-logs/src/Logs/Model/LogProvider.cpp
index 5b81692..10054a0 100644 (file)
--- a/lib-logs/src/Logs/Model/LogProvider.cpp
+++ b/lib-logs/src/Logs/Model/LogProvider.cpp
@@ -56,7 +56,7 @@ const LogProvider::LogGroupList &LogProvider::getLogGroupList()
        return m_Groups;
 }
 
-const Contacts::Model::ContactDataList &LogProvider::getContactDataList()
+const LogProvider::DataList &LogProvider::getDataList()
 {
        if (m_Logs.empty()) {
                fillList();