Rename Ubuntu.Connectivity to Unity.Connectivity to prevent name clash
commit85f90d7faa6c6b956207f230ccc44cacc2860fbe
authorMichał Sawicz <michal.sawicz@canonical.com>
dateMon 25 Aug 2014, 12:05 (12 years ago)
parente95909e
plugins/Ubuntu/CMakeLists.txt−1
@@ -1,4 +1,3 @@
1−add_subdirectory(Connectivity)
21add_subdirectory(Gestures)
32add_subdirectory(DownloadDaemonListener)
43add_subdirectory(Payments)
plugins/Unity/CMakeLists.txt+1
@@ -1,3 +1,4 @@
1+add_subdirectory(Connectivity)
12add_subdirectory(Indicators)
23add_subdirectory(Launcher)
34add_subdirectory(Session)
plugins/Ubuntu/Connectivity/CMakeLists.txt → plugins/Unity/Connectivity/CMakeLists.txtrenamed+1−1
@@ -7,4 +7,4 @@ add_library(Connectivity MODULE ${CONNECTIVITY_SOURCES})
77
88qt5_use_modules(Connectivity Qml DBus Core)
99
10−add_unity8_plugin(Ubuntu.Connectivity 0.1 Ubuntu/Connectivity TARGETS Connectivity)
10+add_unity8_plugin(Unity.Connectivity 0.1 Unity/Connectivity TARGETS Connectivity)
plugins/Ubuntu/Connectivity/Connectivity.cpp → plugins/Unity/Connectivity/Connectivity.cpprenamed
The content is the same.
plugins/Ubuntu/Connectivity/Connectivity.h → plugins/Unity/Connectivity/Connectivity.hrenamed
The content is the same.
plugins/Ubuntu/Connectivity/Connectivity.qmltypes → plugins/Unity/Connectivity/Connectivity.qmltypesrenamed+4−2
@@ -4,13 +4,15 @@ import QtQuick.tooling 1.1
44// It is used for QML tooling purposes only.
55//
66// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.Connectivity 0.1 plugins'
7+// 'qmlplugindump -notrelocatable Unity.Connectivity 0.1 plugins'
88
99Module {
1010 Component {
1111 name: "Connectivity"
1212 prototype: "QObject"
13− exports: ["Ubuntu.Connectivity/Connectivity 0.1"]
13+ exports: ["Unity.Connectivity/Connectivity 0.1"]
14+ isCreatable: false
15+ isSingleton: true
1416 exportMetaObjectRevisions: [0]
1517 Method { name: "unlockAllModems" }
1618 }
plugins/Ubuntu/Connectivity/plugin.cpp → plugins/Unity/Connectivity/plugin.cpprenamed+1−1
@@ -28,7 +28,7 @@ static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
2828
2929void BackendPlugin::registerTypes(const char *uri)
3030{
31− Q_ASSERT(uri == QLatin1String("Ubuntu.Connectivity"));
31+ Q_ASSERT(uri == QLatin1String("Unity.Connectivity"));
3232
3333 qmlRegisterSingletonType<Connectivity>(uri, 0, 1, "Connectivity", service_provider);
3434}
plugins/Ubuntu/Connectivity/plugin.h → plugins/Unity/Connectivity/plugin.hrenamed
The content is the same.
plugins/Ubuntu/Connectivity/qmldir → plugins/Unity/Connectivity/qmldirrenamed+1−1
@@ -1,3 +1,3 @@
1−module Ubuntu.Connectivity
1+module Unity.Connectivity
22plugin Connectivity
33typeinfo Connectivity.qmltypes
qml/Shell.qml+1−1
@@ -20,9 +20,9 @@ import GSettings 1.0
2020import Unity.Application 0.1
2121import Ubuntu.Components 0.1
2222import Ubuntu.Components.Popups 1.0
23−import Ubuntu.Connectivity 0.1
2423import Ubuntu.Gestures 0.1
2524import Ubuntu.SystemImage 0.1
25+import Unity.Connectivity 0.1
2626import Unity.Launcher 0.1
2727import Utils 0.1
2828import LightDM 0.1 as LightDM
tests/mocks/Ubuntu/CMakeLists.txt−1
@@ -1,4 +1,3 @@
1−add_subdirectory(Connectivity)
21add_subdirectory(DownloadDaemonListener)
32add_subdirectory(Payments)
43add_subdirectory(SystemImage)
tests/mocks/Unity/CMakeLists.txt+1
@@ -1,4 +1,5 @@
11add_subdirectory(Application)
2+add_subdirectory(Connectivity)
23add_subdirectory(Indicators)
34add_subdirectory(Launcher)
45add_subdirectory(Notifications)
tests/mocks/Ubuntu/Connectivity/CMakeLists.txt → tests/mocks/Unity/Connectivity/CMakeLists.txtrenamed+1−1
@@ -7,4 +7,4 @@ add_library(MockConnectivity MODULE ${MOCK_CONNECTIVITY_SOURCES})
77
88qt5_use_modules(MockConnectivity Qml Quick Core)
99
10−add_unity8_mock(Ubuntu.Connectivity 0.1 Ubuntu/Connectivity TARGETS MockConnectivity)
10+add_unity8_mock(Unity.Connectivity 0.1 Unity/Connectivity TARGETS MockConnectivity)
tests/mocks/Ubuntu/Connectivity/Connectivity.qmltypes → tests/mocks/Unity/Connectivity/Connectivity.qmltypesrenamed+4−2
@@ -4,13 +4,15 @@ import QtQuick.tooling 1.1
44// It is used for QML tooling purposes only.
55//
66// This file was auto-generated by:
7−// 'qmlplugindump -notrelocatable Ubuntu.Connectivity 0.1 plugins'
7+// 'qmlplugindump -notrelocatable Unity.Connectivity 0.1 tests/mocks'
88
99Module {
1010 Component {
1111 name: "MockConnectivity"
1212 prototype: "QObject"
13− exports: ["Ubuntu.Connectivity/Connectivity 0.1"]
13+ exports: ["Unity.Connectivity/Connectivity 0.1"]
14+ isCreatable: false
15+ isSingleton: true
1416 exportMetaObjectRevisions: [0]
1517 Signal { name: "unlockingAllModems" }
1618 Method { name: "unlockAllModems" }
tests/mocks/Ubuntu/Connectivity/MockConnectivity.cpp → tests/mocks/Unity/Connectivity/MockConnectivity.cpprenamed
The content is the same.
tests/mocks/Ubuntu/Connectivity/MockConnectivity.h → tests/mocks/Unity/Connectivity/MockConnectivity.hrenamed
The content is the same.
tests/mocks/Ubuntu/Connectivity/plugin.cpp → tests/mocks/Unity/Connectivity/plugin.cpprenamed+1−1
@@ -28,7 +28,7 @@ static QObject *service_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
2828
2929void BackendPlugin::registerTypes(const char *uri)
3030{
31− Q_ASSERT(uri == QLatin1String("Ubuntu.Connectivity"));
31+ Q_ASSERT(uri == QLatin1String("Unity.Connectivity"));
3232
3333 qmlRegisterSingletonType<MockConnectivity>(uri, 0, 1, "Connectivity", service_provider);
3434}
tests/mocks/Ubuntu/Connectivity/plugin.h → tests/mocks/Unity/Connectivity/plugin.hrenamed
The content is the same.
tests/mocks/Ubuntu/Connectivity/qmldir → tests/mocks/Unity/Connectivity/qmldirrenamed+1−1
@@ -1,3 +1,3 @@
1−module Ubuntu.Connectivity
1+module Unity.Connectivity
22plugin MockConnectivity
33typeinfo Connectivity.qmltypes
tests/mocks/Unity/Unity.qmltypes+6−2
@@ -36,6 +36,10 @@ Module {
3636 prototype: "unity::shell::scopes::PreviewModelInterface"
3737 exports: ["Unity/FakePreviewModel 0.2"]
3838 exportMetaObjectRevisions: [0]
39+ Method {
40+ name: "setLoaded"
41+ Parameter { type: "bool" }
42+ }
3943 }
4044 Component {
4145 name: "PreviewStack"
@@ -59,9 +63,9 @@ Module {
5963 Component {
6064 name: "ResultsModel"
6165 prototype: "unity::shell::scopes::ResultsModelInterface"
62− exports: ["Unity/ResultsModel 0.2"]
66+ exports: ["Unity/FakeResultsModel 0.2", "Unity/ResultsModel 0.2"]
6367 isCreatable: false
64− exportMetaObjectRevisions: [0]
68+ exportMetaObjectRevisions: [0, 0]
6569 }
6670 Component {
6771 name: "Scope"
tests/qmltests/tst_Shell.qml+1−1
@@ -21,8 +21,8 @@ import QtQuick 2.0
2121import QtTest 1.0
2222import GSettings 1.0
2323import LightDM 0.1 as LightDM
24−import Ubuntu.Connectivity 0.1
2524import Unity.Application 0.1
25+import Unity.Connectivity 0.1
2626import Unity.Test 0.1 as UT
2727import Powerd 0.1
2828