summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/widget/controlwidgetconnection.cpp8
-rw-r--r--src/widget/controlwidgetconnection.h5
-rw-r--r--src/widget/wbasewidget.cpp2
3 files changed, 8 insertions, 7 deletions
diff --git a/src/widget/controlwidgetconnection.cpp b/src/widget/controlwidgetconnection.cpp
index 26705f61ef..39614a2b93 100644
--- a/src/widget/controlwidgetconnection.cpp
+++ b/src/widget/controlwidgetconnection.cpp
@@ -83,21 +83,21 @@ void ControlParameterWidgetConnection::resetControl() {
}
}
-void ControlParameterWidgetConnection::setControlParameterFromWidget(double v) {
+void ControlParameterWidgetConnection::setControlParameter(double v) {
if (m_directionOption & DIR_FROM_WIDGET) {
- setControlParameter(v);
+ ControlWidgetConnection::setControlParameter(v);
}
}
void ControlParameterWidgetConnection::setControlParameterDown(double v) {
if ((m_directionOption & DIR_FROM_WIDGET) && (m_emitOption & EMIT_ON_PRESS)) {
- setControlParameter(v);
+ ControlWidgetConnection::setControlParameter(v);
}
}
void ControlParameterWidgetConnection::setControlParameterUp(double v) {
if ((m_directionOption & DIR_FROM_WIDGET) && (m_emitOption & EMIT_ON_RELEASE)) {
- setControlParameter(v);
+ ControlWidgetConnection::setControlParameter(v);
}
}
diff --git a/src/widget/controlwidgetconnection.h b/src/widget/controlwidgetconnection.h
index 2998b5d250..4ae74601c4 100644
--- a/src/widget/controlwidgetconnection.h
+++ b/src/widget/controlwidgetconnection.h
@@ -21,7 +21,6 @@ class ControlWidgetConnection : public QObject {
virtual ~ControlWidgetConnection();
double getControlParameter() const;
- void setControlParameter(double v);
double getControlParameterForValue(double value) const;
const ConfigKey& getKey() const {
@@ -34,6 +33,8 @@ class ControlWidgetConnection : public QObject {
virtual void slotControlValueChanged(double v) = 0;
protected:
+ void setControlParameter(double v);
+
WBaseWidget* m_pWidget;
QScopedPointer<ControlObjectSlave> m_pControl;
@@ -108,7 +109,7 @@ class ControlParameterWidgetConnection : public ControlWidgetConnection {
void setEmitOption(enum EmitOption v) { m_emitOption = v; };
void resetControl();
- void setControlParameterFromWidget(double v);
+ void setControlParameter(double v);
void setControlParameterDown(double v);
void setControlParameterUp(double v);
diff --git a/src/widget/wbasewidget.cpp b/src/widget/wbasewidget.cpp
index 6b0972286d..c2efac0b2e 100644
--- a/src/widget/wbasewidget.cpp
+++ b/src/widget/wbasewidget.cpp
@@ -93,7 +93,7 @@ void WBaseWidget::resetControlParameter() {
void WBaseWidget::setControlParameter(double v) {
foreach (ControlParameterWidgetConnection* pControlConnection, m_connections) {
- pControlConnection->setControlParameterFromWidget(v);
+ pControlConnection->setControlParameter(v);
}
}