Index: sources/view/td/data/treatment/VTreatmentTrends.cpp =================================================================== diff -u -r3f45841f8e2fa936666f8de8e2a02fe19fb39a8d -raacca8cc53f5e4ff5abb6d7df3d5ad48c915645c --- sources/view/td/data/treatment/VTreatmentTrends.cpp (.../VTreatmentTrends.cpp) (revision 3f45841f8e2fa936666f8de8e2a02fe19fb39a8d) +++ sources/view/td/data/treatment/VTreatmentTrends.cpp (.../VTreatmentTrends.cpp) (revision aacca8cc53f5e4ff5abb6d7df3d5ad48c915645c) @@ -23,15 +23,6 @@ using namespace View; /*! - * \brief Function called during startup to register this class with the QMetaObject system - */ -static void qRegister() -{ - qmlRegisterType ("VTreatmentTrends", 0, 1, "VTreatmentTrends"); -} -Q_COREAPP_STARTUP_FUNCTION(qRegister) - -/*! * \brief View::VTreatmentTrends * \details Constructor * \param parent - parent of this object @@ -41,7 +32,6 @@ _data(this), _history(this) { - QQmlEngine::setObjectOwnership(&_data, QQmlEngine::CppOwnership); _data.setRoleNames({ { eDataRole_Timestamp, "timestamp" }, { eDataRole_Systolic, "systolic" }, @@ -131,7 +121,7 @@ entry[eHistoryRole_Timestamp] = QDateTime::currentDateTime(); entry[eHistoryRole_EntryID] = vData.mAlarmID; entry[eHistoryRole_Priority] = 0; - entry[eHistoryRole_Message] = _TreatmentLog.alarmTitle(vData.mAlarmID, false); + entry[eHistoryRole_Message] = _TreatmentLog.trendsAlarmTitle(vData.mAlarmID); _history.insertRow(0, entry); } @@ -147,7 +137,7 @@ entry[eHistoryRole_Timestamp] = QDateTime::currentDateTime(); entry[eHistoryRole_EntryID] = vData.mEventID; entry[eHistoryRole_Priority] = 0; - entry[eHistoryRole_Message] = _TreatmentLog.eventTitle(vData.mEventID, false); + entry[eHistoryRole_Message] = _TreatmentLog.trendsEventTitle(vData.mEventID); _history.insertRow(0, entry); }