git.iko.soy/unity8
on xenial help sign in
Fixed preview construction that resulted in duplicated actions for generic preview.
commit5d7c85e21d6c3e9702be9d9cb2dc055acadd0b50 authorPawel Stolowski <pawel.stolowski@canonical.com> dateFri 28 Jun 2013, 18:07 (13 years ago) parent2e263ce
2 files changed+9−2
compare with xenial
unifiedsplit
plugins/Unity/preview.cpp+7−2 plugins/Unity/preview.h+2
plugins/Unity/preview.cpp+7−2
@@ -131,13 +131,13 @@ Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)
131131 preview = new GenericPreview();
132132 }
133133
134− preview->Preview::setUnityPreview(unityPreview);
134+ preview->setUnityPreviewBase(unityPreview);
135135 preview->setUnityPreview(unityPreview);
136136
137137 return preview;
138138}
139139
140−void Preview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)
140+void Preview::setUnityPreviewBase(unity::dash::Preview::Ptr unityPreview)
141141{
142142 m_unityPreview = unityPreview;
143143
@@ -163,6 +163,11 @@ void Preview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)
163163 Q_EMIT imageSourceUriChanged();
164164}
165165
166+void Preview::setUnityPreview(unity::dash::Preview::Ptr /* unityPreview */)
167+{
168+ // default implementation does nothing
169+}
170+
166171void Preview::execute(const QString& actionId, const QHash<QString, QVariant>& hints)
167172{
168173 if (m_unityPreview) {
plugins/Unity/preview.h+2
@@ -76,6 +76,8 @@ protected:
7676 unity::dash::Preview::Ptr m_unityPreview;
7777
7878private:
79+ void setUnityPreviewBase(unity::dash::Preview::Ptr unityPreview);
80+
7981 QList<QObject *> m_actions;
8082 QList<QObject *> m_infoHints;
8183};