git.iko.soy/unity8
on xenial help sign in
Fixed indentation. Return QString() instead of "".
9d31cb0Pawel Stolowski
plugins/Unity/applicationpreview.cpp+4−4
compare with xenial
unifiedsplit
@@ -35,7 +35,7 @@ QString ApplicationPreview::lastUpdate() const
35 } else {
35 } else {
36 qWarning() << "Preview not set";
36 qWarning() << "Preview not set";
37 }
37 }
38− return "";
38+ return QString();
39}
39}
40
40
41QString ApplicationPreview::copyright() const
41QString ApplicationPreview::copyright() const
@@ -45,7 +45,7 @@ QString ApplicationPreview::copyright() const
45 } else {
45 } else {
46 qWarning() << "Preview not set";
46 qWarning() << "Preview not set";
47 }
47 }
48−return "";
48+ return QString();
49}
49}
50
50
51QString ApplicationPreview::license() const
51QString ApplicationPreview::license() const
@@ -55,7 +55,7 @@ QString ApplicationPreview::license() const
55 } else {
55 } else {
56 qWarning() << "Preview not set";
56 qWarning() << "Preview not set";
57 }
57 }
58− return "";
58+ return QString();
59}
59}
60
60
61QString ApplicationPreview::appIcon() const
61QString ApplicationPreview::appIcon() const
@@ -65,7 +65,7 @@ QString ApplicationPreview::appIcon() const
65 } else {
65 } else {
66 qWarning() << "Preview not set";
66 qWarning() << "Preview not set";
67 }
67 }
68− return "";
68+ return QString();
69}
69}
70
70
71float ApplicationPreview::rating() const
71float ApplicationPreview::rating() const
plugins/Unity/moviepreview.cpp+1−1
@@ -36,7 +36,7 @@ QString MoviePreview::year() const
36 } else {
36 } else {
37 qWarning() << "Preview not set";
37 qWarning() << "Preview not set";
38 }
38 }
39− return "";
39+ return QString();
40}
40}
41
41
42float MoviePreview::rating() const
42float MoviePreview::rating() const
plugins/Unity/preview.cpp+7−10
@@ -48,7 +48,7 @@ QString Preview::rendererName() const
48 } else {
48 } else {
49 qWarning() << "Preview not set";
49 qWarning() << "Preview not set";
50 }
50 }
51− return "";
51+ return QString();
52}
52}
53
53
54QString Preview::title() const
54QString Preview::title() const
@@ -58,7 +58,7 @@ QString Preview::title() const
58 } else {
58 } else {
59 qWarning() << "Preview not set";
59 qWarning() << "Preview not set";
60 }
60 }
61− return "";
61+ return QString();
62}
62}
63
63
64QString Preview::subtitle () const
64QString Preview::subtitle () const
@@ -68,7 +68,7 @@ QString Preview::subtitle () const
68 } else {
68 } else {
69 qWarning() << "Preview not set";
69 qWarning() << "Preview not set";
70 }
70 }
71− return "";
71+ return QString();
72}
72}
73
73
74QString Preview::description() const
74QString Preview::description() const
@@ -78,7 +78,7 @@ QString Preview::description() const
78 } else {
78 } else {
79 qWarning() << "Preview not set";
79 qWarning() << "Preview not set";
80 }
80 }
81− return "";
81+ return QString();
82}
82}
83
83
84QVariant Preview::actions()
84QVariant Preview::actions()
@@ -117,14 +117,11 @@ Preview* Preview::newFromUnityPreview(unity::dash::Preview::Ptr unityPreview)
117
117
118 if (typeid(*unityPreview) == typeid(unity::dash::GenericPreview)) {
118 if (typeid(*unityPreview) == typeid(unity::dash::GenericPreview)) {
119 preview = new GenericPreview();
119 preview = new GenericPreview();
120− }
121− else if (typeid(*unityPreview) == typeid(unity::dash::MusicPreview)) {
120+ } else if (typeid(*unityPreview) == typeid(unity::dash::MusicPreview)) {
122 preview = new MusicPreview();
121 preview = new MusicPreview();
123− }
124− else if (typeid(*unityPreview) == typeid(unity::dash::MoviePreview)) {
122+ } else if (typeid(*unityPreview) == typeid(unity::dash::MoviePreview)) {
125 preview = new MoviePreview();
123 preview = new MoviePreview();
126− }
127− else if (typeid(*unityPreview) == typeid(unity::dash::ApplicationPreview)) {
124+ } else if (typeid(*unityPreview) == typeid(unity::dash::ApplicationPreview)) {
128 preview = new ApplicationPreview();
125 preview = new ApplicationPreview();
129 } else {
126 } else {
130 qWarning() << "Unknown preview type: " << typeid(*unityPreview).name();
127 qWarning() << "Unknown preview type: " << typeid(*unityPreview).name();
plugins/Unity/previewaction.cpp+5−5
@@ -40,35 +40,35 @@ QString PreviewAction::id() const
40{
40{
41 if (m_unityAction)
41 if (m_unityAction)
42 return QString::fromStdString(m_unityAction->id);
42 return QString::fromStdString(m_unityAction->id);
43− return "";
43+ return QString();
44}
44}
45
45
46QString PreviewAction::displayName() const
46QString PreviewAction::displayName() const
47{
47{
48 if (m_unityAction)
48 if (m_unityAction)
49 return QString::fromStdString(m_unityAction->display_name);
49 return QString::fromStdString(m_unityAction->display_name);
50− return "";
50+ return QString();
51}
51}
52
52
53QString PreviewAction::iconHint() const
53QString PreviewAction::iconHint() const
54{
54{
55 if (m_unityAction)
55 if (m_unityAction)
56 return QString::fromStdString(m_unityAction->icon_hint);
56 return QString::fromStdString(m_unityAction->icon_hint);
57− return "";
57+ return QString();
58}
58}
59
59
60QString PreviewAction::extraText() const
60QString PreviewAction::extraText() const
61{
61{
62 if (m_unityAction)
62 if (m_unityAction)
63 return QString::fromStdString(m_unityAction->extra_text);
63 return QString::fromStdString(m_unityAction->extra_text);
64− return "";
64+ return QString();
65}
65}
66
66
67QString PreviewAction::activationUri() const
67QString PreviewAction::activationUri() const
68{
68{
69 if (m_unityAction)
69 if (m_unityAction)
70 return QString::fromStdString(m_unityAction->activation_uri);
70 return QString::fromStdString(m_unityAction->activation_uri);
71− return "";
71+ return QString();
72}
72}
73
73
74LayoutHint PreviewAction::layoutHint() const
74LayoutHint PreviewAction::layoutHint() const
plugins/Unity/previewinfohint.cpp+3−3
@@ -41,7 +41,7 @@ QString PreviewInfoHint::id() const
41 if (m_unityInfoHint) {
41 if (m_unityInfoHint) {
42 return QString::fromStdString(m_unityInfoHint->id);
42 return QString::fromStdString(m_unityInfoHint->id);
43 }
43 }
44− return "";
44+ return QString();
45}
45}
46
46
47QString PreviewInfoHint::displayName() const
47QString PreviewInfoHint::displayName() const
@@ -49,7 +49,7 @@ QString PreviewInfoHint::displayName() const
49 if (m_unityInfoHint) {
49 if (m_unityInfoHint) {
50 return QString::fromStdString(m_unityInfoHint->display_name);
50 return QString::fromStdString(m_unityInfoHint->display_name);
51 }
51 }
52− return "";
52+ return QString();
53}
53}
54
54
55QString PreviewInfoHint::iconHint() const
55QString PreviewInfoHint::iconHint() const
@@ -57,7 +57,7 @@ QString PreviewInfoHint::iconHint() const
57 if (m_unityInfoHint) {
57 if (m_unityInfoHint) {
58 return QString::fromStdString(m_unityInfoHint->icon_hint);
58 return QString::fromStdString(m_unityInfoHint->icon_hint);
59 }
59 }
60− return "";
60+ return QString();
61}
61}
62
62
63QVariant PreviewInfoHint::value() const
63QVariant PreviewInfoHint::value() const