diff options
author | RJ Ryan <rryan@mixxx.org> | 2014-01-19 18:52:31 -0500 |
---|---|---|
committer | RJ Ryan <rryan@mixxx.org> | 2014-01-19 18:52:31 -0500 |
commit | 69790698bf09702db8809e4f5d20d68608ce4a84 (patch) | |
tree | 4ebb9a5f3d123630d2d3ab439bf2128c666b9b6a /src/controlobject.cpp | |
parent | e0d4f41b046df061271612958392d049761e6adf (diff) |
Add support for making skin-created controls persist in the user configuration.
Remove ControlWidgetPropertyConnection loading and saving of control from config.
Diffstat (limited to 'src/controlobject.cpp')
-rw-r--r-- | src/controlobject.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/controlobject.cpp b/src/controlobject.cpp index e41163a36c..57d443ce66 100644 --- a/src/controlobject.cpp +++ b/src/controlobject.cpp @@ -28,9 +28,9 @@ ControlObject::ControlObject() { } -ControlObject::ControlObject(ConfigKey key, bool bIgnoreNops, bool bTrack) +ControlObject::ControlObject(ConfigKey key, bool bIgnoreNops, bool bTrack, bool bPersist) : m_pControl(NULL) { - initialize(key, bIgnoreNops, bTrack); + initialize(key, bIgnoreNops, bTrack, bPersist); } ControlObject::~ControlObject() { @@ -39,9 +39,12 @@ ControlObject::~ControlObject() { } } -void ControlObject::initialize(ConfigKey key, bool bIgnoreNops, bool bTrack) { +void ControlObject::initialize(ConfigKey key, bool bIgnoreNops, bool bTrack, + bool bPersist) { m_key = key; - m_pControl = ControlDoublePrivate::getControl(m_key, true, this, bIgnoreNops, bTrack); + m_pControl = ControlDoublePrivate::getControl(m_key, true, this, + bIgnoreNops, bTrack, + bPersist); connect(m_pControl.data(), SIGNAL(valueChanged(double, QObject*)), this, SLOT(privateValueChanged(double, QObject*)), Qt::DirectConnection); |