git.iko.soy/unity8
on xenial help sign in
Address review comments
commitc488c56116b4ac73403e201a709d602f9520723d authorMichael Terry <michael.terry@canonical.com> dateThu 8 Sep 2016, 12:19 (10 years ago) parent1c33768
7 files changed+10−9
compare with xenial
unifiedsplit
plugins/LightDM/Greeter.cpp+1−1 plugins/LightDM/Greeter.h+1−1 plugins/LightDM/SessionsModel.h+1−1 plugins/LightDM/UsersModel.cpp+1−1 qml/Shell.qml+1−1 tests/mocks/liblightdm/MockController.cpp+1 tests/mocks/liblightdm/MockSessionsModel.cpp+4−4
plugins/LightDM/Greeter.cpp+1−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013, 2015 Canonical, Ltd.
2+ * Copyright (C) 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 General Public License as published by
plugins/LightDM/Greeter.h+1−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2012,2013,2015 Canonical, Ltd.
2+ * Copyright (C) 2012-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 General Public License as published by
plugins/LightDM/SessionsModel.h+1−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2015 Canonical, Ltd.
2+ * Copyright (C) 2015-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 General Public License as published by
plugins/LightDM/UsersModel.cpp+1−1
@@ -1,5 +1,5 @@
11/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2013,2015-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 General Public License as published by
qml/Shell.qml+1−1
@@ -607,7 +607,7 @@ StyledItem {
607607 readonly property bool focusedSurfaceIsFullscreen: MirFocusController.focusedSurface
608608 ? MirFocusController.focusedSurface.state === Mir.FullscreenState
609609 : false
610− fullscreenMode: (focusedSurfaceIsFullscreen && !LightDM.Greeter.active && launcher.progress == 0)
610+ fullscreenMode: (focusedSurfaceIsFullscreen && !LightDM.Greeter.active && launcher.progress === 0)
611611 || greeter.hasLockedApp
612612 locked: greeter && greeter.active
613613 }
tests/mocks/liblightdm/MockController.cpp+1
@@ -48,6 +48,7 @@ MockController::MockController(QObject *parent)
4848
4949MockController::~MockController()
5050{
51+ m_instance = nullptr;
5152}
5253
5354MockController *MockController::instance()
tests/mocks/liblightdm/MockSessionsModel.cpp+4−4
@@ -44,10 +44,10 @@ SessionsModel::SessionsModel(QObject* parent)
4444 d->roleNames[KeyRole] = "key";
4545 d->roleNames[TypeRole] = "type";
4646
47− connect(MockController::instance(), SIGNAL(sessionModeChanged()),
48− this, SLOT(resetEntries()));
49− connect(MockController::instance(), SIGNAL(numSessionsChanged()),
50− this, SLOT(resetEntries()));
47+ connect(MockController::instance(), &MockController::sessionModeChanged,
48+ this, &SessionsModel::resetEntries);
49+ connect(MockController::instance(), &MockController::numSessionsChanged,
50+ this, &SessionsModel::resetEntries);
5151 resetEntries();
5252}
5353