Merge unity:include-fixes into unity:master

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 5ba0a962255faf88285191d60a0265edafc23eb1
Merged at revision: cb7ae65f8e26320661b2b156462fda0fba09af77
Proposed branch: unity:include-fixes
Merge into: unity:master
Diff against target: 87 lines (+13/-2)
6 files modified
UnityCore/GLibDBusServer.cpp (+2/-0)
debian/changelog (+6/-1)
launcher/DevicesSettingsImp.cpp (+1/-0)
launcher/FavoriteStoreGSettings.cpp (+2/-0)
launcher/FavoriteStorePrivate.h (+1/-1)
unity-shared/IconLoader.h (+1/-0)
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+358294@code.launchpad.net

Commit message

Add missing includes for build w/o pch

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/UnityCore/GLibDBusServer.cpp b/UnityCore/GLibDBusServer.cpp
index 49b70d7..8fcfdf9 100644
--- a/UnityCore/GLibDBusServer.cpp
+++ b/UnityCore/GLibDBusServer.cpp
@@ -17,7 +17,9 @@
17* Authored by: Marco Trevisan (Treviño) <marco.trevisan@canonical.com>17* Authored by: Marco Trevisan (Treviño) <marco.trevisan@canonical.com>
18*/18*/
1919
20#include <algorithm>
20#include <unordered_map>21#include <unordered_map>
22
21#include <NuxCore/Logger.h>23#include <NuxCore/Logger.h>
2224
23#include "GLibDBusServer.h"25#include "GLibDBusServer.h"
diff --git a/debian/changelog b/debian/changelog
index 720b5aa..bfc0f2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
1unity (7.5.0+18.10.20180926.2-0ubuntu2) UNRELEASED; urgency=medium1unity (7.5.0+18.10.20180926.2-0ubuntu2) UNRELEASED; urgency=medium
22
3 [ Marco Trevisan (Treviño) ]
3 * debian/gbp.conf: add default settings to use gbp-buildpackage4 * debian/gbp.conf: add default settings to use gbp-buildpackage
5 * debian: use native source format
6
7 [ Aleksey Tulinov ]
8 * Add missing includes for build w/o pch
49
5 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Wed, 26 Sep 2018 23:47:35 +020010 -- Marco Trevisan (Treviño) <marco@ubuntu.com> Sun, 04 Nov 2018 20:26:08 -0600
611
7unity (7.5.0+18.10.20180926.2-0ubuntu1) cosmic; urgency=medium12unity (7.5.0+18.10.20180926.2-0ubuntu1) cosmic; urgency=medium
813
diff --git a/launcher/DevicesSettingsImp.cpp b/launcher/DevicesSettingsImp.cpp
index 08eddb9..25f40a6 100644
--- a/launcher/DevicesSettingsImp.cpp
+++ b/launcher/DevicesSettingsImp.cpp
@@ -17,6 +17,7 @@
17 * Authored by: Andrea Azzarone <andrea.azzarone@canonical.com>17 * Authored by: Andrea Azzarone <andrea.azzarone@canonical.com>
18 */18 */
1919
20#include <algorithm>
20#include <list>21#include <list>
2122
22#include <gio/gio.h>23#include <gio/gio.h>
diff --git a/launcher/FavoriteStoreGSettings.cpp b/launcher/FavoriteStoreGSettings.cpp
index 415a04b..493e823 100644
--- a/launcher/FavoriteStoreGSettings.cpp
+++ b/launcher/FavoriteStoreGSettings.cpp
@@ -18,6 +18,8 @@
18* Marco Trevisan <marco.trevisan@canonical.com>18* Marco Trevisan <marco.trevisan@canonical.com>
19*/19*/
2020
21#include <algorithm>
22
21#include <NuxCore/Logger.h>23#include <NuxCore/Logger.h>
22#include <UnityCore/DesktopUtilities.h>24#include <UnityCore/DesktopUtilities.h>
2325
diff --git a/launcher/FavoriteStorePrivate.h b/launcher/FavoriteStorePrivate.h
index 3edad23..ebd3cfe 100644
--- a/launcher/FavoriteStorePrivate.h
+++ b/launcher/FavoriteStorePrivate.h
@@ -22,6 +22,7 @@
2222
23#include <list>23#include <list>
24#include <string>24#include <string>
25#include <vector>
2526
26namespace unity27namespace unity
27{28{
@@ -47,4 +48,3 @@ bool IsDesktopFilePath(std::string const& path);
47} // namespace unity48} // namespace unity
4849
49#endif50#endif
50
diff --git a/unity-shared/IconLoader.h b/unity-shared/IconLoader.h
index fb4587e..595def4 100644
--- a/unity-shared/IconLoader.h
+++ b/unity-shared/IconLoader.h
@@ -22,6 +22,7 @@
2222
23#include <boost/utility.hpp>23#include <boost/utility.hpp>
2424
25#include <functional>
25#include <memory>26#include <memory>
26#include <gtk/gtk.h>27#include <gtk/gtk.h>
27#include <UnityCore/ActionHandle.h>28#include <UnityCore/ActionHandle.h>

Subscribers

People subscribed via source and target branches

to all changes: