summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/controlobjectthreadwidget.cpp2
-rw-r--r--src/widget/knobeventhandler.h2
-rw-r--r--src/widget/woverview.cpp4
-rw-r--r--src/widget/woverview.h2
-rw-r--r--src/widget/wpushbutton.cpp2
-rw-r--r--src/widget/wpushbutton.h2
-rw-r--r--src/widget/wslidercomposed.cpp4
-rw-r--r--src/widget/wslidercomposed.h2
-rw-r--r--src/widget/wstatuslight.cpp2
-rw-r--r--src/widget/wstatuslight.h2
-rw-r--r--src/widget/wvumeter.cpp2
-rw-r--r--src/widget/wvumeter.h2
-rw-r--r--src/widget/wwidget.cpp4
-rw-r--r--src/widget/wwidget.h2
14 files changed, 17 insertions, 17 deletions
diff --git a/src/controlobjectthreadwidget.cpp b/src/controlobjectthreadwidget.cpp
index b06083cd40..8d3b59cc96 100644
--- a/src/controlobjectthreadwidget.cpp
+++ b/src/controlobjectthreadwidget.cpp
@@ -68,7 +68,7 @@ void ControlObjectThreadWidget::setWidget(QWidget * widget, bool connectValueFro
if (connectValueToWidget) {
connect(this, SIGNAL(valueChanged(double)),
- widget, SLOT(setValue(double)));
+ widget, SLOT(slotConnectedValueChanged(double)));
}
emit(valueChanged(get()));
}
diff --git a/src/widget/knobeventhandler.h b/src/widget/knobeventhandler.h
index 61a11951be..4a47d69ecc 100644
--- a/src/widget/knobeventhandler.h
+++ b/src/widget/knobeventhandler.h
@@ -38,7 +38,7 @@ class KnobEventHandler {
// Clamp to [0.0, 1.0]
value = math_max(0.0, math_min(1.0, value));
- pWidget->setValue(value);
+ pWidget->slotConnectedValueChanged(value);
emit(pWidget->valueChangedLeftDown(value));
pWidget->update();
}
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index b71e72c514..4bb06f2529 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -120,14 +120,14 @@ void WOverview::setup(QDomNode node, const SkinContext& context) {
//qDebug() << "WOverview : m_markRanges" << m_markRanges.size();
}
-void WOverview::setValue(double dValue) {
+void WOverview::slotConnectedValueChanged(double dValue) {
if (!m_bDrag)
{
// Calculate handle position
int iPos = valueToPosition(dValue);
if (iPos != m_iPos) {
m_iPos = iPos;
- //qDebug() << "WOverview::setValue" << dValue << ">>" << m_iPos;
+ //qDebug() << "WOverview::slotConnectedValueChanged" << dValue << ">>" << m_iPos;
update();
}
}
diff --git a/src/widget/woverview.h b/src/widget/woverview.h
index 052e65ca6f..9ebe8b5b77 100644
--- a/src/widget/woverview.h
+++ b/src/widget/woverview.h
@@ -40,7 +40,7 @@ class WOverview : public WWidget {
void setup(QDomNode node, const SkinContext& context);
public slots:
- void setValue(double);
+ void slotConnectedValueChanged(double);
void slotLoadNewTrack(TrackPointer pTrack);
void slotTrackLoaded(TrackPointer pTrack);
void slotUnloadTrack(TrackPointer pTrack);
diff --git a/src/widget/wpushbutton.cpp b/src/widget/wpushbutton.cpp
index 56ce6fc257..f9ec5e45dc 100644
--- a/src/widget/wpushbutton.cpp
+++ b/src/widget/wpushbutton.cpp
@@ -172,7 +172,7 @@ void WPushButton::setPixmapBackground(const QString &filename) {
}
}
-void WPushButton::setValue(double v) {
+void WPushButton::slotConnectedValueChanged(double v) {
m_value = v;
if (m_iNoStates == 1) {
diff --git a/src/widget/wpushbutton.h b/src/widget/wpushbutton.h
index 09394157ad..65bdd020a4 100644
--- a/src/widget/wpushbutton.h
+++ b/src/widget/wpushbutton.h
@@ -54,7 +54,7 @@ class WPushButton : public WWidget {
void setStates(int iStatesW);
public slots:
- void setValue(double);
+ void slotConnectedValueChanged(double);
protected:
virtual void paintEvent(QPaintEvent *);
diff --git a/src/widget/wslidercomposed.cpp b/src/widget/wslidercomposed.cpp
index a761297465..ce61be1198 100644
--- a/src/widget/wslidercomposed.cpp
+++ b/src/widget/wslidercomposed.cpp
@@ -81,7 +81,7 @@ void WSliderComposed::setHandlePixmap(bool bHorizontal, const QString& filenameH
m_iHandleLength = m_bHorizontal ?
m_pHandle->width() : m_pHandle->height();
- setValue(m_value);
+ slotConnectedValueChanged(m_value);
update();
}
}
@@ -203,7 +203,7 @@ void WSliderComposed::paintEvent(QPaintEvent *) {
}
}
-void WSliderComposed::setValue(double dValue) {
+void WSliderComposed::slotConnectedValueChanged(double dValue) {
if (!m_bDrag && m_value != dValue) {
// Set value without emitting a valueChanged signal
// and force display update
diff --git a/src/widget/wslidercomposed.h b/src/widget/wslidercomposed.h
index fd46a316cd..f17ad2337d 100644
--- a/src/widget/wslidercomposed.h
+++ b/src/widget/wslidercomposed.h
@@ -51,7 +51,7 @@ class WSliderComposed : public WWidget {
void wheelEvent(QWheelEvent *e);
inline bool isHorizontal() const { return m_bHorizontal; };
public slots:
- void setValue(double);
+ void slotConnectedValueChanged(double);
private:
void unsetPixmaps();
diff --git a/src/widget/wstatuslight.cpp b/src/widget/wstatuslight.cpp
index a45244f127..e33ade3016 100644
--- a/src/widget/wstatuslight.cpp
+++ b/src/widget/wstatuslight.cpp
@@ -86,7 +86,7 @@ void WStatusLight::setPixmap(int iState, const QString& filename) {
}
}
-void WStatusLight::setValue(double v) {
+void WStatusLight::slotConnectedValueChanged(double v) {
int val = static_cast<int>(v);
if (m_iPos == val) {
return;
diff --git a/src/widget/wstatuslight.h b/src/widget/wstatuslight.h
index 1082800f2a..0f42f0fbce 100644
--- a/src/widget/wstatuslight.h
+++ b/src/widget/wstatuslight.h
@@ -40,7 +40,7 @@ class WStatusLight : public WWidget {
void setup(QDomNode node, const SkinContext& context);
public slots:
- void setValue(double v);
+ void slotConnectedValueChanged(double v);
protected:
void paintEvent(QPaintEvent *);
diff --git a/src/widget/wvumeter.cpp b/src/widget/wvumeter.cpp
index cbb08d4949..ecc8217880 100644
--- a/src/widget/wvumeter.cpp
+++ b/src/widget/wvumeter.cpp
@@ -103,7 +103,7 @@ void WVuMeter::setPixmaps(const QString &vuFilename,
}
}
-void WVuMeter::setValue(double dValue) {
+void WVuMeter::slotConnectedValueChanged(double dValue) {
int idx = static_cast<int>(dValue * m_iNoPos);
// Range check
if (idx > m_iNoPos)
diff --git a/src/widget/wvumeter.h b/src/widget/wvumeter.h
index b67d329c0b..bab5bca9b0 100644
--- a/src/widget/wvumeter.h
+++ b/src/widget/wvumeter.h
@@ -39,7 +39,7 @@ class WVuMeter : public WWidget {
void setPixmapBackground(const QString& filename);
void setPixmaps(const QString &vuFilename,
bool bHorizontal=false);
- void setValue(double fValue);
+ void slotConnectedValueChanged(double fValue);
protected slots:
void updateState(int msecsElapsed);
diff --git a/src/widget/wwidget.cpp b/src/widget/wwidget.cpp
index 813b048747..7ce777d53d 100644
--- a/src/widget/wwidget.cpp
+++ b/src/widget/wwidget.cpp
@@ -37,7 +37,7 @@ WWidget::WWidget(QWidget* parent, Qt::WindowFlags flags)
WWidget::~WWidget() {
}
-void WWidget::setValue(double value) {
+void WWidget::slotConnectedValueChanged(double value) {
m_value = value;
update();
}
@@ -60,7 +60,7 @@ void WWidget::slotReEmitValueUp(double value) {
}
void WWidget::updateValue(double value) {
- setValue(value);
+ slotConnectedValueChanged(value);
emit(valueChangedUp(value));
emit(valueChangedDown(value));
}
diff --git a/src/widget/wwidget.h b/src/widget/wwidget.h
index 29fd127f53..d6076395a9 100644
--- a/src/widget/wwidget.h
+++ b/src/widget/wwidget.h
@@ -56,7 +56,7 @@ public:
}
public slots:
- virtual void setValue(double value);
+ virtual void slotConnectedValueChanged(double value);
void updateValue(double value);
void setOnOff(double);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 08:43:54 +0000