Index: leahi.pro =================================================================== diff -u -re07cde120d7476c4add90c4f86cf55af9ea830de -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- leahi.pro (.../leahi.pro) (revision e07cde120d7476c4add90c4f86cf55af9ea830de) +++ leahi.pro (.../leahi.pro) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -1,4 +1,4 @@ -QT += qml quick serialbus concurrent charts bluetooth +QT += qml quick serialbus concurrent bluetooth widgets CONFIG += c++17 warn_on # CONFIG += disable-desktop # QMAKE_CXX = clazy Index: sources/ApplicationPost.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/ApplicationPost.cpp (.../ApplicationPost.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -17,6 +17,8 @@ #include #include #include +#include +#include // Project #include "Logger.h" @@ -89,37 +91,34 @@ */ bool ApplicationPost::checkOSVersion() { - QString exrVer("%1\\s*\"\\d+\\.\\d+\\.\\d+\""); - QString exrBld("%1\\s*\"\\d+\""); + // TODO: Qt6 Port - verify function has been correctly ported + 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; quint16 major; quint16 minor; quint16 micro; - // check the statement exists in the long - int rowVer = _content.indexOf (regVer); - int rowBld = _content.indexOf (regBld); Q_UNUSED(rowBld); - bool ok = rowVer >= 0; // found + QRegularExpressionMatch matchVer = regVer.match(_content); + QRegularExpressionMatch matchBld = regBld.match(_content); + + bool ok = matchVer.hasMatch() && matchBld.hasMatch(); 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. - 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. - micro = versions[2].toUInt(); // type, existance, count has been already tested by regex, and was rejected in first check section. + major = matchVer.captured(1).toUInt(); + minor = matchVer.captured(2).toUInt(); + micro = matchVer.captured(3).toUInt(); + ok = major >= Storage::OS_VERSION_MAJOR && minor >= Storage::OS_VERSION_MINOR && micro >= Storage::OS_VERSION_MICRO ; if ( ! ok ) goto lOut; - _osVersion = version + "." + build; + _osVersion = QString("%1.%2.%3.%4").arg(major).arg(minor).arg(micro).arg(matchBld.captured(1)); lOut: if ( ! ok ) emit didFail(Gui::GuiAlarmID::ALARM_ID_UI_POST_FAILURE_OS_VERSION); Index: sources/bluetooth/BluetoothInterface.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -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::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; @@ -1082,22 +1082,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; @@ -1174,8 +1174,8 @@ } // blood pressure measurements - const QLowEnergyCharacteristic detailBPMeas = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::BloodPressureMeasurement)); - QLowEnergyDescriptor configBPMeas = detailBPMeas.descriptor(QBluetoothUuid::ClientCharacteristicConfiguration); + const QLowEnergyCharacteristic detailBPMeas = _serviceBloodPressure->characteristic(QBluetoothUuid::CharacteristicType::BloodPressureMeasurement); + QLowEnergyDescriptor configBPMeas = detailBPMeas.descriptor(QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration); if (configBPMeas.isValid()) _serviceBloodPressure->writeDescriptor(configBPMeas, _bloodPressureNotifyValue); } @@ -1253,7 +1253,7 @@ return; } // blood pressure feature - const QLowEnergyCharacteristic detailBPFeat = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::BloodPressureFeature)); + const QLowEnergyCharacteristic detailBPFeat = _serviceBloodPressure->characteristic(QBluetoothUuid::CharacteristicType::BloodPressureFeature); if (!detailBPFeat.isValid()) { qDebug() << "Blood pressure feature not found."; return; @@ -1285,7 +1285,7 @@ return; } // battery level percent - const QLowEnergyCharacteristic detail = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::BatteryLevel)); + const QLowEnergyCharacteristic detail = _serviceBloodPressure->characteristic(QBluetoothUuid::CharacteristicType::BatteryLevel); if (!detail.isValid()) { qDebug() << "Battery level not found."; return; Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -726,7 +726,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 -rdb13a6a2cb1e27bacf245ac251997b3f9c54c01b -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/device/DeviceModels.cpp (.../DeviceModels.cpp) (revision db13a6a2cb1e27bacf245ac251997b3f9c54c01b) +++ sources/device/DeviceModels.cpp (.../DeviceModels.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -277,7 +277,8 @@ // get the value QString val = vByteArray; - ok = ! val.isNull() && val.isSimpleText(); + // TODO: Qt6 Port: ok = ! val.isNull() && val.isSimpleText(); + ok = ! val.isNull(); // TODO: Qt6 Port // 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 @@ -322,7 +323,8 @@ // get the value QString val = vByteArray; - ok = ! val.isNull() && val.isSimpleText(); + // TODO: Qt6 Port: ok = ! val.isNull() && val.isSimpleText(); + ok = ! val.isNull(); // TODO: Qt6 Port // 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 -rdb13a6a2cb1e27bacf245ac251997b3f9c54c01b -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision db13a6a2cb1e27bacf245ac251997b3f9c54c01b) +++ sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -16,6 +16,7 @@ // Qt #include +#include // Project #include "ApplicationController.h" @@ -404,7 +405,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; Index: sources/gui/qml/components/BaseChart.qml =================================================================== diff -u -rba86bcba8047d424b5b0f617d7297f2349b0d975 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/gui/qml/components/BaseChart.qml (.../BaseChart.qml) (revision ba86bcba8047d424b5b0f617d7297f2349b0d975) +++ sources/gui/qml/components/BaseChart.qml (.../BaseChart.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -14,7 +14,6 @@ */ import QtQuick 2.15 -import QtCharts 2.15 import QtQuick.Shapes 1.15 // Import the Shapes module import "qrc:/globals" @@ -30,9 +29,11 @@ property int lineSeries1Value : 0 property int lineSeries2Value : 0 property int lineSeries3Value : 0 +/* TODO: Qt6 Port property alias lineSeries1Color : _line1.color property alias lineSeries2Color : _line2.color property alias lineSeries3Color : _line3.color +*/ readonly property int minY : -700 readonly property int maxY : 600 @@ -114,6 +115,7 @@ onTriggered : plotGraph() } +/* TODO: Qt6 Port DateTimeAxis { id: _xAxis format : "H:mm" tickCount : 13 @@ -286,4 +288,5 @@ } } } +*/ } Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -r7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 // Dialog -import QtGraphicalEffects 1.12 +import QtQuick.Effects // Project // Qml imports @@ -67,14 +67,10 @@ radius : Variables.dialogRadius layer.enabled : showDropShadow - layer.effect: DropShadow { + layer.effect: RectangularShadow { id: _dropShadow - horizontalOffset: 4 - verticalOffset : 4 radius : 12 - samples : 32 color : Colors.dropShadowDialogColor - source : _backgroundRect anchors.fill : _backgroundRect } Index: sources/gui/qml/compounds/NumPad.qml =================================================================== diff -u -rfd09b0ee6e41d75755e0572008d4f932b0bddf2b -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision fd09b0ee6e41d75755e0572008d4f932b0bddf2b) +++ sources/gui/qml/compounds/NumPad.qml (.../NumPad.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -15,7 +15,6 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 import "qrc:/components" import "qrc:/globals" Index: sources/gui/qml/dialogs/AlarmDialog.qml =================================================================== diff -u -r8f6ecb60abf6d47d4554cfd3019ca496d79b6f69 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 8f6ecb60abf6d47d4554cfd3019ca496d79b6f69) +++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -1,6 +1,6 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import QtQuick.Effects // Project // Qml imports @@ -155,13 +155,9 @@ } layer.enabled : true - layer.effect : DropShadow { id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 + layer.effect : RectangularShadow { id: _dropShadow radius : 3.0 - samples : 7 color : "#50000000" - source : _stepRect anchors.fill : _stepRect } } Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 7fb13d9e1a453a37ab4dea5536e0f19ed6e272d2) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -15,7 +15,6 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 // Project // Qml imports Index: sources/gui/qml/dialogs/PatientIdEntry.qml =================================================================== diff -u -r1eedad37ea1cad5c9aa41ac082614d082f525a7f -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/gui/qml/dialogs/PatientIdEntry.qml (.../PatientIdEntry.qml) (revision 1eedad37ea1cad5c9aa41ac082614d082f525a7f) +++ sources/gui/qml/dialogs/PatientIdEntry.qml (.../PatientIdEntry.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -51,7 +51,7 @@ textInput.leftPadding : Variables.defaultMargin * 14 textInput.inputMethodHints : Qt.ImhPreferLowercase textInput.echoMode : TextInput.Normal - textInput.validator : RegExpValidator { regExp: Variables.regExp_PatientID } + textInput.validator : RegularExpressionValidator { regularExpression: Variables.regExp_PatientID } line.visible : false enabled : _root.editingEnabled @@ -82,7 +82,7 @@ textInput.leftPadding : Variables.defaultMargin * 14 textInput.inputMethodHints : Qt.ImhPreferLowercase textInput.echoMode : TextInput.Normal - textInput.validator : RegExpValidator { regExp: Variables.regExp_PatientID } + textInput.validator : RegularExpressionValidator { regularExpression: Variables.regExp_PatientID } line.visible : false enabled : _root.editingEnabled Index: sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml =================================================================== diff -u -r7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision 7c12b8ce1964a37e856ebcae205f8b4ed19f3c6a) +++ sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +import QtQuick.Effects // Qml imports import "qrc:/globals" @@ -184,14 +184,10 @@ } layer.enabled : true - layer.effect: DropShadow { + layer.effect: RectangularShadow { id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 radius : 3.0 - samples : 7 color : "#50000000" - source : _header anchors.fill : _header } } Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml =================================================================== diff -u -r81ce00a3b6eb8014fda6c811e1c80bd8bc8469b6 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 81ce00a3b6eb8014fda6c811e1c80bd8bc8469b6) +++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -16,7 +16,7 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 -import QtGraphicalEffects 1.12 +import QtQuick.Effects // Qml imports import "qrc:/globals" @@ -191,14 +191,10 @@ } layer.enabled : true - layer.effect: DropShadow { + layer.effect: RectangularShadow { id: _dropShadow - horizontalOffset: 0 - verticalOffset : 3 radius : 3.0 - samples : 7 color : "#50000000" - source : _header anchors.fill : _header } } Index: sources/gui/qml/pages/treatment/TreatmentHDF.qml =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -75,13 +75,13 @@ width : _column.cellWidth height : _column.cellHeight lineSeries1Value : vTreatmentPressureOcclusion.arterialPressure - lineSeries1Color : Colors.pressuresArterialBar + // TODO: Qt6 Port: lineSeries1Color : Colors.pressuresArterialBar lineSeries2Value : vTreatmentPressureOcclusion.venousPressure - lineSeries2Color : Colors.pressuresVenousBar + // TODO: Qt6 Port: lineSeries2Color : Colors.pressuresVenousBar lineSeries3Value : vTreatmentPressureOcclusion.tmpPressure - lineSeries3Color : Colors.pressuresTmpBar + // TODO: Qt6 Port: lineSeries3Color : Colors.pressuresTmpBar } } Index: sources/gui/qml/pages/treatment/TreatmentSection.qml =================================================================== diff -u -r19acf57838bc97979052d626f3e05d46310b6335 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision 19acf57838bc97979052d626f3e05d46310b6335) +++ sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -15,7 +15,8 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import QtQuick.Effects + import "qrc:/globals" import "qrc:/components" import "qrc:/pages/treatment" @@ -58,14 +59,10 @@ } layer.enabled: _root.enableDropShadow - layer.effect: DropShadow { + layer.effect: RectangularShadow { id: _dropShadow - horizontalOffset: 3 - verticalOffset: 5 radius: 3.0 - samples: 7 color: "#50000000" - source: _root anchors.fill: _root } } Index: sources/gui/qml/pages/treatment/TreatmentTrends.qml =================================================================== diff -u -rc70815ad2b3beadf61832f2e4d12eb90d476e020 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision c70815ad2b3beadf61832f2e4d12eb90d476e020) +++ sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import QtQuick.Effects // Project // Qml imports @@ -57,14 +57,10 @@ color : Colors.treatmentSectionHeader layer { enabled: true - effect: DropShadow { id: _topHeaderShadow + effect: RectangularShadow { id: _topHeaderShadow objectName : "_topHeaderShadow" - horizontalOffset: 2 - verticalOffset : 2 radius : 12 - samples : 32 color : "#50000000" - source : _header } } Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml =================================================================== diff -u -r200b0481616ac03872ad09baa168e0ae1ce6a2ee -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 200b0481616ac03872ad09baa168e0ae1ce6a2ee) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -1,7 +1,7 @@ // Qt import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import QtQuick.Effects // Project @@ -146,13 +146,9 @@ } layer.enabled : _root.dropShadowEnabled && _root.showButtons - layer.effect : DropShadow { id: _dropShadow - horizontalOffset: 3 - verticalOffset : 3 + layer.effect : RectangularShadow { id: _dropShadow radius : 3.0 - samples : 7 color : "#50000000" - source : _root anchors.fill : _root } } Index: sources/model/MAbstract.cpp =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/model/MAbstract.cpp (.../MAbstract.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/MAbstract.cpp (.../MAbstract.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -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 (static_cast(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 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/model/hd/adjustment/MAdjustRequestsBase.h (.../MAdjustRequestsBase.h) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/model/hd/adjustment/MAdjustRequestsBase.h (.../MAdjustRequestsBase.h) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -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 (static_cast(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 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/model/settings/MBluetooth.h (.../MBluetooth.h) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/model/settings/MBluetooth.h (.../MBluetooth.h) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -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 -r09fc72d1410ab86f8de7b00dd7de4ea5612cf470 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 09fc72d1410ab86f8de7b00dd7de4ea5612cf470) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -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; } @@ -657,7 +657,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 -r277c22276bf6f02a2fe28107b48ffe4b6995e734 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 277c22276bf6f02a2fe28107b48ffe4b6995e734) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -341,7 +341,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); } @@ -497,7 +497,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 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/utility/format.cpp (.../format.cpp) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/utility/format.cpp (.../format.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -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 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e --- sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision a58f91b077c8131bea3dbde0fc338adb113fc9f3) +++ sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) @@ -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 ); @@ -167,7 +167,7 @@ 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 );