Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
skyjake committed Sep 1, 2019
1 parent 89d5ff2 commit 937cd52
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 21 deletions.
8 changes: 4 additions & 4 deletions doomsday/libs/core/include/de/widgets/animationrule.h
Expand Up @@ -99,12 +99,12 @@ class DE_PUBLIC AnimationRule : public Rule, DE_OBSERVES(Clock, TimeChange)
void finish();
void pause();
void resume();
String description() const;
String description() const override;

protected:
~AnimationRule();
void update();
void timeChanged(Clock const &);
~AnimationRule() override;
void update() override;
void timeChanged(Clock const &) override;

private:
Animation _animation;
Expand Down
5 changes: 3 additions & 2 deletions doomsday/libs/core/include/de/widgets/constantrule.h
Expand Up @@ -67,12 +67,13 @@ class DE_PUBLIC ConstantRule : public Rule
*/
void set(float newValue);

String description() const;
String description() const override;

public:
static const ConstantRule &zero();

protected:
void update();
void update() override;

private:
float _pendingValue;
Expand Down
11 changes: 5 additions & 6 deletions doomsday/libs/core/include/de/widgets/indirectrule.h
Expand Up @@ -38,7 +38,7 @@ class DE_PUBLIC IndirectRule : public Rule
{
public:
IndirectRule();
~IndirectRule();
~IndirectRule() override;

/**
* Sets the source rule whose value this indirect rule will reflect.
Expand All @@ -49,12 +49,11 @@ class DE_PUBLIC IndirectRule : public Rule

void unsetSource();

bool hasSource() const;

void update();

bool hasSource() const;
const Rule &source() const;
String description() const;

void update() override;
String description() const override;

private:
const Rule *_source;
Expand Down
12 changes: 4 additions & 8 deletions doomsday/libs/core/include/de/widgets/operatorrule.h
Expand Up @@ -95,16 +95,12 @@ class DE_PUBLIC OperatorRule : public Rule
}

protected:
~OperatorRule();
~OperatorRule() override;

inline Operator op() const
{
return Operator((_flags >> BaseFlagsShift) & 0xf);
}

void update();
inline Operator op() const { return Operator((_flags >> BaseFlagsShift) & 0xf); }

String description() const;
void update() override;
String description() const override;

private:
Rule const *_leftOperand;
Expand Down
2 changes: 1 addition & 1 deletion doomsday/libs/core/include/de/widgets/rule.h
Expand Up @@ -171,7 +171,7 @@ class DE_PUBLIC Rule : public Counted, public DE_AUDIENCE_INTERFACE(RuleInvalida
}

// Implements IRuleInvalidationObserver.
void ruleInvalidated();
void ruleInvalidated() override;

protected:
int _flags; // Derived rules use this, too.
Expand Down

0 comments on commit 937cd52

Please sign in to comment.