Index: denali.pro =================================================================== diff -u -r53134008481fd775533e8988b7436f2f75e47336 -r7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab --- denali.pro (.../denali.pro) (revision 53134008481fd775533e8988b7436f2f75e47336) +++ denali.pro (.../denali.pro) (revision 7c895d9b6c198a48ab75ac2090b0a61d99bbd1ab) @@ -52,14 +52,6 @@ common/MsgDefs.h \ \ # Main sources/main.h \ - sources/model/MEndTreatmentResponse.h \ - sources/model/MStartTreatmentResponse.h \ - sources/model/hd/data/MPrimingData.h \ - sources/model/MTreatmentParametersResp.h \ - sources/storage/FileSaver.h \ - sources/model/MDGDebugText.h \ - sources/model/MHDDebugText.h \ - sources/storage/DriveWatcher.h \ sources/Threads.h \ sources/MainTimer.h \ sources/ApplicationPost.h \ @@ -69,6 +61,11 @@ sources/model/MModel.h \ sources/model/MAbstract.h \ sources/model/MPowerOff.h \ + sources/model/MEndTreatmentResponse.h \ + sources/model/MStartTreatmentResponse.h \ + sources/model/MTreatmentParametersResp.h \ + sources/model/MDGDebugText.h \ + sources/model/MHDDebugText.h \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmCleared.h \ sources/model/hd/alarm/MAlarmTriggered.h \ @@ -90,6 +87,7 @@ sources/model/hd/data/MTreatmentStatesData.h \ sources/model/hd/data/MHDOperationModeData.h \ sources/model/hd/data/MTreatmentSalineData.h \ + sources/model/hd/data/MPrimingData.h \ \ # ---------- Models - DG - Data sources/model/dg/data/MDGDrainPumpData.h \ sources/model/dg/data/MDGHeatersData.h \ @@ -155,6 +153,8 @@ sources/storage/StorageGlobals.h \ sources/storage/Logger.h \ sources/storage/FileHandler.h \ + sources/storage/FileSaver.h \ + sources/storage/DriveWatcher.h \ \ # Utility sources/utility/crc.h \ sources/utility/format.h \ @@ -167,10 +167,6 @@ \ # common \ # Main main.cpp \ - sources/model/MEndTreatmentResponse.cpp \ - sources/model/MStartTreatmentResponse.cpp \ - sources/model/hd/data/MPrimingData.cpp \ - sources/model/MTreatmentParametersResp.cpp \ sources/Threads.cpp \ sources/MainTimer.cpp \ sources/ApplicationPost.cpp \ @@ -180,6 +176,10 @@ sources/model/MAbstract.cpp \ sources/model/MPowerOff.cpp \ sources/model/MHDDebugText.cpp \ + sources/model/MEndTreatmentResponse.cpp \ + sources/model/MStartTreatmentResponse.cpp \ + sources/model/MTreatmentParametersResp.cpp \ + sources/model/MDGDebugText.cpp \ \ # ---------- Models - Alarm sources/model/hd/alarm/MAlarmCleared.cpp \ sources/model/hd/alarm/MAlarmTriggered.cpp \ @@ -200,8 +200,8 @@ sources/model/hd/data/MTreatmentStatesData.cpp \ sources/model/hd/data/MHDOperationModeData.cpp \ sources/model/hd/data/MTreatmentSalineData.cpp \ + sources/model/hd/data/MPrimingData.cpp \ \ # ---------- Models - DG - Data - sources/model/MDGDebugText.cpp \ sources/model/dg/data/MDGDrainPumpData.cpp \ sources/model/dg/data/MDGHeatersData.cpp \ sources/model/dg/data/MDGLoadCellReadingsData.cpp \