6ad9a9a · unity8 · git.iko.soy

git.iko.soy/unity8

Emit only one signal for changes.

commit6ad9a9afe3e0ae969ec686b101b3fcf0525252b2 authorPawel Stolowski <pawel.stolowski@canonical.com> dateTue 2 Jul 2013, 12:57 (13 years ago) parent24fca31

11 files changed+37−78

compare with xenial

unifiedsplit

plugins/Unity/applicationpreview.cpp+1−6 plugins/Unity/applicationpreview.h+7−12 plugins/Unity/moviepreview.cpp+1−3 plugins/Unity/moviepreview.h+4−6 plugins/Unity/musicpreview.cpp+1 plugins/Unity/preview.cpp−9 plugins/Unity/preview.h+9−16 plugins/Unity/previewaction.cpp+1−5 plugins/Unity/previewaction.h+7−11 plugins/Unity/previewinfohint.cpp+1−3 plugins/Unity/previewinfohint.h+5−7

plugins/Unity/applicationpreview.cpp+1−6

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

9292{

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

9494

95− Q_EMIT lastUpdateChanged();

96− Q_EMIT copyrightChanged();

97− Q_EMIT licenseChanged();

98− Q_EMIT appIconChanged();

99− Q_EMIT ratingChanged();

100− Q_EMIT numRatingsChanged();

95+ Q_EMIT previewChanged();

10196}

plugins/Unity/applicationpreview.h+7−12

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

3434{

3535 Q_OBJECT

3636

37− Q_PROPERTY(QString lastUpdate READ lastUpdate NOTIFY lastUpdateChanged)

38− Q_PROPERTY(QString copyright READ copyright NOTIFY copyrightChanged)

39− Q_PROPERTY(QString license READ license NOTIFY licenseChanged)

40− Q_PROPERTY(QString appIcon READ appIcon NOTIFY appIconChanged)

41− Q_PROPERTY(float rating READ rating NOTIFY ratingChanged)

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

37+ Q_PROPERTY(QString lastUpdate READ lastUpdate NOTIFY previewChanged)

38+ Q_PROPERTY(QString copyright READ copyright NOTIFY previewChanged)

39+ Q_PROPERTY(QString license READ license NOTIFY previewChanged)

40+ Q_PROPERTY(QString appIcon READ appIcon NOTIFY previewChanged)

41+ Q_PROPERTY(float rating READ rating NOTIFY previewChanged)

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

4343

4444public:

4545 explicit ApplicationPreview(QObject *parent = 0);

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

5252 unsigned int numRatings() const;

5353

5454Q_SIGNALS:

55− void lastUpdateChanged();

56− void copyrightChanged();

57− void licenseChanged();

58− void appIconChanged();

59− void ratingChanged();

60− void numRatingsChanged();

55+ void previewChanged();

6156

6257protected:

6358 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)

6363{

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

6565

66− Q_EMIT yearChanged();

67− Q_EMIT ratingChanged();

68− Q_EMIT numRatingsChanged();

66+ Q_EMIT previewChanged();

6967}

plugins/Unity/moviepreview.h+4−6

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

3434{

3535 Q_OBJECT

3636

37− Q_PROPERTY(QString year READ year NOTIFY yearChanged)

38− Q_PROPERTY(float rating READ rating NOTIFY ratingChanged)

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

37+ Q_PROPERTY(QString year READ year NOTIFY previewChanged)

38+ Q_PROPERTY(float rating READ rating NOTIFY previewChanged)

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

4040

4141public:

4242 explicit MoviePreview(QObject *parent = 0);

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

4646 unsigned int numRatings() const;

4747

4848Q_SIGNALS:

49− void yearChanged();

50− void ratingChanged();

51− void numRatingsChanged();

49+ void previewChanged();

5250

5351protected:

5452 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)

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

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

3838

39+ Q_EMIT previewChanged();

3940 Q_EMIT tracksChanged();

4041}

4142

plugins/Unity/preview.cpp−9

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

155155 action->setUnityAction(unityAction);

156156 m_actions.append(action);

157157 }

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();

167158}

168159

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

plugins/Unity/preview.h+9−16

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

3636{

3737 Q_OBJECT

3838

39− Q_PROPERTY(QString rendererName READ rendererName NOTIFY rendererNameChanged)

40− Q_PROPERTY(QString title READ title NOTIFY titleChanged)

41− Q_PROPERTY(QString subtitle READ subtitle NOTIFY subtitleChanged)

42− Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)

43− Q_PROPERTY(QVariant actions READ actions NOTIFY actionsChanged)

44− Q_PROPERTY(QVariant infoHints READ infoHints NOTIFY infoHintsChanged)

45− Q_PROPERTY(QString image READ image NOTIFY imageChanged)

