6ad9a9a · unity8 · git.iko.soy

plugins/Unity/applicationpreview.cpp+1−6

compare with xenial

unifiedsplit

@@ -92,10 +92,5 @@ void ApplicationPreview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)

92{

93 m_unityAppPreview = std::dynamic_pointer_cast<unity::dash::ApplicationPreview>(unityPreview);

94

95− Q_EMIT lastUpdateChanged();

95+ Q_EMIT previewChanged();

96− Q_EMIT copyrightChanged();

97− Q_EMIT licenseChanged();

98− Q_EMIT appIconChanged();

99− Q_EMIT ratingChanged();

100− Q_EMIT numRatingsChanged();

101}

96}

plugins/Unity/applicationpreview.h+7−12

@@ -34,12 +34,12 @@ class Q_DECL_EXPORT ApplicationPreview: public Preview

34{

35 Q_OBJECT

36

37− Q_PROPERTY(QString lastUpdate READ lastUpdate NOTIFY lastUpdateChanged)

37+ Q_PROPERTY(QString lastUpdate READ lastUpdate NOTIFY previewChanged)

38− Q_PROPERTY(QString copyright READ copyright NOTIFY copyrightChanged)

38+ Q_PROPERTY(QString copyright READ copyright NOTIFY previewChanged)

39− Q_PROPERTY(QString license READ license NOTIFY licenseChanged)

39+ Q_PROPERTY(QString license READ license NOTIFY previewChanged)

40− Q_PROPERTY(QString appIcon READ appIcon NOTIFY appIconChanged)

40+ Q_PROPERTY(QString appIcon READ appIcon NOTIFY previewChanged)

41− Q_PROPERTY(float rating READ rating NOTIFY ratingChanged)

41+ Q_PROPERTY(float rating READ rating NOTIFY previewChanged)

42− Q_PROPERTY(unsigned int numRatings READ numRatings NOTIFY numRatingsChanged)

42+ Q_PROPERTY(unsigned int numRatings READ numRatings NOTIFY previewChanged)

43

44public:

45 explicit ApplicationPreview(QObject *parent = 0);

@@ -52,12 +52,7 @@ public:

52 unsigned int numRatings() const;

53

54Q_SIGNALS:

55− void lastUpdateChanged();

55+ void previewChanged();

56− void copyrightChanged();

57− void licenseChanged();

58− void appIconChanged();

59− void ratingChanged();

60− void numRatingsChanged();

61

56

62protected:

57protected:

63 void setUnityPreview(unity::dash::Preview::Ptr unityPreview) override;

58 void setUnityPreview(unity::dash::Preview::Ptr unityPreview) override;

plugins/Unity/moviepreview.cpp+1−3

@@ -63,7 +63,5 @@ void MoviePreview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)

63{

64 m_unityMoviePreview = std::dynamic_pointer_cast<unity::dash::MoviePreview>(unityPreview);

65

66− Q_EMIT yearChanged();

66+ Q_EMIT previewChanged();

67− Q_EMIT ratingChanged();

68− Q_EMIT numRatingsChanged();

69}

67}

plugins/Unity/moviepreview.h+4−6

@@ -34,9 +34,9 @@ class Q_DECL_EXPORT MoviePreview: public Preview

34{

35 Q_OBJECT

36

37− Q_PROPERTY(QString year READ year NOTIFY yearChanged)

37+ Q_PROPERTY(QString year READ year NOTIFY previewChanged)

38− Q_PROPERTY(float rating READ rating NOTIFY ratingChanged)

38+ Q_PROPERTY(float rating READ rating NOTIFY previewChanged)

39− Q_PROPERTY(unsigned int numRatings READ numRatings NOTIFY numRatingsChanged)

39+ Q_PROPERTY(unsigned int numRatings READ numRatings NOTIFY previewChanged)

40

41public:

42 explicit MoviePreview(QObject *parent = 0);

@@ -46,9 +46,7 @@ public:

46 unsigned int numRatings() const;

47

48Q_SIGNALS:

49− void yearChanged();

49+ void previewChanged();

50− void ratingChanged();

51− void numRatingsChanged();

52

50

53protected:

51protected:

54 void setUnityPreview(unity::dash::Preview::Ptr unityPreview) override;

52 void setUnityPreview(unity::dash::Preview::Ptr unityPreview) override;

plugins/Unity/musicpreview.cpp+1

@@ -36,6 +36,7 @@ void MusicPreview::setUnityPreview(unity::dash::Preview::Ptr unityPreview)

36 m_tracks->setModel(m_unityMusicPreview->GetTracksModel()->model());

37 m_unityMusicPreview->GetTracksModel()->model.changed.connect(sigc::mem_fun(this, &MusicPreview::onTracksModelChanged));

38

39+ Q_EMIT previewChanged();

39 Q_EMIT tracksChanged();

40 Q_EMIT tracksChanged();

40}

