From 43319a8d793aca70b7a06090d24ac5dfb834910f Mon Sep 17 00:00:00 2001 From: Michael Gregorius Date: Fri, 26 May 2023 11:11:45 +0200 Subject: [PATCH] Move implementations of Model into cpp file (#6711) Move the implementation of the Model methods into Model.cpp so that recompiles after changes are much quicker. Make Model:: isDefaultConstructed const. --- include/Model.h | 29 ++++++----------------------- src/core/Model.cpp | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/include/Model.h b/include/Model.h index cc3079796..6db8f9f30 100644 --- a/include/Model.h +++ b/include/Model.h @@ -37,35 +37,18 @@ class LMMS_EXPORT Model : public QObject { Q_OBJECT public: - Model( Model * _parent, QString _display_name = QString(), - bool _default_constructed = false ) : - QObject( _parent ), - m_displayName( _display_name ), - m_defaultConstructed( _default_constructed ) - { - } + Model(Model * _parent, QString _display_name = QString(), + bool _default_constructed = false ); ~Model() override = default; - bool isDefaultConstructed() - { - return m_defaultConstructed; - } + bool isDefaultConstructed() const; - Model* parentModel() const - { - return dynamic_cast( parent() ); - } + Model* parentModel() const; - virtual QString displayName() const - { - return m_displayName; - } + virtual QString displayName() const; - virtual void setDisplayName( const QString& displayName ) - { - m_displayName = displayName; - } + virtual void setDisplayName(const QString& displayName); virtual QString fullDisplayName() const; diff --git a/src/core/Model.cpp b/src/core/Model.cpp index dd277bc4e..83602bd08 100644 --- a/src/core/Model.cpp +++ b/src/core/Model.cpp @@ -27,6 +27,33 @@ namespace lmms { +Model::Model(Model * _parent, QString _display_name, bool _default_constructed) : + QObject( _parent ), + m_displayName( _display_name ), + m_defaultConstructed( _default_constructed ) +{ +} + +bool Model::isDefaultConstructed() const +{ + return m_defaultConstructed; +} + +Model* Model::parentModel() const +{ + return dynamic_cast( parent() ); +} + +QString Model::displayName() const +{ + return m_displayName; +} + +void Model::setDisplayName( const QString& displayName ) +{ + m_displayName = displayName; +} + QString Model::fullDisplayName() const { const QString & n = displayName();