on xenial help sign in
Fixed indentation. Return QString() instead of "".
commit9d31cb0ac1753d18d404da86c975046e27d2dc7e authorPawel Stolowski <pawel.stolowski@canonical.com> dateMon 1 Jul 2013, 12:35 (13 years ago) parent12a8a4b
5 files changed+20−23
plugins/Unity/applicationpreview.cpp+4−4 plugins/Unity/moviepreview.cpp+1−1 plugins/Unity/preview.cpp+7−10 plugins/Unity/previewaction.cpp+5−5 plugins/Unity/previewinfohint.cpp+3−3
plugins/Unity/applicationpreview.cpp+4−4
@@ -35,7 +35,7 @@ QString ApplicationPreview::lastUpdate() const
3535 } else {
3636 qWarning() << "Preview not set";
3737 }
38− return "";
38+ return QString();
3939}
4040
4141QString ApplicationPreview::copyright() const
@@ -45,7 +45,7 @@ QString ApplicationPreview::copyright() const
4545 } else {
4646 qWarning() << "Preview not set";
4747 }
48−return "";
48+ return QString();
4949}
5050
5151QString ApplicationPreview::license() const
@@ -55,7 +55,7 @@ QString ApplicationPreview::license() const
5555 } else {
5656 qWarning() << "Preview not set";
5757 }
58− return "";
58+ return QString();
5959}
6060
6161QString ApplicationPreview::appIcon() const
@@ -65,7 +65,7 @@ QString ApplicationPreview::appIcon() const
6565 } else {
6666 qWarning() << "Preview not set";
6767 }
68− return "";
68+ return QString();
6969}
7070
7171float ApplicationPreview::rating() const
plugins/Unity/moviepreview.cpp+1−1
@@ -36,7 +36,7 @@ QString MoviePreview::year() const
3636 } else {
3737 qWarning() << "Preview not set";
3838 }
39− return "";
39+ return QString();
4040}
4141
4242float MoviePreview::rating() const
plugins/Unity/preview.cpp+7−10
@@ -48,7 +48,7 @@ QString Preview::rendererName() const
4848 } else {
4949 qWarning() << "Preview not set";
5050 }
51− return "";
51+ return QString();
5252}
5353
5454QString Preview::title() const
@@ -58,7 +58,7 @@ QString Preview::title() const
5858 } else {
5959 qWarning() << "Preview not set";
6060 }
61− return "";
61+ return QString();
6262}
6363
6464QString Preview::subtitle () const
@@ -68,7 +68,7 @@ QString Preview::subtitle () const
6868 } else {
6969 qWarning() << "Preview not set";
7070 }
71− return "";
71+ return QString();
7272}
7373
7474QString Preview::description() const
@@ -78,7 +78,7 @@ QString Preview::description() const
7878 } else {
7979 qWarning() << "Preview not set";
8080 }
81− return "";
81+ return QString();
8282}
8383
8484QVariant Preview::actions()
@@ -117,14 +117,11 @@ Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)
117117
118118 if (typeid(*unityPreview) == typeid(unity::dash::GenericPreview)) {
119119 preview = new GenericPreview();
120− }
121− else if (typeid(*unityPreview) == typeid(unity::dash::MusicPreview)) {
120+ } else if (typeid(*unityPreview) == typeid(unity::dash::MusicPreview)) {
122121 preview = new MusicPreview();
123− }
124− else if (typeid(*unityPreview) == typeid(unity::dash::MoviePreview)) {
122+ } else if (typeid(*unityPreview) == typeid(unity::dash::MoviePreview)) {
125123 preview = new MoviePreview();
126− }
127− else if (typeid(*unityPreview) == typeid(unity::dash::ApplicationPreview)) {
124+ } else if (typeid(*unityPreview) == typeid(unity::dash::ApplicationPreview)) {
128125 preview = new ApplicationPreview();
129126 } else {
130127 qWarning() << "Unknown preview type: " << typeid(*unityPreview).name();
plugins/Unity/previewaction.cpp+5−5
@@ -40,35 +40,35 @@ QString PreviewAction::id() const
4040{
4141 if (m_unityAction)
4242 return QString::fromStdString(m_unityAction->id);
43− return "";
43+ return QString();
4444}
4545
4646QString PreviewAction::displayName() const
4747{
4848 if (m_unityAction)
4949 return QString::fromStdString(m_unityAction->display_name);
50− return "";
50+ return QString();
5151}
5252
5353QString PreviewAction::iconHint() const
5454{
5555 if (m_unityAction)
5656 return QString::fromStdString(m_unityAction->icon_hint);
57− return "";
57+ return QString();
5858}
5959
6060QString PreviewAction::extraText() const
6161{
6262 if (m_unityAction)
6363 return QString::fromStdString(m_unityAction->extra_text);
64− return "";
64+ return QString();
6565}
6666
6767QString PreviewAction::activationUri() const
6868{
6969 if (m_unityAction)
7070 return QString::fromStdString(m_unityAction->activation_uri);
71− return "";
71+ return QString();
7272}
7373
7474LayoutHint PreviewAction::layoutHint() const
plugins/Unity/previewinfohint.cpp+3−3
@@ -41,7 +41,7 @@ QString PreviewInfoHint::id() const
4141 if (m_unityInfoHint) {
4242 return QString::fromStdString(m_unityInfoHint->id);
4343 }
44− return "";
44+ return QString();
4545}
4646
4747QString PreviewInfoHint::displayName() const
@@ -49,7 +49,7 @@ QString PreviewInfoHint::displayName() const
4949 if (m_unityInfoHint) {
5050 return QString::fromStdString(m_unityInfoHint->display_name);
5151 }
52− return "";
52+ return QString();
5353}
5454
5555QString PreviewInfoHint::iconHint() const
@@ -57,7 +57,7 @@ QString PreviewInfoHint::iconHint() const
5757 if (m_unityInfoHint) {
5858 return QString::fromStdString(m_unityInfoHint->icon_hint);
5959 }
60− return "";
60+ return QString();
6161}
6262
6363QVariant PreviewInfoHint::value() const