41}

41

42

plugins/Unity/preview.cpp−9

@@ -155,15 +155,6 @@ void Preview::setUnityPreviewBase(unity::dash::Preview::Ptr unityPreview)

155 action->setUnityAction(unityAction);

156 m_actions.append(action);

157 }

158−

159− Q_EMIT rendererNameChanged();

160− Q_EMIT titleChanged();

161− Q_EMIT subtitleChanged();

162− Q_EMIT descriptionChanged();

163− Q_EMIT actionsChanged();

164− Q_EMIT infoHintsChanged();

165− Q_EMIT imageChanged();

166− Q_EMIT imageSourceUriChanged();

167}

158}

168

159

169void Preview::setUnityPreview(unity::dash::Preview::Ptr /* unityPreview */)

160void Preview::setUnityPreview(unity::dash::Preview::Ptr /* unityPreview */)

plugins/Unity/preview.h+9−16

@@ -36,14 +36,14 @@ class Q_DECL_EXPORT Preview : public QObject

36{

37 Q_OBJECT

38

39− Q_PROPERTY(QString rendererName READ rendererName NOTIFY rendererNameChanged)

39+ Q_PROPERTY(QString rendererName READ rendererName NOTIFY previewChanged)

40− Q_PROPERTY(QString title READ title NOTIFY titleChanged)

40+ Q_PROPERTY(QString title READ title NOTIFY previewChanged)

41− Q_PROPERTY(QString subtitle READ subtitle NOTIFY subtitleChanged)

41+ Q_PROPERTY(QString subtitle READ subtitle NOTIFY previewChanged)

42− Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)

42+ Q_PROPERTY(QString description READ description NOTIFY previewChanged)

43− Q_PROPERTY(QVariant actions READ actions NOTIFY actionsChanged)

43+ Q_PROPERTY(QVariant actions READ actions NOTIFY previewChanged)

44− Q_PROPERTY(QVariant infoHints READ infoHints NOTIFY infoHintsChanged)

44+ Q_PROPERTY(QVariant infoHints READ infoHints NOTIFY previewChanged)

45− Q_PROPERTY(QString image READ image NOTIFY imageChanged)

45+ Q_PROPERTY(QString image READ image NOTIFY previewChanged)

46− Q_PROPERTY(QString imageSourceUri READ imageSourceUri NOTIFY imageSourceUriChanged)

46+ Q_PROPERTY(QString imageSourceUri READ imageSourceUri NOTIFY previewChanged)

47

48public:

49 explicit Preview(QObject *parent = 0);

@@ -61,14 +61,7 @@ public:

61 Q_INVOKABLE void execute(const QString& actionId, const QHash<QString, QVariant>& hints);

62

63Q_SIGNALS:

64− void rendererNameChanged();

64+ void previewChanged();

65− void titleChanged();

66− void subtitleChanged();

67− void descriptionChanged();

68− void actionsChanged();

69− void infoHintsChanged();

70− void imageChanged();

71− void imageSourceUriChanged();

72

65

73protected:

66protected:

74 virtual void setUnityPreview(unity::dash::Preview::Ptr unityPreview);

67 virtual void setUnityPreview(unity::dash::Preview::Ptr unityPreview);

plugins/Unity/previewaction.cpp+1−5

@@ -29,11 +29,7 @@ void PreviewAction::setUnityAction(unity::dash::Preview::ActionPtr unityAction)

