git.iko.soy/unity8
on xenial help sign in
Refactor mocks to use IntegratedLightDM name
bbd9623Josh Arenson
plugins/IntegratedLightDM/CMakeLists.txt+1−1
compare with xenial
unifiedsplit
@@ -8,7 +8,7 @@ include_directories(
8 ${CMAKE_CURRENT_SOURCE_DIR}
8 ${CMAKE_CURRENT_SOURCE_DIR}
9 ${CMAKE_CURRENT_BINARY_DIR}
9 ${CMAKE_CURRENT_BINARY_DIR}
10 ${CMAKE_SOURCE_DIR}/plugins/Utils
10 ${CMAKE_SOURCE_DIR}/plugins/Utils
11− ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
11+ ${CMAKE_SOURCE_DIR}/tests/mocks/IntegratedLightDM
12 #${LIBLIGHTDM_INCLUDE_DIRS}
12 #${LIBLIGHTDM_INCLUDE_DIRS}
13 ${libunity8-private_SOURCE_DIR}
13 ${libunity8-private_SOURCE_DIR}
14 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
14 ${LIBUSERMETRICSOUTPUT_INCLUDE_DIRS}
tests/CMakeLists.txt+2−2
@@ -10,7 +10,7 @@ add_dependencies(qmltests qmlunittests qmluitests)
10add_subdirectory(libs)
10add_subdirectory(libs)
11add_subdirectory(qmltests)
11add_subdirectory(qmltests)
12add_subdirectory(mocks)
12add_subdirectory(mocks)
13−#add_subdirectory(whitespace)
13+add_subdirectory(whitespace)
14−#add_subdirectory(plugins)
14+add_subdirectory(plugins)
15add_subdirectory(utils)
15add_subdirectory(utils)
16add_subdirectory(uqmlscene)
16add_subdirectory(uqmlscene)
tests/mocks/CMakeLists.txt+1−1
@@ -32,7 +32,7 @@ add_subdirectory(AccountsService)
32add_subdirectory(GSettings.1.0)
32add_subdirectory(GSettings.1.0)
33add_subdirectory(indicator-service)
33add_subdirectory(indicator-service)
34add_subdirectory(libusermetrics)
34add_subdirectory(libusermetrics)
35−#add_subdirectory(LightDM)
35+add_subdirectory(IntegratedLightDM)
36add_subdirectory(Lights)
36add_subdirectory(Lights)
37add_subdirectory(MeeGo)
37add_subdirectory(MeeGo)
38add_subdirectory(Powerd)
38add_subdirectory(Powerd)
tests/mocks/LightDM/CMakeLists.txt → tests/mocks/IntegratedLightDM/CMakeLists.txtrenamed+6−6
@@ -10,16 +10,16 @@ include_directories(
10 ${CMAKE_CURRENT_SOURCE_DIR}
10 ${CMAKE_CURRENT_SOURCE_DIR}
11 ${CMAKE_CURRENT_BINARY_DIR}
11 ${CMAKE_CURRENT_BINARY_DIR}
12 ${CMAKE_SOURCE_DIR}/plugins/Utils
12 ${CMAKE_SOURCE_DIR}/plugins/Utils
13− ${CMAKE_SOURCE_DIR}/plugins/LightDM
13+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM
14 ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
14 ${CMAKE_SOURCE_DIR}/tests/mocks/libusermetrics
15 ${libunity8-private_SOURCE_DIR}
15 ${libunity8-private_SOURCE_DIR}
16)
16)
17
17
18set(QMLPLUGIN_SRC
18set(QMLPLUGIN_SRC
19− ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeter.cpp
19+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/DBusGreeter.cpp
20− ${CMAKE_SOURCE_DIR}/plugins/LightDM/DBusGreeterList.cpp
20+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/DBusGreeterList.cpp
21− ${CMAKE_SOURCE_DIR}/plugins/LightDM/Greeter.cpp
21+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/Greeter.cpp
22− ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
22+ ${CMAKE_SOURCE_DIR}/plugins/IntegratedLightDM/UsersModel.cpp
23 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
23 ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
24 MockGreeter.cpp
24 MockGreeter.cpp
25 MockUsersModel.cpp
25 MockUsersModel.cpp
@@ -42,7 +42,7 @@ target_link_libraries(MockLightDM-qml
42
42
43qt5_use_modules(MockLightDM-qml DBus Gui Qml)
43qt5_use_modules(MockLightDM-qml DBus Gui Qml)
44
44
45−add_unity8_mock(LightDM 0.1 LightDM
45+add_unity8_mock(IntegratedLightDM 0.1 IntegratedLightDM
46 PREFIX mocks
46 PREFIX mocks
47 TARGETS MockLightDM-qml
47 TARGETS MockLightDM-qml
48 ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/liblightdm"
48 ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_CURRENT_BINARY_DIR}/liblightdm"
tests/mocks/LightDM/LightDM.qmltypes → tests/mocks/IntegratedLightDM/IntegratedLightDM.qmltypesrenamed+6−8
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.1
4// It is used for QML tooling purposes only.
4// It is used for QML tooling purposes only.
5//
5//
6// This file was auto-generated by:
6// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable LightDM 0.1 tests/mocks'
7+// 'qmlplugindump -notrelocatable IntegratedLightDM 0.1 tests/mocks'
8
8
9Module {
9Module {
10 Component {
10 Component {
@@ -61,7 +61,7 @@ Module {
61 Component {
61 Component {
62 name: "MockGreeter"
62 name: "MockGreeter"
63 prototype: "Greeter"
63 prototype: "Greeter"
64− exports: ["LightDM/Greeter 0.1"]
64+ exports: ["IntegratedLightDM/Greeter 0.1"]
65 isCreatable: false
65 isCreatable: false
66 isSingleton: true
66 isSingleton: true
67 exportMetaObjectRevisions: [0]
67 exportMetaObjectRevisions: [0]
@@ -74,7 +74,7 @@ Module {
74 Component {
74 Component {
75 name: "MockUsersModel"
75 name: "MockUsersModel"
76 prototype: "UsersModel"
76 prototype: "UsersModel"
77− exports: ["LightDM/Users 0.1"]
77+ exports: ["IntegratedLightDM/Users 0.1"]
78 isCreatable: false
78 isCreatable: false
79 isSingleton: true
79 isSingleton: true
80 exportMetaObjectRevisions: [0]
80 exportMetaObjectRevisions: [0]
@@ -92,7 +92,7 @@ Module {
92 Component {
92 Component {
93 name: "QLightDM::UsersModel"
93 name: "QLightDM::UsersModel"
94 prototype: "QAbstractListModel"
94 prototype: "QAbstractListModel"
95− exports: ["LightDM/UserRoles 0.1"]
95+ exports: ["IntegratedLightDM/UserRoles 0.1"]
96 isCreatable: false
96 isCreatable: false
97 exportMetaObjectRevisions: [0]
97 exportMetaObjectRevisions: [0]
98 Enum {
98 Enum {
@@ -207,7 +207,7 @@ Module {
207 Component {
207 Component {
208 name: "UserMetricsOutput::UserMetrics"
208 name: "UserMetricsOutput::UserMetrics"
209 prototype: "QObject"
209 prototype: "QObject"
210− exports: ["LightDM/Infographic 0.1"]
210+ exports: ["IntegratedLightDM/Infographic 0.1"]
211 isCreatable: false
211 isCreatable: false
212 isSingleton: true
212 isSingleton: true
213 exportMetaObjectRevisions: [0]
213 exportMetaObjectRevisions: [0]
@@ -246,7 +246,7 @@ Module {
246 }
246 }
247 Signal {
247 Signal {
248 name: "currentDayChanged"
248 name: "currentDayChanged"
249− Parameter { name: "currentDay"; type: "int" }
249+ Parameter { name: "length"; type: "int" }
250 }
250 }
251 Signal {
251 Signal {
252 name: "secondColorChanged"
252 name: "secondColorChanged"
@@ -264,8 +264,6 @@ Module {
264 Signal { name: "dataChanged" }
264 Signal { name: "dataChanged" }
265 Signal { name: "dataAboutToDisappear" }
265 Signal { name: "dataAboutToDisappear" }
266 Signal { name: "dataDisappeared" }
266 Signal { name: "dataDisappeared" }
267− Method { name: "nextDataSourceSlot" }
268− Method { name: "readyForDataChangeSlot" }
269 }
267 }
270 Component { name: "UsersModel"; prototype: "UnitySortFilterProxyModelQML" }
268 Component { name: "UsersModel"; prototype: "UnitySortFilterProxyModelQML" }
271}
269}
tests/mocks/LightDM/MockGreeter.cpp → tests/mocks/IntegratedLightDM/MockGreeter.cpprenamed

The content is the same.

tests/mocks/LightDM/MockGreeter.h → tests/mocks/IntegratedLightDM/MockGreeter.hrenamed

The content is the same.

tests/mocks/LightDM/MockUsersModel.cpp → tests/mocks/IntegratedLightDM/MockUsersModel.cpprenamed

The content is the same.

tests/mocks/LightDM/MockUsersModel.h → tests/mocks/IntegratedLightDM/MockUsersModel.hrenamed

The content is the same.

tests/mocks/LightDM/QLightDM/Greeter → tests/mocks/IntegratedLightDM/QLightDM/Greeterrenamed

The content is the same.

tests/mocks/LightDM/QLightDM/UsersModel → tests/mocks/IntegratedLightDM/QLightDM/UsersModelrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/CMakeLists.txt → tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txtrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/Greeter.cpp → tests/mocks/IntegratedLightDM/liblightdm/Greeter.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/Greeter.h → tests/mocks/IntegratedLightDM/liblightdm/Greeter.hrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/GreeterPrivate.cpp → tests/mocks/IntegratedLightDM/liblightdm/GreeterPrivate.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/GreeterPrivate.h → tests/mocks/IntegratedLightDM/liblightdm/GreeterPrivate.hrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/UsersModel.cpp → tests/mocks/IntegratedLightDM/liblightdm/UsersModel.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/UsersModel.h → tests/mocks/IntegratedLightDM/liblightdm/UsersModel.hrenamed

The content is the same.

tests/mocks/LightDM/liblightdm/UsersModelPrivate.cpp → tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.cpprenamed

The content is the same.

tests/mocks/LightDM/liblightdm/UsersModelPrivate.h → tests/mocks/IntegratedLightDM/liblightdm/UsersModelPrivate.hrenamed

The content is the same.

tests/mocks/LightDM/plugin.cpp → tests/mocks/IntegratedLightDM/plugin.cpprenamed+3−3
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014, 2015 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 General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -53,12 +53,12 @@ static QObject *infographic_provider(QQmlEngine *engine, QJSEngine *scriptEngine
53 return UserMetricsOutput::UserMetrics::getInstance();
53 return UserMetricsOutput::UserMetrics::getInstance();
54}
54}
55
55
56−void LightDMPlugin::registerTypes(const char *uri)
56+void IntegratedLightDMPlugin::registerTypes(const char *uri)
57{
57{
58 qmlRegisterType<QAbstractItemModel>();
58 qmlRegisterType<QAbstractItemModel>();
59 qmlRegisterType<UserMetricsOutput::ColorTheme>();
59 qmlRegisterType<UserMetricsOutput::ColorTheme>();
60
60
61− Q_ASSERT(uri == QLatin1String("LightDM"));
61+ Q_ASSERT(uri == QLatin1String("IntegratedLightDM"));
62 qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
62 qRegisterMetaType<QLightDM::Greeter::MessageType>("QLightDM::Greeter::MessageType");
63 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
63 qRegisterMetaType<QLightDM::Greeter::PromptType>("QLightDM::Greeter::PromptType");
64 qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);
64 qmlRegisterSingletonType<MockGreeter>(uri, 0, 1, "Greeter", greeter_provider);
tests/mocks/LightDM/plugin.h → tests/mocks/IntegratedLightDM/plugin.hrenamed+2−2
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2014 Canonical, Ltd.
2+ * Copyright (C) 2014, 2015 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 General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
20#include <QtQml/QQmlEngine>
20#include <QtQml/QQmlEngine>
21#include <QtQml/QQmlExtensionPlugin>
21#include <QtQml/QQmlExtensionPlugin>
22
22
23−class LightDMPlugin : public QQmlExtensionPlugin
23+class IntegratedLightDMPlugin : public QQmlExtensionPlugin
24{
24{
25 Q_OBJECT
25 Q_OBJECT
26 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
26 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
tests/mocks/IntegratedLightDM/qmldirnew file+3
@@ -0,0 +1,3 @@
1+module IntegratedLightDM
2+plugin MockLightDM-qml
3+typeinfo IntegratedLightDM.qmltypes
tests/mocks/LightDM/qmldirdeleted−3
@@ -1,3 +0,0 @@
1−module LightDM
2−plugin MockLightDM-qml
3−typeinfo LightDM.qmltypes