diff --git a/src/kaleidoscope/simulator/actions/AssertLayerIsActive.h b/src/kaleidoscope/simulator/actions/AssertLayerIsActive.h index 5cc8a462..b381aecf 100644 --- a/src/kaleidoscope/simulator/actions/AssertLayerIsActive.h +++ b/src/kaleidoscope/simulator/actions/AssertLayerIsActive.h @@ -48,6 +48,8 @@ class AssertLayerIsActive { public: + virtual ~Action() = default; + Action(int layer_id) : layer_id_(layer_id) {} virtual void describe(const char *add_indent = "") const override { diff --git a/src/kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h b/src/kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h index cd9b4767..214e6e5c 100644 --- a/src/kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h +++ b/src/kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h @@ -47,6 +47,8 @@ class AssertTopActiveLayerIs { public: + virtual ~Action() = default; + Action(int layer_id) : layer_id_(layer_id) {} virtual void describe(const char *add_indent = "") const override { diff --git a/src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h b/src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h index 1288def2..12bfcfde 100644 --- a/src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h +++ b/src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h @@ -58,6 +58,7 @@ class GenerateHostEvent { class Action : public interface::ReportAction, public HostEventAction { public: + virtual ~Action() = default; virtual void describe(const char *add_indent = "") const override { this->getSimulator()->log() << add_indent << "Generating host event"; diff --git a/src/kaleidoscope/simulator/interface/actions/AssertCycleIsNth.h b/src/kaleidoscope/simulator/interface/actions/AssertCycleIsNth.h index 7596ced8..9fce7e8c 100644 --- a/src/kaleidoscope/simulator/interface/actions/AssertCycleIsNth.h +++ b/src/kaleidoscope/simulator/interface/actions/AssertCycleIsNth.h @@ -46,6 +46,8 @@ namespace interface { public: + virtual ~Action() = default; + Action(int cycle_id) : cycle_id_(cycle_id) {} virtual void describe(const char *add_indent = "") const override { diff --git a/src/kaleidoscope/simulator/interface/actions/AssertElapsedTimeGreater.h b/src/kaleidoscope/simulator/interface/actions/AssertElapsedTimeGreater.h index 49a4061d..b074b577 100644 --- a/src/kaleidoscope/simulator/interface/actions/AssertElapsedTimeGreater.h +++ b/src/kaleidoscope/simulator/interface/actions/AssertElapsedTimeGreater.h @@ -48,6 +48,8 @@ namespace interface { public: + virtual ~Action() = default; + Action(Simulator_::TimeType delta_t, Simulator_::TimeType start_t = 0) : start_t_(start_t), delta_t_(delta_t) diff --git a/src/kaleidoscope/simulator/interface/actions/AssertNumOverallReportsEquals.h b/src/kaleidoscope/simulator/interface/actions/AssertNumOverallReportsEquals.h index 8c402a97..9f0a2854 100644 --- a/src/kaleidoscope/simulator/interface/actions/AssertNumOverallReportsEquals.h +++ b/src/kaleidoscope/simulator/interface/actions/AssertNumOverallReportsEquals.h @@ -50,6 +50,8 @@ namespace interface { public: + virtual ~Action() = default; + Action(int n_overall_reports) : n_overall_reports_(n_overall_reports) {} diff --git a/src/kaleidoscope/simulator/interface/actions/CustomAction.h b/src/kaleidoscope/simulator/interface/actions/CustomAction.h index e179fb83..14665665 100644 --- a/src/kaleidoscope/simulator/interface/actions/CustomAction.h +++ b/src/kaleidoscope/simulator/interface/actions/CustomAction.h @@ -50,6 +50,8 @@ namespace interface { public: + virtual ~Action() = default; + Action(const std::function &func) : func_(func) {} diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertCycleGeneratesNReports.h b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertCycleGeneratesNReports.h index 07a4539a..9b58b2e9 100644 --- a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertCycleGeneratesNReports.h +++ b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertCycleGeneratesNReports.h @@ -50,6 +50,7 @@ namespace interface { public: + virtual ~Action() = default; Action(int n_reports) : n_reports_(n_reports) {} virtual void describe(const char *add_indent = "") const override { diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEmpty.h b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEmpty.h index 7b51cb76..29523681 100644 --- a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEmpty.h +++ b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEmpty.h @@ -41,6 +41,8 @@ namespace interface { public: + virtual ~Action() = default; + virtual void describe(const char *add_indent = "") const override { this->getSimulator()->log() << add_indent << "Report empty"; } diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEquals.h b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEquals.h index f230319e..af327b25 100644 --- a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEquals.h +++ b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportEquals.h @@ -57,6 +57,8 @@ namespace interface { public: + virtual ~Action() = default; + Action(const _ReportType &report) : report_(report) {} diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportIsNthInCycle.h b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportIsNthInCycle.h index ab9b8a00..6503224b 100644 --- a/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportIsNthInCycle.h +++ b/src/kaleidoscope/simulator/interface/actions/generic_report/AssertReportIsNthInCycle.h @@ -46,6 +46,8 @@ namespace interface { public: + virtual ~Action() = default; + Action(int report_id) : report_id_(report_id) {} virtual void describe(const char *add_indent = "") const override { diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/CustomReportAction.h b/src/kaleidoscope/simulator/interface/actions/generic_report/CustomReportAction.h index deb45ba6..fd4e51b9 100644 --- a/src/kaleidoscope/simulator/interface/actions/generic_report/CustomReportAction.h +++ b/src/kaleidoscope/simulator/interface/actions/generic_report/CustomReportAction.h @@ -54,6 +54,8 @@ namespace interface { using ReportAction<_ReportType>::ActionBaseType; + virtual ~Action() = default; + Action(const std::function &func) : func_(func) {} diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/DumpReport.h b/src/kaleidoscope/simulator/interface/actions/generic_report/DumpReport.h index f9834112..96443212 100644 --- a/src/kaleidoscope/simulator/interface/actions/generic_report/DumpReport.h +++ b/src/kaleidoscope/simulator/interface/actions/generic_report/DumpReport.h @@ -41,6 +41,8 @@ namespace interface { public: + virtual ~Action() = default; + virtual void describe(const char *add_indent = "") const override { this->getReport().dump(*this->getSimulator(), add_indent); } diff --git a/src/kaleidoscope/simulator/interface/actions/generic_report/ReportAction.h b/src/kaleidoscope/simulator/interface/actions/generic_report/ReportAction.h index 08319131..b2ff864b 100644 --- a/src/kaleidoscope/simulator/interface/actions/generic_report/ReportAction.h +++ b/src/kaleidoscope/simulator/interface/actions/generic_report/ReportAction.h @@ -38,10 +38,12 @@ namespace interface { /// class ReportAction_ : public Action_ { public: - + typedef Report_ ReportType; typedef ReportAction_ ActionBaseType; + virtual ~ReportAction_() = default; + virtual uint8_t getReportTypeId() const { return AnyTypeReportTypeId; } diff --git a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyKeycodeActive.h b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyKeycodeActive.h index 57d44615..5e88d3fa 100644 --- a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyKeycodeActive.h +++ b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyKeycodeActive.h @@ -41,6 +41,8 @@ namespace interface { public: + virtual ~Action() = default; + virtual void describe(const char *add_indent = "") const override { this->getSimulator()->log() << add_indent << "Any keycodes active"; } diff --git a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyModifierActive.h b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyModifierActive.h index 802afe0e..2d91de07 100644 --- a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyModifierActive.h +++ b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertAnyModifierActive.h @@ -41,6 +41,8 @@ namespace interface { public: + virtual ~Action() = default; + virtual void describe(const char *add_indent = "") const override { this->getSimulator()->log() << add_indent << "Any modifiers active"; } diff --git a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertKeycodesActive.h b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertKeycodesActive.h index 8cf1feba..ee2308f5 100644 --- a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertKeycodesActive.h +++ b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertKeycodesActive.h @@ -77,6 +77,8 @@ namespace interface { public: + virtual ~Action() = default; + Action(const std::vector &keycodes, bool exclusively = false) : keycodes_(keycodes), diff --git a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertModifiersActive.h b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertModifiersActive.h index ade7e0ec..e78a8b9a 100644 --- a/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertModifiersActive.h +++ b/src/kaleidoscope/simulator/interface/actions/keyboard_report/AssertModifiersActive.h @@ -78,6 +78,9 @@ namespace interface { public: + virtual ~Action() = default; + + Action(const std::vector &modifiers, bool exclusively = false) : modifiers_(modifiers),