git.iko.soy/unity8
on xenial help sign in
Small fixer ups
0d4782fMichael Terry
plugins/Unity/Launcher/launchermodel.cpp+2−4
compare with xenial
unifiedsplit
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013-2014 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
5 * it under the terms of the GNU Lesser General Public License as published by
@@ -12,9 +12,6 @@
12 *
12 *
13 * You should have received a copy of the GNU Lesser General Public License
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Michael Zanetti <michael.zanetti@canonical.com>
18 */
15 */
19
16
20#include "launchermodel.h"
17#include "launchermodel.h"
@@ -24,6 +21,7 @@
24#include "asadapter.h"
21#include "asadapter.h"
25
22
26#include <ubuntu-app-launch/application.h>
23#include <ubuntu-app-launch/application.h>
24+#include <ubuntu-app-launch/registry.h>
27#include <unity/shell/application/ApplicationInfoInterface.h>
25#include <unity/shell/application/ApplicationInfoInterface.h>
28#include <unity/shell/application/MirSurfaceListInterface.h>
26#include <unity/shell/application/MirSurfaceListInterface.h>
29
27
plugins/Unity/Launcher/launchermodel.h+4−9
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright 2013-2014 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU Lesser General Public License as published by
5 * it under the terms of the GNU Lesser General Public License as published by
@@ -12,15 +12,11 @@
12 *
12 *
13 * You should have received a copy of the GNU Lesser General Public License
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Michael Zanetti <michael.zanetti@canonical.com>
18 */
15 */
19
16
20−#ifndef LAUNCHERMODEL_H
17+#pragma once
21−#define LAUNCHERMODEL_H
22
18
23−#include <ubuntu-app-launch/registry.h>
19+#include <memory>
24#include <unity/shell/launcher/LauncherModelInterface.h>
20#include <unity/shell/launcher/LauncherModelInterface.h>
25#include <unity/shell/application/ApplicationManagerInterface.h>
21#include <unity/shell/application/ApplicationManagerInterface.h>
26
22
@@ -34,6 +30,7 @@ class ASAdapter;
34namespace ubuntu {
30namespace ubuntu {
35 namespace app_launch {
31 namespace app_launch {
36 class Application;
32 class Application;
33+ class Registry;
37 }
34 }
38}
35}
39
36
@@ -100,5 +97,3 @@ private:
100
97
101 friend class LauncherModelTest;
98 friend class LauncherModelTest;
102};
99};
103−
104−#endif // LAUNCHERMODEL_H