on xenial help sign in
Small fixer ups
commit0d4782f0f7339290443783e4e8b11f29ebd4d1b9 authorMichael Terry <michael.terry@canonical.com> dateThu 22 Sep 2016, 16:41 (10 years ago) parent257d372
2 files changed+6−13
plugins/Unity/Launcher/launchermodel.cpp+2−4 plugins/Unity/Launcher/launchermodel.h+4−9
plugins/Unity/Launcher/launchermodel.cpp+2−4
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013-2014 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
@@ -12,9 +12,6 @@
1212 *
1313 * You should have received a copy of the GNU Lesser General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Michael Zanetti <michael.zanetti@canonical.com>
1815 */
1916
2017#include "launchermodel.h"
@@ -24,6 +21,7 @@
2421#include "asadapter.h"
2522
2623#include <ubuntu-app-launch/application.h>
24+#include <ubuntu-app-launch/registry.h>
2725#include <unity/shell/application/ApplicationInfoInterface.h>
2826#include <unity/shell/application/MirSurfaceListInterface.h>
2927
plugins/Unity/Launcher/launchermodel.h+4−9
@@ -1,5 +1,5 @@
11/*
2− * Copyright 2013-2014 Canonical Ltd.
2+ * Copyright 2013-2016 Canonical Ltd.
33 *
44 * This program is free software; you can redistribute it and/or modify
55 * it under the terms of the GNU Lesser General Public License as published by
@@ -12,15 +12,11 @@
1212 *
1313 * You should have received a copy of the GNU Lesser General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Michael Zanetti <michael.zanetti@canonical.com>
1815 */
1916
20−#ifndef LAUNCHERMODEL_H
21−#define LAUNCHERMODEL_H
17+#pragma once
2218
23−#include <ubuntu-app-launch/registry.h>
19+#include <memory>
2420#include <unity/shell/launcher/LauncherModelInterface.h>
2521#include <unity/shell/application/ApplicationManagerInterface.h>
2622
@@ -34,6 +30,7 @@ class ASAdapter;
3430namespace ubuntu {
3531 namespace app_launch {
3632 class Application;
33+ class Registry;
3734 }
3835}
3936
@@ -100,5 +97,3 @@ private:
10097
10198 friend class LauncherModelTest;
10299};
103−
104−#endif // LAUNCHERMODEL_H