Index: leahi.pro =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- leahi.pro (.../leahi.pro) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ leahi.pro (.../leahi.pro) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -1,4 +1,6 @@ -QT += qml quick serialbus concurrent bluetooth widgets +QT += qml quick serialbus concurrent charts bluetooth +# Qt6 Port: replace the above line with the following one: +# QT += qml quick serialbus concurrent bluetooth widgets CONFIG += c++17 warn_on # CONFIG += disable-desktop # QMAKE_CXX = clazy Index: main.cpp =================================================================== diff -u -r6eaef41ddd9dcb8717b1fbb7925b52279b0553cd -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- main.cpp (.../main.cpp) (revision 6eaef41ddd9dcb8717b1fbb7925b52279b0553cd) +++ main.cpp (.../main.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -512,8 +512,12 @@ #ifdef BUILD_FOR_TARGET Storage::FileHandler::write("/home/root/lockdown.log" , errorText, false); #else +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) Storage::FileHandler::write("/home/leahi/lockdown.log" , errorText, false); +#else + Storage::FileHandler::write("/home/denali/lockdown.log" , errorText, false); #endif +#endif if ( ! errorCode ) { QProcess::startDetached( scriptName, { qApp->applicationName() + ":" + QString::number(qApp->applicationPid()) }); } Index: sources/bluetooth/BluetoothInterface.cpp =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -672,7 +672,11 @@ void BluetoothInterface::onServiceCharacteristicChanged (const QLowEnergyCharacteristic &vCharacteristic, const QByteArray &vValue) { QLowEnergyService *service = reinterpret_cast(sender()); NOTIFY_DETAILS_CHANGE +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (vCharacteristic.uuid() == QBluetoothUuid(QBluetoothUuid::CharacteristicType::BloodPressureMeasurement)) +#else + if (vCharacteristic.uuid() == QBluetoothUuid(QBluetoothUuid::BloodPressureMeasurement)) +#endif { interpretBloodPressure(vValue); } @@ -731,7 +735,11 @@ void BluetoothInterface::onServiceDescriptorWritten (const QLowEnergyDescriptor &vDescriptor , const QByteArray &vValue) { QLowEnergyService *service = reinterpret_cast(sender()); NOTIFY_CONFIG_WRITE +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if ( vDescriptor.uuid() == QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration && vValue == _bloodPressureNotifyValue ) { +#else + if ( vDescriptor.uuid() == QBluetoothUuid(QBluetoothUuid::ClientCharacteristicConfiguration) && vValue == _bloodPressureNotifyValue ) { +#endif _reconnectionActive = true; } } @@ -756,20 +764,44 @@ if ( ! sender() ) return; QLowEnergyService *service = reinterpret_cast(sender()); switch (vState) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) case QLowEnergyService::RemoteServiceDiscovered : { +#else + case QLowEnergyService::ServiceDiscovered : { +#endif NOTIFY_SERVICE_DETAILS_DONE +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) switch(QBluetoothUuid::ServiceClassUuid(service->serviceUuid().toUInt32())) { +#else + switch( service->serviceUuid().toUInt32() ) { +#endif +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) case QBluetoothUuid::ServiceClassUuid::BloodPressure: +#else + case QBluetoothUuid::BloodPressure: +#endif enableNotify(); break; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) case QBluetoothUuid::ServiceClassUuid::DeviceInformation: +#else + case QBluetoothUuid::DeviceInformation: +#endif interpretInformation(); break; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) case QBluetoothUuid::ServiceClassUuid::BatteryService : { +#else + case QBluetoothUuid::BatteryService : { +#endif int index = 0; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QByteArray data = service->characteristic(QBluetoothUuid::CharacteristicType::BatteryLevel).value(); +#else + QByteArray data = service->characteristic(QBluetoothUuid::BatteryLevel).value(); +#endif Types::U08 batteryLevel; if (GetValue(data, index, batteryLevel)) { _tempBatt = batteryLevel.value; @@ -1082,22 +1114,38 @@ */ void BluetoothInterface::makeServices(const QBluetoothUuid &vService) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (vService == QBluetoothUuid (QBluetoothUuid::ServiceClassUuid::DeviceInformation )) { +#else + if (vService == QBluetoothUuid (QBluetoothUuid::DeviceInformation )) { +#endif _serviceDeviceInformation = _device->createServiceObject(vService, this); initConnectionsService (_serviceDeviceInformation ); return; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (vService == QBluetoothUuid (QBluetoothUuid::ServiceClassUuid::CurrentTimeService )) { +#else + if (vService == QBluetoothUuid (QBluetoothUuid::CurrentTimeService )) { +#endif _serviceCurrentTime = _device->createServiceObject(vService, this); initConnectionsService (_serviceCurrentTime ); return; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (vService == QBluetoothUuid (QBluetoothUuid::ServiceClassUuid::BloodPressure )) { +#else + if (vService == QBluetoothUuid (QBluetoothUuid::BloodPressure )) { +#endif _serviceBloodPressure = _device->createServiceObject(vService, this); initConnectionsService (_serviceBloodPressure ); return; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (vService == QBluetoothUuid (QBluetoothUuid::ServiceClassUuid::BatteryService )) { +#else + if (vService == QBluetoothUuid (QBluetoothUuid::BatteryService )) { +#endif _serviceBattery = _device->createServiceObject(vService, this); initConnectionsService (_serviceBattery ); return; @@ -1174,8 +1222,13 @@ } // blood pressure measurements +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const QLowEnergyCharacteristic detailBPMeas = _serviceBloodPressure->characteristic(QBluetoothUuid::CharacteristicType::BloodPressureMeasurement); QLowEnergyDescriptor configBPMeas = detailBPMeas.descriptor(QBluetoothUuid::DescriptorType::ClientCharacteristicConfiguration); +#else + const QLowEnergyCharacteristic detailBPMeas = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::BloodPressureMeasurement)); + QLowEnergyDescriptor configBPMeas = detailBPMeas.descriptor(QBluetoothUuid::ClientCharacteristicConfiguration); +#endif if (configBPMeas.isValid()) _serviceBloodPressure->writeDescriptor(configBPMeas, _bloodPressureNotifyValue); } @@ -1253,7 +1306,11 @@ return; } // blood pressure feature +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const QLowEnergyCharacteristic detailBPFeat = _serviceBloodPressure->characteristic(QBluetoothUuid::CharacteristicType::BloodPressureFeature); +#else + const QLowEnergyCharacteristic detailBPFeat = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::BloodPressureFeature)); +#endif if (!detailBPFeat.isValid()) { qDebug() << "Blood pressure feature not found."; return; @@ -1285,7 +1342,11 @@ return; } // battery level percent +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const QLowEnergyCharacteristic detail = _serviceBloodPressure->characteristic(QBluetoothUuid::CharacteristicType::BatteryLevel); +#else + const QLowEnergyCharacteristic detail = _serviceBloodPressure->characteristic(QBluetoothUuid(QBluetoothUuid::BatteryLevel)); +#endif if (!detail.isValid()) { qDebug() << "Battery level not found."; return; Index: sources/device/DeviceModels.cpp =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/device/DeviceModels.cpp (.../DeviceModels.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/device/DeviceModels.cpp (.../DeviceModels.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -230,9 +230,12 @@ // get the value QString val = vByteArray; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) // TODO: Qt6 port - find replacement for deprecated QString::isSimpleText(). - // ok = ! val.isNull() && val.isSimpleText(); ok = ! val.isNull(); +#else + ok = ! val.isNull() && val.isSimpleText(); +#endif // 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,8 +280,12 @@ // get the value QString val = vByteArray; - // TODO: Qt6 Port: ok = ! val.isNull() && val.isSimpleText(); - ok = ! val.isNull(); // TODO: Qt6 Port +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + // TODO: Qt6 port - find replacement for deprecated QString::isSimpleText(). + ok = ! val.isNull(); +#else + ok = ! val.isNull() && val.isSimpleText(); +#endif // 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 @@ -323,8 +330,12 @@ // get the value QString val = vByteArray; - // TODO: Qt6 Port: ok = ! val.isNull() && val.isSimpleText(); - ok = ! val.isNull(); // TODO: Qt6 Port +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + // TODO: Qt6 port - find replacement for deprecated QString::isSimpleText(). + ok = ! val.isNull(); +#else + ok = ! val.isNull() && val.isSimpleText(); +#endif // 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 -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/device/DeviceView.cpp (.../DeviceView.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -16,7 +16,11 @@ // Qt #include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include +#else +#include +#endif // Project #include "ApplicationController.h" @@ -405,7 +409,11 @@ if ( field.isEmpty() ) { ssidInfo.mSupported = false; } else { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) ssidInfo.mSupported = field.remove(QRegularExpression("(WPA[23])")).trimmed().isEmpty(); +#else + ssidInfo.mSupported = field.remove(QRegExp("(WPA[23])")).trimmed().isEmpty(); +#endif } break; Index: sources/gui/GuiGlobals.cpp =================================================================== diff -u -rae028f2ce4768d53d280f119ab2a11ac516fd3d2 -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision ae028f2ce4768d53d280f119ab2a11ac516fd3d2) +++ sources/gui/GuiGlobals.cpp (.../GuiGlobals.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -207,7 +207,11 @@ { //using namespace View; qmlRegisterType ("Gui.View" , 0, 1, "GuiView"); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) qmlRegisterUncreatableType ("Gui.Actions" , 0, 1, "guiActions" , QStringLiteral("Used only for enumerations no need to have an object")); +#else + qmlRegisterUncreatableType ("Gui.Actions" , 0, 1, "GuiActions" , QStringLiteral("Used only for enumerations no need to have an object")); +#endif qmlRegisterSingletonType ("Gui.VEventSpy", 0, 1, "GuiEventSpy", [](QQmlEngine *, QJSEngine *) -> QObject * { return &_VEventSpy; }); Index: sources/gui/qml/components/BaseChart.qml =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/components/BaseChart.qml (.../BaseChart.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/gui/qml/components/BaseChart.qml (.../BaseChart.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -14,6 +14,7 @@ */ import QtQuick 2.15 +import QtCharts 2.15 // Qt6 Port: remove deprecated QtCharts module import QtQuick.Shapes 1.15 // Import the Shapes module import "qrc:/globals" @@ -29,11 +30,11 @@ property int lineSeries1Value : 0 property int lineSeries2Value : 0 property int lineSeries3Value : 0 -/* TODO: Qt6 Port +// BEGIN - Qt6 Port: lines need to be updated property alias lineSeries1Color : _line1.color property alias lineSeries2Color : _line2.color property alias lineSeries3Color : _line3.color -*/ +// END - Qt6 Port readonly property int minY : -700 readonly property int maxY : 600 @@ -115,7 +116,7 @@ onTriggered : plotGraph() } -/* TODO: Qt6 Port +// BEGIN - Qt6 Port: QtCharts is deprecated, the following may need to be updated: DateTimeAxis { id: _xAxis format : "H:mm" tickCount : 13 @@ -288,5 +289,5 @@ } } } -*/ +// END - Qt6 Port } Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -16,7 +16,10 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 // Dialog +import QtGraphicalEffects 1.12 +/* Qt6 Port: replace the above import with the following one: import QtQuick.Effects +*/ // Project // Qml imports @@ -67,12 +70,24 @@ radius : Variables.dialogRadius layer.enabled : showDropShadow + layer.effect: DropShadow { + id: _dropShadow + horizontalOffset: 4 + verticalOffset : 4 + radius : 12 + samples : 32 + color : Colors.dropShadowDialogColor + source : _backgroundRect + anchors.fill : _backgroundRect + } +/* Qt6 Port: replace above DropShadow with following RectangularShadow: layer.effect: RectangularShadow { id: _dropShadow radius : 12 color : Colors.dropShadowDialogColor anchors.fill : _backgroundRect } +*/ // 👇 Placeholder for an injected component. Ex. numpad Item { id: _backgroundItem } Index: sources/gui/qml/components/NotificationBarSmall.qml =================================================================== diff -u -rae028f2ce4768d53d280f119ab2a11ac516fd3d2 -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision ae028f2ce4768d53d280f119ab2a11ac516fd3d2) +++ sources/gui/qml/components/NotificationBarSmall.qml (.../NotificationBarSmall.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -86,15 +86,24 @@ onLevelChanged: { switch (level) { + case GuiActions.ALARM_PRIORITY_HIGH: +/* Qt6 Port: replace above line with the following: case guiActions.ALARM_PRIORITY_HIGH: +*/ _root.color = Colors.textNotificationHighBg; _text.color = Colors.textNotificationHighFg; break; + case GuiActions.ALARM_PRIORITY_MEDIUM: +/* Qt6 Port: replace above line with the following: case guiActions.ALARM_PRIORITY_MEDIUM: +*/ _root.color = Colors.textNotificationMedBg; _text.color = Colors.textNotificationMedFg; break; + case GuiActions.ALARM_PRIORITY_LOW: +/* Qt6 Port: replace above line with the following: case guiActions.ALARM_PRIORITY_LOW: +*/ _root.color = Colors.textNotificationLowBg; _text.color = Colors.textNotificationLowFg; break; Index: sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml =================================================================== diff -u -rec73ac3ed13ada1998d3c3746cefa82bbbef5645 -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml (.../TreatmentAdjustmentUltrafiltrationMetrics.qml) (revision ec73ac3ed13ada1998d3c3746cefa82bbbef5645) +++ sources/gui/qml/compounds/TreatmentAdjustmentUltrafiltrationMetrics.qml (.../TreatmentAdjustmentUltrafiltrationMetrics.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -61,7 +61,10 @@ width : _left.width label : qsTr("UF Volume Goal") unit : Variables.unitVolume + value : _root.rightValue.toFixed(Variables.ultrafiltrationPrecision) +/* Qt6 Port: replace the above line with the following line: value : _root.rightValue?.toFixed(Variables.ultrafiltrationPrecision) ?? "" +*/ valueColor : Colors.fluidText } } Index: sources/gui/qml/dialogs/AlarmDialog.qml =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/gui/qml/dialogs/AlarmDialog.qml (.../AlarmDialog.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -1,6 +1,9 @@ // Qt import QtQuick 2.12 +import QtGraphicalEffects 1.12 +/* Qt6 Port: replace the above import with the following one: import QtQuick.Effects +*/ // Project // Qml imports @@ -155,11 +158,22 @@ } layer.enabled : true + layer.effect : DropShadow { id: _dropShadow + horizontalOffset: 0 + verticalOffset : 3 + radius : 3.0 + samples : 7 + color : "#50000000" + source : _stepRect + anchors.fill : _stepRect + } +/* Qt6 Port: replace the above DropShadow with the following RectangularShadow: layer.effect : RectangularShadow { id: _dropShadow radius : 3.0 color : "#50000000" anchors.fill : _stepRect } +*/ } Text { id: _delegateText Index: sources/gui/qml/dialogs/PatientIdEntry.qml =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/dialogs/PatientIdEntry.qml (.../PatientIdEntry.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/gui/qml/dialogs/PatientIdEntry.qml (.../PatientIdEntry.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -51,7 +51,10 @@ textInput.leftPadding : Variables.defaultMargin * 14 textInput.inputMethodHints : Qt.ImhPreferLowercase textInput.echoMode : TextInput.Normal + textInput.validator : RegExpValidator { regExp: Variables.regExp_PatientID } +/* Qt6 Port: replace the above line with the following one: textInput.validator : RegularExpressionValidator { regularExpression: Variables.regExp_PatientID } +*/ line.visible : false enabled : _root.editingEnabled @@ -82,7 +85,10 @@ textInput.leftPadding : Variables.defaultMargin * 14 textInput.inputMethodHints : Qt.ImhPreferLowercase textInput.echoMode : TextInput.Normal + textInput.validator : RegExpValidator { regExp: Variables.regExp_PatientID } +/* Qt6 Port: replace the above line with the following one: textInput.validator : RegularExpressionValidator { regularExpression: Variables.regExp_PatientID } +*/ line.visible : false enabled : _root.editingEnabled Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -rae028f2ce4768d53d280f119ab2a11ac516fd3d2 -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision ae028f2ce4768d53d280f119ab2a11ac516fd3d2) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -18,7 +18,10 @@ import QtQuick 2.12 // Project +import Gui.Actions 0.1 +/* Qt6 Port: replace the above import with the following one: import Gui.Actions 0.1 as GuiActions +*/ /*! @@ -195,19 +198,28 @@ let contentBg = "" let contentFg = "" switch (vPriority) { + case GuiActions.ALARM_PRIORITY_HIGH: +/* Qt6 Port: replace the above line with the following one: case GuiActions.guiActions.ALARM_PRIORITY_HIGH: +*/ titleBg = alarmTopBarHighBg titleFg = alarmTopBarHighFg contentBg = white contentFg = textNotificationHighFg break + case GuiActions.ALARM_PRIORITY_MEDIUM: +/* Qt6 Port: replace the above line with the following one: case GuiActions.guiActions.ALARM_PRIORITY_MEDIUM: +*/ titleBg = alarmTopBarMedBg titleFg = alarmTopBarMedFg contentBg = white contentFg = textNotificationMedFg break + case GuiActions.ALARM_PRIORITY_LOW: +/* Qt6 Port: replace the above line with the following one: case GuiActions.guiActions.ALARM_PRIORITY_LOW: +*/ titleBg = alarmTopBarLowBg titleFg = alarmTopBarLowFg contentBg = white Index: sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/gui/qml/pages/settings/SettingsAdvancedInstitutional.qml (.../SettingsAdvancedInstitutional.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -16,7 +16,10 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 +import QtGraphicalEffects 1.12 +/* Qt6 Port: replace the above import with the following one: import QtQuick.Effects +*/ // Qml imports import "qrc:/globals" @@ -184,12 +187,24 @@ } layer.enabled : true + layer.effect: DropShadow { + id: _dropShadow + horizontalOffset: 0 + verticalOffset : 3 + radius : 3.0 + samples : 7 + color : "#50000000" + source : _header + anchors.fill : _header + } +/* Qt6 Port: replace the above DropShadow with the following RectangularShadow: layer.effect: RectangularShadow { id: _dropShadow radius : 3.0 color : "#50000000" anchors.fill : _header } +*/ } ListView { id: _listView Index: sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml =================================================================== diff -u -r45968308d0ad5074e17343e0e0f0a8c5a6c456d5 -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision 45968308d0ad5074e17343e0e0f0a8c5a6c456d5) +++ sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -14,7 +14,7 @@ */ // Qt -import QtQuick +import QtQuick 2.15 // Project import Gui.Actions 0.1 @@ -47,6 +47,11 @@ 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]))$/ } +/* Qt6 Port: replace the above RegExpValidator with the following RegularExpressionValidator: + 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: { if ( visible ) vAdjustmentVersions .doAdjustment() Index: sources/gui/qml/pages/settings/SettingsExportLogs.qml =================================================================== diff -u -r6eaef41ddd9dcb8717b1fbb7925b52279b0553cd -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision 6eaef41ddd9dcb8717b1fbb7925b52279b0553cd) +++ sources/gui/qml/pages/settings/SettingsExportLogs.qml (.../SettingsExportLogs.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -64,9 +64,14 @@ property bool isDevice : _GuiView.runOnDevice readonly property string typePathClr : "" readonly property string typePathPrefix : "file://" + readonly property string typePathTxr : typePathPrefix + (isDevice ? "/mnt/data/configurations" : "/home/denali/Desktop/sd-card" ) + readonly property string typePathSrc : typePathPrefix + (isDevice ? "/media/sd-card" : "/home/denali/Desktop/sd-card" ) + readonly property string typePathDst : typePathPrefix + (isDevice ? "/media/usb" : "/home/denali/Desktop/usb-disk") +/* Qt6 Port: replace the above typePathTxr, typePathSrc, typePathDst with the following ones: readonly property string typePathTxr : typePathPrefix + (isDevice ? "/mnt/data/configurations" : "/home/leahi/Desktop/sd-card" ) readonly property string typePathSrc : typePathPrefix + (isDevice ? "/media/sd-card" : "/home/leahi/Desktop/sd-card" ) readonly property string typePathDst : typePathPrefix + (isDevice ? "/media/usb" : "/home/leahi/Desktop/usb-disk") +*/ readonly property string typeFolderApplication : "/log" readonly property string typeFolderService : "/service" readonly property string typeFolderTreatment : "/treatment" Index: sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/gui/qml/pages/settings/SettingsInstitutionalRecord.qml (.../SettingsInstitutionalRecord.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -16,7 +16,10 @@ // Qt import QtQuick 2.12 import QtQuick.Controls 2.12 +import QtGraphicalEffects 1.12 +/* Qt6 Port: replace the above import with the following one: import QtQuick.Effects +*/ // Qml imports import "qrc:/globals" @@ -191,12 +194,24 @@ } layer.enabled : true + layer.effect: DropShadow { + id: _dropShadow + horizontalOffset: 0 + verticalOffset : 3 + radius : 3.0 + samples : 7 + color : "#50000000" + source : _header + anchors.fill : _header + } +/* Qt6 Port: replace the above DropShadow with the following RectangularShadow: layer.effect: RectangularShadow { id: _dropShadow radius : 3.0 color : "#50000000" anchors.fill : _header } +*/ } ListView { id: _listView Index: sources/gui/qml/pages/settings/SettingsWiFi.qml =================================================================== diff -u -r45968308d0ad5074e17343e0e0f0a8c5a6c456d5 -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision 45968308d0ad5074e17343e0e0f0a8c5a6c456d5) +++ sources/gui/qml/pages/settings/SettingsWiFi.qml (.../SettingsWiFi.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -35,6 +35,11 @@ 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]))$/ } +/* Qt6 Port: replace the above RegExpValidator with the following RegularExpressionValidator: + 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 entryWidth : 175 Index: sources/gui/qml/pages/treatment/TreatmentHDF.qml =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/gui/qml/pages/treatment/TreatmentHDF.qml (.../TreatmentHDF.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -75,13 +75,19 @@ width : _column.cellWidth height : _column.cellHeight lineSeries1Value : vTreatmentPressureOcclusion.arterialPressure - // TODO: Qt6 Port: lineSeries1Color : Colors.pressuresArterialBar + /* Qt6 Port: replace deprecated QtCharts and update the following line: + lineSeries1Color : Colors.pressuresArterialBar + */ lineSeries2Value : vTreatmentPressureOcclusion.venousPressure - // TODO: Qt6 Port: lineSeries2Color : Colors.pressuresVenousBar + /* Qt6 Port: replace deprecated QtCharts and update the following line: + lineSeries2Color : Colors.pressuresVenousBar + */ lineSeries3Value : vTreatmentPressureOcclusion.tmpPressure - // TODO: Qt6 Port: lineSeries3Color : Colors.pressuresTmpBar + /* Qt6 Port: replace deprecated QtCharts and update the following line: + lineSeries3Color : Colors.pressuresTmpBar + */ } } Index: sources/gui/qml/pages/treatment/TreatmentSection.qml =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/gui/qml/pages/treatment/TreatmentSection.qml (.../TreatmentSection.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -15,7 +15,10 @@ // Qt import QtQuick 2.12 +import QtGraphicalEffects 1.12 +/* Qt6 Port: replace the above import with the following one: import QtQuick.Effects +*/ import "qrc:/globals" import "qrc:/components" @@ -59,10 +62,22 @@ } layer.enabled: _root.enableDropShadow + layer.effect: DropShadow { + id: _dropShadow + horizontalOffset: 3 + verticalOffset: 5 + radius: 3.0 + samples: 7 + color: "#50000000" + source: _root + anchors.fill: _root + } +/* Qt6 Port: replace the above DropShadow with the following RectangularShadow: layer.effect: RectangularShadow { id: _dropShadow radius: 3.0 color: "#50000000" anchors.fill: _root } +*/ } Index: sources/gui/qml/pages/treatment/TreatmentTrends.qml =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/gui/qml/pages/treatment/TreatmentTrends.qml (.../TreatmentTrends.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -15,7 +15,10 @@ // Qt import QtQuick 2.12 +import QtGraphicalEffects 1.12 +/* Qt6 Port: replaced the above import with the following one: import QtQuick.Effects +*/ // Project // Qml imports @@ -57,11 +60,18 @@ color : Colors.treatmentSectionHeader layer { enabled: true + effect: DropShadow { id: _topHeaderShadow + objectName : "_topHeaderShadow" + horizontalOffset: 2 + verticalOffset : 2 + } +/* Qt6 Port: replace the above DropShadow with the following RectangularShadow: effect: RectangularShadow { id: _topHeaderShadow objectName : "_topHeaderShadow" radius : 12 color : "#50000000" } +*/ } Text { id: _text Index: sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/gui/qml/pages/treatment/sections/TreatmentFlowsComponent.qml (.../TreatmentFlowsComponent.qml) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -1,7 +1,10 @@ // Qt import QtQuick 2.12 +import QtGraphicalEffects 1.12 +/* Qt6 Port: replaced the above import with the following one: import QtQuick.Effects +*/ // Project @@ -146,9 +149,20 @@ } layer.enabled : _root.dropShadowEnabled && _root.showButtons + layer.effect : DropShadow { id: _dropShadow + horizontalOffset: 3 + verticalOffset : 3 + radius : 3.0 + samples : 7 + color : "#50000000" + source : _root + anchors.fill : _root + } +/* Qt6 Port: replace the above DropShadow with the following RectangularShadow: layer.effect : RectangularShadow { id: _dropShadow radius : 3.0 color : "#50000000" anchors.fill : _root } +*/ } Index: sources/model/MAbstract.cpp =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/model/MAbstract.cpp (.../MAbstract.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/model/MAbstract.cpp (.../MAbstract.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -43,7 +43,11 @@ QVariantList mParameters = parameters(); QString mString = description(); for( const auto ¶meter : mParameters ) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (static_cast(parameter.typeId()) == QMetaType::Float) // Qt has a mixed definition of QVariant::Type and QMetaType seems like a not fixed issue. +#else + if (static_cast(parameter.type()) == QMetaType::Float) // Qt has a mixed definition of QVariant::Type and QMetaType seems like a not fixed issue. +#endif #ifdef ROUND_FLOATS mString += _delimiter + QString("%1").arg(parameter.toFloat(),0,'f',_precision); #else Index: sources/model/hd/adjustment/MAdjustRequestsBase.h =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/model/hd/adjustment/MAdjustRequestsBase.h (.../MAdjustRequestsBase.h) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/model/hd/adjustment/MAdjustRequestsBase.h (.../MAdjustRequestsBase.h) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -51,7 +51,11 @@ QString senderID = "UI,"; QString mString = senderID + vStringPrefix; for( const auto ¶meter : vParameters ) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) if (static_cast(parameter.typeId()) == QMetaType::Float) // Qt has a mixed definition of QVariant::Type and QMetaType seems like a not fixed issue. +#else + if (static_cast(parameter.type()) == QMetaType::Float) // Qt has a mixed definition of QVariant::Type and QMetaType seems like a not fixed issue. +#endif #ifdef ROUND_FLOATS mString += delimiter + QString("%1").arg(parameter.toFloat(),0,'f',precision); #else Index: sources/storage/Logger.cpp =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -467,7 +467,11 @@ _exportLogsType = eLogAppED; LOG_DEBUG(QString("Export %1 start").arg(_logNames[_exportLogsType])); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QFuture future = QtConcurrent::run(&Logger::exportLogs, this, vExportList); +#else + QFuture future = QtConcurrent::run(this, &Logger::exportLogs, vExportList); +#endif _exportLogsWatcher.setFuture(future); return true; } @@ -484,7 +488,11 @@ _exportLogsType = eLogDebug; LOG_DEBUG(QString("Export %1 start").arg(_logNames[_exportLogsType])); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QFuture future = QtConcurrent::run(&Logger::exportErrs, this, vExportList); +#else + QFuture future = QtConcurrent::run(this, &Logger::exportErrs, vExportList); +#endif _exportLogsWatcher.setFuture(future); return true; } @@ -501,7 +509,11 @@ _exportLogsType = eLogTrtmt; LOG_DEBUG(QString("Export %1 start").arg(_logNames[_exportLogsType])); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QFuture future = QtConcurrent::run(&Logger::exportTrts, this, vExportList); +#else + QFuture future = QtConcurrent::run(this, &Logger::exportTrts, vExportList); +#endif _exportLogsWatcher.setFuture(future); return true; } @@ -657,7 +669,11 @@ { LOG_DEBUG("Remove Logs Starting"); emit didRemoveLogs(true); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QFuture mFuture = QtConcurrent::run(&Logger::removeLogs, this, vLogType); +#else + QFuture mFuture = QtConcurrent::run(this, &Logger::removeLogs, vLogType); +#endif _removeLogsWatcher.setFuture(mFuture); return true; } Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -r6eaef41ddd9dcb8717b1fbb7925b52279b0553cd -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 6eaef41ddd9dcb8717b1fbb7925b52279b0553cd) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -43,8 +43,12 @@ #ifdef BUILD_FOR_TARGET const char *USB_Mount_Point = "/media/usb/"; #else +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const char *USB_Mount_Point = "/home/leahi/Desktop/usb-disk/"; +#else + const char *USB_Mount_Point = "/home/denali/Desktop/usb-disk/"; #endif +#endif const char *USB_File_System = "vfat"; @@ -72,8 +76,12 @@ const char *SDCard_Base_Path_Name = "/media/sd-card/"; #else // should not be in the project application folder. [not tracking by git] +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const char *SDCard_Base_Path_Name = "/home/leahi/Desktop/sd-card/"; +#else + const char *SDCard_Base_Path_Name = "/home/denali/Desktop/sd-card/"; #endif +#endif // Screenshot store folder const char *Screenshot_Base_Path_Name = "Screenshots/"; // this is the base path which will use the USB_Mount_Point to store the screenshots. @@ -87,16 +95,24 @@ #ifdef BUILD_FOR_TARGET return QString(QCoreApplication::applicationDirPath() + "/").toLatin1().constData(); #else +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) return "/home/leahi/Desktop/"; +#else + return "/home/denali/Desktop/"; #endif +#endif } const char *Translations_Path() { #ifdef BUILD_FOR_TARGET return QString(QCoreApplication::applicationDirPath() + "/").toLatin1().constData(); #else +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) return "/home/leahi/Projects/application/resources/"; +#else + return "/home/denali/Projects/application/resources/"; #endif +#endif } #ifdef BUILD_FOR_TARGET @@ -110,9 +126,14 @@ #endif #else // should be in the project application folder. [is tracking by git] +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const char *Settings_Path_Init = "/home/leahi/Public/luis/application/config/configurations/"; const char *Settings_Path_Name = "/home/leahi/Public/luis/application/config/configurations/"; +#else + const char *Settings_Path_Init = "/home/denali/Public/luis/application/config/configurations/"; + const char *Settings_Path_Name = "/home/denali/Public/luis/application/config/configurations/"; #endif +#endif const char *Settings_Category_Instructions = "Instructions/Instructions" ; const char *Settings_Category_InstructionsImagesLoc = "%1/Instructions/" ; const char *Settings_Category_DataList = "Parameters/DataList" ; @@ -142,8 +163,12 @@ #endif #else // on VM it is a temporary file which is not being tracked +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const char *CloudSync_Base_Path_Name = "/home/leahi/Desktop/CloudSync/"; +#else + const char *CloudSync_Base_Path_Name = "/home/denali/Desktop/CloudSync/"; #endif +#endif #ifdef BUILD_FOR_TARGET const char *CloudSync_Credentials_Folder_Name = "credentials/"; @@ -160,7 +185,11 @@ // therefore in manufacturing or update mode we are still running scripts as root. return QCoreApplication::applicationDirPath() + ( ( gEnableManufacturing || gEnableUpdating )? "/scripts/" : "/scripts/"); #else +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) return "/home/leahi/Projects/application/scripts/"; +#else + return "/home/denali/Projects/application/scripts/"; +#endif #endif } Index: sources/storage/TreatmentLog.cpp =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/storage/TreatmentLog.cpp (.../TreatmentLog.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -341,7 +341,11 @@ void TreatmentLog::saveLogConcurrent() { LOG_DEBUG("Save Treatment Log Started"); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QFuture mFuture = QtConcurrent::run(&TreatmentLog::saveLog, this); +#else + QFuture mFuture = QtConcurrent::run(this, &TreatmentLog::saveLog); +#endif _saveWatcher.setFuture(mFuture); } @@ -497,7 +501,11 @@ void TreatmentLog::exportLogConcurrent() { LOG_DEBUG("Export Treatment Log Started"); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QFuture mFuture = QtConcurrent::run(&TreatmentLog::exportLog, this); +#else + QFuture mFuture = QtConcurrent::run(this, &TreatmentLog::exportLog); +#endif _exportWatcher.setFuture(mFuture); } Index: sources/utility/format.cpp =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/utility/format.cpp (.../format.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/utility/format.cpp (.../format.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -78,7 +78,11 @@ { QByteArray mData; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) switch (static_cast(vData.typeId())) { +#else + switch (static_cast(vData.type())) { +#endif case QMetaType::QString: // string { mData += vData.toByteArray(); Index: sources/view/VEventSpy.cpp =================================================================== diff -u -r3e682c5afdadcf4dd2006e3d975fbee58e48619e -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision 3e682c5afdadcf4dd2006e3d975fbee58e48619e) +++ sources/view/VEventSpy.cpp (.../VEventSpy.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -150,7 +150,11 @@ void VEventSpy::touchEventSpy(QEvent *vEvent, const QString &vTypeName) { QTouchEvent *touchEvent = static_cast(vEvent); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) const QList &points = touchEvent->points(); +#else + const QList &points = touchEvent->touchPoints(); +#endif QString logString; int c = points.count(); touchCount ( _touchCount + 1 ); @@ -167,7 +171,11 @@ default : break; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QPointF pos = point.globalPosition(); +#else + QPointF pos = point.screenPos(); +#endif 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 -rdb13a6a2cb1e27bacf245ac251997b3f9c54c01b -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision db13a6a2cb1e27bacf245ac251997b3f9c54c01b) +++ sources/view/settings/VSettings.cpp (.../VSettings.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -220,7 +220,9 @@ { TKeysList keysList; Q_UNUSED(vGroup); Q_UNUSED(vKeys) // TODO: Qt6 port - remove +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) /* TODO: Qt6 port - QRegularExpression +#endif for ( quint16 keyIndex = 0; keyIndex < vKeys.count(); keyIndex++ ) { QRegExp regx("\\{\\s*\\d+\\s*:\\s*\\d+\\s*:\\s*\\w*\\s*:\\s*\\d*\\s*\\}"); QString key = vKeys[keyIndex]; @@ -251,7 +253,9 @@ keyList += key; keysList += keyList; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) */ +#endif return keysList; } Index: sources/view/td/data/treatment/VTDTreatmentStatesData.cpp =================================================================== diff -u -rdb13a6a2cb1e27bacf245ac251997b3f9c54c01b -rc2f474ff07c98aa350c445a2474976a3cf985f40 --- sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision db13a6a2cb1e27bacf245ac251997b3f9c54c01b) +++ sources/view/td/data/treatment/VTDTreatmentStatesData.cpp (.../VTDTreatmentStatesData.cpp) (revision c2f474ff07c98aa350c445a2474976a3cf985f40) @@ -72,7 +72,7 @@ ENUM_CHECK_C( GuiSalineStates, NUM_OF_FLUID_BOLUS_STATES ) } ENUM_READ ( GuiSalineStates, FLUID_BOLUS_IDLE_STATE , sbIdle ); ENUM_READ ( GuiSalineStates, FLUID_BOLUS_WAIT_FOR_PUMPS_STOP_STATE , sbWaitPump ); - ENUM_READ ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE , sbSubstitutionRunning ); + ENUM_READ ( GuiSalineStates, FLUID_BOLUS_IN_PROGRESS_STATE , sbSubstitutionRunning ); // Heparin States _heparin = false;