diff options
50 files changed, 65 insertions, 68 deletions
diff --git a/apps/com.luxoft.vehicle/Main.qml b/apps/com.luxoft.vehicle/Main.qml index e3def09f..f21ceee9 100644 --- a/apps/com.luxoft.vehicle/Main.qml +++ b/apps/com.luxoft.vehicle/Main.qml @@ -34,7 +34,7 @@ import QtQuick 2.2 import QtApplicationManager.Application 2.0 import application.windows 1.0 import shared.utils 1.0 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import shared.com.pelagicore.drivedata 1.0 import shared.com.pelagicore.systeminfo 1.0 import shared.Style 1.0 diff --git a/apps/com.luxoft.vehicle/stores/VehicleStore.qml b/apps/com.luxoft.vehicle/stores/VehicleStore.qml index d776e4d6..2aa53b72 100644 --- a/apps/com.luxoft.vehicle/stores/VehicleStore.qml +++ b/apps/com.luxoft.vehicle/stores/VehicleStore.qml @@ -31,7 +31,7 @@ ****************************************************************************/ import QtQuick 2.8 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import shared.com.pelagicore.drivedata 1.0 QtObject { diff --git a/apps/com.pelagicore.apps.settings/store/RootStore.qml b/apps/com.pelagicore.apps.settings/store/RootStore.qml index ab8dfcb4..db375d43 100644 --- a/apps/com.pelagicore.apps.settings/store/RootStore.qml +++ b/apps/com.pelagicore.apps.settings/store/RootStore.qml @@ -33,7 +33,7 @@ import QtQml 2.2 import QtQml.Models 2.3 import shared.utils 1.0 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import shared.Style 1.0 import "../helper" diff --git a/apps/com.pelagicore.climate/Main.qml b/apps/com.pelagicore.climate/Main.qml index 08a5495e..08ecfacb 100644 --- a/apps/com.pelagicore.climate/Main.qml +++ b/apps/com.pelagicore.climate/Main.qml @@ -34,7 +34,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.2 import application.windows 1.0 import shared.utils 1.0 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import shared.Style 1.0 import "stores" 1.0 diff --git a/apps/com.pelagicore.hud/Main.qml b/apps/com.pelagicore.hud/Main.qml index 03119733..b0ecf9dd 100644 --- a/apps/com.pelagicore.hud/Main.qml +++ b/apps/com.pelagicore.hud/Main.qml @@ -33,7 +33,7 @@ import QtQuick 2.8 import QtQuick.Controls 2.2 import application.windows 1.0 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import shared.com.pelagicore.drivedata 1.0 import shared.Style 1.0 import shared.Sizes 1.0 diff --git a/apps/com.pelagicore.map/Main.qml b/apps/com.pelagicore.map/Main.qml index 59eccf60..381c5090 100644 --- a/apps/com.pelagicore.map/Main.qml +++ b/apps/com.pelagicore.map/Main.qml @@ -34,7 +34,7 @@ import QtQuick 2.9 import application.windows 1.0 import shared.utils 1.0 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import shared.com.pelagicore.drivedata 1.0 import shared.com.pelagicore.systeminfo 1.0 import shared.Style 1.0 diff --git a/apps/com.pelagicore.music/Main.qml b/apps/com.pelagicore.music/Main.qml index b167c184..5fc595d1 100644 --- a/apps/com.pelagicore.music/Main.qml +++ b/apps/com.pelagicore.music/Main.qml @@ -40,7 +40,7 @@ import QtQuick.Layouts 1.2 import "stores" 1.0 import "views" 1.0 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import shared.com.pelagicore.drivedata 1.0 import shared.Style 1.0 import shared.Sizes 1.0 diff --git a/apps/com.pelagicore.music/stores/MusicStore.qml b/apps/com.pelagicore.music/stores/MusicStore.qml index 4b2764a0..b9f8071e 100644 --- a/apps/com.pelagicore.music/stores/MusicStore.qml +++ b/apps/com.pelagicore.music/stores/MusicStore.qml @@ -35,7 +35,7 @@ import QtApplicationManager.Application 2.0 import QtIvi 1.0 import QtIvi.Media 1.0 import shared.utils 1.0 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 Store { id: root diff --git a/apps/com.theqtcompany.cluster/Main.qml b/apps/com.theqtcompany.cluster/Main.qml index 38678b00..818d4cae 100644 --- a/apps/com.theqtcompany.cluster/Main.qml +++ b/apps/com.theqtcompany.cluster/Main.qml @@ -33,7 +33,7 @@ import QtQuick 2.8 import QtQuick.Window 2.2 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import application.windows 1.0 import shared.Sizes 1.0 diff --git a/apps/com.theqtcompany.cluster/stores/RootStore.qml b/apps/com.theqtcompany.cluster/stores/RootStore.qml index ff18b34a..73d95f7d 100644 --- a/apps/com.theqtcompany.cluster/stores/RootStore.qml +++ b/apps/com.theqtcompany.cluster/stores/RootStore.qml @@ -30,7 +30,7 @@ ****************************************************************************/ import QtQuick 2.8 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import shared.com.pelagicore.drivedata 1.0 import QtApplicationManager.Application 2.0 diff --git a/apps/com.theqtcompany.cluster/views/+lucee/ClusterView.qml b/apps/com.theqtcompany.cluster/views/+lucee/ClusterView.qml index 5ce341db..02506d29 100644 --- a/apps/com.theqtcompany.cluster/views/+lucee/ClusterView.qml +++ b/apps/com.theqtcompany.cluster/views/+lucee/ClusterView.qml @@ -31,7 +31,7 @@ import QtQuick 2.8 import QtQuick.Window 2.2 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import application.windows 1.0 import shared.animations 1.0 diff --git a/apps/com.theqtcompany.cluster/views/ClusterView.qml b/apps/com.theqtcompany.cluster/views/ClusterView.qml index 06c4a642..c49210fa 100644 --- a/apps/com.theqtcompany.cluster/views/ClusterView.qml +++ b/apps/com.theqtcompany.cluster/views/ClusterView.qml @@ -33,7 +33,7 @@ import QtQuick 2.8 import QtQuick.Window 2.2 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import application.windows 1.0 import shared.Sizes 1.0 diff --git a/doc/doc.pri b/doc/doc.pri index 395aa36a..a603b36e 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -1,7 +1,7 @@ CONFIG += force_qt QT *= quick ivicore -INCLUDEPATH += $$OUT_PWD/../src/dataprovider/frontend +INCLUDEPATH += $$OUT_PWD/../src/remotesettings/frontend build_online_docs: { QMAKE_DOCS = $$PWD/online/neptune3ui.qdocconf diff --git a/doc/neptune3ui-project.qdocconf b/doc/neptune3ui-project.qdocconf index 73553cf9..007e6d42 100644 --- a/doc/neptune3ui-project.qdocconf +++ b/doc/neptune3ui-project.qdocconf @@ -4,9 +4,9 @@ url = http://doc.qt.io/Neptune3UI moduleheader = Neptune3UIDoc -headerdirs += $$BUILDDIR/../src/dataprovider/frontend +headerdirs += $$BUILDDIR/../src/remotesettings/frontend -sourcedirs += src ../ $$BUILDDIR/../src/dataprovider/frontend +sourcedirs += src ../ $$BUILDDIR/../src/remotesettings/frontend imagedirs += src/images diff --git a/doc/src/neptune3ui-remote-settings-server.qdoc b/doc/src/neptune3ui-remote-settings-server.qdoc index 2617c4a8..5b74d2c0 100644 --- a/doc/src/neptune3ui-remote-settings-server.qdoc +++ b/doc/src/neptune3ui-remote-settings-server.qdoc @@ -49,7 +49,7 @@ settings service would not need to be remote, but could be running in-process instead. By default the remote settings server is started automatically by Neptune 3 UI. It may also be - started by running the dataprovider-server executable. The executable is installed or + started by running the remotesettings-server executable. The executable is installed or built during the build of Neptune 3 UI. The server needs a settings file "server.conf" for setting up the connection. This settings file is shipped with Neptune 3 UI and is located in the root directory. The same settings file is also read by the backend plugin instances loaded by diff --git a/doc/src/neptune3ui-testing-squish.qdoc b/doc/src/neptune3ui-testing-squish.qdoc index 1a3cf5ec..b93ebce2 100644 --- a/doc/src/neptune3ui-testing-squish.qdoc +++ b/doc/src/neptune3ui-testing-squish.qdoc @@ -127,7 +127,7 @@ attachableAUT/app_vehicle = "localhost:7732" are: \list \li D-Bus process - \li dataprovider-server + \li remotesettings-server \endlist Consequently, for Neptune 3 UI you have to force Squish to ignore these processes to run the @@ -142,7 +142,7 @@ attachableAUT/app_vehicle = "localhost:7732" \badcode # ignore the following processes - dataprovider-server + remotesettings-server dbus-daemon \endcode diff --git a/server.conf b/server.conf index 46961f68..c4e9cccc 100644 --- a/server.conf +++ b/server.conf @@ -1,2 +1,2 @@ -[dataprovider] +[remotesettings] Registry=tcp://0.0.0.0:9999 diff --git a/squishtests/suite_neptune3/shared/scripts/bdd_hooks.py b/squishtests/suite_neptune3/shared/scripts/bdd_hooks.py index 834af235..a4fde0ec 100644 --- a/squishtests/suite_neptune3/shared/scripts/bdd_hooks.py +++ b/squishtests/suite_neptune3/shared/scripts/bdd_hooks.py @@ -75,7 +75,7 @@ def start_neptune_ui_app_w_focus(window): # !!! Remember to use ignoredauts.txt feature # otherwise this will cause a lot of trouble, - # with dbus and dataprovider-server !!! + # with dbus and remotesettings-server !!! # Read the documentation: # https://doc.qt.io/Neptune3UI/neptune3ui-testing-squish.html#exclude-disruptive-sub-processes command_line_options = ("-r" diff --git a/squishtests/suite_neptune3/shared/scripts/common/settings.py b/squishtests/suite_neptune3/shared/scripts/common/settings.py index 098075cb..138d5d99 100644 --- a/squishtests/suite_neptune3/shared/scripts/common/settings.py +++ b/squishtests/suite_neptune3/shared/scripts/common/settings.py @@ -40,7 +40,7 @@ G_WAIT_SOME_STEPS_SEC = 1 G_WAIT_SWITCH_APP_CONTEXT = 1 G_AUT_MAIN = "neptune3-ui" -G_AUT_REMOTE = "dataprovider-server" +G_AUT_REMOTE = "remotesettings-server" G_AUT_APPMAN = "appman-launcher-qml" G_MULTI_PROCESS = None diff --git a/src/dataprovider/qml_plugin/qmldir b/src/dataprovider/qml_plugin/qmldir deleted file mode 100644 index 8742be8c..00000000 --- a/src/dataprovider/qml_plugin/qmldir +++ /dev/null @@ -1,3 +0,0 @@ -module shared.com.pelagicore.dataprovider -plugin dataproviderplugin -classname DataProviderPlugin diff --git a/src/neptune3-ui/main.cpp b/src/neptune3-ui/main.cpp index be4b34cc..7f36670f 100644 --- a/src/neptune3-ui/main.cpp +++ b/src/neptune3-ui/main.cpp @@ -110,7 +110,7 @@ Q_DECL_EXPORT int main(int argc, char *argv[]) // start the server; the server itself will ensure one instance only startExtraProcess(QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/vehiclefunctions-simulation-server"); startExtraProcess(QCoreApplication::applicationDirPath() + "/drivedata-server"); - startExtraProcess(QCoreApplication::applicationDirPath() + "/dataprovider-server"); + startExtraProcess(QCoreApplication::applicationDirPath() + "/remotesettings-server"); #endif // load the Qt translations diff --git a/src/dataprovider/app/ClusterPage.qml b/src/remotesettings/app/ClusterPage.qml index ef719acc..ef719acc 100644 --- a/src/dataprovider/app/ClusterPage.qml +++ b/src/remotesettings/app/ClusterPage.qml diff --git a/src/dataprovider/app/ConnectionDialog.qml b/src/remotesettings/app/ConnectionDialog.qml index a4ca82a1..a4ca82a1 100644 --- a/src/dataprovider/app/ConnectionDialog.qml +++ b/src/remotesettings/app/ConnectionDialog.qml diff --git a/src/dataprovider/app/SettingsPage.qml b/src/remotesettings/app/SettingsPage.qml index 17c82c97..17c82c97 100644 --- a/src/dataprovider/app/SettingsPage.qml +++ b/src/remotesettings/app/SettingsPage.qml diff --git a/src/dataprovider/app/SystemUIPage.qml b/src/remotesettings/app/SystemUIPage.qml index 6353caff..6353caff 100644 --- a/src/dataprovider/app/SystemUIPage.qml +++ b/src/remotesettings/app/SystemUIPage.qml diff --git a/src/dataprovider/app/app.pro b/src/remotesettings/app/app.pro index 2d472593..9639c5c6 100644 --- a/src/dataprovider/app/app.pro +++ b/src/remotesettings/app/app.pro @@ -6,7 +6,7 @@ CONFIG -= app_bundle include($$SOURCE_DIR/config.pri) -LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(dataprovider) +LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(remotesettings) INCLUDEPATH += $$OUT_PWD/../frontend diff --git a/src/dataprovider/app/app.qrc b/src/remotesettings/app/app.qrc index e257dfd6..e257dfd6 100644 --- a/src/dataprovider/app/app.qrc +++ b/src/remotesettings/app/app.qrc diff --git a/src/dataprovider/app/client.cpp b/src/remotesettings/app/client.cpp index 8209e245..8209e245 100644 --- a/src/dataprovider/app/client.cpp +++ b/src/remotesettings/app/client.cpp diff --git a/src/dataprovider/app/client.h b/src/remotesettings/app/client.h index 92ac2c1d..92ac2c1d 100644 --- a/src/dataprovider/app/client.h +++ b/src/remotesettings/app/client.h diff --git a/src/dataprovider/app/main.cpp b/src/remotesettings/app/main.cpp index 367ed72c..367ed72c 100644 --- a/src/dataprovider/app/main.cpp +++ b/src/remotesettings/app/main.cpp diff --git a/src/dataprovider/app/main.qml b/src/remotesettings/app/main.qml index c0edb2dd..8b43441d 100644 --- a/src/dataprovider/app/main.qml +++ b/src/remotesettings/app/main.qml @@ -33,7 +33,7 @@ import QtQuick 2.7 import QtQuick.Controls 2.2 import QtQuick.Layouts 1.3 import QtIvi 1.0 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import shared.com.pelagicore.drivedata 1.0 import QtQuick.Window 2.3 diff --git a/src/dataprovider/app/qml.qrc b/src/remotesettings/app/qml.qrc index ec50876c..ec50876c 100644 --- a/src/dataprovider/app/qml.qrc +++ b/src/remotesettings/app/qml.qrc diff --git a/src/dataprovider/app/qtquickcontrols2.conf b/src/remotesettings/app/qtquickcontrols2.conf index ce3af5ce..ce3af5ce 100644 --- a/src/dataprovider/app/qtquickcontrols2.conf +++ b/src/remotesettings/app/qtquickcontrols2.conf diff --git a/src/dataprovider/app/server.conf b/src/remotesettings/app/server.conf index a1e6baa6..a1e6baa6 100644 --- a/src/dataprovider/app/server.conf +++ b/src/remotesettings/app/server.conf diff --git a/src/dataprovider/backend/backend.pro b/src/remotesettings/backend/backend.pro index e5166a9f..18d6ca26 100644 --- a/src/dataprovider/backend/backend.pro +++ b/src/remotesettings/backend/backend.pro @@ -1,5 +1,5 @@ TEMPLATE=lib -TARGET = $$qtLibraryTarget(dataprovider_backend_qtro) +TARGET = $$qtLibraryTarget(remotesettings_backend_qtro) CONFIG += ivigenerator plugin QT_FOR_CONFIG += ivicore @@ -7,7 +7,7 @@ QT_FOR_CONFIG += ivicore include($$SOURCE_DIR/config.pri) -LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(dataprovider) +LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(remotesettings) DESTDIR = $$BUILD_DIR/qtivi #needed for the android deployment to work @@ -22,7 +22,7 @@ PLUGIN_CLASS_NAME = IviSettingsBackendInterface QT += core ivicore QFACE_FORMAT = backend_qtro -QFACE_SOURCES = ../dataprovider.qface +QFACE_SOURCES = ../remotesettings.qface DEPENDPATH += $$OUT_PWD/../backend diff --git a/src/dataprovider/backend_simulation/backend_simulation.pro b/src/remotesettings/backend_simulation/backend_simulation.pro index c1a6ce0c..b5ba75c7 100644 --- a/src/dataprovider/backend_simulation/backend_simulation.pro +++ b/src/remotesettings/backend_simulation/backend_simulation.pro @@ -1,5 +1,5 @@ TEMPLATE=lib -TARGET = $$qtLibraryTarget(dataprovider_backend_simulation) +TARGET = $$qtLibraryTarget(remotesettings_backend_simulation) CONFIG += ivigenerator plugin QT_FOR_CONFIG += ivicore @@ -7,7 +7,7 @@ QT_FOR_CONFIG += ivicore include($$SOURCE_DIR/config.pri) -LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(dataprovider) +LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(remotesettings) DESTDIR = $$BUILD_DIR/qtivi #needed for the android deployment to work @@ -22,7 +22,7 @@ PLUGIN_CLASS_NAME = IviSettingsBackendInterface QT += core ivicore QFACE_FORMAT = backend_simulator -QFACE_SOURCES = ../dataprovider.qface +QFACE_SOURCES = ../remotesettings.qface DEPENDPATH += $$OUT_PWD/../backend diff --git a/src/dataprovider/frontend/frontend.pro b/src/remotesettings/frontend/frontend.pro index b01d548f..ef2f653c 100644 --- a/src/dataprovider/frontend/frontend.pro +++ b/src/remotesettings/frontend/frontend.pro @@ -1,4 +1,4 @@ -TARGET = $$qtLibraryTarget(dataprovider) +TARGET = $$qtLibraryTarget(remotesettings) TEMPLATE = lib CONFIG += ivigenerator DESTDIR = $$LIB_DESTDIR @@ -10,10 +10,10 @@ macos: QMAKE_SONAME_PREFIX = @rpath include($$SOURCE_DIR/config.pri) -DEFINES += QT_BUILD_DATAPROVIDER_LIB +DEFINES += QT_BUILD_REMOTESETTINGS_LIB QT += ivicore ivicore-private qml -QFACE_SOURCES = ../dataprovider.qface +QFACE_SOURCES = ../remotesettings.qface DEPENDPATH += $$OUT_PWD/../frontend diff --git a/src/dataprovider/qml_plugin/plugin.cpp b/src/remotesettings/qml_plugin/plugin.cpp index e605f9f8..9bc8bb21 100644 --- a/src/dataprovider/qml_plugin/plugin.cpp +++ b/src/remotesettings/qml_plugin/plugin.cpp @@ -32,20 +32,20 @@ #include <QtQml/qqmlextensionplugin.h> #include <qqml.h> -#include "dataprovidermodule.h" +#include "remotesettingsmodule.h" QT_BEGIN_NAMESPACE -class DataProviderPlugin : public QQmlExtensionPlugin +class RemoteSettingsPlugin : public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: virtual void registerTypes(const char *uri) override { - Q_ASSERT(QLatin1String(uri) == QLatin1String("shared.com.pelagicore.dataprovider")); + Q_ASSERT(QLatin1String(uri) == QLatin1String("shared.com.pelagicore.remotesettings")); - DataProviderModule::registerQmlTypes(uri, 1, 0); + RemoteSettingsModule::registerQmlTypes(uri, 1, 0); } }; diff --git a/src/dataprovider/qml_plugin/qml_plugin.pro b/src/remotesettings/qml_plugin/qml_plugin.pro index 89ae6928..9ac0b76f 100644 --- a/src/dataprovider/qml_plugin/qml_plugin.pro +++ b/src/remotesettings/qml_plugin/qml_plugin.pro @@ -1,8 +1,8 @@ TEMPLATE = lib CONFIG += plugin -TARGET = dataproviderplugin +TARGET = remotesettingsplugin QT += qml -LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(dataprovider) +LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(remotesettings) INCLUDEPATH += $$OUT_PWD/../frontend include($$SOURCE_DIR/config.pri) @@ -10,7 +10,7 @@ include($$SOURCE_DIR/config.pri) SOURCES += \ plugin.cpp -uri = com.pelagicore.dataprovider +uri = com.pelagicore.remotesettings load(qmlplugin) QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptune3/lib, $$installPath) diff --git a/src/remotesettings/qml_plugin/qmldir b/src/remotesettings/qml_plugin/qmldir new file mode 100644 index 00000000..61ab26a1 --- /dev/null +++ b/src/remotesettings/qml_plugin/qmldir @@ -0,0 +1,3 @@ +module shared.com.pelagicore.remotesettings +plugin remotesettingsplugin +classname RemoteSettingsPlugin diff --git a/src/dataprovider/dataprovider-server/main.cpp b/src/remotesettings/remotesettings-server/main.cpp index 75c2e9f6..fc88014b 100644 --- a/src/dataprovider/dataprovider-server/main.cpp +++ b/src/remotesettings/remotesettings-server/main.cpp @@ -40,9 +40,9 @@ int main(int argc, char *argv[]) QCoreApplication a(argc, argv); // single instance guard - QLockFile lockFile(QStringLiteral("%1/NeptuneDataProviderServer.lock").arg(QDir::tempPath())); + QLockFile lockFile(QStringLiteral("%1/NeptuneRemoteSettingsServer.lock").arg(QDir::tempPath())); if (!lockFile.tryLock(100)) { - qCritical("Neptune DataProviderServer already running, aborting..."); + qCritical("Neptune RemoteSettingsServer already running, aborting..."); return EXIT_FAILURE; } diff --git a/src/dataprovider/dataprovider-server/dataprovider-server.pro b/src/remotesettings/remotesettings-server/remotesettings-server.pro index 02474cbc..9c0f6904 100644 --- a/src/dataprovider/dataprovider-server/dataprovider-server.pro +++ b/src/remotesettings/remotesettings-server/remotesettings-server.pro @@ -10,7 +10,7 @@ QT_FOR_CONFIG += ivicore include($$SOURCE_DIR/config.pri) QFACE_FORMAT = server_qtro -QFACE_SOURCES = ../dataprovider.qface +QFACE_SOURCES = ../remotesettings.qface SOURCES += \ main.cpp\ @@ -21,7 +21,7 @@ HEADERS += \ DEPENDPATH += $$OUT_PWD/../server -LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(dataprovider) +LIBS += -L$$LIB_DESTDIR -l$$qtLibraryTarget(remotesettings) INCLUDEPATH += $$OUT_PWD/../frontend @@ -29,7 +29,7 @@ QMAKE_RPATHDIR += $$QMAKE_REL_RPATH_BASE/$$relative_path($$INSTALL_PREFIX/neptun DISTFILES += -TARGET = dataprovider-server +TARGET = remotesettings-server DESTDIR = $$BUILD_DIR target.path = $$INSTALL_PREFIX/neptune3 diff --git a/src/dataprovider/dataprovider-server/server.cpp b/src/remotesettings/remotesettings-server/server.cpp index 6a726704..4b6cc4a0 100644 --- a/src/dataprovider/dataprovider-server/server.cpp +++ b/src/remotesettings/remotesettings-server/server.cpp @@ -32,7 +32,7 @@ #include "server.h" #include <QCoreApplication> -Q_LOGGING_CATEGORY(dataProviderServer, "dataProvider.server") +Q_LOGGING_CATEGORY(remoteSettingsServer, "remoteSettings.server") Server::Server(QObject *parent) : QObject(parent) { @@ -44,23 +44,23 @@ Server::Server(QObject *parent) : QObject(parent) void Server::start() { m_UISettingsService.reset(new UISettingsSimpleSource()); - Core::instance()->host()->enableRemoting(m_UISettingsService.data(), "DataProvider.UISettings"); - qCDebug(dataProviderServer) << "register service at: DataProvider.UISettings"; + Core::instance()->host()->enableRemoting(m_UISettingsService.data(), "RemoteSettings.UISettings"); + qCDebug(remoteSettingsServer) << "register service at: RemoteSettings.UISettings"; m_systemUIService.reset(new SystemUISimpleSource()); - Core::instance()->host()->enableRemoting(m_systemUIService.data(), "DataProvider.SystemUI"); - qCDebug(dataProviderServer) << "register service at: DataProvider.SystemUI"; + Core::instance()->host()->enableRemoting(m_systemUIService.data(), "RemoteSettings.SystemUI"); + qCDebug(remoteSettingsServer) << "register service at: RemoteSettings.SystemUI"; m_connectionMonitoringService.reset(new ConnectionMonitoringSimpleSource()); - Core::instance()->host()->enableRemoting(m_connectionMonitoringService.data(), "DataProvider.ConnectionMonitoring"); - qCDebug(dataProviderServer) << "register service at: DataProvider.ConnectionMonitoring"; + Core::instance()->host()->enableRemoting(m_connectionMonitoringService.data(), "RemoteSettings.ConnectionMonitoring"); + qCDebug(remoteSettingsServer) << "register service at: RemoteSettings.ConnectionMonitoring"; initConnectionMonitoring(); } void Server::onROError(QRemoteObjectNode::ErrorCode code) { - qCWarning(dataProviderServer) << "Remote objects error, code:" << code; + qCWarning(remoteSettingsServer) << "Remote objects error, code:" << code; } void Server::onAboutToQuit() diff --git a/src/dataprovider/dataprovider-server/server.h b/src/remotesettings/remotesettings-server/server.h index dab0b8df..243bdced 100644 --- a/src/dataprovider/dataprovider-server/server.h +++ b/src/remotesettings/remotesettings-server/server.h @@ -41,7 +41,7 @@ #include "rep_systemui_source.h" #include "rep_connectionmonitoring_source.h" -Q_DECLARE_LOGGING_CATEGORY(dataProviderServer) +Q_DECLARE_LOGGING_CATEGORY(remoteSettingsServer) class Server : public QObject { diff --git a/src/dataprovider/dataprovider.pro b/src/remotesettings/remotesettings.pro index 989f4076..038b3e11 100644 --- a/src/dataprovider/dataprovider.pro +++ b/src/remotesettings/remotesettings.pro @@ -7,7 +7,7 @@ SUBDIRS += \ # Don't build the production backend on android and ios, only use the simulation backend !android:!ios:SUBDIRS += \ - dataprovider-server \ + remotesettings-server \ app \ backend \ @@ -17,4 +17,4 @@ server.depends = frontend app.depends = frontend qml_plugin.depends = frontend -OTHER_FILES += dataprovider.qface +OTHER_FILES += remotesettings.qface diff --git a/src/dataprovider/dataprovider.qface b/src/remotesettings/remotesettings.qface index aae44027..80766514 100644 --- a/src/dataprovider/dataprovider.qface +++ b/src/remotesettings/remotesettings.qface @@ -1,6 +1,5 @@ -module DataProvider 1.0 +module RemoteSettings 1.0 -@config: {id: "UISettings"} interface UISettings { string language; list<string> languages; @@ -37,7 +36,6 @@ interface UISettings { bool flatGauges; } -@config: {id: "SystemUI"} interface SystemUI { /* * Incrementing this value will make sysui switch to display the next @@ -50,7 +48,6 @@ interface SystemUI { int applicationICWindowSwitchCount } -@config: {id: "ConnectionMonitoring"} interface ConnectionMonitoring { int intervalMS; int counter; diff --git a/src/src.pro b/src/src.pro index 4741158e..061cffd7 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,11 +1,11 @@ TEMPLATE = subdirs SUBDIRS += neptune3-ui -SUBDIRS += dataprovider \ +SUBDIRS += remotesettings \ drivedata use_qsr{ #build Qt Safe Renderer Cluster SUBDIRS += neptune3-ui-qsr-cluster - neptune3-ui-qsr-cluster.depends = dataprovider-server + neptune3-ui-qsr-cluster.depends = remotesettings-server } diff --git a/sysui/stores/ClusterStore.qml b/sysui/stores/ClusterStore.qml index 3f394a32..524e45a4 100644 --- a/sysui/stores/ClusterStore.qml +++ b/sysui/stores/ClusterStore.qml @@ -32,7 +32,7 @@ import QtQuick 2.8 import QtApplicationManager.SystemUI 2.0 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import shared.com.pelagicore.drivedata 1.0 QtObject { diff --git a/sysui/stores/RootStore.qml b/sysui/stores/RootStore.qml index f937df79..a75835ae 100644 --- a/sysui/stores/RootStore.qml +++ b/sysui/stores/RootStore.qml @@ -39,7 +39,7 @@ import shared.utils 1.0 import system.models.application 1.0 -import shared.com.pelagicore.dataprovider 1.0 +import shared.com.pelagicore.remotesettings 1.0 import shared.com.pelagicore.systeminfo 1.0 Store { diff --git a/tests/qmltests/qmltests.pro b/tests/qmltests/qmltests.pro index 758c07b6..0f9768dc 100644 --- a/tests/qmltests/qmltests.pro +++ b/tests/qmltests/qmltests.pro @@ -5,7 +5,7 @@ SOURCES += testrunner.cpp include(../../config.pri) # This will add the install directory to the PATH variable of the target_wrapper.bat for the autotest -# This is needed as the libdataprovider.dll will be installed there +# This is needed as the libremotesettings.dll will be installed there win32 { extra_path.name = PATH extra_path.CONFIG = prepend |