From dac94d0295f6f43c04c0843d1c905df841a63657 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 23 Nov 2016 15:03:18 +0100 Subject: [PATCH] unstable --- tests/CMakeLists.txt | 2 ++ tests/src/components/contacts/ContactModel.hpp | 6 +++--- tests/src/components/contacts/ContactsListModel.cpp | 2 +- tests/src/components/contacts/ContactsListModel.hpp | 6 +++--- tests/src/components/contacts/ContactsListProxyModel.hpp | 6 +++--- .../components/smart-search-bar/SmartSearchBarModel.hpp | 2 +- .../smart-search-bar/SmartSearchBarProxyModel.cpp | 1 + .../smart-search-bar/SmartSearchBarProxyModel.hpp | 9 +++++++++ 8 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 tests/src/components/smart-search-bar/SmartSearchBarProxyModel.cpp create mode 100644 tests/src/components/smart-search-bar/SmartSearchBarProxyModel.hpp diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 5aaa57a5e..33d06153e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -41,6 +41,7 @@ set(SOURCES src/components/notifier/Notifier.cpp src/components/settings/AccountSettingsModel.cpp src/components/settings/SettingsModel.cpp + src/components/smart-search-bar/SmartSearchBarModel.cpp src/components/timeline/TimelineModel.cpp src/main.cpp ) @@ -58,6 +59,7 @@ set(HEADERS src/components/presence/Presence.hpp src/components/settings/AccountSettingsModel.hpp src/components/settings/SettingsModel.hpp + src/components/smart-search-bar/SmartSearchBarModel.hpp src/components/timeline/TimelineModel.hpp src/utils.hpp ) diff --git a/tests/src/components/contacts/ContactModel.hpp b/tests/src/components/contacts/ContactModel.hpp index f5e05e78b..f51e09b09 100644 --- a/tests/src/components/contacts/ContactModel.hpp +++ b/tests/src/components/contacts/ContactModel.hpp @@ -1,5 +1,5 @@ -#ifndef CONTACT_MODEL_H -#define CONTACT_MODEL_H +#ifndef CONTACT_MODEL_H_ +#define CONTACT_MODEL_H_ #include #include @@ -80,4 +80,4 @@ private: Q_DECLARE_METATYPE(ContactModel*); -#endif // CONTACT_MODEL_H +#endif // CONTACT_MODEL_H_ diff --git a/tests/src/components/contacts/ContactsListModel.cpp b/tests/src/components/contacts/ContactsListModel.cpp index 0b28ef3c8..098417e50 100644 --- a/tests/src/components/contacts/ContactsListModel.cpp +++ b/tests/src/components/contacts/ContactsListModel.cpp @@ -59,7 +59,7 @@ bool ContactsListModel::removeRows (int row, int count, const QModelIndex &paren ContactModel *contact = m_list[row]; m_list.removeAt(row); - m_linphone_friends->removeFriend(contact->m_linphone_friend); + // m_linphone_friends->removeFriend(contact->m_linphone_friend); contact->deleteLater(); } diff --git a/tests/src/components/contacts/ContactsListModel.hpp b/tests/src/components/contacts/ContactsListModel.hpp index 5ba186f13..4ab812819 100644 --- a/tests/src/components/contacts/ContactsListModel.hpp +++ b/tests/src/components/contacts/ContactsListModel.hpp @@ -1,5 +1,5 @@ -#ifndef CONTACTS_LIST_MODEL_H -#define CONTACTS_LIST_MODEL_H +#ifndef CONTACTS_LIST_MODEL_H_ +#define CONTACTS_LIST_MODEL_H_ #include @@ -39,4 +39,4 @@ private: std::shared_ptr m_linphone_friends; }; -#endif // CONTACTS_LIST_MODEL_H +#endif // CONTACTS_LIST_MODEL_H_ diff --git a/tests/src/components/contacts/ContactsListProxyModel.hpp b/tests/src/components/contacts/ContactsListProxyModel.hpp index 4312c2b3b..c2d1d3054 100644 --- a/tests/src/components/contacts/ContactsListProxyModel.hpp +++ b/tests/src/components/contacts/ContactsListProxyModel.hpp @@ -1,5 +1,5 @@ -#ifndef CONTACTS_LIST_PROXY_MODEL_H -#define CONTACTS_LIST_PROXY_MODEL_H +#ifndef CONTACTS_LIST_PROXY_MODEL_H_ +#define CONTACTS_LIST_PROXY_MODEL_H_ #include @@ -49,4 +49,4 @@ private: bool m_use_connected_filter; }; -#endif // CONTACTS_LIST_PROXY_MODEL_H +#endif // CONTACTS_LIST_PROXY_MODEL_H_ diff --git a/tests/src/components/smart-search-bar/SmartSearchBarModel.hpp b/tests/src/components/smart-search-bar/SmartSearchBarModel.hpp index 0d56ab8a0..166d8dce3 100644 --- a/tests/src/components/smart-search-bar/SmartSearchBarModel.hpp +++ b/tests/src/components/smart-search-bar/SmartSearchBarModel.hpp @@ -6,4 +6,4 @@ class SmartSearchBarModel { }; -#endif +#endif // SMART_SEARCH_BAR_MODEL_H_ diff --git a/tests/src/components/smart-search-bar/SmartSearchBarProxyModel.cpp b/tests/src/components/smart-search-bar/SmartSearchBarProxyModel.cpp new file mode 100644 index 000000000..e6e04783c --- /dev/null +++ b/tests/src/components/smart-search-bar/SmartSearchBarProxyModel.cpp @@ -0,0 +1 @@ +#include "SmartSearchBarProxyModel.hpp" diff --git a/tests/src/components/smart-search-bar/SmartSearchBarProxyModel.hpp b/tests/src/components/smart-search-bar/SmartSearchBarProxyModel.hpp new file mode 100644 index 000000000..7057fc024 --- /dev/null +++ b/tests/src/components/smart-search-bar/SmartSearchBarProxyModel.hpp @@ -0,0 +1,9 @@ +#ifndef SMART_SEARCH_BAR_PROXY_MODEL_H_ +#define SMART_SEARCH_BAR_PROXY_MODEL_H_ + +class SmartSearchBarProxyModel { + + +}; + +#endif // SMART_SEARCH_BAR_PROXY_MODEL_H_