alpha
/
Kaleidoscope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

describeState needs to be marked override for clang

Browse Source
pull/851/head
Jesse Vincent 4 years ago
parent 7d991b7544
commit 309ac5339c
No known key found for this signature in database
GPG Key ID: CC228463465E40BC
17 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
src/kaleidoscope/simulator/actions/AssertLayerIsActive.h
Unescape View File

@ -54,7 +54,7 @@ public:
this->getSimulator()->log() << add_indent << "Layer " << layer_id_ << " expected to be active"; this->getSimulator()->log() << add_indent << "Layer " << layer_id_ << " expected to be active";
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Layer " << layer_id_ << " is active: " << Layer.isActive((uint8_t)layer_id_); this->getSimulator()->log() << add_indent << "Layer " << layer_id_ << " is active: " << Layer.isActive((uint8_t)layer_id_);
} }

2
src/kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h
Unescape View File

@ -53,7 +53,7 @@ public:
this->getSimulator()->log() << add_indent << "Top active layer is " << layer_id_; this->getSimulator()->log() << add_indent << "Top active layer is " << layer_id_;
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Top active layer is " << Layer.top(); this->getSimulator()->log() << add_indent << "Top active layer is " << Layer.top();
} }

2
src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h
Unescape View File

@ -63,7 +63,7 @@ public:
this->getSimulator()->log() << add_indent << "Generating host event"; this->getSimulator()->log() << add_indent << "Generating host event";
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->describe(add_indent); this->describe(add_indent);
} }

2
src/kaleidoscope/simulator/interface/actions/AssertCycleIsNth.h
Unescape View File

@ -52,7 +52,7 @@ namespace interface {
this->getSimulator()->log() << add_indent << "Is " << cycle_id_ << ". cycle"; this->getSimulator()->log() << add_indent << "Is " << cycle_id_ << ". cycle";
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Is " << this->getSimulator()->getCycleId() << ". cycle"; this->getSimulator()->log() << add_indent << "Is " << this->getSimulator()->getCycleId() << ". cycle";
} }

2
src/kaleidoscope/simulator/interface/actions/AssertElapsedTimeGreater.h
Unescape View File

@ -57,7 +57,7 @@ namespace interface {
this->getSimulator()->log() << add_indent << "Time elapsed greater " << delta_t_ << " ms"; this->getSimulator()->log() << add_indent << "Time elapsed greater " << delta_t_ << " ms";
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Actual time elapsed " this->getSimulator()->log() << add_indent << "Actual time elapsed "
<< this->getSimulator()->getTime() << " ms"; << this->getSimulator()->getTime() << " ms";
} }

2
src/kaleidoscope/simulator/interface/actions/AssertNumOverallReportsEquals.h
Unescape View File

