From 5237ba09c1f99d3856bb7680dba90c2da85678a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20St=C3=BCrz?= Date: Thu, 7 Apr 2016 09:59:43 +0200 Subject: [PATCH] clean up --- server/ruleengine.h | 4 ---- server/time/calendaritem.h | 1 + server/time/timedescriptor.h | 5 +++++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/server/ruleengine.h b/server/ruleengine.h index 03c962f2..210d6a98 100644 --- a/server/ruleengine.h +++ b/server/ruleengine.h @@ -74,11 +74,7 @@ public: QList evaluateTime(const QDateTime &dateTime); RuleError addRule(const Rule &rule, bool fromEdit = false); -// RuleError addRule(const RuleId &ruleId, const QString &name, const QList &eventDescriptorList, const QList &actions, bool enabled = true); -// RuleError addRule(const RuleId &ruleId, const QString &name, const QList &eventDescriptorList, const StateEvaluator &stateEvaluator, const QList &actions, const QList &exitActions, bool enabled = true, bool executable = true, bool fromEdit = false); - RuleError editRule(const Rule &rule); -// RuleError editRule(const RuleId &ruleId, const QString &name, const QList &eventDescriptorList, const StateEvaluator &stateEvaluator, const QList &actions, const QList &exitActions, bool enabled = true, bool executable = true); QList rules() const; QList ruleIds() const; diff --git a/server/time/calendaritem.h b/server/time/calendaritem.h index 925281b9..9fb2fef9 100644 --- a/server/time/calendaritem.h +++ b/server/time/calendaritem.h @@ -59,6 +59,7 @@ private: bool evaluateDaily(const QDateTime &dateTime) const; bool evaluateWeekly(const QDateTime &dateTime) const; bool evaluateMonthly(const QDateTime &dateTime) const; + }; } diff --git a/server/time/timedescriptor.h b/server/time/timedescriptor.h index 5e703995..7e63a8c8 100644 --- a/server/time/timedescriptor.h +++ b/server/time/timedescriptor.h @@ -23,6 +23,7 @@ #include "timeeventitem.h" #include "calendaritem.h" +#include "guhsettings.h" namespace guhserver { @@ -42,6 +43,10 @@ public: bool evaluate(const QDateTime &dateTime) const; +// void dumpToSettings(GuhSettings &settings, const QString &groupName) const; +// static TimeDescriptor loadFromSettings(GuhSettings &settings, const QString &groupPrefix); + + private: QList m_timeEventItems; QList m_calendarItems;