From cef439b1ced608d49cc9f2577810e9f1535bb287 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Thu, 3 Dec 2009 19:09:55 +0100 Subject: [PATCH] AutomatableModel: made member variables private again As of commit dd28a654b548a8b27c4875c25e72341a5a64fb50 some member variables were made protected without any actual requirement for it. Revert the part of the commit. --- include/AutomatableModel.h | 6 +++--- src/core/AutomatableModel.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/AutomatableModel.h b/include/AutomatableModel.h index 0f9308975..e419190d1 100644 --- a/include/AutomatableModel.h +++ b/include/AutomatableModel.h @@ -225,9 +225,6 @@ protected: float fittedValue( float _value ) const; - float m_minValue; - float m_maxValue; - float m_value; private: void linkModel( AutomatableModel * _model ); @@ -235,7 +232,10 @@ private: DataType m_dataType; + float m_value; float m_initValue; + float m_minValue; + float m_maxValue; float m_step; float m_range; diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp index 7762edcb8..2864f266c 100644 --- a/src/core/AutomatableModel.cpp +++ b/src/core/AutomatableModel.cpp @@ -44,11 +44,11 @@ AutomatableModel::AutomatableModel( DataType _type, const QString & _display_name, bool _default_constructed ) : Model( _parent, _display_name, _default_constructed ), - m_minValue( _min ), - m_maxValue( _max ), m_dataType( _type ), m_value( _val ), m_initValue( _val ), + m_minValue( _min ), + m_maxValue( _max ), m_step( _step ), m_range( _max - _min ), m_journalEntryReady( false ),