Unity

Merge lp:~hikiko/unity/unity.layouts-fix into lp:unity

  1. unity.layouts-fix
  2. Merge into trunk
Proposed by Eleni Maria Stea
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 3839
Proposed branch: lp:~hikiko/unity/unity.layouts-fix
Merge into: lp:unity
Prerequisite: lp:~hikiko/unity/unity.scale-music-preview
Diff against target: 47 lines (+15/-0)
3 files modified
dash/previews/ApplicationPreview.cpp (+8/-0)
dash/previews/GenericPreview.cpp (+4/-0)
dash/previews/MoviePreview.cpp (+3/-0)
To merge this branch: bzr merge lp:~hikiko/unity/unity.layouts-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marco Trevisan (Treviño) Approve
Unity Team Pending
Review via email: mp+223566@code.launchpad.net

Commit message

initialized the new layouts

Description of the change

initialized the new layouts

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3825
http://jenkins.qa.ubuntu.com/job/unity-ci/972/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/59

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/972/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dash/previews/ApplicationPreview.cpp'
2--- dash/previews/ApplicationPreview.cpp 2014-06-18 14:10:29 +0000
3+++ dash/previews/ApplicationPreview.cpp 2014-06-18 14:10:29 +0000
4@@ -73,6 +73,14 @@
5
6 ApplicationPreview::ApplicationPreview(dash::Preview::Ptr preview_model)
7 : Preview(preview_model)
8+, title_subtitle_layout_(nullptr)
9+, image_data_layout_(nullptr)
10+, main_app_info_(nullptr)
11+, icon_layout_(nullptr)
12+, app_data_layout_(nullptr)
13+, app_updated_copywrite_layout_(nullptr)
14+, app_info_layout_(nullptr)
15+, actions_layout_(nullptr)
16 {
17 SetupViews();
18 }
19
20=== modified file 'dash/previews/GenericPreview.cpp'
21--- dash/previews/GenericPreview.cpp 2014-06-18 14:10:29 +0000
22+++ dash/previews/GenericPreview.cpp 2014-06-18 14:10:29 +0000
23@@ -64,6 +64,10 @@
24
25 GenericPreview::GenericPreview(dash::Preview::Ptr preview_model)
26 : Preview(preview_model)
27+, image_data_layout_(nullptr)
28+, preview_info_layout_(nullptr)
29+, preview_data_layout_(nullptr)
30+, actions_layout_(nullptr)
31 {
32 SetupViews();
33 UpdateScale(scale);
34
35=== modified file 'dash/previews/MoviePreview.cpp'
36--- dash/previews/MoviePreview.cpp 2014-06-18 14:10:29 +0000
37+++ dash/previews/MoviePreview.cpp 2014-06-18 14:10:29 +0000
38@@ -65,6 +65,9 @@
39
40 MoviePreview::MoviePreview(dash::Preview::Ptr preview_model)
41 : Preview(preview_model)
42+, image_data_layout_(nullptr)
43+, preview_info_layout_(nullptr)
44+, actions_layout_(nullptr)
45 {
46 SetupViews();
47 }