diff options
author | RJ Ryan <rryan@mixxx.org> | 2016-05-07 16:14:59 -0700 |
---|---|---|
committer | RJ Ryan <rryan@mixxx.org> | 2016-05-07 16:25:04 -0700 |
commit | 2511a95a7332c089a2e77d020e7e331b4ff1a33e (patch) | |
tree | c2155145af4eab3d9b8ebbc7063028728da06dac /src/widget | |
parent | cf941799fd0bc0f3751e07e0949305d537825b0c (diff) |
Switch a lot of function arguments to const references in LegacySkinParser.
Diffstat (limited to 'src/widget')
55 files changed, 56 insertions, 56 deletions
diff --git a/src/widget/wbattery.cpp b/src/widget/wbattery.cpp index 68cd9eb4bb..6ae0392858 100644 --- a/src/widget/wbattery.cpp +++ b/src/widget/wbattery.cpp @@ -14,7 +14,7 @@ WBattery::WBattery(QWidget* parent) } } -void WBattery::setup(QDomNode node, const SkinContext& context) { +void WBattery::setup(const QDomNode& node, const SkinContext& context) { if (context.hasNode(node, "BackPath")) { QString mode_str = context.selectAttributeString( context.selectElement(node, "BackPath"), "scalemode", "TILE"); diff --git a/src/widget/wbattery.h b/src/widget/wbattery.h index d867212f51..2b25034121 100644 --- a/src/widget/wbattery.h +++ b/src/widget/wbattery.h @@ -17,7 +17,7 @@ class WBattery : public WWidget { public: explicit WBattery(QWidget* parent=nullptr); - void setup(QDomNode node, const SkinContext& context); + void setup(const QDomNode& node, const SkinContext& context); public slots: // gets information from battery and updates the Pixmap diff --git a/src/widget/wcombobox.cpp b/src/widget/wcombobox.cpp index 53da169f70..45c1f87c23 100644 --- a/src/widget/wcombobox.cpp +++ b/src/widget/wcombobox.cpp @@ -10,7 +10,7 @@ WComboBox::WComboBox(QWidget* pParent) this, SLOT(slotCurrentIndexChanged(int))); } -void WComboBox::setup(QDomNode node, const SkinContext& context) { +void WComboBox::setup(const QDomNode& node, const SkinContext& context) { // Load pixmaps for associated states QDomNode state = context.selectNode(node, "State"); while (!state.isNull()) { diff --git a/src/widget/wcombobox.h b/src/widget/wcombobox.h index d981ac4729..930aacb942 100644 --- a/src/widget/wcombobox.h +++ b/src/widget/wcombobox.h @@ -13,7 +13,7 @@ class WComboBox : public QComboBox, public WBaseWidget { public: explicit WComboBox(QWidget* pParent); - void setup(QDomNode node, const SkinContext& context); + void setup(const QDomNode& node, const SkinContext& context); void onConnectedControlChanged(double dParameter, double dValue) override; diff --git a/src/widget/wcoverart.cpp b/src/widget/wcoverart.cpp index bb910349c3..82f2f9a3a6 100644 --- a/src/widget/wcoverart.cpp +++ b/src/widget/wcoverart.cpp @@ -46,7 +46,7 @@ WCoverArt::~WCoverArt() { delete m_pDlgFullSize; } -void WCoverArt::setup(QDomNode node, const SkinContext& context) { +void WCoverArt::setup(const QDomNode& node, const SkinContext& context) { Q_UNUSED(node); setMouseTracking(true); diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h index fbc7a1fa61..c8312913ad 100644 --- a/src/widget/wcoverart.h +++ b/src/widget/wcoverart.h @@ -22,7 +22,7 @@ class WCoverArt : public QWidget, public WBaseWidget { const QString& group); ~WCoverArt() override; - void setup(QDomNode node, const SkinContext& context); + void setup(const QDomNode& node, const SkinContext& context); public slots: void slotLoadTrack(TrackPointer); diff --git a/src/widget/wdisplay.cpp b/src/widget/wdisplay.cpp index 4826c5f562..d1ab3219d8 100644 --- a/src/widget/wdisplay.cpp +++ b/src/widget/wdisplay.cpp @@ -37,7 +37,7 @@ WDisplay::~WDisplay() { resetPositions(); } -void WDisplay::setup(QDomNode node, const SkinContext& context) { +void WDisplay::setup(const QDomNode& node, const SkinContext& context) { // Set background pixmap if available if (context.hasNode(node, "BackPath")) { QDomElement backPathNode = context.selectElement(node, "BackPath"); diff --git a/src/widget/wdisplay.h b/src/widget/wdisplay.h index ff513ab1b8..58e6ac3ba2 100644 --- a/src/widget/wdisplay.h +++ b/src/widget/wdisplay.h @@ -33,7 +33,7 @@ class WDisplay : public WWidget { explicit WDisplay(QWidget *parent=nullptr); ~WDisplay() override; - void setup(QDomNode node, const SkinContext& context); + void setup(const QDomNode& node, const SkinContext& context); void onConnectedControlChanged(double dParameter, double dValue) override; diff --git a/src/widget/weffect.cpp b/src/widget/weffect.cpp index 5d75e271e0..aa3581b1aa 100644 --- a/src/widget/weffect.cpp +++ b/src/widget/weffect.cpp @@ -11,7 +11,7 @@ WEffect::WEffect(QWidget* pParent, EffectsManager* pEffectsManager) effectUpdated(); } -void WEffect::setup(QDomNode node, const SkinContext& context) { +void WEffect::setup(const QDomNode& node, const SkinContext& context) { WLabel::setup(node, context); // EffectWidgetUtils propagates NULLs so this is all safe. EffectRackPointer pRack = EffectWidgetUtils::getEffectRackFromNode( diff --git a/src/widget/weffect.h b/src/widget/weffect.h index 93394ada18..6a0e736cec 100644 --- a/src/widget/weffect.h +++ b/src/widget/weffect.h @@ -14,7 +14,7 @@ class WEffect : public WLabel { public: WEffect(QWidget* pParent, EffectsManager* pEffectsManager); - void setup(QDomNode node, const SkinContext& context) override; + void setup(const QDomNode& node, const SkinContext& context) override; private slots: void effectUpdated(); diff --git a/src/widget/weffectbuttonparameter.cpp b/src/widget/weffectbuttonparameter.cpp index cd00221c62..6dc2924afc 100644 --- a/src/widget/weffectbuttonparameter.cpp +++ b/src/widget/weffectbuttonparameter.cpp @@ -8,7 +8,7 @@ WEffectButtonParameter::WEffectButtonParameter(QWidget* pParent, EffectsManager* : WEffectParameterBase(pParent, pEffectsManager) { } -void WEffectButtonParameter::setup(QDomNode node, const SkinContext& context) { +void WEffectButtonParameter::setup(const QDomNode& node, const SkinContext& context) { // EffectWidgetUtils propagates NULLs so this is all safe. EffectRackPointer pRack = EffectWidgetUtils::getEffectRackFromNode( node, context, m_pEffectsManager); diff --git a/src/widget/weffectbuttonparameter.h b/src/widget/weffectbuttonparameter.h index 8275048230..2e6b845a9f 100644 --- a/src/widget/weffectbuttonparameter.h +++ b/src/widget/weffectbuttonparameter.h @@ -14,7 +14,7 @@ class WEffectButtonParameter : public WEffectParameterBase { public: WEffectButtonParameter(QWidget* pParent, EffectsManager* pEffectsManager); - void setup(QDomNode node, const SkinContext& context) override; + void setup(const QDomNode& node, const SkinContext& context) override; }; diff --git a/src/widget/weffectchain.cpp b/src/widget/weffectchain.cpp index d723ebb2b7..cf6ccda72a 100644 --- a/src/widget/weffectchain.cpp +++ b/src/widget/weffectchain.cpp @@ -10,7 +10,7 @@ WEffectChain::WEffectChain(QWidget* pParent, EffectsManager* pEffectsManager) chainUpdated(); } -void WEffectChain::setup(QDomNode node, const SkinContext& context) { +void WEffectChain::setup(const QDomNode& node, const SkinContext& context) { WLabel::setup(node, context); // EffectWidgetUtils propagates NULLs so this is all safe. EffectRackPointer pRack = EffectWidgetUtils::getEffectRackFromNode( diff --git a/src/widget/weffectchain.h b/src/widget/weffectchain.h index caf062e8d3..45b81c8700 100644 --- a/src/widget/weffectchain.h +++ b/src/widget/weffectchain.h @@ -16,7 +16,7 @@ class WEffectChain : public WLabel { public: WEffectChain(QWidget* pParent, EffectsManager* pEffectsManager); - void setup(QDomNode node, const SkinContext& context) override; + void setup(const QDomNode& node, const SkinContext& context) override; private slots: void chainUpdated(); diff --git a/src/widget/weffectparameter.cpp b/src/widget/weffectparameter.cpp index f353a16e9e..e292ab0763 100644 --- a/src/widget/weffectparameter.cpp +++ b/src/widget/weffectparameter.cpp @@ -8,7 +8,7 @@ WEffectParameter::WEffectParameter(QWidget* pParent, EffectsManager* pEffectsMan : WEffectParameterBase(pParent, pEffectsManager) { } -void WEffectParameter::setup(QDomNode node, const SkinContext& context) { +void WEffectParameter::setup(const QDomNode& node, const SkinContext& context) { // EffectWidgetUtils propagates NULLs so this is all safe. EffectRackPointer pRack = EffectWidgetUtils::getEffectRackFromNode( node, context, m_pEffectsManager); diff --git a/src/widget/weffectparameter.h b/src/widget/weffectparameter.h index 05ffd45ca3..d7a37ab5e2 100644 --- a/src/widget/weffectparameter.h +++ b/src/widget/weffectparameter.h @@ -14,7 +14,7 @@ class WEffectParameter : public WEffectParameterBase { public: WEffectParameter(QWidget* pParent, EffectsManager* pEffectsManager); - void setup(QDomNode node, const SkinContext& context) override; + void setup(const QDomNode& node, const SkinContext& context) override; }; diff --git a/src/widget/weffectparameterbase.h b/src/widget/weffectparameterbase.h index 8b2932279e..2b6c9497e2 100644 --- a/src/widget/weffectparameterbase.h +++ b/src/widget/weffectparameterbase.h @@ -14,7 +14,7 @@ class WEffectParameterBase : public WLabel { public: WEffectParameterBase(QWidget* pParent, EffectsManager* pEffectsManager); - void setup(QDomNode node, const SkinContext& context) override = 0; + void setup(const QDomNode& node, const SkinContext& context) override = 0; protected slots: void parameterUpdated(); diff --git a/src/widget/weffectpushbutton.cpp b/src/widget/weffectpushbutton.cpp index 6f82f089f2..ecea381735 100644 --- a/src/widget/weffectpushbutton.cpp +++ b/src/widget/weffectpushbutton.cpp @@ -10,7 +10,7 @@ WEffectPushButton::WEffectPushButton(QWidget* pParent, EffectsManager* pEffectsM m_pButtonMenu(nullptr) { } -void WEffectPushButton::setup(QDomNode node, const SkinContext& context) { +void WEffectPushButton::setup(const QDomNode& node, const SkinContext& context) { // Setup parent class. WPushButton::setup(node, context); diff --git a/src/widget/weffectpushbutton.h b/src/widget/weffectpushbutton.h index 31dbe8c489..ad78f5715a 100644 --- a/src/widget/weffectpushbutton.h +++ b/src/widget/weffectpushbutton.h @@ -16,7 +16,7 @@ class WEffectPushButton : public WPushButton { public: WEffectPushButton(QWidget* pParent, EffectsManager* pEffectsManager); - void setup(QDomNode node, const SkinContext& context) override; + void setup(const QDomNode& node, const SkinContext& context) override; public slots: void onConnectedControlChanged(double dParameter, double dValue) override; diff --git a/src/widget/wkey.cpp b/src/widget/wkey.cpp index 6edfbc22d8..b20075cf46 100644 --- a/src/widget/wkey.cpp +++ b/src/widget/wkey.cpp @@ -19,7 +19,7 @@ void WKey::onConnectedControlChanged(double dParameter, double dValue) { setValue(dValue); } -void WKey::setup(QDomNode node, const SkinContext& context) { +void WKey::setup(const QDomNode& node, const SkinContext& context) { WLabel::setup(node, context); m_displayCents = context.selectBool(node, "DisplayCents", false); } diff --git a/src/widget/wkey.h b/src/widget/wkey.h index f694ad9d1c..9f66437e80 100644 --- a/src/widget/wkey.h +++ b/src/widget/wkey.h @@ -12,7 +12,7 @@ class WKey : public WLabel { explicit WKey(const char* group, QWidget* pParent=nullptr); void onConnectedControlChanged(double dParameter, double dValue) override; - void setup(QDomNode node, const SkinContext& context) override; + void setup(const QDomNode& node, const SkinContext& context) override; private slots: void setValue(double dValue); diff --git a/src/widget/wknobcomposed.cpp b/src/widget/wknobcomposed.cpp index 463703ddc5..bbd8945d67 100644 --- a/src/widget/wknobcomposed.cpp +++ b/src/widget/wknobcomposed.cpp @@ -13,7 +13,7 @@ WKnobComposed::WKnobComposed(QWidget* pParent) m_dKnobCenterYOffset(0) { } -void WKnobComposed::setup(QDomNode node, const SkinContext& context) { +void WKnobComposed::setup(const QDomNode& node, const SkinContext& context) { clear(); // Set background pixmap if available diff --git a/src/widget/wknobcomposed.h b/src/widget/wknobcomposed.h index 49451e8de2..dfbd9c8483 100644 --- a/src/widget/wknobcomposed.h +++ b/src/widget/wknobcomposed.h @@ -17,7 +17,7 @@ class WKnobComposed : public WWidget { public: explicit WKnobComposed(QWidget* pParent=nullptr); - void setup(QDomNode node, const SkinContext& context); + void setup(const QDomNode& node, const SkinContext& context); void onConnectedControlChanged(double dParameter, double dValue) override; diff --git a/src/widget/wlabel.cpp b/src/widget/wlabel.cpp index 4c787f74dd..8d815d459f 100644 --- a/src/widget/wlabel.cpp +++ b/src/widget/wlabel.cpp @@ -29,7 +29,7 @@ WLabel::WLabel(QWidget* pParent) m_elideMode(Qt::ElideNone) { } -void WLabel::setup(QDomNode node, const SkinContext& context) { +void WLabel::setup(const QDomNode& node, const SkinContext& context) { // Colors QPalette pal = palette(); //we have to copy out the palette to edit it since it's const (probably for threadsafety) if (context.hasNode(node, "BgColor")) { diff --git a/src/widget/wlabel.h b/src/widget/wlabel.h index c4a86edb8c..da77246a9e 100644 --- a/src/widget/wlabel.h +++ b/src/widget/wlabel.h @@ -29,7 +29,7 @@ class WLabel : public QLabel, public WBaseWidget { public: explicit WLabel(QWidget* pParent=nullptr); - virtual void setup(QDomNode node, const SkinContext& context); + virtual void setup(const QDomNode& node, const SkinContext& context); QString text() const; void setText(const QString& text); diff --git a/src/widget/wnumber.cpp b/src/widget/wnumber.cpp index e2228f78c1..d8b34c8a1c 100644 --- a/src/widget/wnumber.cpp +++ b/src/widget/wnumber.cpp @@ -22,7 +22,7 @@ WNumber::WNumber(QWidget* pParent) m_iNoDigits(2) { } -void WNumber::setup(QDomNode node, const SkinContext& context) { +void WNumber::setup(const QDomNode& node, const SkinContext& context) { WLabel::setup(node, context); // Number of digits after the decimal. diff --git a/src/widget/wnumber.h b/src/widget/wnumber.h index b7270a77e2..7974ffcfd9 100644 --- a/src/widget/wnumber.h +++ b/src/widget/wnumber.h @@ -28,7 +28,7 @@ class WNumber : public WLabel { public: explicit WNumber(QWidget* pParent = nullptr); - void setup(QDomNode node, const SkinContext& context) override; + void setup(const QDomNode& node, const SkinContext& context) override; void onConnectedControlChanged(double dParameter, double dValue) override; diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp index 12896fde12..3c5ba1d9ed 100644 --- a/src/widget/woverview.cpp +++ b/src/widget/woverview.cpp @@ -66,7 +66,7 @@ WOverview::~WOverview() { } } -void WOverview::setup(QDomNode node, const SkinContext& context) { +void WOverview::setup(const QDomNode& node, const SkinContext& context) { m_signalColors.setup(node, context); m_qColorBackground = m_signalColors.getBgColor(); @@ -195,7 +195,7 @@ void WOverview::slotTrackLoaded(TrackPointer pTrack) { } void WOverview::slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrack) { - qDebug() << "WOverview::slotLoadingTrack" << pNewTrack << pOldTrack; + qDebug() << this << "WOverview::slotLoadingTrack" << pNewTrack << pOldTrack; if (m_pCurrentTrack != nullptr && pOldTrack == m_pCurrentTrack) { disconnect(m_pCurrentTrack.data(), SIGNAL(waveformSummaryUpdated()), this, SLOT(slotWaveformSummaryUpdated())); diff --git a/src/widget/woverview.h b/src/widget/woverview.h index 3fd0e98958..bf594cdb10 100644 --- a/src/widget/woverview.h +++ b/src/widget/woverview.h @@ -36,7 +36,7 @@ class WOverview : public WWidget { WOverview(const char* pGroup, UserSettingsPointer pConfig, QWidget* parent=nullptr); ~WOverview() override; - void setup(QDomNode node, const SkinContext& context); + void setup(const QDomNode& node, const SkinContext& context); public slots: void onConnectedControlChanged(double dParameter, double dValue) override; diff --git a/src/widget/wpushbutton.cpp b/src/widget/wpushbutton.cpp index d6cb44403e..49a00335f8 100644 --- a/src/widget/wpushbutton.cpp +++ b/src/widget/wpushbutton.cpp @@ -48,7 +48,7 @@ WPushButton::WPushButton(QWidget* pParent, ControlPushButton::ButtonMode leftBut setStates(0); } -void WPushButton::setup(QDomNode node, const SkinContext& context) { +void WPushButton::setup(const QDomNode& node, const SkinContext& context) { // Number of states int iNumStates = context.selectInt(node, "NumberStates"); setStates(iNumStates); diff --git a/src/widget/wpushbutton.h b/src/widget/wpushbutton.h index cdaf796cb5..8da7b74e2a 100644 --- a/src/widget/wpushbutton.h +++ b/src/widget/wpushbutton.h @@ -62,7 +62,7 @@ class WPushButton : public WWidget { return 0; } - virtual void setup(QDomNode node, const SkinContext& context); + virtual void setup(const QDomNode& node, const SkinContext& context); // Sets the number of states associated with this button, and removes // associated pixmaps. diff --git a/src/widget/wsearchlineedit.cpp b/src/widget/wsearchlineedit.cpp index a0d49d52b1..3b80f4cdb1 100644 --- a/src/widget/wsearchlineedit.cpp +++ b/src/widget/wsearchlineedit.cpp @@ -62,7 +62,7 @@ WSearchLineEdit::WSearchLineEdit(QWidget* pParent) arg(m_clearButton->sizeHint().width() + frameWidth + 1)); } -void WSearchLineEdit::setup(QDomNode node, const SkinContext& context) { +void WSearchLineEdit::setup(const QDomNode& node, const SkinContext& context) { // Background color QColor bgc(255,255,255); if (context.hasNode(node, "BgColor")) { diff --git a/src/widget/wsearchlineedit.h b/src/widget/wsearchlineedit.h index 2d3455ea25..81a64ca217 100644 --- a/src/widget/wsearchlineedit.h +++ b/src/widget/wsearchlineedit.h @@ -18,7 +18,7 @@ class WSearchLineEdit : public QLineEdit, public WBaseWidget { public: explicit WSearchLineEdit(QWidget* pParent); - void setup(QDomNode node, const SkinContext& context); + void setup(const QDomNode& node, const SkinContext& context); protected: void resizeEvent(QResizeEvent* /*unused*/) override; diff --git a/src/widget/wsingletoncontainer.cpp b/src/widget/wsingletoncontainer.cpp index 25e32e2275..fa61c74e8e 100644 --- a/src/widget/wsingletoncontainer.cpp +++ b/src/widget/wsingletoncontainer.cpp @@ -10,7 +10,7 @@ WSingletonContainer::WSingletonContainer(QWidget* pParent) : WWidgetGroup(pParent), m_pWidget(nullptr), m_pLayout(nullptr) { } -void WSingletonContainer::setup(QDomNode node, const SkinContext& context) { +void WSingletonContainer::setup(const QDomNode& node, const SkinContext& context) { setContentsMargins(0, 0, 0, 0); m_pLayout = new QVBoxLayout(); m_pLayout->setSpacing(0); diff --git a/src/widget/wsingletoncontainer.h b/src/widget/wsingletoncontainer.h index 621f068188..6aa7bef706 100644 --- a/src/widget/wsingletoncontainer.h +++ b/ |