on xenial help sign in
Fix some review nits
commit9d4200b53d5bdc0318f0c7f2dcf65e43e2b33ddc authorMichael Terry <michael.terry@canonical.com> dateTue 25 Mar 2014, 11:04 (13 years ago) parentf91fa3c
7 files changed+6−52
debian/control+1 plugins/AccountsService/AccountsService.cpp−1 plugins/LightDM/URLDispatcher.cpp+2−8 plugins/SessionBroadcast/SessionBroadcast.cpp+1−2 plugins/SessionManager/plugin.cpp+1−1 tests/autopilot/unity8/shell/tests/test_greeter.py.THIS−38 tests/mocks/SessionManager/plugin.cpp+1−2
debian/control+1
@@ -107,6 +107,7 @@ Description: Unity 8 shell
107107Package: unity8-greeter
108108Architecture: any
109109Depends: dbus-x11,
110+ libglib2.0-bin,
110111 lightdm,
111112 ubuntu-touch-session,
112113 unity8 (>= ${source:Version}),
plugins/AccountsService/AccountsService.cpp−1
@@ -24,7 +24,6 @@
2424AccountsService::AccountsService(QObject* parent)
2525 : QObject(parent),
2626 m_service(new AccountsServiceDBusAdaptor(this)),
27− m_user(qgetenv("USER")),
2827 m_demoEdges(false),
2928 m_statsWelcomeScreen(false)
3029{
plugins/LightDM/URLDispatcher.cpp+2−8
@@ -17,8 +17,6 @@
1717#include "URLDispatcher.h"
1818
1919#include <QDBusConnection>
20−#include <QProcess>
21−#include <unistd.h>
2220
2321class URLDispatcherInterface : public QObject
2422{
@@ -29,20 +27,16 @@ public:
2927 explicit URLDispatcherInterface(URLDispatcher *parent);
3028
3129 Q_SCRIPTABLE void DispatchURL(const QString &url);
32−
33−private:
34− URLDispatcher *m_parent;
3530};
3631
3732URLDispatcherInterface::URLDispatcherInterface(URLDispatcher *parent)
38− : QObject(parent),
39− m_parent(parent)
33+ : QObject(parent)
4034{
4135}
4236
4337void URLDispatcherInterface::DispatchURL(const QString &url)
4438{
45− Q_EMIT m_parent->dispatchURL(url);
39+ Q_EMIT static_cast<URLDispatcher *>(parent())->dispatchURL(url);
4640}
4741
4842URLDispatcher::URLDispatcher(QObject *parent)
plugins/SessionBroadcast/SessionBroadcast.cpp+1−2
@@ -22,8 +22,7 @@
2222#include <QDBusInterface>
2323
2424SessionBroadcast::SessionBroadcast(QObject* parent)
25− : QObject(parent),
26− m_broadcaster(NULL)
25+ : QObject(parent)
2726{
2827 auto connection = QDBusConnection::SM_BUSNAME();
2928 auto interface = connection.interface();
plugins/SessionManager/plugin.cpp+1−1
@@ -19,7 +19,7 @@
1919
2020#include "plugin.h"
2121#include "SessionManager.h"
22−#include <QtQml>
22+#include <QtQml/qqml.h>
2323
2424static QObject *sessionmanager_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
2525{
tests/autopilot/unity8/shell/tests/test_greeter.py.THISdeleted−38
@@ -1,38 +0,0 @@
1−# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
2−#
3−# Unity Autopilot Test Suite
4−# Copyright (C) 2012-2013 Canonical
5−#
6−# This program is free software: you can redistribute it and/or modify
7−# it under the terms of the GNU General Public License as published by
8−# the Free Software Foundation, either version 3 of the License, or
9−# (at your option) any later version.
10−#
11−# This program is distributed in the hope that it will be useful,
12−# but WITHOUT ANY WARRANTY; without even the implied warranty of
13−# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14−# GNU General Public License for more details.
15−#
16−# You should have received a copy of the GNU General Public License
17−# along with this program. If not, see <http://www.gnu.org/licenses/>.
18−#
19−
20−from unity8.shell.tests import UnityTestCase, _get_device_emulation_scenarios
21−from autopilot.introspection.types import Rectangle
22−from testtools.matchers import Equals
23−
24−class TestGreeter(UnityTestCase):
25−
26− """Tests the Shell Greeter."""
27−
28− scenarios = _get_device_emulation_scenarios()
29−
30− def test_greeter_background(self):
31− """Test that the background of the greeter is placed correctly
32−
33− """
34− self.launch_greeter()
35− greeter_background = self.main_window.get_greeter_background()
36− winRect = Rectangle(self.main_window.x, self.main_window.y,
37− self.main_window.width, self.main_window.height)
38− self.assertThat(greeter_background.globalRect, Equals(winRect))
tests/mocks/SessionManager/plugin.cpp+1−2
@@ -18,8 +18,7 @@
1818
1919#include "plugin.h"
2020#include "SessionManager.h"
21−
22−#include <QtQml>
21+#include <QtQml/qqml.h>
2322
2423static QObject *sessionmanager_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
2524{