summaryrefslogtreecommitdiffstats
path: root/src/waveform
diff options
context:
space:
mode:
authorJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-11-17 20:02:14 +0100
committerJan Holthuis <jan.holthuis@ruhr-uni-bochum.de>2020-11-19 19:46:54 +0100
commit4e1bebf0f5e06ecdd99c41771e7b4ee19c0cdcf3 (patch)
treed0e98cee9eef416282049092ea93b0b2b6eb417d /src/waveform
parent133ea1e3d6547964f014144eee15590ea449c7af (diff)
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
Diffstat (limited to 'src/waveform')
-rw-r--r--src/waveform/renderers/waveformmark.cpp2
-rw-r--r--src/waveform/renderers/waveformwidgetrenderer.cpp2
-rw-r--r--src/waveform/renderers/waveformwidgetrenderer.h4
-rw-r--r--src/waveform/visualplayposition.cpp2
-rw-r--r--src/waveform/visualplayposition.h2
-rw-r--r--src/waveform/waveform.cpp2
-rw-r--r--src/waveform/waveform.h6
-rw-r--r--src/waveform/waveformmarklabel.cpp11
-rw-r--r--src/waveform/waveformmarklabel.h13
9 files changed, 27 insertions, 17 deletions
diff --git a/src/waveform/renderers/waveformmark.cpp b/src/waveform/renderers/waveformmark.cpp
index 7bbd98630d..951fa352fc 100644
--- a/src/waveform/renderers/waveformmark.cpp
+++ b/src/waveform/renderers/waveformmark.cpp
@@ -7,7 +7,7 @@
#include "waveformmark.h"
namespace {
-Qt::Alignment decodeAlignmentFlags(QString alignString, Qt::Alignment defaultFlags) {
+Qt::Alignment decodeAlignmentFlags(const QString& alignString, Qt::Alignment defaultFlags) {
QStringList stringFlags = alignString.toLower()
.split('|',
#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
diff --git a/src/waveform/renderers/waveformwidgetrenderer.cpp b/src/waveform/renderers/waveformwidgetrenderer.cpp
index e66ea37fa8..2058b1d661 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.cpp
+++ b/src/waveform/renderers/waveformwidgetrenderer.cpp
@@ -290,7 +290,7 @@ void WaveformWidgetRenderer::drawPlayPosmarker(QPainter* painter) {
}
void WaveformWidgetRenderer::drawTriangle(QPainter* painter,
- QBrush fillColor,
+ const QBrush& fillColor,
QPointF p0,
QPointF p1,
QPointF p2) {
diff --git a/src/waveform/renderers/waveformwidgetrenderer.h b/src/waveform/renderers/waveformwidgetrenderer.h
index 9a4a761ac0..26f5582f75 100644
--- a/src/waveform/renderers/waveformwidgetrenderer.h
+++ b/src/waveform/renderers/waveformwidgetrenderer.h
@@ -139,7 +139,7 @@ class WaveformWidgetRenderer {
}
void setTrack(TrackPointer track);
- void setMarkPositions(QMap<WaveformMarkPointer, int> markPositions) {
+ void setMarkPositions(const QMap<WaveformMarkPointer, int>& markPositions) {
m_markPositions = markPositions;
}
@@ -206,7 +206,7 @@ private:
// draw play position indicator triangles
void drawPlayPosmarker(QPainter* painter);
void drawTriangle(QPainter* painter,
- QBrush fillColor,
+ const QBrush& fillColor,
QPointF p1,
QPointF p2,
QPointF p3);
diff --git a/src/waveform/visualplayposition.cpp b/src/waveform/visualplayposition.cpp
index aeafaf8f97..68a9641cf8 100644
--- a/src/waveform/visualplayposition.cpp
+++ b/src/waveform/visualplayposition.cpp
@@ -112,7 +112,7 @@ void VisualPlayPosition::slotAudioBufferSizeChanged(double sizeMillis) {
}
//static
-QSharedPointer<VisualPlayPosition> VisualPlayPosition::getVisualPlayPosition(QString group) {
+QSharedPointer<VisualPlayPosition> VisualPlayPosition::getVisualPlayPosition(const QString& group) {
QSharedPointer<VisualPlayPosition> vpp = m_listVisualPlayPosition.value(group);
if (vpp.isNull()) {
vpp = QSharedPointer<VisualPlayPosition>(new VisualPlayPosition(group));
diff --git a/src/waveform/visualplayposition.h b/src/waveform/visualplayposition.h
index badbf6b77e..0ca4e16b66 100644
--- a/src/waveform/visualplayposition.h
+++ b/src/waveform/visualplayposition.h
@@ -55,7 +55,7 @@ class VisualPlayPosition : public QObject {
// WARNING: Not thread safe. This function must only be called from the main
// thread.
- static QSharedPointer<VisualPlayPosition> getVisualPlayPosition(QString group);
+ static QSharedPointer<VisualPlayPosition> getVisualPlayPosition(const QString& group);
// This is called by SoundDevicePortAudio just after the callback starts.
static void setCallbackEntryToDacSecs(double secs, const PerformanceTimer& time);
diff --git a/src/waveform/waveform.cpp b/src/waveform/waveform.cpp
index 86f736c727..efb9ba6fce 100644
--- a/src/waveform/waveform.cpp
+++ b/src/waveform/waveform.cpp
@@ -17,7 +17,7 @@ int computeTextureStride(int size) {
return stride;
}
-Waveform::Waveform(const QByteArray data)
+Waveform::Waveform(const QByteArray& data)
: m_id(-1),
m_saveState(SaveState::NotSaved),
m_dataSize(0),
diff --git a/src/waveform/waveform.h b/src/waveform/waveform.h
index cd9cefefcf..813d846c0b 100644
--- a/src/waveform/waveform.h
+++ b/src/waveform/waveform.h
@@ -37,7 +37,7 @@ class Waveform {
Saved
};
- explicit Waveform(const QByteArray pData = QByteArray());
+ explicit Waveform(const QByteArray& pData = QByteArray());
Waveform(int audioSampleRate, int audioSamples,
int desiredVisualSampleRate, int maxVisualSamples);
@@ -58,7 +58,7 @@ class Waveform {
return m_version;
}
- void setVersion(QString version) {
+ void setVersion(const QString& version) {
QMutexLocker locker(&m_mutex);
m_version = version;
}
@@ -68,7 +68,7 @@ class Waveform {
return m_description;
}
- void setDescription(QString description) {
+ void setDescription(const QString& description) {
QMutexLocker locker(&m_mutex);
m_description = description;
}
diff --git a/src/waveform/waveformmarklabel.cpp b/src/waveform/waveformmarklabel.cpp
index 33aa6d3b31..0c7b3f7797 100644
--- a/src/waveform/waveformmarklabel.cpp
+++ b/src/waveform/waveformmarklabel.cpp
@@ -1,9 +1,14 @@
#include "waveform/waveformmarklabel.h"
#include "util/math.h"
-void WaveformMarkLabel::prerender(QPointF bottomLeft, QPixmap icon, QString text,
- QFont font, QColor textColor, QColor backgroundColor,
- float widgetWidth, double scaleFactor) {
+void WaveformMarkLabel::prerender(QPointF bottomLeft,
+ const QPixmap& icon,
+ QString text,
+ const QFont& font,
+ QColor textColor,
+ QColor backgroundColor,
+ float widgetWidth,
+ double scaleFactor) {
if (text.isEmpty() && icon.isNull()) {
clear();
return;
diff --git a/src/waveform/waveformmarklabel.h b/src/waveform/waveformmarklabel.h
index e3a588a49b..fdb87badfe 100644
--- a/src/waveform/waveformmarklabel.h
+++ b/src/waveform/waveformmarklabel.h
@@ -16,9 +16,14 @@ class WaveformMarkLabel {
WaveformMarkLabel() {};
// Render the label to an internal QPixmap buffer
- void prerender(QPointF bottomLeft, QPixmap icon, QString text,
- QFont font, QColor textColor, QColor backgroundColor,
- float widgetWidth, double scaleFactor);
+ void prerender(QPointF bottomLeft,
+ const QPixmap& icon,
+ QString text,
+ const QFont& font,
+ QColor textColor,
+ QColor backgroundColor,
+ float widgetWidth,
+ double scaleFactor);
// Draw the prerendered pixmap
void draw(QPainter* pPainter);
@@ -27,7 +32,7 @@ class WaveformMarkLabel {
return m_areaRect;
};
- void setAreaRect(QRectF areaRect) {
+ void setAreaRect(const QRectF& areaRect) {
m_areaRect = areaRect;
}