git.iko.soy/unity8
on xenial help sign in
Removed *changed() notifications for Filter properties and marked them CONSTANT.
0431d60Pawel Stolowski
plugins/Unity/filter.cpp−33
compare with xenial
unifiedsplit
@@ -99,20 +99,7 @@ void Filter::clear()
99
99
100void Filter::setUnityFilter(unity::dash::Filter::Ptr unityFilter)
100void Filter::setUnityFilter(unity::dash::Filter::Ptr unityFilter)
101{
101{
102− if (m_unityFilter != nullptr) {
103− m_signals.disconnectAll();
104− }
105−
106 m_unityFilter = unityFilter;
102 m_unityFilter = unityFilter;
107−
108− /* Property change signals */
109− m_signals << m_unityFilter->id.changed.connect(sigc::mem_fun(this, &Filter::onIdChanged))
110− << m_unityFilter->name.changed.connect(sigc::mem_fun(this, &Filter::onNameChanged))
111− << m_unityFilter->icon_hint.changed.connect(sigc::mem_fun(this, &Filter::onIconHintChanged))
112− << m_unityFilter->renderer_name.changed.connect(sigc::mem_fun(this, &Filter::onRendererNameChanged))
113− << m_unityFilter->visible.changed.connect(sigc::mem_fun(this, &Filter::visibleChanged))
114− << m_unityFilter->collapsed.changed.connect(sigc::mem_fun(this, &Filter::collapsedChanged))
115− << m_unityFilter->filtering.changed.connect(sigc::mem_fun(this, &Filter::filteringChanged));
116}
103}
117
104
118Filter* Filter::newFromUnityFilter(unity::dash::Filter::Ptr unityFilter)
105Filter* Filter::newFromUnityFilter(unity::dash::Filter::Ptr unityFilter)
@@ -140,23 +127,3 @@ bool Filter::hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const
140{
127{
141 return m_unityFilter == unityFilter;
128 return m_unityFilter == unityFilter;
142}
129}
143−
144−void Filter::onIdChanged(std::string id)
145−{
146− Q_EMIT idChanged(QString::fromStdString(id));
147−}
148−
149−void Filter::onNameChanged(std::string name)
150−{
151− Q_EMIT nameChanged(QString::fromStdString(name));
152−}
153−
154−void Filter::onIconHintChanged(std::string iconHint)
155−{
156− Q_EMIT iconHintChanged(QString::fromStdString(iconHint));
157−}
158−
159−void Filter::onRendererNameChanged(std::string renderer)
160−{
161− Q_EMIT rendererNameChanged(QString::fromStdString(renderer));
162−}
plugins/Unity/filter.h+7−26
@@ -28,22 +28,19 @@
28// libunity-core
28// libunity-core
29#include <UnityCore/Filter.h>
29#include <UnityCore/Filter.h>
30
30
31−// local
32−#include "signalslist.h"
33−
34class GenericOptionsModel;
31class GenericOptionsModel;
35
32
36class Q_DECL_EXPORT Filter : public QObject
33class Q_DECL_EXPORT Filter : public QObject
37{
34{
38 Q_OBJECT
35 Q_OBJECT
39
36
40− Q_PROPERTY(QString id READ id NOTIFY idChanged)
37+ Q_PROPERTY(QString id READ id CONSTANT)
41− Q_PROPERTY(QString name READ name NOTIFY nameChanged)
38+ Q_PROPERTY(QString name READ name CONSTANT)
42− Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
39+ Q_PROPERTY(QString iconHint READ iconHint CONSTANT)
43− Q_PROPERTY(QString rendererName READ rendererName NOTIFY rendererNameChanged)
40+ Q_PROPERTY(QString rendererName READ rendererName CONSTANT)
44− Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
41+ Q_PROPERTY(bool visible READ visible CONSTANT)
45− Q_PROPERTY(bool collapsed READ collapsed NOTIFY collapsedChanged)
42+ Q_PROPERTY(bool collapsed READ collapsed CONSTANT)
46− Q_PROPERTY(bool filtering READ filtering NOTIFY filteringChanged)
43+ Q_PROPERTY(bool filtering READ filtering CONSTANT)
47 Q_PROPERTY(GenericOptionsModel* options READ options NOTIFY optionsChanged)
44 Q_PROPERTY(GenericOptionsModel* options READ options NOTIFY optionsChanged)
48
45
49public:
46public:
@@ -65,27 +62,11 @@ public:
65 bool hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const;
62 bool hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const;
66
63
67Q_SIGNALS:
64Q_SIGNALS:
68− void idChanged(const QString &id);
69− void nameChanged(const QString &name);
70− void iconHintChanged(const QString &iconHint);
71− void rendererNameChanged(const QString &renderer);
72− void visibleChanged(bool);
73− void collapsedChanged(bool);
74− void filteringChanged(bool);
75 void optionsChanged();
65 void optionsChanged();
76
66
77protected:
67protected:
78 unity::dash::Filter::Ptr m_unityFilter;
68 unity::dash::Filter::Ptr m_unityFilter;
79 virtual void setUnityFilter(unity::dash::Filter::Ptr unityFilter);
69 virtual void setUnityFilter(unity::dash::Filter::Ptr unityFilter);
80−
81−private:
82− void onIdChanged(std::string);
83− void onNameChanged(std::string);
84− void onIconHintChanged(std::string);
85− void onRendererNameChanged(std::string);
86−
87−private:
88− SignalsList m_signals;
89};
70};
90
71
91Q_DECLARE_METATYPE(Filter*)
72Q_DECLARE_METATYPE(Filter*)