46− Q_PROPERTY(QString imageSourceUri READ imageSourceUri NOTIFY imageSourceUriChanged)

39+ Q_PROPERTY(QString rendererName READ rendererName NOTIFY previewChanged)

40+ Q_PROPERTY(QString title READ title NOTIFY previewChanged)

41+ Q_PROPERTY(QString subtitle READ subtitle NOTIFY previewChanged)

42+ Q_PROPERTY(QString description READ description NOTIFY previewChanged)

43+ Q_PROPERTY(QVariant actions READ actions NOTIFY previewChanged)

44+ Q_PROPERTY(QVariant infoHints READ infoHints NOTIFY previewChanged)

45+ Q_PROPERTY(QString image READ image NOTIFY previewChanged)

46+ Q_PROPERTY(QString imageSourceUri READ imageSourceUri NOTIFY previewChanged)

4747

4848public:

4949 explicit Preview(QObject *parent = 0);

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

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

6262

6363Q_SIGNALS:

64− void rendererNameChanged();

65− void titleChanged();

66− void subtitleChanged();

67− void descriptionChanged();

68− void actionsChanged();

69− void infoHintsChanged();

70− void imageChanged();

71− void imageSourceUriChanged();

64+ void previewChanged();

7265

7366protected:

7467 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)

2929{

3030 m_unityAction = unityAction;

3131

32− Q_EMIT displayNameChanged();

33− Q_EMIT iconHintChanged();

34− Q_EMIT extraTextChanged();

35− Q_EMIT activationUriChanged();

36− Q_EMIT layoutHintChanged();

32+ Q_EMIT previewActionChanged();

3733}

3834

3935QString PreviewAction::id() const

plugins/Unity/previewaction.h+7−11

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

4040{

4141 Q_OBJECT

4242

43− Q_PROPERTY(QString id READ id)

44− Q_PROPERTY(QString displayName READ displayName NOTIFY displayNameChanged)

45− Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

46− Q_PROPERTY(QString extraText READ extraText NOTIFY extraTextChanged)

47− Q_PROPERTY(QString activationUri READ activationUri NOTIFY activationUriChanged)

48− Q_PROPERTY(LayoutHint layoutHint READ layoutHint NOTIFY layoutHintChanged)

43+ Q_PROPERTY(QString id READ id NOTIFY previewActionChanged)

44+ Q_PROPERTY(QString displayName READ displayName NOTIFY previewActionChanged)

45+ Q_PROPERTY(QString iconHint READ iconHint NOTIFY previewActionChanged)

46+ Q_PROPERTY(QString extraText READ extraText NOTIFY previewActionChanged)

47+ Q_PROPERTY(QString activationUri READ activationUri NOTIFY previewActionChanged)

48+ Q_PROPERTY(LayoutHint layoutHint READ layoutHint NOTIFY previewActionChanged)

4949

5050public:

5151 explicit PreviewAction(QObject *parent = 0);

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

5959 LayoutHint layoutHint() const;

6060

6161Q_SIGNALS:

62− void displayNameChanged();

63− void iconHintChanged();

64− void extraTextChanged();

65− void activationUriChanged();

66− void layoutHintChanged();

62+ void previewActionChanged();

6763

6864private:

6965 unity::dash::Preview::ActionPtr m_unityAction;

plugins/Unity/previewinfohint.cpp+1−3

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

3131{

3232 m_unityInfoHint = unityInfoHint;

3333

34− Q_EMIT displayNameChanged();

35− Q_EMIT iconHintChanged();

36− Q_EMIT valueChanged();

34+ Q_EMIT previewInfoHintChanged();

3735}

3836

3937QString PreviewInfoHint::id() const

plugins/Unity/previewinfohint.h+5−7

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

3232{

3333 Q_OBJECT

3434

35− Q_PROPERTY(QString id READ id)

36− Q_PROPERTY(QString displayName READ displayName NOTIFY displayNameChanged)

37− Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)

38− Q_PROPERTY(QVariant value READ value NOTIFY valueChanged)

35+ Q_PROPERTY(QString id READ id NOTIFY previewInfoHintChanged)

36+ Q_PROPERTY(QString displayName READ displayName NOTIFY previewInfoHintChanged)

37+ Q_PROPERTY(QString iconHint READ iconHint NOTIFY previewInfoHintChanged)

38+ Q_PROPERTY(QVariant value READ value NOTIFY previewInfoHintChanged)

3939

4040public:

4141 explicit PreviewInfoHint(QObject *parent = 0);

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

4747 QVariant value() const;

4848

4949Q_SIGNALS:

50− void displayNameChanged();

51− void iconHintChanged();

52− void valueChanged();

50+ void previewInfoHintChanged();

5351

5452private:

5553 unity::dash::Preview::InfoHintPtr m_unityInfoHint;