29{

30 m_unityAction = unityAction;

31

32− Q_EMIT displayNameChanged();

32+ Q_EMIT previewActionChanged();

33− Q_EMIT iconHintChanged();

34− Q_EMIT extraTextChanged();

35− Q_EMIT activationUriChanged();

36− Q_EMIT layoutHintChanged();

37}

33}

38

34

39QString PreviewAction::id() const

35QString PreviewAction::id() const

plugins/Unity/previewaction.h+7−11

@@ -40,12 +40,12 @@ class PreviewAction : public QObject

40{

41 Q_OBJECT

42

43− Q_PROPERTY(QString id READ id)

43+ Q_PROPERTY(QString id READ id NOTIFY previewActionChanged)

44− Q_PROPERTY(QString displayName READ displayName NOTIFY displayNameChanged)

44+ Q_PROPERTY(QString displayName READ displayName NOTIFY previewActionChanged)

45− Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

45+ Q_PROPERTY(QString iconHint READ iconHint NOTIFY previewActionChanged)

46− Q_PROPERTY(QString extraText READ extraText NOTIFY extraTextChanged)

46+ Q_PROPERTY(QString extraText READ extraText NOTIFY previewActionChanged)

47− Q_PROPERTY(QString activationUri READ activationUri NOTIFY activationUriChanged)

47+ Q_PROPERTY(QString activationUri READ activationUri NOTIFY previewActionChanged)

48− Q_PROPERTY(LayoutHint layoutHint READ layoutHint NOTIFY layoutHintChanged)

48+ Q_PROPERTY(LayoutHint layoutHint READ layoutHint NOTIFY previewActionChanged)

49

50public:

51 explicit PreviewAction(QObject *parent = 0);

@@ -59,11 +59,7 @@ public:

59 LayoutHint layoutHint() const;

60

61Q_SIGNALS:

62− void displayNameChanged();

62+ void previewActionChanged();

63− void iconHintChanged();

64− void extraTextChanged();

65− void activationUriChanged();

66− void layoutHintChanged();

67

63

68private:

64private:

69 unity::dash::Preview::ActionPtr m_unityAction;

65 unity::dash::Preview::ActionPtr m_unityAction;

plugins/Unity/previewinfohint.cpp+1−3

@@ -31,9 +31,7 @@ void PreviewInfoHint::setUnityInfoHint(unity::dash::Preview::InfoHintPtr unityIn

31{

32 m_unityInfoHint = unityInfoHint;

33

34− Q_EMIT displayNameChanged();

34+ Q_EMIT previewInfoHintChanged();

35− Q_EMIT iconHintChanged();

36− Q_EMIT valueChanged();

37}

35}

38

36

39QString PreviewInfoHint::id() const

37QString PreviewInfoHint::id() const

plugins/Unity/previewinfohint.h+5−7

@@ -32,10 +32,10 @@ class PreviewInfoHint : public QObject

32{

33 Q_OBJECT

34

35− Q_PROPERTY(QString id READ id)

35+ Q_PROPERTY(QString id READ id NOTIFY previewInfoHintChanged)

36− Q_PROPERTY(QString displayName READ displayName NOTIFY displayNameChanged)

36+ Q_PROPERTY(QString displayName READ displayName NOTIFY previewInfoHintChanged)

37− Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

37+ Q_PROPERTY(QString iconHint READ iconHint NOTIFY previewInfoHintChanged)

38− Q_PROPERTY(QVariant value READ value NOTIFY valueChanged)

38+ Q_PROPERTY(QVariant value READ value NOTIFY previewInfoHintChanged)

39

40public:

41 explicit PreviewInfoHint(QObject *parent = 0);

@@ -47,9 +47,7 @@ public:

47 QVariant value() const;

48

49Q_SIGNALS:

50− void displayNameChanged();

50+ void previewInfoHintChanged();

51− void iconHintChanged();

52− void valueChanged();

53

51

54private:

52private:

55 unity::dash::Preview::InfoHintPtr m_unityInfoHint;

53 unity::dash::Preview::InfoHintPtr m_unityInfoHint;