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

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 :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'dash/previews/ApplicationPreview.cpp'
--- dash/previews/ApplicationPreview.cpp 2014-06-18 14:10:29 +0000
+++ dash/previews/ApplicationPreview.cpp 2014-06-18 14:10:29 +0000
@@ -73,6 +73,14 @@
7373
74ApplicationPreview::ApplicationPreview(dash::Preview::Ptr preview_model)74ApplicationPreview::ApplicationPreview(dash::Preview::Ptr preview_model)
75: Preview(preview_model)75: Preview(preview_model)
76, title_subtitle_layout_(nullptr)
77, image_data_layout_(nullptr)
78, main_app_info_(nullptr)
79, icon_layout_(nullptr)
80, app_data_layout_(nullptr)
81, app_updated_copywrite_layout_(nullptr)
82, app_info_layout_(nullptr)
83, actions_layout_(nullptr)
76{84{
77 SetupViews();85 SetupViews();
78}86}
7987
=== modified file 'dash/previews/GenericPreview.cpp'
--- dash/previews/GenericPreview.cpp 2014-06-18 14:10:29 +0000
+++ dash/previews/GenericPreview.cpp 2014-06-18 14:10:29 +0000
@@ -64,6 +64,10 @@
6464
65GenericPreview::GenericPreview(dash::Preview::Ptr preview_model)65GenericPreview::GenericPreview(dash::Preview::Ptr preview_model)
66: Preview(preview_model)66: Preview(preview_model)
67, image_data_layout_(nullptr)
68, preview_info_layout_(nullptr)
69, preview_data_layout_(nullptr)
70, actions_layout_(nullptr)
67{71{
68 SetupViews();72 SetupViews();
69 UpdateScale(scale);73 UpdateScale(scale);
7074
=== modified file 'dash/previews/MoviePreview.cpp'
--- dash/previews/MoviePreview.cpp 2014-06-18 14:10:29 +0000
+++ dash/previews/MoviePreview.cpp 2014-06-18 14:10:29 +0000
@@ -65,6 +65,9 @@
6565
66MoviePreview::MoviePreview(dash::Preview::Ptr preview_model)66MoviePreview::MoviePreview(dash::Preview::Ptr preview_model)
67: Preview(preview_model)67: Preview(preview_model)
68, image_data_layout_(nullptr)
69, preview_info_layout_(nullptr)
70, actions_layout_(nullptr)
68{71{
69 SetupViews();72 SetupViews();
70}73}