From 2c134d65fed33930801581e8c906ed1eb0048112 Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Sat, 27 Apr 2019 15:26:17 +0200 Subject: [PATCH] Code style + Extend for TempoSyncKnob --- include/AutomatableModel.h | 4 ++-- include/ModelVisitor.h | 9 ++++++--- include/TempoSyncKnobModel.h | 1 + src/core/ModelVisitor.cpp | 3 +++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h index 93550e33f..3e0b6143d 100644 --- a/include/AutomatableModel.h +++ b/include/AutomatableModel.h @@ -104,7 +104,7 @@ public: Target* dynamicCast(bool doThrow = false) { DCastVisitor vis; accept(vis); - if(doThrow && !vis.result) Q_ASSERT(false); + if (doThrow && !vis.result) { Q_ASSERT(false); } return vis.result; } @@ -113,7 +113,7 @@ public: const Target* dynamicCast(bool doThrow = false) const { ConstDCastVisitor vis; accept(vis); - if(doThrow && !vis.result) Q_ASSERT(false); + if (doThrow && !vis.result) { Q_ASSERT(false); } return vis.result; } diff --git a/include/ModelVisitor.h b/include/ModelVisitor.h index 6411d0702..f9d156e30 100644 --- a/include/ModelVisitor.h +++ b/include/ModelVisitor.h @@ -30,6 +30,7 @@ class BoolModel; class IntModel; class FloatModel; class ComboBoxModel; +class TempoSyncKnobModel; class ModelVisitor { @@ -38,9 +39,10 @@ class ModelVisitor public: virtual void visit(AutomatableModel& ) {} virtual void visit(BoolModel& m); - virtual void visit(IntModel& ); - virtual void visit(FloatModel& ); - virtual void visit(ComboBoxModel& ); + virtual void visit(IntModel& m); + virtual void visit(FloatModel& m); + virtual void visit(ComboBoxModel& m); + virtual void visit(TempoSyncKnobModel& m); virtual ~ModelVisitor(); }; @@ -55,6 +57,7 @@ public: virtual void visit(const IntModel& m); virtual void visit(const FloatModel& m); virtual void visit(const ComboBoxModel& m); + virtual void visit(const TempoSyncKnobModel& m); virtual ~ConstModelVisitor(); }; diff --git a/include/TempoSyncKnobModel.h b/include/TempoSyncKnobModel.h index 9a8ad619c..52fab30bb 100644 --- a/include/TempoSyncKnobModel.h +++ b/include/TempoSyncKnobModel.h @@ -33,6 +33,7 @@ class QAction; class LMMS_EXPORT TempoSyncKnobModel : public FloatModel { Q_OBJECT + MODEL_IS_VISITABLE public: enum TempoSyncMode { diff --git a/src/core/ModelVisitor.cpp b/src/core/ModelVisitor.cpp index 48065c57e..4036f56e0 100644 --- a/src/core/ModelVisitor.cpp +++ b/src/core/ModelVisitor.cpp @@ -26,16 +26,19 @@ #include "AutomatableModel.h" #include "ComboBoxModel.h" +#include "TempoSyncKnobModel.h" void ModelVisitor::visit(BoolModel &m) { up(m); } void ModelVisitor::visit(IntModel &m) { up(m); } void ModelVisitor::visit(FloatModel &m) { up(m); } void ModelVisitor::visit(ComboBoxModel &m) { up(m); } +void ModelVisitor::visit(TempoSyncKnobModel &m) { up(m); } void ConstModelVisitor::visit(const BoolModel &m) { up(m); } void ConstModelVisitor::visit(const IntModel &m) { up(m); } void ConstModelVisitor::visit(const FloatModel &m) { up(m); } void ConstModelVisitor::visit(const ComboBoxModel &m) { up(m); } +void ConstModelVisitor::visit(const TempoSyncKnobModel &m) { up(m); } ModelVisitor::~ModelVisitor() {} ConstModelVisitor::~ConstModelVisitor() {}