git.iko.soy/unity8
on xenial help sign in
Don't use std::string in Filter's signals.
commit6f5e21854cc6b51dcf1a98625c9b2ec844d87891 authorPawel Stolowski <pawel.stolowski@canonical.com> dateTue 13 Aug 2013, 12:00 (13 years ago) parent865b871
2 files changed+34−8
compare with xenial
unifiedsplit
plugins/Unity/filter.cpp+24−4 plugins/Unity/filter.h+10−4
plugins/Unity/filter.cpp+24−4
@@ -106,10 +106,10 @@ void Filter::setUnityFilter(unity::dash::Filter::Ptr unityFilter)
106106 m_unityFilter = unityFilter;
107107
108108 /* Property change signals */
109− m_signals << m_unityFilter->id.changed.connect(sigc::mem_fun(this, &Filter::idChanged))
110− << m_unityFilter->name.changed.connect(sigc::mem_fun(this, &Filter::nameChanged))
111− << m_unityFilter->icon_hint.changed.connect(sigc::mem_fun(this, &Filter::iconHintChanged))
112− << m_unityFilter->renderer_name.changed.connect(sigc::mem_fun(this, &Filter::rendererNameChanged))
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))
113113 << m_unityFilter->visible.changed.connect(sigc::mem_fun(this, &Filter::visibleChanged))
114114 << m_unityFilter->collapsed.changed.connect(sigc::mem_fun(this, &Filter::collapsedChanged))
115115 << m_unityFilter->filtering.changed.connect(sigc::mem_fun(this, &Filter::filteringChanged));
@@ -140,3 +140,23 @@ bool Filter::hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const
140140{
141141 return m_unityFilter == unityFilter;
142142}
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+10−4
@@ -65,10 +65,10 @@ public:
6565 bool hasUnityFilter(unity::dash::Filter::Ptr unityFilter) const;
6666
6767Q_SIGNALS:
68− void idChanged(std::string);
69− void nameChanged(std::string);
70− void iconHintChanged(std::string);
71− void rendererNameChanged(std::string);
68+ void idChanged(const QString &id);
69+ void nameChanged(const QString &name);
70+ void iconHintChanged(const QString &iconHint);
71+ void rendererNameChanged(const QString &renderer);
7272 void visibleChanged(bool);
7373 void collapsedChanged(bool);
7474 void filteringChanged(bool);
@@ -78,6 +78,12 @@ protected:
7878 unity::dash::Filter::Ptr m_unityFilter;
7979 virtual void setUnityFilter(unity::dash::Filter::Ptr unityFilter);
8080
81+private:
82+ void onIdChanged(std::string);
83+ void onNameChanged(std::string);
84+ void onIconHintChanged(std::string);
85+ void onRendererNameChanged(std::string);
86+
8187private:
8288 SignalsList m_signals;
8389};