diff options
author | Daniel Schürmann <daschuer@mixxx.org> | 2020-11-20 07:07:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-20 07:07:13 +0100 |
commit | f99d07b0a96cdbcf8c309fc0d7dc13dd2fc0b197 (patch) | |
tree | e2411c56e7c63b6142337bcb28dafc9e55c8316a /src/widget | |
parent | 1ddb09583aee53d34f3e4d48fc48ec98619957bb (diff) | |
parent | 9213b41a02c408bf82b0606f3a71646036f7d1e7 (diff) |
Merge pull request #3335 from Holzhaus/clazy-function-args-by-ref
Fix -Wclazy-function-arg-by-ref warnings
Diffstat (limited to 'src/widget')
45 files changed, 118 insertions, 109 deletions
diff --git a/src/widget/trackdroptarget.h b/src/widget/trackdroptarget.h index cb7cd4a77f..01c0b99be5 100644 --- a/src/widget/trackdroptarget.h +++ b/src/widget/trackdroptarget.h @@ -23,8 +23,8 @@ class TrackDropTarget { } signals: - virtual void trackDropped(QString filename, QString group) = 0; - virtual void cloneDeck(QString sourceGroup, QString targetGroup) = 0; + virtual void trackDropped(const QString& filename, const QString& group) = 0; + virtual void cloneDeck(const QString& sourceGroup, const QString& targetGroup) = 0; }; #endif // TRACKDROPTARGET diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h index 3b28624f66..dc49f17649 100644 --- a/src/widget/wcoverart.h +++ b/src/widget/wcoverart.h @@ -33,8 +33,8 @@ class WCoverArt : public QWidget, public WBaseWidget, public TrackDropTarget { void slotEnable(bool); signals: - void trackDropped(QString filename, QString group) override; - void cloneDeck(QString source_group, QString target_group) override; + void trackDropped(const QString& filename, const QString& group) override; + void cloneDeck(const QString& sourceGroup, const QString& targetGroup) override; private slots: void slotCoverFound( diff --git a/src/widget/wcoverartlabel.cpp b/src/widget/wcoverartlabel.cpp index 1e06646367..2d76d4be50 100644 --- a/src/widget/wcoverartlabel.cpp +++ b/src/widget/wcoverartlabel.cpp @@ -50,7 +50,7 @@ WCoverArtLabel::WCoverArtLabel(QWidget* parent) WCoverArtLabel::~WCoverArtLabel() = default; void WCoverArtLabel::setCoverArt(const CoverInfo& coverInfo, - QPixmap px) { + const QPixmap& px) { m_pCoverMenu->setCoverArt(coverInfo); if (px.isNull()) { m_loadedCover = px; diff --git a/src/widget/wcoverartlabel.h b/src/widget/wcoverartlabel.h index 23df1050cc..e269b25c13 100644 --- a/src/widget/wcoverartlabel.h +++ b/src/widget/wcoverartlabel.h @@ -19,7 +19,7 @@ class WCoverArtLabel : public QLabel { explicit WCoverArtLabel(QWidget* parent = nullptr); ~WCoverArtLabel() override; // Verifies that the base destructor is virtual - void setCoverArt(const CoverInfo& coverInfo, QPixmap px); + void setCoverArt(const CoverInfo& coverInfo, const QPixmap& px); void loadTrack(TrackPointer pTrack); signals: diff --git a/src/widget/wcuemenupopup.cpp b/src/widget/wcuemenupopup.cpp index 89c8ef5d47..ea92cb56c0 100644 --- a/src/widget/wcuemenupopup.cpp +++ b/src/widget/wcuemenupopup.cpp @@ -67,7 +67,7 @@ WCueMenuPopup::WCueMenuPopup(UserSettingsPointer pConfig, QWidget* parent) layout()->activate(); } -void WCueMenuPopup::setTrackAndCue(TrackPointer pTrack, CuePointer pCue) { +void WCueMenuPopup::setTrackAndCue(TrackPointer pTrack, const CuePointer& pCue) { if (pTrack && pCue) { m_pTrack = pTrack; m_pCue = pCue; diff --git a/src/widget/wcuemenupopup.h b/src/widget/wcuemenupopup.h index 0afd541eb8..9bfbbeb3f4 100644 --- a/src/widget/wcuemenupopup.h +++ b/src/widget/wcuemenupopup.h @@ -23,7 +23,7 @@ class WCueMenuPopup : public QWidget { delete m_pDeleteCue; } - void setTrackAndCue(TrackPointer pTrack, CuePointer pCue); + void setTrackAndCue(TrackPointer pTrack, const CuePointer& pCue); void setColorPalette(const ColorPalette& palette) { if (m_pColorPicker != nullptr) { diff --git a/src/widget/wdisplay.cpp b/src/widget/wdisplay.cpp index 70d072709c..f2110bfcdd 100644 --- a/src/widget/wdisplay.cpp +++ b/src/widget/wdisplay.cpp @@ -98,9 +98,9 @@ void WDisplay::resetPositions() { m_disabledPixmaps.resize(0); } -void WDisplay::setPixmapBackground(PixmapSource source, - Paintable::DrawMode mode, - double scaleFactor) { +void WDisplay::setPixmapBackground(const PixmapSource& source, + Paintable::DrawMode mode, + double scaleFactor) { m_pPixmapBack = WPixmapStore::getPaintable(source, mode, scaleFactor); if (m_pPixmapBack.isNull() || m_pPixmapBack->isNull()) { qDebug() << metaObject()->className() diff --git a/src/widget/wdisplay.h b/src/widget/wdisplay.h index 1e5715429c..b5b8acad33 100644 --- a/src/widget/wdisplay.h +++ b/src/widget/wdisplay.h @@ -53,7 +53,7 @@ class WDisplay : public WWidget { double scaleFactor); void setPixmapBackground( - PixmapSource source, + const PixmapSource& source, Paintable::DrawMode mode, double scaleFactor); diff --git a/src/widget/wknobcomposed.cpp b/src/widget/wknobcomposed.cpp index 8b2c3deb6a..e2fbb98c1f 100644 --- a/src/widget/wknobcomposed.cpp +++ b/src/widget/wknobcomposed.cpp @@ -88,9 +88,9 @@ void WKnobComposed::clear() { m_pKnob.clear(); } -void WKnobComposed::setPixmapBackground(PixmapSource source, - Paintable::DrawMode mode, - double scaleFactor) { +void WKnobComposed::setPixmapBackground(const PixmapSource& source, + Paintable::DrawMode mode, + double scaleFactor) { m_pPixmapBack = WPixmapStore::getPaintable(source, mode, scaleFactor); if (m_pPixmapBack.isNull() || m_pPixmapBack->isNull()) { qDebug() << metaObject()->className() @@ -98,9 +98,9 @@ void WKnobComposed::setPixmapBackground(PixmapSource source, } } -void WKnobComposed::setPixmapKnob(PixmapSource source, - Paintable::DrawMode mode, - double scaleFactor) { +void WKnobComposed::setPixmapKnob(const PixmapSource& source, + Paintable::DrawMode mode, + double scaleFactor) { m_pKnob = WPixmapStore::getPaintable(source, mode, scaleFactor); if (m_pKnob.isNull() || m_pKnob->isNull()) { qDebug() << metaObject()->className() diff --git a/src/widget/wknobcomposed.h b/src/widget/wknobcomposed.h index 454fd48b13..489c5db9a1 100644 --- a/src/widget/wknobcomposed.h +++ b/src/widget/wknobcomposed.h @@ -38,11 +38,11 @@ class WKnobComposed : public WWidget { void inputActivity(); void clear(); void setPixmapBackground( - PixmapSource source, + const PixmapSource& source, Paintable::DrawMode mode, double scaleFactor); void setPixmapKnob( - PixmapSource source, + const PixmapSource& source, Paintable::DrawMode mode, double scaleFactor); void drawArc(QPainter* pPainter); diff --git a/src/widget/wlibrary.cpp b/src/widget/wlibrary.cpp index e45efdba6a..b293fe6151 100644 --- a/src/widget/wlibrary.cpp +++ b/src/widget/wlibrary.cpp @@ -33,7 +33,7 @@ void WLibrary::setup(const QDomNode& node, const SkinContext& context) { kMaxTrackTableBackgroundColorOpacity); } -bool WLibrary::registerView(QString name, QWidget* view) { +bool WLibrary::registerView(const QString& name, QWidget* view) { QMutexLocker lock(&m_mutex); if (m_viewMap.contains(name)) { return false; diff --git a/src/widget/wlibrary.h b/src/widget/wlibrary.h index 5c6a4fad7e..91e655ffa7 100644 --- a/src/widget/wlibrary.h +++ b/src/widget/wlibrary.h @@ -25,7 +25,7 @@ class WLibrary : public QStackedWidget, public WBaseWidget { // the view and is in charge of deleting it. Returns whether or not the // registration was successful. Registered widget must implement the // LibraryView interface. - bool registerView(QString name, QWidget* view); + bool registerView(const QString& name, QWidget* view); LibraryView* getActiveView() const; diff --git a/src/widget/wlibrarytableview.cpp b/src/widget/wlibrarytableview.cpp index 0baabfc6bd..ff650d0afe 100644 --- a/src/widget/wlibrarytableview.cpp +++ b/src/widget/wlibrarytableview.cpp @@ -12,12 +12,11 @@ #include "widget/wwidget.h" WLibraryTableView::WLibraryTableView(QWidget* parent, - UserSettingsPointer pConfig, - ConfigKey vScrollBarPosKey) + UserSettingsPointer pConfig, + const ConfigKey& vScrollBarPosKey) : QTableView(parent), m_pConfig(pConfig), m_vScrollBarPosKey(vScrollBarPosKey) { - loadVScrollBarPosState(); // Setup properties for table diff --git a/src/widget/wlibrarytableview.h b/src/widget/wlibrarytableview.h index da2413a1dc..2b65c949c0 100644 --- a/src/widget/wlibrarytableview.h +++ b/src/widget/wlibrarytableview.h @@ -19,8 +19,8 @@ class WLibraryTableView : public QTableView, public virtual LibraryView { public: WLibraryTableView(QWidget* parent, - UserSettingsPointer pConfig, - ConfigKey vScrollBarPosKey); + UserSettingsPointer pConfig, + const ConfigKey& vScrollBarPosKey); ~WLibraryTableView() override; void moveSelection(int delta) override; @@ -40,8 +40,7 @@ class WLibraryTableView : public QTableView, public virtual LibraryView { signals: void loadTrack(TrackPointer pTrack); - void loadTrackToPlayer(TrackPointer pTrack, QString group, - bool play = false); + void loadTrackToPlayer(TrackPointer pTrack, const QString& group, bool play = false); void trackSelected(TrackPointer pTrack); void onlyCachedCoverArt(bool); void scrollValueChanged(int); diff --git a/src/widget/wmainmenubar.h b/src/widget/wmainmenubar.h index 7f305ac4b2..a40be8d49b 100644 --- a/src/widget/wmainmenubar.h +++ b/src/widget/wmainmenubar.h @@ -64,7 +64,7 @@ class WMainMenuBar : public QMenuBar { void toggleBroadcasting(bool toggle); void toggleRecording(bool enabled); void toggleVinylControl(int deck); - void visitUrl(QString url); + void visitUrl(const QString& url); void quit(); void internalRecordingStateChange(bool recording); diff --git a/src/widget/woverview.h b/src/widget/woverview.h index 03be183855..20e36d61bd 100644 --- a/src/widget/woverview.h +++ b/src/widget/woverview.h @@ -47,8 +47,8 @@ class WOverview : public WWidget, public TrackDropTarget { AnalyzerProgress analyzerProgress); signals: - void trackDropped(QString filename, QString group) override; - void cloneDeck(QString source_group, QString target_group) override; + void trackDropped(const QString& filename, const QString& group) override; + void cloneDeck(const QString& sourceGroup, const QString& targetGroup) override; protected: WOverview( diff --git a/src/widget/wpixmapstore.cpp b/src/widget/wpixmapstore.cpp index ebb33e25ef..bf007dce23 100644 --- a/src/widget/wpixmapstore.cpp +++ b/src/widget/wpixmapstore.cpp @@ -13,9 +13,9 @@ QSharedPointer<ImgSource> WPixmapStore::m_loader = QSharedPointer<ImgSource>(new ImgLoader()); // static -PaintablePointer WPixmapStore::getPaintable(PixmapSource source, - Paintable::DrawMode mode, - double scaleFactor) { +PaintablePointer WPixmapStore::getPaintable(const PixmapSource& source, + Paintable::DrawMode mode, + double scaleFactor) { if (source.isEmpty()) { return PaintablePointer(); } diff --git a/src/widget/wpixmapstore.h b/src/widget/wpixmapstore.h index ec501617c6..01100a0c57 100644 --- a/src/widget/wpixmapstore.h +++ b/src/widget/wpixmapstore.h @@ -39,7 +39,7 @@ typedef QWeakPointer<Paintable> WeakPaintablePointer; class WPixmapStore { public: static PaintablePointer getPaintable( - PixmapSource source, + const PixmapSource& source, Paintable::DrawMode mode, double scaleFactor); static QPixmap* getPixmapNoCache(const QString& fileName, double scaleFactor); diff --git a/src/widget/wpushbutton.cpp b/src/widget/wpushbutton.cpp index 4be634c96f..3965b75123 100644 --- a/src/widget/wpushbutton.cpp +++ b/src/widget/wpushbutton.cpp @@ -257,8 +257,11 @@ void WPushButton::setStates(int iStates) { m_align.resize(iStates); } -void WPushButton::setPixmap(int iState, bool bPressed, PixmapSource source, - Paintable::DrawMode mode, double scaleFactor) { +void WPushButton::setPixmap(int iState, + bool bPressed, + const PixmapSource& source, + Paintable::DrawMode mode, + double scaleFactor) { QVector<PaintablePointer>& pixmaps = bPressed ? m_pressedPixmaps : m_unpressedPixmaps; @@ -279,9 +282,9 @@ void WPushButton::setPixmap(int iState, bool bPressed, PixmapSource source, pixmaps.replace(iState, pPixmap); } -void WPushButton::setPixmapBackground(PixmapSource source, - Paintable::DrawMode mode, - double scaleFactor) { +void WPushButton::setPixmapBackground(const PixmapSource& source, + Paintable::DrawMode mode, + double scaleFactor) { // Load background pixmap m_pPixmapBack = WPixmapStore::getPaintable(source, mode, scaleFactor); if (!source.isEmpty() && diff --git a/src/widget/wpushbutton.h b/src/widget/wpushbutton.h index ac5f6ef525..6393ea5710 100644 --- a/src/widget/wpushbutton.h +++ b/src/widget/wpushbutton.h @@ -95,13 +95,16 @@ class WPushButton : public WWidget { virtual void restyleAndRepaint(); // Associates a pixmap of a given state of the button with the widget - void setPixmap(int iState, bool bPressed, PixmapSource source, - Paintable::DrawMode mode, double scaleFactor); + void setPixmap(int iState, + bool bPressed, + const PixmapSource& source, + Paintable::DrawMode mode, + double scaleFactor); // Associates a background pixmap with the widget. This is only needed if // the button pixmaps contains alpha channel values. void setPixmapBackground( - PixmapSource source, + const PixmapSource& source, Paintable::DrawMode mode, double scaleFactor); diff --git a/src/widget/wrecordingduration.cpp b/src/widget/wrecordingduration.cpp index 7d314408cd..ee9770bf64 100644 --- a/src/widget/wrecordingduration.cpp +++ b/src/widget/wrecordingduration.cpp @@ -39,6 +39,6 @@ void WRecordingDuration::slotRecordingInactive(bool isRecording) { } } -void WRecordingDuration::refreshLabel(QString durationRecorded) { +void WRecordingDuration::refreshLabel(const QString& durationRecorded) { setText(durationRecorded); } diff --git a/src/widget/wrecordingduration.h b/src/widget/wrecordingduration.h index 840cc575ea..e6adbd5411 100644 --- a/src/widget/wrecordingduration.h +++ b/src/widget/wrecordingduration.h @@ -18,7 +18,7 @@ class WRecordingDuration: public WLabel { void setup(const QDomNode& node, const SkinContext& context) override; private slots: - void refreshLabel(QString); + void refreshLabel(const QString&); void slotRecordingInactive(bool); private: diff --git a/src/widget/wsingletoncontainer.cpp b/src/widget/wsingletoncontainer.cpp index 11f5073739..6deebe709d 100644 --- a/src/widget/wsingletoncontainer.cpp +++ b/src/widget/wsingletoncontainer.cpp @@ -58,7 +58,7 @@ void WSingletonContainer::showEvent(QShowEvent* event) { } } -void SingletonMap::insertSingleton(QString objectName, QWidget* widget) { +void SingletonMap::insertSingleton(const QString& objectName, QWidget* widget) { if (m_singletons.contains(objectName)){ qWarning() << "ERROR: Tried to insert a singleton with a name that has" << "already been inserted:" << objectName; @@ -67,6 +67,6 @@ void SingletonMap::insertSingleton(QString objectName, QWidget* widget) { m_singletons.insert(objectName, widget); } -QWidget* SingletonMap::getSingletonWidget(QString objectName) const { +QWidget* SingletonMap::getSingletonWidget(const QString& objectName) const { return m_singletons.value(objectName, nullptr); } diff --git a/src/widget/wsingletoncontainer.h b/src/widget/wsingletoncontainer.h index 87812d4f94..168e263ad4 100644 --- a/src/widget/wsingletoncontainer.h +++ b/src/widget/wsingletoncontainer.h @@ -73,12 +73,12 @@ class SingletonMap { // Takes a constructed QWidget and inserts it in the map of available // singletons. Checks that an object of that name hasn't already been // defined. - void insertSingleton(QString objectName, QWidget* widget); + void insertSingleton(const QString& objectName, QWidget* widget); // We don't want to end up with badly-constructed containers, so only // provide a factory function. Returns NULL if the objectName is not in // the map. - QWidget* getSingletonWidget(QString objectName) const; + QWidget* getSingletonWidget(const QString& objectName) const; private: QMap<QString, QWidget*> m_singletons; diff --git a/src/widget/wslidercomposed.cpp b/src/widget/wslidercomposed.cpp index 3d3035bd0c..0c28df5b61 100644 --- a/src/widget/wslidercomposed.cpp +++ b/src/widget/wslidercomposed.cpp @@ -167,9 +167,9 @@ void WSliderComposed::setup(const QDomNode& node, const SkinContext& context) { setFocusPolicy(Qt::NoFocus); } -void WSliderComposed::setSliderPixmap(PixmapSource sourceSlider, - Paintable::DrawMode drawMode, - double scaleFactor) { +void WSliderComposed::setSliderPixmap(const PixmapSource& sourceSlider, + Paintable::DrawMode drawMode, + double scaleFactor) { m_pSlider = WPixmapStore::getPaintable(sourceSlider, drawMode, scaleFactor); if (!m_pSlider) { qDebug() << "WSliderComposed: Error loading slider pixmap:" << sourceSlider.getPath(); @@ -180,9 +180,9 @@ void WSliderComposed::setSliderPixmap(PixmapSource sourceSlider, } void WSliderComposed::setHandlePixmap(bool bHorizontal, - PixmapSource sourceHandle, - Paintable::DrawMode mode, - double scaleFactor) { + const PixmapSource& sourceHandle, + Paintable::DrawMode mode, + double scaleFactor) { m_bHorizontal = bHorizontal; m_handler.setHorizontal(m_bHorizontal); m_pHandle = WPixmapStore::getPaintable(sourceHandle, mode, scaleFactor); diff --git a/src/widget/wslidercomposed.h b/src/widget/wslidercomposed.h index 87370facc7..df17823263 100644 --- a/src/widget/wslidercomposed.h +++ b/src/widget/wslidercomposed.h @@ -46,12 +46,12 @@ class WSliderComposed : public WWidget { void setup(const QDomNode& node, const SkinContext& context); void setSliderPixmap( - PixmapSource sourceSlider, + const PixmapSource& sourceSlider, Paintable::DrawMode drawMode, double scaleFactor); void setHandlePixmap( bool bHorizontal, - PixmapSource sourceHandle, + const PixmapSource& sourceHandle, Paintable::DrawMode mode, double scaleFactor); inline bool isHorizontal() const { return m_bHorizontal; }; diff --git a/src/widget/wspinny.h b/src/widget/wspinny.h index 190094af42..5f82d33002 100644 --- a/src/widget/wspinny.h +++ b/src/widget/wspinny.h @@ -62,8 +62,8 @@ class WSpinny : public QGLWidget, public WBaseWidget, public VinylSignalQualityL signals: - void trackDropped(QString filename, QString group) override; - void cloneDeck(QString source_group, QString target_group) override; + void trackDropped(const QString& filename, const QString& group) override; + void cloneDeck(const QString& sourceGroup, const QString& targetGroup) override; protected: //QWidget: diff --git a/src/widget/wstarrating.cpp b/src/widget/wstarrating.cpp index a7f58e05ba..a9a010bf5b 100644 --- a/src/widget/wstarrating.cpp +++ b/src/widget/wstarrating.cpp @@ -7,7 +7,7 @@ #include "track/track.h" -WStarRating::WStarRating(QString group, QWidget* pParent) +WStarRating::WStarRating(const QString& group, QWidget* pParent) : WWidget(pParent), m_starRating(0, 5), m_group(group), diff --git a/src/widget/wstarrating.h b/src/widget/wstarrating.h index 6304efe605..426701042b 100644 --- a/src/widget/wstarrating.h +++ b/src/widget/wstarrating.h @@ -18,7 +18,7 @@ class ControlPushButton; class WStarRating : public WWidget { Q_OBJECT public: - WStarRating(QString group, QWidget* pParent); + WStarRating(const QString& group, QWidget* pParent); virtual void setup(const QDomNode& node, const SkinContext& context); QSize sizeHint() const override; diff --git a/src/widget/wstatuslight.cpp b/src/widget/wstatuslight.cpp index 48d7b4baba..e3ab09736a 100644 --- a/src/widget/wstatuslight.cpp +++ b/src/widget/wstatuslight.cpp @@ -70,9 +70,10 @@ void WStatusLight::setup(const QDomNode& node, const SkinContext& context) { setFocusPolicy(Qt::NoFocus); } -void WStatusLight::setPixmap(int iState, PixmapSource source, - Paintable::DrawMode mode, - double scaleFactor) { +void WStatusLight::setPixmap(int iState, + const PixmapSource& source, + Paintable::DrawMode mode, + double scaleFactor) { if (iState < 0 || iState >= m_pixmaps.size()) { return; } diff --git a/src/widget/wstatuslight.h b/src/widget/wstatuslight.h index ac7250dff5..9ac71aa006 100644 --- a/src/widget/wstatuslight.h +++ b/src/widget/wstatuslight.h @@ -45,8 +45,10 @@ class WStatusLight : public WWidget { void paintEvent(QPaintEvent * /*unused*/) override; private: - void setPixmap(int iState, PixmapSource source, |