From 4e1bebf0f5e06ecdd99c41771e7b4ee19c0cdcf3 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Tue, 17 Nov 2020 20:02:14 +0100 Subject: Pass non-trivial/large function args by reference Fixes a bunch of `-Wclazy-function-args-by-ref` warnings. See https://github.com/KDE/clazy/blob/master/docs/checks/README-function-args-by-ref.md for details. Most of these changes are automated, using the clazy fixit by setting the `CLAZY_EXPORT_FIXES` before compilation and then running: $ mkdir /tmp/patch $ find ../src -iname "*.yaml" -exec mv {} /tmp/patch \; $ clang-apply-replacements /tmp/patch --- src/control/control.cpp | 2 +- src/control/control.h | 2 +- src/control/controlaudiotaperpot.cpp | 8 ++++---- src/control/controlaudiotaperpot.h | 2 +- src/control/controleffectknob.cpp | 2 +- src/control/controleffectknob.h | 2 +- src/control/controlencoder.cpp | 2 +- src/control/controlencoder.h | 2 +- src/control/controlindicator.cpp | 2 +- src/control/controlindicator.h | 2 +- src/control/controllinpotmeter.cpp | 10 ++++++---- src/control/controllinpotmeter.h | 8 +++++--- src/control/controllogpotmeter.cpp | 4 ++-- src/control/controllogpotmeter.h | 2 +- src/control/controlobject.cpp | 7 +++++-- src/control/controlobject.h | 8 +++++--- src/control/controlpotmeter.cpp | 14 ++++++++------ src/control/controlpotmeter.h | 14 ++++++++------ src/control/controlpushbutton.cpp | 2 +- src/control/controlpushbutton.h | 2 +- src/control/controlttrotary.cpp | 3 ++- src/control/controlttrotary.h | 2 +- 22 files changed, 58 insertions(+), 44 deletions(-) (limited to 'src/control') diff --git a/src/control/control.cpp b/src/control/control.cpp index 9b0ae2f9f9..6f988913f3 100644 --- a/src/control/control.cpp +++ b/src/control/control.cpp @@ -18,7 +18,7 @@ QHash ControlDoublePrivate::s_qCOAliasHash MMutex ControlDoublePrivate::s_qCOHashMutex; ControlDoublePrivate::ControlDoublePrivate( - ConfigKey key, + const ConfigKey& key, ControlObject* pCreatorCO, bool bIgnoreNops, bool bTrack, diff --git a/src/control/control.h b/src/control/control.h index da89fafb06..9f2f89c395 100644 --- a/src/control/control.h +++ b/src/control/control.h @@ -160,7 +160,7 @@ class ControlDoublePrivate : public QObject { private: ControlDoublePrivate( - ConfigKey key, + const ConfigKey& key, ControlObject* pCreatorCO, bool bIgnoreNops, bool bTrack, diff --git a/src/control/controlaudiotaperpot.cpp b/src/control/controlaudiotaperpot.cpp index d0e55f4d38..9264b67774 100644 --- a/src/control/controlaudiotaperpot.cpp +++ b/src/control/controlaudiotaperpot.cpp @@ -1,11 +1,11 @@ #include "control/controlaudiotaperpot.h" -ControlAudioTaperPot::ControlAudioTaperPot(ConfigKey key, - double minDB, double maxDB, - double neutralParameter) +ControlAudioTaperPot::ControlAudioTaperPot(const ConfigKey& key, + double minDB, + double maxDB, + double neutralParameter) : ControlPotmeter(key) { - // Override ControlPotmeters default value of 0.5 setDefaultValue(1.0); set(1.0); diff --git a/src/control/controlaudiotaperpot.h b/src/control/controlaudiotaperpot.h index 8ffc6b1644..8c16262d6f 100644 --- a/src/control/controlaudiotaperpot.h +++ b/src/control/controlaudiotaperpot.h @@ -12,7 +12,7 @@ class ControlAudioTaperPot : public ControlPotmeter { // minDB is the Start value of the pure db scale it cranked to -Infinity by the linear part of the AudioTaperPot // maxDB is the Upper gain Value // neutralParameter is a knob position between 0 and 1 where the gain is 1 (0dB) - ControlAudioTaperPot(ConfigKey key, double minDB, double maxDB, double neutralParameter); + ControlAudioTaperPot(const ConfigKey& key, double minDB, double maxDB, double neutralParameter); }; #endif // CONTROLAUDIOTAPERPOT_H diff --git a/src/control/controleffectknob.cpp b/src/control/controleffectknob.cpp index 169cade841..cf01306458 100644 --- a/src/control/controleffectknob.cpp +++ b/src/control/controleffectknob.cpp @@ -3,7 +3,7 @@ #include "util/math.h" #include "effects/effectmanifestparameter.h" -ControlEffectKnob::ControlEffectKnob(ConfigKey key, double dMinValue, double dMaxValue) +ControlEffectKnob::ControlEffectKnob(const ConfigKey& key, double dMinValue, double dMaxValue) : ControlPotmeter(key, dMinValue, dMaxValue) { } diff --git a/src/control/controleffectknob.h b/src/control/controleffectknob.h index eabb38e07b..b0a10e2ae8 100644 --- a/src/control/controleffectknob.h +++ b/src/control/controleffectknob.h @@ -7,7 +7,7 @@ class ControlEffectKnob : public ControlPotmeter { Q_OBJECT public: - ControlEffectKnob(ConfigKey key, double dMinValue = 0.0, double dMaxValue = 1.0); + ControlEffectKnob(const ConfigKey& key, double dMinValue = 0.0, double dMaxValue = 1.0); void setBehaviour(EffectManifestParameter::ControlHint type, double dMinValue, double dMaxValue); diff --git a/src/control/controlencoder.cpp b/src/control/controlencoder.cpp index be6778c915..3dd146a6e9 100644 --- a/src/control/controlencoder.cpp +++ b/src/control/controlencoder.cpp @@ -1,6 +1,6 @@ #include "control/controlencoder.h" -ControlEncoder::ControlEncoder(ConfigKey key, bool bIgnoreNops) +ControlEncoder::ControlEncoder(const ConfigKey& key, bool bIgnoreNops) : ControlObject(key, bIgnoreNops) { if (m_pControl) { m_pControl->setBehavior(new ControlEncoderBehavior()); diff --git a/src/control/controlencoder.h b/src/control/controlencoder.h index 1bbd3c986d..a323ac3133 100644 --- a/src/control/controlencoder.h +++ b/src/control/controlencoder.h @@ -7,7 +7,7 @@ class ControlEncoder : public ControlObject { Q_OBJECT public: - ControlEncoder(ConfigKey key, bool bIgnoreNops=true); + ControlEncoder(const ConfigKey& key, bool bIgnoreNops = true); }; #endif diff --git a/src/control/controlindicator.cpp b/src/control/controlindicator.cpp index 1109f2b971..2d655b02b0 100644 --- a/src/control/controlindicator.cpp +++ b/src/control/controlindicator.cpp @@ -2,7 +2,7 @@ #include "control/controlproxy.h" #include "util/math.h" -ControlIndicator::ControlIndicator(ConfigKey key) +ControlIndicator::ControlIndicator(const ConfigKey& key) : ControlObject(key, false), m_blinkValue(OFF), m_nextSwitchTime(0.0) { diff --git a/src/control/controlindicator.h b/src/control/controlindicator.h index d723c8b8a1..62ec95b452 100644 --- a/src/control/controlindicator.h +++ b/src/control/controlindicator.h @@ -15,7 +15,7 @@ class ControlIndicator : public ControlObject { RATIO1TO1_250MS = 3, // used for Pioneer cue }; - ControlIndicator(ConfigKey key); + ControlIndicator(const ConfigKey& key); virtual ~ControlIndicator(); void setBlinkValue(enum BlinkValue bv); diff --git a/src/control/controllinpotmeter.cpp b/src/control/controllinpotmeter.cpp index c3ab24cca5..deaa65f91a 100644 --- a/src/control/controllinpotmeter.cpp +++ b/src/control/controllinpotmeter.cpp @@ -1,9 +1,11 @@ #include "control/controllinpotmeter.h" -ControlLinPotmeter::ControlLinPotmeter(ConfigKey key, - double dMinValue, double dMaxValue, - double dStep, double dSmallStep, - bool allowOutOfBounds) +ControlLinPotmeter::ControlLinPotmeter(const ConfigKey& key, + double dMinValue, + double dMaxValue, + double dStep, + double dSmallStep, + bool allowOutOfBounds) : ControlPotmeter(key, dMinValue, dMaxValue, allowOutOfBounds) { if (m_pControl) { m_pControl->setBehavior( diff --git a/src/control/controllinpotmeter.h b/src/control/controllinpotmeter.h index b958992425..98c8e95537 100644 --- a/src/control/controllinpotmeter.h +++ b/src/control/controllinpotmeter.h @@ -7,9 +7,11 @@ class ControlLinPotmeter : public ControlPotmeter { Q_OBJECT public: // dStep = 0 and dSmallStep = 0 defaults to 10 and 100 steps - ControlLinPotmeter(ConfigKey key, - double dMinValue = 0.0, double dMaxValue = 1.0, - double dStep = 0, double dSmallStep = 0, + ControlLinPotmeter(const ConfigKey& key, + double dMinValue = 0.0, + double dMaxValue = 1.0, + double dStep = 0, + double dSmallStep = 0, bool allowOutOfBounds = false); }; diff --git a/src/control/controllogpotmeter.cpp b/src/control/controllogpotmeter.cpp index c92b06152d..b0c4e40163 100644 --- a/src/control/controllogpotmeter.cpp +++ b/src/control/controllogpotmeter.cpp @@ -17,8 +17,8 @@ #include "control/controllogpotmeter.h" -ControlLogpotmeter::ControlLogpotmeter(ConfigKey key, double dMaxValue, double minDB) - : ControlPotmeter(key, 0, dMaxValue) { +ControlLogpotmeter::ControlLogpotmeter(const ConfigKey& key, double dMaxValue, double minDB) + : ControlPotmeter(key, 0, dMaxValue) { // Override ControlPotmeters default value of 0.5 setDefaultValue(1.0); set(1.0); diff --git a/src/control/controllogpotmeter.h b/src/control/controllogpotmeter.h index 1ec4a93e0f..05e7d6bd93 100644 --- a/src/control/controllogpotmeter.h +++ b/src/control/controllogpotmeter.h @@ -28,7 +28,7 @@ class ControlLogpotmeter : public ControlPotmeter { Q_OBJECT public: - ControlLogpotmeter(ConfigKey key, double dMaxValue, double minDB); + ControlLogpotmeter(const ConfigKey& key, double dMaxValue, double minDB); }; #endif diff --git a/src/control/controlobject.cpp b/src/control/controlobject.cpp index 543046e576..5aa71b84ce 100644 --- a/src/control/controlobject.cpp +++ b/src/control/controlobject.cpp @@ -28,8 +28,11 @@ ControlObject::ControlObject() { } -ControlObject::ControlObject(ConfigKey key, bool bIgnoreNops, bool bTrack, - bool bPersist, double defaultValue) +ControlObject::ControlObject(const ConfigKey& key, + bool bIgnoreNops, + bool bTrack, + bool bPersist, + double defaultValue) : m_key(key) { // Don't bother looking up the control if key is invalid. Prevents log spew. if (m_key.isValid()) { diff --git a/src/control/controlobject.h b/src/control/controlobject.h index 22a6d49b93..b6f3ae5f53 100644 --- a/src/control/controlobject.h +++ b/src/control/controlobject.h @@ -35,9 +35,11 @@ class ControlObject : public QObject { // bPersist: Store value on exit, load on startup. // defaultValue: default value of CO. If CO is persistent and there is no valid // value found in the config, this is also the initial value. - ControlObject(ConfigKey key, - bool bIgnoreNops = true, bool bTrack = false, - bool bPersist = false, double defaultValue = 0.0); + ControlObject(const ConfigKey& key, + bool bIgnoreNops = true, + bool bTrack = false, + bool bPersist = false, + double defaultValue = 0.0); virtual ~ControlObject(); // Returns a pointer to the ControlObject matching the given ConfigKey diff --git a/src/control/controlpotmeter.cpp b/src/control/controlpotmeter.cpp index 9ac26c01e1..a62b77ef43 100644 --- a/src/control/controlpotmeter.cpp +++ b/src/control/controlpotmeter.cpp @@ -19,12 +19,14 @@ #include "control/controlpotmeter.h" #include "control/controlproxy.h" -ControlPotmeter::ControlPotmeter(ConfigKey key, double dMinValue, double dMaxValue, - bool allowOutOfBounds, - bool bIgnoreNops, - bool bTrack, - bool bPersist, - double defaultValue) +ControlPotmeter::ControlPotmeter(const ConfigKey& key, + double dMinValue, + double dMaxValue, + bool allowOutOfBounds, + bool bIgnoreNops, + bool bTrack, + bool bPersist, + double defaultValue) : ControlObject(key, bIgnoreNops, bTrack, bPersist, defaultValue), m_controls(key) { setRange(dMinValue, dMaxValue, allowOutOfBounds); diff --git a/src/control/controlpotmeter.h b/src/control/controlpotmeter.h index ef56a8eb2a..a3dee755c7 100644 --- a/src/control/controlpotmeter.h +++ b/src/control/controlpotmeter.h @@ -73,12 +73,14 @@ class PotmeterControls : public QObject { class ControlPotmeter : public ControlObject { Q_OBJECT public: - ControlPotmeter(ConfigKey key, double dMinValue = 0.0, double dMaxValue = 1.0, - bool allowOutOfBounds = false, - bool bIgnoreNops = true, - bool bTrack = false, - bool bPersist = false, - double defaultValue = 0.0); + ControlPotmeter(const ConfigKey& key, + double dMinValue = 0.0, + double dMaxValue = 1.0, + bool allowOutOfBounds = false, + bool bIgnoreNops = true, + bool bTrack = false, + bool bPersist = false, + double defaultValue = 0.0); virtual ~ControlPotmeter(); // Sets the step count of the associated PushButtons. diff --git a/src/control/controlpushbutton.cpp b/src/control/controlpushbutton.cpp index 6fe0486d56..29c4e9dd9b 100644 --- a/src/control/controlpushbutton.cpp +++ b/src/control/controlpushbutton.cpp @@ -21,7 +21,7 @@ Purpose: Creates a new simulated latching push-button. Input: key - Key for the configuration file -------- ------------------------------------------------------ */ -ControlPushButton::ControlPushButton(ConfigKey key, bool bPersist, double defaultValue) +ControlPushButton::ControlPushButton(const ConfigKey& key, bool bPersist, double defaultValue) : ControlObject(key, false, false, bPersist, defaultValue), m_buttonMode(PUSH), m_iNoStates(2) { diff --git a/src/control/controlpushbutton.h b/src/control/controlpushbutton.h index 408ee217b5..d523ee5329 100644 --- a/src/control/controlpushbutton.h +++ b/src/control/controlpushbutton.h @@ -52,7 +52,7 @@ class ControlPushButton : public ControlObject { } } - ControlPushButton(ConfigKey key, bool bPersist = false, double defaultValue = 0.0); + ControlPushButton(const ConfigKey& key, bool bPersist = false, double defaultValue = 0.0); virtual ~ControlPushButton(); inline ButtonMode getButtonMode() const { diff --git a/src/control/controlttrotary.cpp b/src/control/controlttrotary.cpp index 93b97bab6a..930c8c48d6 100644 --- a/src/control/controlttrotary.cpp +++ b/src/control/controlttrotary.cpp @@ -20,7 +20,8 @@ Purpose: Creates a new rotary encoder Input: key -------- ------------------------------------------------------ */ -ControlTTRotary::ControlTTRotary(ConfigKey key) : ControlObject(key) { +ControlTTRotary::ControlTTRotary(const ConfigKey& key) + : ControlObject(key) { if (m_pControl) { m_pControl->setBehavior( new ControlTTRotaryBehavior()); diff --git a/src/control/controlttrotary.h b/src/control/controlttrotary.h index edef5bd2f9..59ba41eeb2 100644 --- a/src/control/controlttrotary.h +++ b/src/control/controlttrotary.h @@ -23,7 +23,7 @@ class ControlTTRotary : public ControlObject { Q_OBJECT public: - ControlTTRotary(ConfigKey key); + ControlTTRotary(const ConfigKey& key); }; #endif -- cgit v1.2.3