git.iko.soy/unity8
on xenial help sign in
Removed ViewType.
87faa27Pawel Stolowski
plugins/Unity/scope.cpp−17
compare with xenial
unifiedsplit
@@ -87,11 +87,6 @@ Categories* Scope::categories() const
87 return m_categories;
87 return m_categories;
88}
88}
89
89
90−Scope::ViewType Scope::viewType() const
91−{
92− return (Scope::ViewType) m_unityScope->view_type();
93−}
94−
95QString Scope::searchQuery() const
90QString Scope::searchQuery() const
96{
91{
97 return m_searchQuery;
92 return m_searchQuery;
@@ -102,11 +97,6 @@ QString Scope::noResultsHint() const
102 return m_noResultsHint;
97 return m_noResultsHint;
103}
98}
104
99
105−void Scope::setViewType(const Scope::ViewType& viewType)
106−{
107− m_unityScope->view_type = (unity::dash::ScopeViewType) viewType;
108−}
109−
110void Scope::setSearchQuery(const QString& search_query)
100void Scope::setSearchQuery(const QString& search_query)
111{
101{
112 /* Checking for m_searchQuery.isNull() which returns true only when the string
102 /* Checking for m_searchQuery.isNull() which returns true only when the string
@@ -205,8 +195,6 @@ void Scope::setUnityScope(const unity::dash::Scope::Ptr& scope)
205 m_unityScope->categories()->model.changed.connect(sigc::mem_fun(this, &Scope::onCategoriesModelChanged));
195 m_unityScope->categories()->model.changed.connect(sigc::mem_fun(this, &Scope::onCategoriesModelChanged));
206 m_unityScope->categories.changed.connect(sigc::mem_fun(this, &Scope::onCategoriesChanged));
196 m_unityScope->categories.changed.connect(sigc::mem_fun(this, &Scope::onCategoriesChanged));
207 m_unityScope->categories()->swarm_name.changed.connect(sigc::mem_fun(this, &Scope::onCategoriesSwarmNameChanged));
197 m_unityScope->categories()->swarm_name.changed.connect(sigc::mem_fun(this, &Scope::onCategoriesSwarmNameChanged));
208− m_unityScope->view_type.changed.connect(sigc::mem_fun(this, &Scope::onViewTypeChanged));
209−
210 /* Signals forwarding */
198 /* Signals forwarding */
211 connect(this, SIGNAL(searchFinished(const std::string &, unity::glib::HintsMap const &, unity::glib::Error const &)), SLOT(onSearchFinished(const std::string &, unity::glib::HintsMap const &)));
199 connect(this, SIGNAL(searchFinished(const std::string &, unity::glib::HintsMap const &, unity::glib::Error const &)), SLOT(onSearchFinished(const std::string &, unity::glib::HintsMap const &)));
212
200
@@ -265,11 +253,6 @@ void Scope::onCategoriesModelChanged(unity::glib::Object<DeeModel> model)
265 m_categories->setModel(model);
253 m_categories->setModel(model);
266}
254}
267
255
268−void Scope::onViewTypeChanged(unity::dash::ScopeViewType viewType)
269−{
270− Q_EMIT viewTypeChanged( (Scope::ViewType) viewType);
271−}
272−
273void Scope::onSearchFinished(const std::string &query, unity::glib::HintsMap const &hints)
256void Scope::onSearchFinished(const std::string &query, unity::glib::HintsMap const &hints)
274{
257{
275 QString hint;
258 QString hint;
plugins/Unity/scope.h−12
@@ -37,7 +37,6 @@ class Categories;
37class Scope : public QObject
37class Scope : public QObject
38{
38{
39 Q_OBJECT
39 Q_OBJECT
40− Q_ENUMS(ViewType)
41
40
42 Q_PROPERTY(QString id READ id NOTIFY idChanged)
41 Q_PROPERTY(QString id READ id NOTIFY idChanged)
43 Q_PROPERTY(QString name READ name NOTIFY nameChanged)
42 Q_PROPERTY(QString name READ name NOTIFY nameChanged)
@@ -49,7 +48,6 @@ class Scope : public QObject
49 Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)
48 Q_PROPERTY(bool connected READ connected NOTIFY connectedChanged)
50 Q_PROPERTY(DeeListModel* results READ results NOTIFY resultsChanged)
49 Q_PROPERTY(DeeListModel* results READ results NOTIFY resultsChanged)
51 Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)
50 Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)
52− Q_PROPERTY(ViewType viewType READ viewType WRITE setViewType NOTIFY viewTypeChanged)
53
51
54 Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
52 Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
55 Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)
53 Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)
@@ -57,12 +55,6 @@ class Scope : public QObject
57public:
55public:
58 explicit Scope(QObject *parent = 0);
56 explicit Scope(QObject *parent = 0);
59
57
60− enum ViewType {
61− Hidden,
62− HomeView,
63− ScopeView
64− };
65−
66 /* getters */
58 /* getters */
67 QString id() const;
59 QString id() const;
68 QString name() const;
60 QString name() const;
@@ -75,12 +67,10 @@ public:
75 DeeListModel* results() const;
67 DeeListModel* results() const;
76 DeeListModel* globalResults() const;
68 DeeListModel* globalResults() const;
77 Categories* categories() const;
69 Categories* categories() const;
78− ViewType viewType() const;
79 QString searchQuery() const;
70 QString searchQuery() const;
80 QString noResultsHint() const;
71 QString noResultsHint() const;
81
72
82 /* setters */
73 /* setters */
83− void setViewType(const ViewType& viewType);
84 void setSearchQuery(const QString& search_query);
74 void setSearchQuery(const QString& search_query);
85 void setNoResultsHint(const QString& hint);
75 void setNoResultsHint(const QString& hint);
86
76
@@ -101,7 +91,6 @@ Q_SIGNALS:
101 void connectedChanged(bool);
91 void connectedChanged(bool);
102 void resultsChanged();
92 void resultsChanged();
103 void categoriesChanged();
93 void categoriesChanged();
104− void viewTypeChanged(ViewType);
105 void searchFinished(const std::string&, unity::glib::HintsMap const&, unity::glib::Error const&);
94 void searchFinished(const std::string&, unity::glib::HintsMap const&, unity::glib::Error const&);
106 void searchQueryChanged();
95 void searchQueryChanged();
107 void noResultsHintChanged();
96 void noResultsHintChanged();
@@ -117,7 +106,6 @@ private:
117 void onCategoriesSwarmNameChanged(const std::string&);
106 void onCategoriesSwarmNameChanged(const std::string&);
118 void onCategoriesModelChanged(unity::glib::Object<DeeModel>);
107 void onCategoriesModelChanged(unity::glib::Object<DeeModel>);
119 void onCategoriesChanged(const unity::dash::Categories::Ptr&);
108 void onCategoriesChanged(const unity::dash::Categories::Ptr&);
120− void onViewTypeChanged(unity::dash::ScopeViewType);
121
109
122 void onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&);
110 void onActivated(unity::dash::LocalResult const& result, unity::dash::ScopeHandledType type, unity::glib::HintsMap const&);
123 void fallbackActivate(const QString& uri);
111 void fallbackActivate(const QString& uri);