Merge lp:~aacid/unity/nolensinclude into lp:unity/phablet

Proposed by Albert Astals Cid
Status: Merged
Approved by: Andrea Cimitan
Approved revision: no longer in the source branch.
Merged at revision: 629
Proposed branch: lp:~aacid/unity/nolensinclude
Merge into: lp:unity/phablet
Diff against target: 35 lines (+5/-2)
2 files modified
plugins/Unity/peoplepreviewdata.cpp (+1/-0)
plugins/Unity/peoplepreviewdata.h (+4/-2)
To merge this branch: bzr merge lp:~aacid/unity/nolensinclude
Reviewer Review Type Date Requested Status
Ying-Chun Liu (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+160642@code.launchpad.net

Commit message

No need to include lens.h in peoplepreviewdata.h

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Ying-Chun Liu (paulliu) wrote :

looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Unity/peoplepreviewdata.cpp'
2--- plugins/Unity/peoplepreviewdata.cpp 2013-04-04 02:32:19 +0000
3+++ plugins/Unity/peoplepreviewdata.cpp 2013-04-24 13:25:29 +0000
4@@ -21,6 +21,7 @@
5
6 #include <QDebug>
7
8+#include "lens.h"
9
10 static void phoneAppend(QQmlListProperty<PeoplePhoneData> *property, PeoplePhoneData *val)
11 {
12
13=== modified file 'plugins/Unity/peoplepreviewdata.h'
14--- plugins/Unity/peoplepreviewdata.h 2013-03-26 07:47:43 +0000
15+++ plugins/Unity/peoplepreviewdata.h 2013-04-24 13:25:29 +0000
16@@ -20,8 +20,6 @@
17 #ifndef PEOPLEPREVIEWDATA_H
18 #define PEOPLEPREVIEWDATA_H
19
20-#include "lens.h"
21-
22 #include <QList>
23 #include <QObject>
24 #include <qqmllist.h>
25@@ -30,6 +28,10 @@
26 // libunity-core
27 #include <UnityCore/PeoplePreview.h>
28
29+#include <sigc++/connection.h>
30+
31+class Lens;
32+
33 /*!
34 * \brief The PeoplePhoneData class stores the data for one phone number
35 */

Subscribers

People subscribed via source and target branches