Index: CMakeLists.txt =================================================================== diff -u -re21748fb21b8c964e51bb2f4be7faf699d30a057 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- CMakeLists.txt (.../CMakeLists.txt) (revision e21748fb21b8c964e51bb2f4be7faf699d30a057) +++ CMakeLists.txt (.../CMakeLists.txt) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -4,6 +4,10 @@ include(cmake/Debug.cmake) +cmake_host_system_information(RESULT CORE_COUNT QUERY NUMBER_OF_PHYSICAL_CORES) +set(CMAKE_BUILD_PARALLEL_LEVEL ${CORE_COUNT}) +set(ENV{CMAKE_BUILD_PARALLEL_LEVEL} ${CORE_COUNT}) + option(BUILD_CPPCHECK "Run static code analysis (Cppcheck)" ON) option(BUILD_GENERATE_ALARM_MAPPING "Generate MAlarmMapping.cpp" ON) option(BUILD_DEBUG "Build debug" OFF) @@ -24,11 +28,11 @@ # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} # COMMAND git rev-parse --abbrev-ref HEAD # ) -# +# # add_custom_target(${PROJECT_NAME}-Timestamp ALL # COMMAND date "+%m%d%H%M" # ) -# +# add_compile_options(-Wall -Werror -Wextra -Wimplicit-fallthrough) # -save-temps # see .ii add_compile_definitions( @@ -57,7 +61,7 @@ find_package(Git) find_package( - Qt5 COMPONENTS Core Quick Widgets SerialBus Concurrent Charts Bluetooth + Qt6 COMPONENTS Core Quick Widgets SerialBus Concurrent Charts Bluetooth REQUIRED ) Index: sources/ApplicationPost.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -17,6 +17,7 @@ #include #include #include +#include // Project #include "Logger.h" @@ -92,8 +93,8 @@ QString exrVer("%1\\s*\"\\d+\\.\\d+\\.\\d+\""); QString exrBld("%1\\s*\"\\d+\""); - QRegExp regVer(exrVer.arg(_postmsg_osversion)); - QRegExp regBld(exrBld.arg(_postmsg_osbuild )); + QRegularExpression regVer(exrVer.arg(_postmsg_osversion)); + QRegularExpression regBld(exrBld.arg(_postmsg_osbuild )); QString version; QString build; QStringList versions; @@ -108,8 +109,8 @@ if ( ! ok ) goto lOut; // check the Os version is compatible - version = regVer.cap(0).replace(_postmsg_osversion,"").replace("\"",""); // 0 is the first captured and next if any are the subsets. - build = regBld.cap(0).replace(_postmsg_osbuild ,"").replace("\"",""); // 0 is the first captured and next if any are the subsets. + // TODO: fix using match.captured // version = regVer.captured(0).replace(_postmsg_osversion,"").replace("\"",""); // 0 is the first captured and next if any are the subsets. + // TODO: fix using match.captured // build = regBld.captured(0).replace(_postmsg_osbuild ,"").replace("\"",""); // 0 is the first captured and next if any are the subsets. versions = version.split("."); major = versions[0].toUInt(); // type, existance, count has been already tested by regex, and was rejected in first check section. minor = versions[1].toUInt(); // type, existance, count has been already tested by regex, and was rejected in first check section. Index: sources/bluetooth/BluetoothInterface.cpp =================================================================== diff -u -re21748fb21b8c964e51bb2f4be7faf699d30a057 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision e21748fb21b8c964e51bb2f4be7faf699d30a057) +++ sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -672,7 +672,7 @@ void BluetoothInterface::onServiceCharacteristicChanged (const QLowEnergyCharacteristic &vCharacteristic, const QByteArray &vValue) { QLowEnergyService *service = reinterpret_cast(sender()); NOTIFY_DETAILS_CHANGE - if (vCharacteristic.uuid() == QBluetoothUuid(QBluetoothUuid::BloodPressureMeasurement)) + if (vCharacteristic.uuid() == QBluetoothUuid(QBluetoothUuid::CharacteristicType::BloodPressureMeasurement)) { interpretBloodPressure(vValue); } @@ -731,7 +731,7 @@ void BluetoothInterface::onServiceDescriptorWritten (const QLowEnergyDescriptor &vDescriptor , const QByteArray &vValue) { QLowEnergyService *service = reinterpret_cast(sender()); NOTIFY_CONFIG_WRITE - if ( vDescriptor.uuid() == QBluetoothUuid(QBluetoothUuid::ClientCharacteristicConfiguration) && vValue == _bloodPressureNotifyValue ) { + if ( vDescriptor.uuid() == QBluetoothUuid(QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration) && vValue == _bloodPressureNotifyValue ) { _reconnectionActive = true; } } @@ -756,20 +756,20 @@ if ( ! sender() ) return; QLowEnergyService *service = reinterpret_cast(sender()); switch (vState) { - case QLowEnergyService::ServiceDiscovered : { + case QLowEnergyService::RemoteServiceDiscovered : { NOTIFY_SERVICE_DETAILS_DONE - switch( service->serviceUuid().toUInt32() ) { - case QBluetoothUuid::BloodPressure: + switch( QBluetoothUuid::ServiceClassUuid(service->serviceUuid().toUInt32()) ) { + case QBluetoothUuid::ServiceClassUuid::BloodPressure: enableNotify(); break; - case QBluetoothUuid::DeviceInformation: + case QBluetoothUuid::ServiceClassUuid::DeviceInformation: interpretInformation(); break; - case QBluetoothUuid::BatteryService : { + case QBluetoothUuid::ServiceClassUuid::BatteryService : { int index = 0; - QByteArray data = service->characteristic(QBluetoothUuid::BatteryLevel).value(); + QByteArray data = service->characteristic(QBluetoothUuid::CharacteristicType::BatteryLevel).value(); Types::U08 batteryLevel; if (GetValue(data, index, batteryLevel)) { _tempBatt = batteryLevel.value; @@ -940,7 +940,7 @@ * \return true if the name provided starts with one of the supported keywords mentioned in the Omron documentation */ bool BluetoothInterface::isDeviceSupported( const QString &vName ) { - for (const QString &name : qAsConst(_supportedDeviceKeywords) ) + for (const QString &name : std::as_const(_supportedDeviceKeywords) ) if ( vName.startsWith(name) ) return true; return false; @@ -1083,22 +1083,22 @@ */ void BluetoothInterface::makeServices(const QBluetoothUuid &vService) { - if (vService == QBluetoothUuid (QBluetoothUuid::DeviceInformation )) { + if (vService == QBluetoothUuid (QBluetoothUuid::ServiceClassUuid::DeviceInformation )) { _serviceDeviceInformation = _device->createServiceObject(vService, this); initConnectionsService (_serviceDeviceInformation ); return; } - if (vService == QBluetoothUuid (QBluetoothUuid::CurrentTimeService )) { + if (vService == QBluetoothUuid (QBluetoothUuid::ServiceClassUuid::CurrentTimeService )) { _serviceCurrentTime = _device->createServiceObject(vService, this); initConnectionsService (_serviceCurrentTime ); return; } - if (vService == QBluetoothUuid (QBluetoothUuid::BloodPressure )) { + if (vService == QBluetoothUuid (QBluetoothUuid::ServiceClassUuid::BloodPressure )) { _serviceBloodPressure = _device->createServiceObject(vService, this); initConnectionsService (_serviceBloodPressure ); return; } - if (vService == QBluetoothUuid (QBluetoothUuid::BatteryService )) { + if (vService == QBluetoothUuid (QBluetoothUuid::ServiceClassUuid::BatteryService )) { _serviceBattery = _device->createServiceObject(vService, this); initConnectionsService (_serviceBattery ); return; @@ -1175,8 +1175,8 @@ } // blood pressure measurements - const QLowEnergyCharacteristic detailBPMeas = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::BloodPressureMeasurement)); - QLowEnergyDescriptor configBPMeas = detailBPMeas.descriptor(QBluetoothUuid::ClientCharacteristicConfiguration); + const QLowEnergyCharacteristic detailBPMeas = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::CharacteristicType::BloodPressureMeasurement)); + const QLowEnergyDescriptor configBPMeas = detailBPMeas.descriptor(QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration); if (configBPMeas.isValid()) _serviceBloodPressure->writeDescriptor(configBPMeas, _bloodPressureNotifyValue); } @@ -1254,7 +1254,7 @@ return; } // blood pressure feature - const QLowEnergyCharacteristic detailBPFeat = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::BloodPressureFeature)); + const QLowEnergyCharacteristic detailBPFeat = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::CharacteristicType::BloodPressureFeature)); if (!detailBPFeat.isValid()) { qDebug() << "Blood pressure feature not found."; return; @@ -1286,7 +1286,7 @@ return; } // battery level percent - const QLowEnergyCharacteristic detail = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::BatteryLevel)); + const QLowEnergyCharacteristic detail = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::CharacteristicType::BatteryLevel)); if (!detail.isValid()) { qDebug() << "Battery level not found."; return; Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r3c07dc803109f716937b692cb4a67a5324bb9ca3 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 3c07dc803109f716937b692cb4a67a5324bb9ca3) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -714,7 +714,7 @@ QString category = Storage::Settings_Category_MessagesUnhandled; QStringList groups = _Settings.groups(category); // DEBUG: qDebug() << groups; - for(const auto &group: qAsConst(groups)) { + for (const auto &group: std::as_const(groups)) { bool ok; quint16 id = QString(group).toUInt(&ok,16); if (!ok) continue; Index: sources/device/DeviceModels.cpp =================================================================== diff -u -ra2a273600d25e863214833ead3324a63fb4759f1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/device/DeviceModels.cpp (.../DeviceModels.cpp) (revision a2a273600d25e863214833ead3324a63fb4759f1) +++ sources/device/DeviceModels.cpp (.../DeviceModels.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -232,7 +232,7 @@ // get the value QString val = vByteArray; - ok = ! val.isNull() && val.isSimpleText(); + ok = ! val.isNull(); // TODO: add regex to check valid string // && val.isSimpleText(); // check if the vExitCode passed and it has a value other than zero if ( ! ok ){ _data.mReason = Device::DeviceError::eDevice_Scripts_Error_Incorrect_Rsp_Type ; goto lError; } // there is not a valid value @@ -277,7 +277,7 @@ // get the value QString val = vByteArray; - ok = ! val.isNull() && val.isSimpleText(); + ok = ! val.isNull(); // TODO: add regex to check valid string // && val.isSimpleText(); // check if the vExitCode passed and it has a value other than zero if ( ! ok ){ _data.mReason = Device::DeviceError::eDevice_Scripts_Error_Incorrect_Rsp_Type ; goto lError; } // there is not a valid value Index: sources/device/DeviceView.cpp =================================================================== diff -u -rdeaef8b5bdfe9be7293e63fb6ac256a9ce3cd3f4 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision deaef8b5bdfe9be7293e63fb6ac256a9ce3cd3f4) +++ sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -15,6 +15,7 @@ #include "DeviceView.h" // Qt +#include // Project #include "ApplicationController.h" @@ -402,7 +403,7 @@ if ( field.isEmpty() ) { ssidInfo.mSupported = false; } else { - ssidInfo.mSupported = field.remove(QRegExp("(WPA[23])")).trimmed().isEmpty(); + ssidInfo.mSupported = field.remove(QRegularExpression("(WPA[23])")).trimmed().isEmpty(); } break; @@ -426,7 +427,7 @@ } _dataList.clear(); - for (const auto &ssid: qAsConst(ssidInfoList)) { + for (const auto &ssid: std::as_const(ssidInfoList)) { DataModel data; data.mWifiMacAddress = ssid.mBSSID; data.mWifiSSID = ssid.mSSID; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -r3c07dc803109f716937b692cb4a67a5324bb9ca3 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 3c07dc803109f716937b692cb4a67a5324bb9ca3) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -175,7 +175,7 @@ { //using namespace View; qmlRegisterType ("Gui.View" , 0, 1, "GuiView"); - qmlRegisterUncreatableType ("Gui.Actions" , 0, 1, "GuiActions" , QStringLiteral("Used only for enumerations no need to have an object")); + qmlRegisterUncreatableType ("Gui.Actions" , 0, 1, "guiActions" , QStringLiteral("Used only for enumerations no need to have an object")); qmlRegisterSingletonType ("Gui.VEventSpy", 0, 1, "GuiEventSpy", [](QQmlEngine *, QJSEngine *) -> QObject * { return &_VEventSpy; }); Index: sources/gui/GuiGlobals.h =================================================================== diff -u -rc819ced24920dacf7410dbd455ae9dabaf5bdf06 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision c819ced24920dacf7410dbd455ae9dabaf5bdf06) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -44,7 +44,6 @@ class GuiActions { Q_GADGET - explicit GuiActions(); public: /*! Index: sources/gui/qml/PowerItem.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/PowerItem.qml (.../PowerItem.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -54,15 +54,15 @@ } onAccepted: { if ( vConfirm.isPowerOff ) { - _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.Accepted) + _GuiView.doActionTransmit(guiActions.ID_PowerOff, guiActions.Accepted) } else { if ( ! vConfirm.isReject ) vConfirm.doConfirm( true ) } } onRejected: { if ( vConfirm.isPowerOff ) { - _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.Rejected) + _GuiView.doActionTransmit(guiActions.ID_PowerOff, guiActions.Rejected) } else { if ( ! vConfirm.isReject ) vConfirm.doConfirm( false ) @@ -100,7 +100,7 @@ Connections { target: _GuiView function onDidActionReceive( vAction, vData ) { switch(vAction) { - case GuiActions.ID_ShuttingDown: + case guiActions.ID_ShuttingDown: _autoHideInfo.showDialog ( qsTr("System is shutting down"), 5000 // if any error happens and shutdown is not successful then after 5 seconds dialog hides. @@ -122,9 +122,9 @@ function onPoweroffTriggered ( vValue ) { switch ( vValue ) { - case GuiActions.Command : open (); break; - case GuiActions.Timeout : close (); break; - case GuiActions.Rejected: reject(); break; + case guiActions.Command : open (); break; + case guiActions.Timeout : close (); break; + case guiActions.Rejected: reject(); break; } } function onAdjustmentTriggered ( vValue ) { Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -rdeaef8b5bdfe9be7293e63fb6ac256a9ce3cd3f4 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision deaef8b5bdfe9be7293e63fb6ac256a9ce3cd3f4) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 // Dialog -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects // Project // Qml imports Index: sources/gui/qml/components/NotificationBarSmall.qml =================================================================== diff -u -r923377d29fe730c0e2209386479a61b1e8ee1097 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision 923377d29fe730c0e2209386479a61b1e8ee1097) +++ sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -84,19 +84,19 @@ onLevelChanged: { switch (level) { - case GuiActions.ALARM_PRIORITY_HIGH: + case guiActions.ALARM_PRIORITY_HIGH: _root.color = Colors.textNotificationHighBg; _text.color = Colors.textNotificationHighFg; break; - case GuiActions.ALARM_PRIORITY_MEDIUM: + case guiActions.ALARM_PRIORITY_MEDIUM: _root.color = Colors.textNotificationMedBg; _text.color = Colors.textNotificationMedFg; break; - case GuiActions.ALARM_PRIORITY_LOW: + case guiActions.ALARM_PRIORITY_LOW: _root.color = Colors.textNotificationLowBg; _text.color = Colors.textNotificationLowFg; break; - default : // GuiActions.ALARM_PRIORITY_NONE + default : // guiActions.ALARM_PRIORITY_NONE _root.color = Colors.textNotificationNoneBg; _text.color = Colors.textNotificationNoneFg; break; Index: sources/gui/qml/components/RangeRect.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/components/RangeRect.qml (.../RangeRect.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/components/RangeRect.qml (.../RangeRect.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -127,17 +127,9 @@ anchors.centerIn: parent anchors.fill: parent - onPositionChanged: { - _root.dragged(mouse) - } - onClicked: { - _root.clicked(mouse) - } - onReleased: { - _root.released(mouse) - } - onPressed: { - _root.pressed(mouse) - } + onPositionChanged : (mouse) => _root.dragged(mouse) + onClicked : (mouse) => _root.clicked(mouse) + onReleased : (mouse) => _root.released(mouse) + onPressed : (mouse) => _root.pressed(mouse) } } Index: sources/gui/qml/components/Slider.qml =================================================================== diff -u -rc65859e54930664100dfdff13afa019e05ae23b6 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision c65859e54930664100dfdff13afa019e05ae23b6) +++ sources/gui/qml/components/Slider.qml (.../Slider.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -273,15 +273,9 @@ border.color: _root.isActive ? Colors.sliderProgressBorderActive : Colors.borderDisableButton // propagation is not working on drag ! - onDragged: { - _root.dragged(vMouseEvent) - } - onPressed: { - _root.pressed(vMouseEvent) - } - onReleased: { - _root.released(vMouseEvent) - } + onDragged : (mouse) => _root.dragged(mouse) + onPressed : (mouse) => _root.pressed(mouse) + onReleased : (mouse) => _root.released(mouse) } function updateHandleValue(vCurrentPositionX) @@ -325,6 +319,7 @@ updateHandleValue(vMouseEvent.x - _progressRect.leftRightTouchMargin) } + onReleased: { // Need to account for the extended touch areas updateHandleValue(vMouseEvent.x - _progressRect.leftRightTouchMargin) @@ -348,7 +343,8 @@ MouseArea { anchors.fill: parent propagateComposedEvents: true - onPressed: { + + onPressed: (mouse) => { mouse.accepted = false // allow propagtion to the lower mouse areas handleSelected() // emit } Index: sources/gui/qml/components/UltrafiltrationButton.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/components/UltrafiltrationButton.qml (.../UltrafiltrationButton.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/components/UltrafiltrationButton.qml (.../UltrafiltrationButton.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -15,7 +15,6 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.0 // Project Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -rf06b3645936db64dff09721cf625a6a8530e3f0a -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision f06b3645936db64dff09721cf625a6a8530e3f0a) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects // Project // Qml imports Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r7b514a9fc7fa77c7e084c6023c49859d95cbcd5a -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 7b514a9fc7fa77c7e084c6023c49859d95cbcd5a) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -457,7 +457,7 @@ Connections { target: _GuiView function onDidActionReceive( vAction, vData ) { // DEBUG: console.debug("onDidActionReceive", vAction, vData) - if (vAction === GuiActions.ID_CANBusFaultCount ) { + if (vAction === guiActions.ID_CANBusFaultCount ) { _canbusFaultCountText.count = vData[0] } } Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml =================================================================== diff -u -r7b514a9fc7fa77c7e084c6023c49859d95cbcd5a -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 7b514a9fc7fa77c7e084c6023c49859d95cbcd5a) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -353,7 +353,7 @@ Connections { target: _GuiView function onDidActionReceive( vAction, vData ) { // DEBUG: console.debug("onDidActionReceive", vAction, vData) - if (vAction === GuiActions.ID_CANBusFaultCount ) { + if (vAction === guiActions.ID_CANBusFaultCount ) { _canbusFaultCountText.count = vData[0] } } Index: sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml =================================================================== diff -u -r164ece178bc4bbe6d31605e6ee711f513bdfc48a -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml (.../HeaderbarInformation.qml) (revision 164ece178bc4bbe6d31605e6ee711f513bdfc48a) +++ sources/gui/qml/dialogs/headerbar/HeaderbarInformation.qml (.../HeaderbarInformation.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -58,7 +58,7 @@ Text { id: _value color : "grey" - text : modelData.value + text : modelData.value ?? "" width : rightColumnWidth font.pixelSize : 20 horizontalAlignment : Text.AlignRight Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -rb04fa0fce565a52305f2153f2cb6c5858453ab15 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision b04fa0fce565a52305f2153f2cb6c5858453ab15) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -151,25 +151,25 @@ let contentBg = "" let contentFg = "" switch (vPriority) { - case GuiActions.ALARM_PRIORITY_HIGH: + case guiActions.ALARM_PRIORITY_HIGH: titleBg = alarmTopBarHighBg titleFg = alarmTopBarHighFg contentBg = white contentFg = textNotificationHighFg break - case GuiActions.ALARM_PRIORITY_MEDIUM: + case guiActions.ALARM_PRIORITY_MEDIUM: titleBg = alarmTopBarMedBg titleFg = alarmTopBarMedFg contentBg = white contentFg = textNotificationMedFg break - case GuiActions.ALARM_PRIORITY_LOW: + case guiActions.ALARM_PRIORITY_LOW: titleBg = alarmTopBarLowBg titleFg = alarmTopBarLowFg contentBg = white contentFg = textNotificationLowFg break - default : // GuiActions.ALARM_PRIORITY_NONE + default : // guiActions.ALARM_PRIORITY_NONE titleBg = backgroundButtonSelect titleFg = textMain contentBg = white Index: sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -55,7 +55,7 @@ Connections { target: vPreTreatmentStates function onSelfTestConsumables_installChanged ( vValue ) { page( _preTreatmentConsumablesInstall , vValue )} - function onselfTestConsumables_primeEntered ( vValue ) {/* _preTreatmentConsumablesSelfTest.checkList.setItemExt( 0, vValue )*/ } + function onSelfTestConsumables_primeEntered ( vValue ) {/* _preTreatmentConsumablesSelfTest.checkList.setItemExt( 0, vValue )*/ } function onSelfTestConsumables_biCarbPumpEntered ( vValue ) { _preTreatmentConsumablesSelfTest.checkList.setItemExt( 0, vValue )} function onSelfTestConsumables_acidPumpEntered ( vValue ) { _preTreatmentConsumablesSelfTest.checkList.setItemExt( 1, vValue )} } Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -14,7 +14,7 @@ */ // Qt -import QtQuick 2.12 +import QtQuick // Project // Qml imports @@ -85,8 +85,8 @@ } textInput.inputMethodHints : Qt.ImhPreferLowercase textInput.echoMode : TextInput.Normal - textInput.validator : RegExpValidator { - regExp: Variables.regExp_PatientID + textInput.validator : RegularExpressionValidator { + regularExpression: Variables.regExp_PatientID } } } Index: sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -14,7 +14,7 @@ */ // Qt -import QtQuick 2.12 +import QtQuick // Project import Gui.Actions 0.1 @@ -44,8 +44,8 @@ readonly property string separatorText : ":" property alias isRegistered : _checkListView.completeVisible - property var ipValidator : RegExpValidator { - regExp:/^(([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))\.){3}([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))$/ + property var ipValidator : RegularExpressionValidator { + regularExpression:/^(([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))\.){3}([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))$/ } onVisibleChanged: { @@ -152,9 +152,9 @@ } Connections { target: vCloudSync - function onisRunningEntered ( vValue ) { _checkListView.checkList.setItemExt( 0, true )} - function onisRegisterStartEntered ( vValue ) { _checkListView.checkList.setItemExt( 1, true )} - function onisRegisterDoneEntered ( vValue ) { _checkListView.checkList.setItemExt( 1, vValue )} + function onIsRunningEntered ( vValue ) { _checkListView.checkList.setItemExt( 0, true )} + function onIsRegisterStartEntered ( vValue ) { _checkListView.checkList.setItemExt( 1, true )} + function onIsRegisterDoneEntered ( vValue ) { _checkListView.checkList.setItemExt( 1, vValue )} } notificationText: "" Index: sources/gui/qml/pages/settings/SettingsStack.qml =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/gui/qml/pages/settings/SettingsStack.qml (.../SettingsStack.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -171,7 +171,7 @@ _GuiView.doQuitApplication() } else { - _GuiView.doActionTransmit(GuiActions.ID_PowerOff, GuiActions.NoData) + _GuiView.doActionTransmit(guiActions.ID_PowerOff, guiActions.NoData) } } itemsText : _root.itemsText Index: sources/gui/qml/pages/settings/SettingsWiFi.qml =================================================================== diff -u -r4d5e0940480dc376ea5631ad0514c733fae92668 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision 4d5e0940480dc376ea5631ad0514c733fae92668) +++ sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -14,7 +14,7 @@ */ // Qt -import QtQuick 2.12 +import QtQuick // Project import Gui.Actions 0.1 @@ -31,8 +31,8 @@ SettingsBase { id: _root itemIndex : SettingsStack.WiFi - property var ipValidator: RegExpValidator { - regExp:/^(([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))\.){3}([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))$/ + property var ipValidator: RegularExpressionValidator { + regularExpression:/^(([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))\.){3}([01]?[0-9]?[0-9]|2([0-4][0-9]|5[0-5]))$/ } labelWidth : 200 Index: sources/gui/qml/pages/treatment/TreatmentSection.qml =================================================================== diff -u -r21bcf654a57e2b3a6d1a2fee1173c3dff81f8f99 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision 21bcf654a57e2b3a6d1a2fee1173c3dff81f8f99) +++ sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import "qrc:/globals" import "qrc:/components" import "qrc:/pages/treatment" Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rea51c0546c7061d225e7b9d8b754554c65f0d1b1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision ea51c0546c7061d225e7b9d8b754554c65f0d1b1) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -148,7 +148,7 @@ onOpened : vTreatmentVitals.doTimerStop() // Can't be moved to C++, and has to be handled here because it can manually being opened by the user - onClosed : { + onClosed : (vQuit) => { if ( ! vQuit ) vTreatmentVitals.doTimerStart() } Index: sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml =================================================================== diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41) +++ sources/gui/qml/pages/treatment/TreatmentUltrafiltrationItem.qml (.../TreatmentUltrafiltrationItem.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -61,7 +61,7 @@ onCloseClicked : close() onEditClicked : { close() - _treatmentAdjustmentUltrafiltrationEdit.reset() // reset the slider to minimum value position + _treatmentAdjustmentUltrafiltrationEdit.revert() // reset the slider to minimum value position _treatmentAdjustmentUltrafiltrationEdit.open() } onResumeClicked : { @@ -128,9 +128,9 @@ _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateDiff = vTreatmentAdjustmentUltrafiltrationEdit.rateDiff _treatmentAdjustmentUltrafiltrationConfirm.ultrafiltrationRateOld = vTreatmentAdjustmentUltrafiltrationEdit.rateOld - _treatmentAdjustmentUltrafiltrationEdit .close() - _treatmentAdjustmentUltrafiltrationConfirm.reset() - _treatmentAdjustmentUltrafiltrationConfirm.open () + _treatmentAdjustmentUltrafiltrationEdit .close () + _treatmentAdjustmentUltrafiltrationConfirm.revert() + _treatmentAdjustmentUltrafiltrationConfirm.open () } else { _treatmentAdjustmentUltrafiltrationEdit.notification.text = vTreatmentAdjustmentUltrafiltrationEdit.text() } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -15,7 +15,6 @@ // Qt import QtQuick 2.12 -//import QtGraphicalEffects 1.0 // Project @@ -56,7 +55,7 @@ titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + Variables.unitTextUltrafiltrationVolume - function reset() { + function revert() { _rateAdjustmentButton.selected = false _durationAdjustmentButton.selected = false } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r86274f18e9356126c41d848bc78bfba318638aee -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 86274f18e9356126c41d848bc78bfba318638aee) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -41,7 +41,7 @@ signal nextClicked(real vVolume) - function reset() { + function revert() { _volumeSlider.value = _private.max } Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml =================================================================== diff -u -re36852d9548379bd861d4b0838761d2aa5243dad -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision e36852d9548379bd861d4b0838761d2aa5243dad) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -1,7 +1,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects // Project @@ -13,10 +13,9 @@ Rectangle { id: _root property string title : "" - property string value : "" property string unitText : "" property string extraText : "" - property alias value : _value.topText + property alias value : _value.topText property bool showButtons : true property bool buttonsEnabled : true @@ -67,7 +66,6 @@ } height : Variables.contentHeight width : Variables.treatmentFlowsComponentWidth - topText : value topTextFont.pixelSize : 60 topTextFont.weight : Font.Medium bottomText : _root.unitText Index: sources/model/MAbstract.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/model/MAbstract.cpp (.../MAbstract.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/MAbstract.cpp (.../MAbstract.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -43,7 +43,7 @@ QVariantList mParameters = parameters(); QString mString = description(); for( const auto ¶meter : mParameters ) { - if (static_cast(parameter.type()) == QMetaType::Float) // Qt has a mixed definition of QVariant::Type and QMetaType seems like a not fixed issue. + if (parameter.typeId() == QMetaType::Float) // Qt has a mixed definition of QVariant::Type and QMetaType seems like a not fixed issue. #ifdef ROUND_FLOATS mString += _delimiter + QString("%1").arg(parameter.toFloat(),0,'f',_precision); #else Index: sources/model/hd/adjustment/MAdjustRequestsBase.h =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/model/hd/adjustment/MAdjustRequestsBase.h (.../MAdjustRequestsBase.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/adjustment/MAdjustRequestsBase.h (.../MAdjustRequestsBase.h) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -51,7 +51,7 @@ QString senderID = "UI,"; QString mString = senderID + vStringPrefix; for( const auto ¶meter : vParameters ) { - if (static_cast(parameter.type()) == QMetaType::Float) // Qt has a mixed definition of QVariant::Type and QMetaType seems like a not fixed issue. + if (parameter.typeId() == QMetaType::Float) // Qt has a mixed definition of QVariant::Type and QMetaType seems like a not fixed issue. #ifdef ROUND_FLOATS mString += delimiter + QString("%1").arg(parameter.toFloat(),0,'f',precision); #else Index: sources/model/settings/MBluetooth.h =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/model/settings/MBluetooth.h (.../MBluetooth.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/settings/MBluetooth.h (.../MBluetooth.h) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -86,7 +86,7 @@ vDevice.name == name ; } QString toString() const { - return addr + "," + pair + "," + name; + return addr + "," + (pair ? "true" : "false") + "," + name; } }; Index: sources/storage/Logger.cpp =================================================================== diff -u -rd862dfcd402206e33b314c458e41c13b684a4565 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision d862dfcd402206e33b314c458e41c13b684a4565) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include @@ -467,7 +467,7 @@ _exportLogsType = eLogAppED; LOG_DEBUG(QString("Export %1 start").arg(_logNames[_exportLogsType])); - QFuture future = QtConcurrent::run(this, &Logger::exportLogs, vExportList); + QFuture future = QtConcurrent::run(&Logger::exportLogs, this, vExportList); _exportLogsWatcher.setFuture(future); return true; } @@ -484,7 +484,7 @@ _exportLogsType = eLogDebug; LOG_DEBUG(QString("Export %1 start").arg(_logNames[_exportLogsType])); - QFuture future = QtConcurrent::run(this, &Logger::exportErrs, vExportList); + QFuture future = QtConcurrent::run(&Logger::exportErrs, this, vExportList); _exportLogsWatcher.setFuture(future); return true; } @@ -501,7 +501,7 @@ _exportLogsType = eLogTrtmt; LOG_DEBUG(QString("Export %1 start").arg(_logNames[_exportLogsType])); - QFuture future = QtConcurrent::run(this, &Logger::exportTrts, vExportList); + QFuture future = QtConcurrent::run(&Logger::exportTrts, this, vExportList); _exportLogsWatcher.setFuture(future); return true; } @@ -658,7 +658,7 @@ { LOG_DEBUG("Remove Logs Starting"); emit didRemoveLogs(true); - QFuture mFuture = QtConcurrent::run(this, &Logger::removeLogs, vLogType); + QFuture mFuture = QtConcurrent::run(&Logger::removeLogs, this, vLogType); _removeLogsWatcher.setFuture(mFuture); return true; } Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -raf9b5ee3e759ca45c4e55488f46601f30143edae -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -311,7 +311,7 @@ void TreatmentLog::saveLogConcurrent() { LOG_DEBUG("Save Treatment Log Started"); - QFuture mFuture = QtConcurrent::run(this, &TreatmentLog::saveLog); + QFuture mFuture = QtConcurrent::run(&TreatmentLog::saveLog, this); _saveWatcher.setFuture(mFuture); } @@ -469,7 +469,7 @@ void TreatmentLog::exportLogConcurrent() { LOG_DEBUG("Export Treatment Log Started"); - QFuture mFuture = QtConcurrent::run(this, &TreatmentLog::exportLog); + QFuture mFuture = QtConcurrent::run(&TreatmentLog::exportLog, this); _exportWatcher.setFuture(mFuture); } Index: sources/utility/format.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/utility/format.cpp (.../format.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/utility/format.cpp (.../format.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -78,7 +78,7 @@ { QByteArray mData; - switch (static_cast(vData.type())) { + switch (static_cast(vData.typeId())) { case QMetaType::QString: // string { mData += vData.toByteArray(); @@ -94,7 +94,7 @@ case QMetaType::QVariantList: // list { QVariantList list = vData.toList(); - for(const auto &item: qAsConst(list)) { + for(const auto &item: std::as_const(list)) { mData += fromVariant(item); } return mData; Index: sources/view/VEventSpy.cpp =================================================================== diff -u -ra58f91b077c8131bea3dbde0fc338adb113fc9f3 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -150,7 +150,7 @@ void VEventSpy::touchEventSpy(QEvent *vEvent, const QString &vTypeName) { QTouchEvent *touchEvent = static_cast(vEvent); - const QList &points = touchEvent->touchPoints(); + const QList &points = touchEvent->points(); QString logString; int c = points.count(); touchCount ( _touchCount + 1 ); @@ -160,14 +160,14 @@ for (auto point : points) { QString state; switch (point.state()) { - case Qt::TouchPointPressed : state = "P"; break; // The touch point is now pressed. - case Qt::TouchPointMoved : state = "M"; break; // The touch point moved. - case Qt::TouchPointStationary : state = "S"; break; // The touch point did not move. - case Qt::TouchPointReleased : state = "R"; break; // The touch point was released. + case QEventPoint::State::Pressed : state = "P"; break; // The touch point is now pressed. + case QEventPoint::State::Updated : state = "M"; break; // The touch point moved. + case QEventPoint::State::Stationary : state = "S"; break; // The touch point did not move. + case QEventPoint::State::Released : state = "R"; break; // The touch point was released. default : break; } - QPointF pos = point.screenPos(); + QPointF pos = point.globalPosition(); logString += QString(",%1,%2,%3").arg(state).arg(pos.x()).arg(pos.y()); } LOG_DEBUG( vTypeName + logString ); Index: sources/view/settings/VSettings.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r57ea732311e6f4c746974f5a52316f63dec23ca8 --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision 57ea732311e6f4c746974f5a52316f63dec23ca8) @@ -81,7 +81,7 @@ updateInstructions(group ); } else { //TODO: Since it is global system settings, move this to the settings controller so the C++ backend can also use it. like Date/Time formats. - for (const auto &key : qAsConst(keys)) { + for (const auto &key : std::as_const(keys)) { // DEBUG: qDebug() << " ~~~~~~~~~~ " << category << group << key << _Settings.value(category, group, key).toString (); QVariantMap keyValue; if ( isservicePass (category, group, key) ) { @@ -129,17 +129,18 @@ { TKeysList keysList; for ( quint16 keyIndex = 0; keyIndex < vKeys.count(); keyIndex++ ) { - QRegExp regx("\\{\\s*\\d+\\s*:\\s*\\d+\\s*:\\s*\\w*\\s*:\\s*\\d*\\s*\\}"); + QRegularExpression regx("\\{\\s*\\d+\\s*:\\s*\\d+\\s*:\\s*\\w*\\s*:\\s*\\d*\\s*\\}"); QString key = vKeys[keyIndex]; + QRegularExpressionMatch regxMatch = regx.match(key); int replacementCount = key.count(regx); QStringList keyList; for ( int j = 0; j < replacementCount; j++ ) { int pos = key.indexOf(regx); - int len = regx.matchedLength(); + int len = regxMatch.captured(j).length(); QString blk = key.mid(pos+1, len-2); keyList += key.mid(0, pos); keyList += ""; // value placeholder - key.remove(0, pos + regx.matchedLength()); + key.remove(0, pos + len); QStringList lst = blk.split(":"); quint16 id = lst[0].toUInt(); quint16 ix = lst[1].toUInt();