git.iko.soy/unity8
on xenial help sign in
Expose result as variant.
0e8d0a0Pawel Stolowski
plugins/Unity/preview.cpp+2−2
compare with xenial
unifiedsplit
@@ -124,9 +124,9 @@ QString Preview::imageSourceUri() const
124 return QString::null;
124 return QString::null;
125}
125}
126
126
127−Result* Preview::result() const
127+QVariant Preview::result() const
128{
128{
129− return m_result;
129+ return QVariant::fromValue(m_result);
130}
130}
131
131
132Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)
132Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)
plugins/Unity/preview.h+2−2
@@ -47,7 +47,7 @@ class Q_DECL_EXPORT Preview : public QObject
47 Q_PROPERTY(QVariantMap infoMap READ infoHintsHash NOTIFY previewChanged)
47 Q_PROPERTY(QVariantMap infoMap READ infoHintsHash NOTIFY previewChanged)
48 Q_PROPERTY(QString image READ image NOTIFY previewChanged)
48 Q_PROPERTY(QString image READ image NOTIFY previewChanged)
49 Q_PROPERTY(QString imageSourceUri READ imageSourceUri NOTIFY previewChanged)
49 Q_PROPERTY(QString imageSourceUri READ imageSourceUri NOTIFY previewChanged)
50− Q_PROPERTY(Result result READ result NOTIFY previewChanged)
50+ Q_PROPERTY(QVariant result READ result NOTIFY previewChanged)
51
51
52public:
52public:
53 explicit Preview(QObject *parent = 0);
53 explicit Preview(QObject *parent = 0);
@@ -62,7 +62,7 @@ public:
62 QVariantMap infoHintsHash() const;
62 QVariantMap infoHintsHash() const;
63 QString image() const;
63 QString image() const;
64 QString imageSourceUri() const;
64 QString imageSourceUri() const;
65− Result* result() const;
65+ QVariant result() const;
66
66
67 Q_INVOKABLE void execute(const QString& actionId, const QHash<QString, QVariant>& hints);
67 Q_INVOKABLE void execute(const QString& actionId, const QHash<QString, QVariant>& hints);
68
68