@ -57,8 +57,8 @@ namespace interface {
this->getSimulator()->log() << add_indent << n_overall_reports_ << " overall " << _ReportType::typeString() << " reports expected"; this->getSimulator()->log() << add_indent << n_overall_reports_ << " overall " << _ReportType::typeString() << " reports expected";
} }
virtual void describeState(const char *add_indent = "") const {
this->getSimulator()->log() << add_indent << this->getSimulator()->getNumTypedOverallReports<_ReportType>() << " overall " << _ReportType::typeString() << " reports encountered"; this->getSimulator()->log() << add_indent << this->getSimulator()->getNumTypedOverallReports<_ReportType>() << " overall " << _ReportType::typeString() << " reports encountered";
virtual void describeState(const char *add_indent = "") const override {
} }
virtual bool evalInternal() override { virtual bool evalInternal() override {

2
src/kaleidoscope/simulator/interface/actions/CustomAction.h
Unescape View File

@ -58,7 +58,7 @@ namespace interface {
this->getSimulator()->log() << add_indent << "Custom keyboard report action"; this->getSimulator()->log() << add_indent << "Custom keyboard report action";
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Custom keyboard report action failed"; this->getSimulator()->log() << add_indent << "Custom keyboard report action failed";
} }

2
src/kaleidoscope/simulator/interface/actions/generic_report/AssertCycleGeneratesNReports.h
Unescape View File

@ -56,8 +56,8 @@ namespace interface {
this->getSimulator()->log() << add_indent << n_reports_ << " keyboard reports expected in cycle"; this->getSimulator()->log() << add_indent << n_reports_ << " keyboard reports expected in cycle";
} }
virtual void describeState(const char *add_indent = "") const {
this->getSimulator()->log() << add_indent << this->getSimulator()->getNumTypedReportsInCycle<_ReportType>() << " keyboard reports encountered"; this->getSimulator()->log() << add_indent << this->getSimulator()->getNumTypedReportsInCycle<_ReportType>() << " keyboard reports encountered";
virtual void describeState(const char *add_indent = "") const override {
} }
virtual bool evalInternal() override { virtual bool evalInternal() override {

2
src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEmpty.h
Unescape View File

@ -45,7 +45,7 @@ namespace interface {
this->getSimulator()->log() << add_indent << "Report empty"; this->getSimulator()->log() << add_indent << "Report empty";
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Report: "; this->getSimulator()->log() << add_indent << "Report: ";
this->getReport().dump(*this->getSimulator(), add_indent); this->getReport().dump(*this->getSimulator(), add_indent);
} }

2
src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEquals.h
Unescape View File

@ -70,7 +70,7 @@ namespace interface {
report_->dump(*this->getSimulator(), add_indent); report_->dump(*this->getSimulator(), add_indent);
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Reports differ: "; this->getSimulator()->log() << add_indent << "Reports differ: ";
this->getSimulator()->log() << add_indent << "expected: "; this->getSimulator()->log() << add_indent << "expected: ";

2
src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportIsNthInCycle.h
Unescape View File

@ -52,7 +52,7 @@ namespace interface {
this->getSimulator()->log() << add_indent << "Report " << report_id_ << ". in cycle"; this->getSimulator()->log() << add_indent << "Report " << report_id_ << ". in cycle";
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Report is " this->getSimulator()->log() << add_indent << "Report is "
<< this->getSimulator()->getNumReportsInCycle() << ". in cycle"; << this->getSimulator()->getNumReportsInCycle() << ". in cycle";
} }

2
src/kaleidoscope/simulator/interface/actions/generic_report/CustomReportAction.h
Unescape View File

@ -63,7 +63,7 @@ namespace interface {
<< _ReportType::typeString() << " report action"; << _ReportType::typeString() << " report action";
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Custom " this->getSimulator()->log() << add_indent << "Custom "
<< _ReportType::typeString() << " report action failed"; << _ReportType::typeString() << " report action failed";
} }

2
src/kaleidoscope/simulator/interface/actions/generic_report/DumpReport.h
Unescape View File

@ -45,7 +45,7 @@ namespace interface {
this->getReport().dump(*this->getSimulator(), add_indent); this->getReport().dump(*this->getSimulator(), add_indent);
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->describe(add_indent); this->describe(add_indent);
} }

2
src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyKeycodeActive.h
Unescape View File

@ -45,7 +45,7 @@ namespace interface {
this->getSimulator()->log() << add_indent << "Any keycodes active"; this->getSimulator()->log() << add_indent << "Any keycodes active";
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Any keycodes active: "; this->getSimulator()->log() << add_indent << "Any keycodes active: ";
this->getSimulator()->log() << this->getReport().isAnyKeyActive(); this->getSimulator()->log() << this->getReport().isAnyKeyActive();
} }

2
src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyModifierActive.h
Unescape View File

@ -45,7 +45,7 @@ namespace interface {
this->getSimulator()->log() << add_indent << "Any modifiers active"; this->getSimulator()->log() << add_indent << "Any modifiers active";
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Any modifiers active: "; this->getSimulator()->log() << add_indent << "Any modifiers active: ";
this->getSimulator()->log() << this->getReport().isAssertAnyModifierActive(); this->getSimulator()->log() << this->getReport().isAssertAnyModifierActive();
} }

2
src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertKeycodesActive.h
Unescape View File

@ -103,7 +103,7 @@ namespace interface {
} }
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Keycodes actually active: "; this->getSimulator()->log() << add_indent << "Keycodes actually active: ";

2
src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertModifiersActive.h
Unescape View File

@ -104,7 +104,7 @@ namespace interface {
} }
} }
virtual void describeState(const char *add_indent = "") const { virtual void describeState(const char *add_indent = "") const override {
this->getSimulator()->log() << add_indent << "Modifiers actually active: "; this->getSimulator()->log() << add_indent << "Modifiers actually active: ";

Write Preview
Loading…
Cancel
Save