summaryrefslogtreecommitdiffstats
path: root/src/widget
diff options
context:
space:
mode:
Diffstat (limited to 'src/widget')
-rw-r--r--src/widget/controlwidgetconnection.cpp2
-rw-r--r--src/widget/wbeatspinbox.cpp2
-rw-r--r--src/widget/wkey.cpp4
-rw-r--r--src/widget/wmainmenubar.cpp2
-rw-r--r--src/widget/wnumberpos.cpp7
-rw-r--r--src/widget/wnumberrate.cpp6
-rw-r--r--src/widget/woverview.cpp11
-rw-r--r--src/widget/wspinny.cpp15
-rw-r--r--src/widget/wtracktableview.cpp2
-rw-r--r--src/widget/wwaveformviewer.cpp2
-rw-r--r--src/widget/wwidgetstack.cpp9
11 files changed, 29 insertions, 33 deletions
diff --git a/src/widget/controlwidgetconnection.cpp b/src/widget/controlwidgetconnection.cpp
index c2c486f820..9348492034 100644
--- a/src/widget/controlwidgetconnection.cpp
+++ b/src/widget/controlwidgetconnection.cpp
@@ -13,7 +13,7 @@ ControlWidgetConnection::ControlWidgetConnection(
: m_pWidget(pBaseWidget),
m_pValueTransformer(pTransformer) {
m_pControl = new ControlProxy(key, this);
- m_pControl->connectValueChanged(SLOT(slotControlValueChanged(double)));
+ m_pControl->connectValueChanged(this, &ControlWidgetConnection::slotControlValueChanged);
}
void ControlWidgetConnection::setControlParameter(double parameter) {
diff --git a/src/widget/wbeatspinbox.cpp b/src/widget/wbeatspinbox.cpp
index 90d213cee7..17b142311c 100644
--- a/src/widget/wbeatspinbox.cpp
+++ b/src/widget/wbeatspinbox.cpp
@@ -27,7 +27,7 @@ WBeatSpinBox::WBeatSpinBox(QWidget* parent, const ConfigKey& configKey,
setValue(m_valueControl.get());
connect(this, SIGNAL(valueChanged(double)),
this, SLOT(slotSpinboxValueChanged(double)));
- m_valueControl.connectValueChanged(SLOT(slotControlValueChanged(double)));
+ m_valueControl.connectValueChanged(this, &WBeatSpinBox::slotControlValueChanged);
}
void WBeatSpinBox::setup(const QDomNode& node, const SkinContext& context) {
diff --git a/src/widget/wkey.cpp b/src/widget/wkey.cpp
index 1fabb15fd0..91b73710cd 100644
--- a/src/widget/wkey.cpp
+++ b/src/widget/wkey.cpp
@@ -8,8 +8,8 @@ WKey::WKey(const char* group, QWidget* pParent)
m_preferencesUpdated("[Preferences]", "updated", this),
m_engineKeyDistance(group, "visual_key_distance", this) {
setValue(m_dOldValue);
- m_preferencesUpdated.connectValueChanged(SLOT(preferencesUpdated(double)));
- m_engineKeyDistance.connectValueChanged(SLOT(setCents()));
+ m_preferencesUpdated.connectValueChanged(this, &WKey::preferencesUpdated);
+ m_engineKeyDistance.connectValueChanged(this, &WKey::setCents);
}
void WKey::onConnectedControlChanged(double dParameter, double dValue) {
diff --git a/src/widget/wmainmenubar.cpp b/src/widget/wmainmenubar.cpp
index 992bdc8998..e959993758 100644
--- a/src/widget/wmainmenubar.cpp
+++ b/src/widget/wmainmenubar.cpp
@@ -697,7 +697,7 @@ void VisibilityControlConnection::slotClearControl() {
void VisibilityControlConnection::slotReconnectControl() {
m_pControl.reset(new ControlProxy(this));
m_pControl->initialize(m_key, false);
- m_pControl->connectValueChanged(SLOT(slotControlChanged()));
+ m_pControl->connectValueChanged(this, &VisibilityControlConnection::slotControlChanged);
m_pAction->setEnabled(m_pControl->valid());
slotControlChanged();
}
diff --git a/src/widget/wnumberpos.cpp b/src/widget/wnumberpos.cpp
index bf96024ec4..f7f833bcdf 100644
--- a/src/widget/wnumberpos.cpp
+++ b/src/widget/wnumberpos.cpp
@@ -12,14 +12,13 @@ WNumberPos::WNumberPos(const char* group, QWidget* parent)
: WNumber(parent),
m_dOldTimeElapsed(0.0) {
m_pTimeElapsed = new ControlProxy(group, "time_elapsed", this);
- m_pTimeElapsed->connectValueChanged(SLOT(slotSetTimeElapsed(double)));
+ m_pTimeElapsed->connectValueChanged(this, &WNumberPos::slotSetTimeElapsed);
m_pTimeRemaining = new ControlProxy(group, "time_remaining", this);
- m_pTimeRemaining->connectValueChanged(SLOT(slotTimeRemainingUpdated(double)));
+ m_pTimeRemaining->connectValueChanged(this, &WNumberPos::slotTimeRemainingUpdated);
m_pShowTrackTimeRemaining = new ControlProxy(
"[Controls]", "ShowDurationRemaining", this);
- m_pShowTrackTimeRemaining->connectValueChanged(
- SLOT(slotSetDisplayMode(double)));
+ m_pShowTrackTimeRemaining->connectValueChanged(this, &WNumberPos::slotSetDisplayMode);
slotSetDisplayMode(m_pShowTrackTimeRemaining->get());
}
diff --git a/src/widget/wnumberrate.cpp b/src/widget/wnumberrate.cpp
index 34a65d159c..84dd888c34 100644
--- a/src/widget/wnumberrate.cpp
+++ b/src/widget/wnumberrate.cpp
@@ -19,11 +19,11 @@
WNumberRate::WNumberRate(const char * group, QWidget * parent)
: WNumber(parent) {
m_pRateRangeControl = new ControlProxy(group, "rateRange", this);
- m_pRateRangeControl->connectValueChanged(SLOT(setValue(double)));
+ m_pRateRangeControl->connectValueChanged(this, &WNumberRate::setValue);
m_pRateDirControl = new ControlProxy(group, "rate_dir", this);
- m_pRateDirControl->connectValueChanged(SLOT(setValue(double)));
+ m_pRateDirControl->connectValueChanged(this, &WNumberRate::setValue);
m_pRateControl = new ControlProxy(group, "rate", this);
- m_pRateControl->connectValueChanged(SLOT(setValue(double)));
+ m_pRateControl->connectValueChanged(this, &WNumberRate::setValue);
// Initialize the widget.
setValue(0);
}
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index c078d0c518..58abba5094 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -57,8 +57,7 @@ WOverview::WOverview(
m_scaleFactor(1.0) {
m_endOfTrackControl = new ControlProxy(
m_group, "end_of_track", this);
- m_endOfTrackControl->connectValueChanged(
- SLOT(onEndOfTrackChange(double)));
+ m_endOfTrackControl->connectValueChanged(this, &WOverview::onEndOfTrackChange);
m_trackSamplesControl =
new ControlProxy(m_group, "track_samples", this);
m_playControl = new ControlProxy(m_group, "play", this);
@@ -96,7 +95,7 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
for (const auto& pMark: m_marks) {
if (pMark->isValid()) {
pMark->connectSamplePositionChanged(this,
- SLOT(onMarkChanged(double)));
+ &WOverview::onMarkChanged);
}
}
@@ -109,15 +108,15 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
if (markRange.m_markEnabledControl) {
markRange.m_markEnabledControl->connectValueChanged(
- this, SLOT(onMarkRangeChange(double)));
+ this, &WOverview::onMarkRangeChange);
}
if (markRange.m_markStartPointControl) {
markRange.m_markStartPointControl->connectValueChanged(
- this, SLOT(onMarkRangeChange(double)));
+ this, &WOverview::onMarkRangeChange);
}
if (markRange.m_markEndPointControl) {
markRange.m_markEndPointControl->connectValueChanged(
- this, SLOT(onMarkRangeChange(double)));
+ this, &WOverview::onMarkRangeChange);
}
}
child = child.nextSibling();
diff --git a/src/widget/wspinny.cpp b/src/widget/wspinny.cpp
index c59ad60597..1a5272d158 100644
--- a/src/widget/wspinny.cpp
+++ b/src/widget/wspinny.cpp
@@ -199,8 +199,7 @@ void WSpinny::setup(const QDomNode& node, const SkinContext& context) {
m_pSlipEnabled = new ControlProxy(
m_group, "slip_enabled", this);
- m_pSlipEnabled->connectValueChanged(
- SLOT(updateSlipEnabled(double)));
+ m_pSlipEnabled->connectValueChanged(this, &WSpinny::updateSlipEnabled);
#ifdef __VINYLCONTROL__
m_pVinylControlSpeedType = new ControlProxy(
@@ -210,18 +209,18 @@ void WSpinny::setup(const QDomNode& node, const SkinContext& context) {
m_pVinylControlEnabled = new ControlProxy(
m_group, "vinylcontrol_enabled", this);
- m_pVinylControlEnabled->connectValueChanged(
- SLOT(updateVinylControlEnabled(double)));
+ m_pVinylControlEnabled->connectValueChanged(this,
+ &WSpinny::updateVinylControlEnabled);
m_pSignalEnabled = new ControlProxy(
m_group, "vinylcontrol_signal_enabled", this);
- m_pSignalEnabled->connectValueChanged(
- SLOT(updateVinylControlSignalEnabled(double)));
+ m_pSignalEnabled->connectValueChanged(this,
+ &WSpinny::updateVinylControlSignalEnabled);
// Match the vinyl control's set RPM so that the spinny widget rotates at
// the same speed as your physical decks, if you're using vinyl control.
- m_pVinylControlSpeedType->connectValueChanged(
- SLOT(updateVinylControlSpeed(double)));
+ m_pVinylControlSpeedType->connectValueChanged(this,
+ &WSpinny::updateVinylControlSpeed);
#else
diff --git a/src/widget/wtracktableview.cpp b/src/widget/wtracktableview.cpp
index 402ce25c57..511b164762 100644
--- a/src/widget/wtracktableview.cpp
+++ b/src/widget/wtracktableview.cpp
@@ -122,7 +122,7 @@ WTrackTableView::WTrackTableView(QWidget * parent,
this, SLOT(updateSelectionCrates(QWidget *)));
m_pCOTGuiTick = new ControlProxy("[Master]", "guiTick50ms", this);
- m_pCOTGuiTick->connectValueChanged(SLOT(slotGuiTick50ms(double)));
+ m_pCOTGuiTick->connectValueChanged(this, &WTrackTableView::slotGuiTick50ms);
connect(this, SIGNAL(scrollValueChanged(int)),
this, SLOT(slotScrollValueChanged(int)));
diff --git a/src/widget/wwaveformviewer.cpp b/src/widget/wwaveformviewer.cpp
index cb8e4b4dfb..5074825475 100644
--- a/src/widget/wwaveformviewer.cpp
+++ b/src/widget/wwaveformviewer.cpp
@@ -27,7 +27,7 @@ WWaveformViewer::WWaveformViewer(const char *group, UserSettingsPointer pConfig,
setAcceptDrops(true);
m_pZoom = new ControlProxy(group, "waveform_zoom", this);
- m_pZoom->connectValueChanged(SLOT(onZoomChange(double)));
+ m_pZoom->connectValueChanged(this, &WWaveformViewer::onZoomChange);
m_pScratchPositionEnable = new ControlProxy(
group, "scratch_position_enable", this);
diff --git a/src/widget/wwidgetstack.cpp b/src/widget/wwidgetstack.cpp
index 9e6548f391..35f6d963a2 100644
--- a/src/widget/wwidgetstack.cpp
+++ b/src/widget/wwidgetstack.cpp
@@ -8,7 +8,7 @@ WidgetStackControlListener::WidgetStackControlListener(QObject* pParent,
: QObject(pParent),
m_control(pControl ? pControl->getKey() : ConfigKey(), this),
m_index(index) {
- m_control.connectValueChanged(SLOT(slotValueChanged(double)));
+ m_control.connectValueChanged(this, &WidgetStackControlListener::slotValueChanged);
}
void WidgetStackControlListener::slotValueChanged(double v) {
@@ -34,10 +34,9 @@ WWidgetStack::WWidgetStack(QWidget* pParent, const ConfigKey& nextConfigKey,
m_nextControl(nextConfigKey, this),
m_prevControl(prevConfigKey, this),
m_currentPageControl(currentPageConfigKey, this) {
- m_nextControl.connectValueChanged(SLOT(onNextControlChanged(double)));
- m_prevControl.connectValueChanged(SLOT(onPrevControlChanged(double)));
- m_currentPageControl.connectValueChanged(
- SLOT(onCurrentPageControlChanged(double)));
+ m_nextControl.connectValueChanged(this, &WWidgetStack::onNextControlChanged);
+ m_prevControl.connectValueChanged(this, &WWidgetStack::onPrevControlChanged);
+ m_currentPageControl.connectValueChanged(this, &WWidgetStack::onCurrentPageControlChanged);
connect(&m_showMapper, SIGNAL(mapped(int)),
this, SLOT(showIndex(int)));
connect(&m_hideMapper, SIGNAL(mapped(int)),
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-31 06:27:41 +0000