Index: denali.pro.user =================================================================== diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- denali.pro.user (.../denali.pro.user) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) +++ denali.pro.user (.../denali.pro.user) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -1,6 +1,6 @@ - + EnvironmentId Index: main.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- main.cpp (.../main.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ main.cpp (.../main.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -127,7 +127,6 @@ QCoreApplication::translate("main", "Show the Message Output")); parser.addOption(optionConsoleoutFrameInterface); - // --- -0 : enable-keep-awake (the fast mode) QCommandLineOption optionSendEmptyKeepAwake(QStringList() << "0" << "enable-keep-awake", QCoreApplication::translate("main", "Enable send low priority, empty message on the CANBus just to keep UI board CAN driver awake")); @@ -165,7 +164,6 @@ QCoreApplication::translate("main", "Disables HD communication timeout")); parser.addOption(optionDisableTimeout); - // --- parse command lines parser.process(*qApp); @@ -325,7 +323,6 @@ //! - Initializing Main Timer _MainTimer.init(); - //! - Initialize the QML Viewer and starts GUI int app_exec = -1; LOG_DEBUG("UI Initializing"); Index: sources/ApplicationController.cpp =================================================================== diff -u -r9d8a60eb984003d3f7814cbe507b1b37f519bc80 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision 9d8a60eb984003d3f7814cbe507b1b37f519bc80) +++ sources/ApplicationController.cpp (.../ApplicationController.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -113,7 +113,6 @@ connect(&_DriveWatcher , SIGNAL(didSDCardStateChange(bool, bool)), this , SLOT( onSDCardStateChange(bool, bool))); - connect(&_GuiController , SIGNAL(didExportLog()), this , SLOT( onExportLog())); Index: sources/canbus/CanInterface.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/canbus/CanInterface.h (.../CanInterface.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/canbus/CanInterface.h (.../CanInterface.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -22,7 +22,6 @@ #include "main.h" // Doxygen : don't remove #include "MessageGlobals.h" - // Define #define _CanInterface Can::CanInterface::I() Index: sources/canbus/FrameInterface.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/canbus/FrameInterface.cpp (.../FrameInterface.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -27,7 +27,6 @@ // namespace using namespace Can; - /*! * \brief FrameInterface::FrameInterface * \details Constructor Index: sources/canbus/MessageAcknowModel.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/canbus/MessageAcknowModel.cpp (.../MessageAcknowModel.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/canbus/MessageAcknowModel.cpp (.../MessageAcknowModel.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -32,7 +32,6 @@ */ MessageAcknowModel::MessageAcknowModel(QObject *parent) : QObject(parent) { } - /*! * \brief MessageAcknowModel::init * \details Initializes the class by setting the connections and starting the timer Index: sources/canbus/MessageInterpreter.cpp =================================================================== diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -191,7 +191,6 @@ case Gui::GuiActionType::ID_Acknow: // len: 0, can have zero len break; // No data, Just registered - case Gui::GuiActionType::ID_KeepAlive: // len: 255, can have any len if ( length ) { // this message has a variable length vPayload = Format::fromVariant(vData[0]); Index: sources/canbus/MessageInterpreter.h =================================================================== diff -u -ra6abc05918a15924460d2b9358365b3eeedf1d1c -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision a6abc05918a15924460d2b9358365b3eeedf1d1c) +++ sources/canbus/MessageInterpreter.h (.../MessageInterpreter.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -78,7 +78,6 @@ template bool notify (const Message &vMessage, QVariantList &vData, Gui::GuiActionType vIdCheck) __attribute_warn_unused_result__; - // ---- Create Treatment Response Data bool createTreatmentRespData (const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; Index: sources/gui/qml/globals/Colors.qml =================================================================== diff -u -r9d8a60eb984003d3f7814cbe507b1b37f519bc80 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision 9d8a60eb984003d3f7814cbe507b1b37f519bc80) +++ sources/gui/qml/globals/Colors.qml (.../Colors.qml) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -106,5 +106,4 @@ readonly property color createTreatmentTextReady : "white" readonly property color createTreatmentInvalidParam : "red" - } Index: sources/gui/qml/globals/Variables.qml =================================================================== diff -u -r9d8a60eb984003d3f7814cbe507b1b37f519bc80 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 9d8a60eb984003d3f7814cbe507b1b37f519bc80) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -48,7 +48,6 @@ readonly property int touchRectHeight : 85 //K:D //70 readonly property int touchRectRadius : 45 - readonly property int titleBottomPadding : 25 readonly property int columnSpacing : 25 //K:D //20 @@ -87,7 +86,6 @@ readonly property int topBarMenuHeight : 100 readonly property int sliderCircleDiameter : 25 - readonly property int pressuresProgressbarWidth : 725 readonly property int ultrafiltrationProgressbarWidth : 880 Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -74,7 +74,6 @@ width: parent.width text: qsTr("Device Settings") - } Diagnostics { @@ -94,4 +93,3 @@ */ - Index: sources/gui/qml/pages/treatment/TreatmentBegin.qml =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/gui/qml/pages/treatment/TreatmentBegin.qml (.../TreatmentBegin.qml) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -43,7 +43,6 @@ state: "begin" } - Flickable { id: _flickable anchors.top: _topMenuBar.bottom anchors.left: parent.left Index: sources/gui/qml/pages/treatment/TreatmentConfirm.qml =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/gui/qml/pages/treatment/TreatmentConfirm.qml (.../TreatmentConfirm.qml) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/gui/qml/pages/treatment/TreatmentConfirm.qml (.../TreatmentConfirm.qml) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -43,7 +43,6 @@ state: "confirm" } - Flickable { id: _flickable anchors.top: _topMenuBar.bottom Index: sources/gui/qml/pages/treatment/TreatmentCreate.qml =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/gui/qml/pages/treatment/TreatmentCreate.qml (.../TreatmentCreate.qml) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -42,7 +42,6 @@ } } - Flickable { id: _flickable anchors.top: _topMenuBar.bottom anchors.left: parent.left @@ -248,7 +247,6 @@ } } - Text { id: _venousPressureLimitsTitle text: qsTr("Venous Pressure Limits") anchors.left: _venousPressureLimits.left @@ -391,7 +389,6 @@ _dialysateFlowRate.setValid(false) } - onDuration_ValidationFailed: { _duration.setValid(false) } Index: sources/gui/qml/pages/treatment/TreatmentPrime.qml =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/gui/qml/pages/treatment/TreatmentPrime.qml (.../TreatmentPrime.qml) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -42,7 +42,6 @@ state: "prime" } - Flickable { id: _flickable anchors.top: _topMenuBar.bottom anchors.left: parent.left Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -128,7 +128,6 @@ onStartClicked : vCreateTreatment.onStart() } - //// Treatment Adjustment Dialogs TreatmentAdjustmentFlow { id: _treatmentAdjustmentFlow onCloseClicked : close() Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -54,7 +54,6 @@ text : ufInfoText } - titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + Variables.unitTextUltrafiltrationVolume ProgressBarEx { id: _rangeProgressBar Index: sources/model/MTreatmentParametersResp.h =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/model/MTreatmentParametersResp.h (.../MTreatmentParametersResp.h) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/model/MTreatmentParametersResp.h (.../MTreatmentParametersResp.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -20,7 +20,6 @@ // Project #include "types.h" - class tst_models; namespace Model { Index: sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp (.../MTreatmentAdjustDurationResponse.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/hd/adjustment/MTreatmentAdjustDurationResponse.cpp (.../MTreatmentAdjustDurationResponse.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -16,7 +16,6 @@ using namespace Model; - QVariantList MAdjustDurationResponse::parameters() const { return { _data.mAccepted.value, Index: sources/model/hd/adjustment/MTreatmentAdjustRequests.h =================================================================== diff -u -r604a782b50c9fc749c3bd71485e285c1070f1e01 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 604a782b50c9fc749c3bd71485e285c1070f1e01) +++ sources/model/hd/adjustment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -25,7 +25,6 @@ namespace Model { - /*! * Simple request models * These are models to send the request for the doAdjustment Index: sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp (.../MTreatmentAdjustUltrafiltrationStateResponse.cpp) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/model/hd/adjustment/MTreatmentAdjustUltrafiltrationStateResponse.cpp (.../MTreatmentAdjustUltrafiltrationStateResponse.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -16,7 +16,6 @@ using namespace Model; - QVariantList MAdjustUltrafiltrationStateResponse::parameters() const { return { _data.mAccepted.value, Index: sources/model/hd/alarm/MAlarmStatusData.cpp =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/hd/alarm/MAlarmStatusData.cpp (.../MAlarmStatusData.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -14,7 +14,6 @@ */ #include "MAlarmStatusData.h" - using namespace Model; using namespace Gui; Index: sources/model/hd/data/MTreatmentFlowsData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/hd/data/MTreatmentFlowsData.h (.../MTreatmentFlowsData.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -14,7 +14,6 @@ */ #pragma once - // Qt #include Index: sources/model/hd/data/MTreatmentRangesData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/hd/data/MTreatmentRangesData.h (.../MTreatmentRangesData.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -24,7 +24,6 @@ // forward declarations class tst_models; - namespace Model { /*! Index: sources/model/hd/data/MTreatmentSalineData.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/model/hd/data/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/model/hd/data/MTreatmentSalineData.h (.../MTreatmentSalineData.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -14,7 +14,6 @@ */ #pragma once - // Qt #include Index: sources/model/hd/data/MTreatmentTimeData.h =================================================================== diff -u -r6cad9b004e904200b71de7431c745795256080df -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/model/hd/data/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision 6cad9b004e904200b71de7431c745795256080df) +++ sources/model/hd/data/MTreatmentTimeData.h (.../MTreatmentTimeData.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -14,7 +14,6 @@ */ #pragma once - // Qt #include Index: sources/storage/FileHandler.cpp =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/storage/FileHandler.cpp (.../FileHandler.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -85,7 +85,6 @@ return true; } - /*! * \brief FileHandler::read * \details reads file vFilename content into vContent variable. @@ -124,7 +123,6 @@ QTextStream in(&file); QString content = in.readAll(); - QJsonDocument doc = QJsonDocument::fromJson(content.toUtf8()); vContent = doc.object(); return true; Index: sources/storage/Logger.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/storage/Logger.cpp (.../Logger.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -106,7 +106,6 @@ connect(this, SIGNAL(didLog(QString,LogType)), this, SLOT( onLog(QString,LogType))); - connect(&_MainTimer, SIGNAL( didDateChange ()), this , SLOT( concurrentRemoveLogs())); Index: sources/storage/Logger.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/storage/Logger.h (.../Logger.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/storage/Logger.h (.../Logger.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -23,13 +23,11 @@ #include "main.h" // Doxygen : don't remove #include "StorageGlobals.h" - // Define #define _Logger Storage::Logger::I() #define LOG_EXPORT _Logger.concurrentExportLogs() - #define LOG_DEBUG(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogDebug) #define LOG_EVENT(vCONTENT) emit Storage::Logger::I().didLog(vCONTENT, Storage::Logger::LogType::eLogEvent) @@ -135,7 +133,6 @@ QThread *_thread = nullptr; bool _init = false; - public slots: bool init(); bool init(QThread &vThread); @@ -178,7 +175,6 @@ private slots: void onSDCardSpaceChange(bool vReady, qint64 vTotal, qint64 vAvailable, quint8 vPercent); - // ----- logging structure private slots: void onLog (const QString &vContent, LogType vLogType); Index: sources/storage/filesaver.cpp =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/storage/filesaver.cpp (.../filesaver.cpp) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/storage/filesaver.cpp (.../filesaver.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -14,15 +14,13 @@ */ #include "filesaver.h" - // Qt #include #include // Project #include "FileHandler.h" - using namespace Storage; FileSaver::FileSaver(QObject *parent) : QObject(parent) Index: sources/view/VCreateTreatment.cpp =================================================================== diff -u -r4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/view/VCreateTreatment.cpp (.../VCreateTreatment.cpp) (revision 4fab8841b1040c8eaa406713ff9bdc8c65b7b6ac) +++ sources/view/VCreateTreatment.cpp (.../VCreateTreatment.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -24,7 +24,6 @@ using namespace View; using namespace Storage; - VCreateTreatment::VCreateTreatment(QObject *parent) : QObject(parent) { connect(&_FileSaver, SIGNAL(fileSaved(bool)), @@ -134,7 +133,6 @@ emit resetCreateTreatment(); } - /** * \brief VCreateTreatment::jsonArrayToStringList * Converts a jsonarray of strings to a QStringList @@ -191,7 +189,6 @@ return; } - #ifdef QT_DEBUG emit showConfirm(); #else @@ -348,7 +345,6 @@ void VCreateTreatment::onFinishedConfirm() { qDebug() << "Finished create treatment confirm..."; - QJsonObject obj { {"bloodFlowRate", QString::number(treatmentData.bloodFlowRate)}, {"dialysateFlowRate", QString::number(treatmentData.dialysateFlowRate)}, Index: sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h (.../VTreatmentAdjustmentDuration.h) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/adjustment/VTreatmentAdjustmentDuration.h (.../VTreatmentAdjustmentDuration.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -40,7 +40,6 @@ AdjustDurationRequestData _data; - // coco begin validated: // The property adjustment_Triggered has to be always true // and to always trigger the change event to work as a notifier for GUI @@ -54,7 +53,6 @@ VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentDuration, AdjustDurationResponseData) - // ----- Adjust Duration public slots: /*! Index: sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp =================================================================== diff -u -r2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp (.../VTreatmentAdjustmentResponseBase.cpp) (revision 2c9421bd6da03c7e0bd0bfa1f49fa95c2bd18a95) +++ sources/view/hd/adjustment/VTreatmentAdjustmentResponseBase.cpp (.../VTreatmentAdjustmentResponseBase.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -20,7 +20,6 @@ VIEW_DEF_CLASS(VTreatmentAdjustmentResponseBase) void VTreatmentAdjustmentResponseBase::initConnections() { } - /*! * \brief VTreatmentAdjustmentResponseBase::reasonText * \details this code is the place holder for the alarms description mapping Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -r64d87d540594252e8039ab2595016d98f1e3cc28 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 64d87d540594252e8039ab2595016d98f1e3cc28) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -64,7 +64,6 @@ emit raiseAlarm(); - } /*! Index: unittests/tst_initializations.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- unittests/tst_initializations.h (.../tst_initializations.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ unittests/tst_initializations.h (.../tst_initializations.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -20,7 +20,6 @@ // Project - class tst_initializations : public QObject { Q_OBJECT Index: unittests/tst_models.cpp =================================================================== diff -u -r9d8a60eb984003d3f7814cbe507b1b37f519bc80 -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- unittests/tst_models.cpp (.../tst_models.cpp) (revision 9d8a60eb984003d3f7814cbe507b1b37f519bc80) +++ unittests/tst_models.cpp (.../tst_models.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -399,7 +399,6 @@ } } - // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DGROPumpData ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ DGROPumpData data definition ~~~~~~~~~~~~~~~~~~~~~~~~ // @@ -1474,12 +1473,10 @@ QTest::newRow("rinsebackFlowRate") << 18 << QByteArray::fromHex(QByteArray("00" "01" "02" "03" "04" "05" "06" "07" "08" "09" "0A" "0B" "0C" "0D" "0E" "0F" "10" "11" "12" "13" "14" "15" "16" "17" "18" "19" "1A" "1B" "1C" "1D" "1E" "1F" "20" "21" "22" "23" "24" "25" "26" "27" "28" "29" "2B" "2C" "2D" "2E" "2F" "30" "31" "32" "33" "34" "35" "36" "37" "38" "39" "3A" "3B" "3C" "3D" "3E" "3F" "40" "41" "42" "43" "44" "45" "46" "47")); } - void tst_models::tst_MTreatmentParametersResp() { Model::MTreatmentParametersResponse mData; - QFETCH(int , errorIndex ); QFETCH(QByteArray, data ); @@ -1544,7 +1541,6 @@ void tst_models::tst_MTreatmentSalineBolusData() { Model::MTreatmentSaline mData; - QFETCH(int , errorIndex ); QFETCH(QByteArray, data ); @@ -1623,7 +1619,6 @@ } } - void tst_models::tst_MTreatmentParameters_fromVariantList() { Model::MAdjustTreatmentParametersRequest mData; Index: unittests/tst_threads.h =================================================================== diff -u -r56e378f7504701b9e9a9dccaf205aef2fd52c58e -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- unittests/tst_threads.h (.../tst_threads.h) (revision 56e378f7504701b9e9a9dccaf205aef2fd52c58e) +++ unittests/tst_threads.h (.../tst_threads.h) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -20,7 +20,6 @@ // Project - class tst_threads : public QObject { Q_OBJECT Index: unittests/tst_views.cpp =================================================================== diff -u -ra3f457785f86bd41a4df1dd3c6ca7300d5fca38e -rcc1e9d6d55c816f3fcd626dc6948cca24da283b3 --- unittests/tst_views.cpp (.../tst_views.cpp) (revision a3f457785f86bd41a4df1dd3c6ca7300d5fca38e) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision cc1e9d6d55c816f3fcd626dc6948cca24da283b3) @@ -307,7 +307,6 @@ view.onResetCreateTreatment(); - for (int i = 0; i < 17; ++i) { VCreateTreatment_simulate_valid_parameters(view); @@ -335,7 +334,6 @@ default: break; } - QCOMPARE(view.validate(view.treatmentData), false); view.onFinishedCreate(); } @@ -414,7 +412,6 @@ view.salineBolusOptions(options); QCOMPARE(options, view.salineBolusOptions()); - options = QStringList() << "08-1251-1" << "08-2251-0" << "08-3251-9"; view.acidConcentrateOptions(options); options.append(" "); view.acidConcentrateOptions(options); @@ -427,7 +424,6 @@ view.bicarbonateConcentrateOptions(options); QCOMPARE(options, view.bicarbonateConcentrateOptions()); - options = QStringList() << "Nipro Elisio-H 17" << "Nipro Elisio-H 19" << "Fresenius Optiflux F160NRe" @@ -488,7 +484,6 @@ view.venousPressureLimitHighMax(v); QCOMPARE(v, view.venousPressureLimitHighMax()); - val = 1; view.bloodPressureMeasureIntervalMin(val); ++val; view.bloodPressureMeasureIntervalMin(val); view.bloodPressureMeasureIntervalMin(val); @@ -499,7 +494,6 @@ view.bloodPressureMeasureIntervalMax(val); QCOMPARE(val, view.bloodPressureMeasureIntervalMax()); - val = 10; view.rinsebackFlowRateMin(val); ++val; view.rinsebackFlowRateMin(val); view.rinsebackFlowRateMin(val); @@ -693,7 +687,6 @@ QVERIFY(view._saveTreatmentProfile); view.onFinishedConfirm(); - view.onFinishedSaveNewTreatment(true); view.onFinishedSaveNewTreatment(false); view.onFinishedPrime();