diff --git a/oscar/SleepLib/machine_loader.cpp b/oscar/SleepLib/machine_loader.cpp index 9cf44abf..d76fc1de 100644 --- a/oscar/SleepLib/machine_loader.cpp +++ b/oscar/SleepLib/machine_loader.cpp @@ -200,6 +200,7 @@ void DestroyLoaders() m_loaders.clear(); } +/* QList CPAPLoader::eventFlags(Day * day) { Machine * mach = day->machine(MT_CPAP); @@ -221,6 +222,7 @@ QList CPAPLoader::eventFlags(Day * day) return list; } +*/ bool uncompressFile(QString infile, QString outfile) { diff --git a/oscar/SleepLib/machine_loader.h b/oscar/SleepLib/machine_loader.h index 70de4c90..2b15b860 100644 --- a/oscar/SleepLib/machine_loader.h +++ b/oscar/SleepLib/machine_loader.h @@ -41,8 +41,8 @@ const QString genericPixmapPath = ":/icons/mask.png"; class MachineLoader: public QObject { Q_OBJECT - friend class ImportThread; - friend class Machine; + //friend class ImportThread; + //friend class Machine; public: MachineLoader(); virtual ~MachineLoader(); @@ -140,13 +140,13 @@ public: CPAPLoader() : MachineLoader() {} virtual ~CPAPLoader() {} - virtual QList eventFlags(Day * day); + //virtual QList eventFlags(Day * day); virtual QString PresReliefLabel() { return QString(""); } virtual ChannelID PresReliefMode() { return NoChannel; } virtual ChannelID PresReliefLevel() { return NoChannel; } - virtual ChannelID HumidifierConnected() { return NoChannel; } - virtual ChannelID HumidifierLevel() { return CPAP_HumidSetting; } + //virtual ChannelID HumidifierConnected() { return NoChannel; } + //virtual ChannelID HumidifierLevel() { return CPAP_HumidSetting; } virtual ChannelID CPAPModeChannel() { return CPAP_Mode; } virtual void initChannels() {}