Merge branch '2.3' of github.com:mixxxdj/mixxx into cleanup-headers

10 files changed, 17 insertions, 15 deletions

diff --git a/src/analyzer/analyzerbeats.cpp b/src/analyzer/analyzerbeats.cpp
index 62b98115cb..67dd45d17f 100644
--- a/src/analyzer/analyzerbeats.cpp
+++ b/src/analyzer/analyzerbeats.cpp
@@ -293,7 +293,7 @@ void AnalyzerBeats::storeResults(TrackPointer tio) {
 
 // static
 QHash<QString, QString> AnalyzerBeats::getExtraVersionInfo(
-        QString pluginId, bool bPreferencesFastAnalysis) {
+        const QString& pluginId, bool bPreferencesFastAnalysis) {
     QHash<QString, QString> extraVersionInfo;
     extraVersionInfo["vamp_plugin_id"] = pluginId;
     if (bPreferencesFastAnalysis) {
diff --git a/src/analyzer/analyzerbeats.h b/src/analyzer/analyzerbeats.h
index fb65c1d8ce..1169fd0436 100644
--- a/src/analyzer/analyzerbeats.h
+++ b/src/analyzer/analyzerbeats.h
@@ -34,7 +34,7 @@ class AnalyzerBeats : public Analyzer {
   private:
     bool shouldAnalyze(TrackPointer tio) const;
     static QHash<QString, QString> getExtraVersionInfo(
-            QString pluginId, bool bPreferencesFastAnalysis);
+            const QString& pluginId, bool bPreferencesFastAnalysis);
 
     BeatDetectionSettings m_bpmSettings;
     std::unique_ptr<mixxx::AnalyzerBeatsPlugin> m_pPlugin;
diff --git a/src/analyzer/analyzerkey.cpp b/src/analyzer/analyzerkey.cpp
index fc9bb3ee09..a11f711525 100644
--- a/src/analyzer/analyzerkey.cpp
+++ b/src/analyzer/analyzerkey.cpp
@@ -30,7 +30,7 @@ mixxx::AnalyzerPluginInfo AnalyzerKey::defaultPlugin() {
     return plugins.at(0);
 }
 
-AnalyzerKey::AnalyzerKey(KeyDetectionSettings keySettings)
+AnalyzerKey::AnalyzerKey(const KeyDetectionSettings& keySettings)
         : m_keySettings(keySettings),
           m_iSampleRate(0),
           m_iTotalSamples(0),
@@ -185,7 +185,7 @@ void AnalyzerKey::storeResults(TrackPointer tio) {
 
 // static
 QHash<QString, QString> AnalyzerKey::getExtraVersionInfo(
-        QString pluginId, bool bPreferencesFastAnalysis) {
+        const QString& pluginId, bool bPreferencesFastAnalysis) {
     QHash<QString, QString> extraVersionInfo;
     extraVersionInfo["vamp_plugin_id"] = pluginId;
     if (bPreferencesFastAnalysis) {
diff --git a/src/analyzer/analyzerkey.h b/src/analyzer/analyzerkey.h
index cfb28554b3..504df21705 100644
--- a/src/analyzer/analyzerkey.h
+++ b/src/analyzer/analyzerkey.h
@@ -13,7 +13,7 @@
 
 class AnalyzerKey : public Analyzer {
   public:
-    explicit AnalyzerKey(KeyDetectionSettings keySettings);
+    explicit AnalyzerKey(const KeyDetectionSettings& keySettings);
     ~AnalyzerKey() override = default;
 
     static QList<mixxx::AnalyzerPluginInfo> availablePlugins();
@@ -26,7 +26,7 @@ class AnalyzerKey : public Analyzer {
 
   private:
     static QHash<QString, QString> getExtraVersionInfo(
-            QString pluginId, bool bPreferencesFastAnalysis);
+            const QString& pluginId, bool bPreferencesFastAnalysis);
 
     bool shouldAnalyze(TrackPointer tio) const;
 
diff --git a/src/analyzer/analyzerwaveform.cpp b/src/analyzer/analyzerwaveform.cpp
index f7dba829fc..ec0a6a1b0f 100644
--- a/src/analyzer/analyzerwaveform.cpp
+++ b/src/analyzer/analyzerwaveform.cpp
@@ -16,7 +16,7 @@ mixxx::Logger kLogger("AnalyzerWaveform");
 
 AnalyzerWaveform::AnalyzerWaveform(
         UserSettingsPointer pConfig,
-        QSqlDatabase dbConnection)
+        const QSqlDatabase& dbConnection)
         : m_analysisDao(pConfig),
           m_waveformData(nullptr),
           m_waveformSummaryData(nullptr),
diff --git a/src/analyzer/analyzerwaveform.h b/src/analyzer/analyzerwaveform.h
index 1f8ea02ae4..03089261b2 100644
--- a/src/analyzer/analyzerwaveform.h
+++ b/src/analyzer/analyzerwaveform.h
@@ -138,7 +138,7 @@ class AnalyzerWaveform : public Analyzer {
   public:
     AnalyzerWaveform(
             UserSettingsPointer pConfig,
-            QSqlDatabase dbConnection);
+            const QSqlDatabase& dbConnection);
     ~AnalyzerWaveform() override;
 
     bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
diff --git a/src/analyzer/plugins/analyzerqueenmarybeats.cpp b/src/analyzer/plugins/analyzerqueenmarybeats.cpp
index 73fc0d8aab..9ea99fd765 100644
--- a/src/analyzer/plugins/analyzerqueenmarybeats.cpp
+++ b/src/analyzer/plugins/analyzerqueenmarybeats.cpp
@@ -78,7 +78,7 @@ bool AnalyzerQueenMaryBeats::processSamples(const CSAMPLE* pIn, const int iLen)
 bool AnalyzerQueenMaryBeats::finalize() {
     m_helper.finalize();
 
-    int nonZeroCount = m_detectionResults.size();
+    int nonZeroCount = static_cast<int>(m_detectionResults.size());
     while (nonZeroCount > 0 && m_detectionResults.at(nonZeroCount - 1) <= 0.0) {
         --nonZeroCount;
     }
@@ -103,7 +103,7 @@ bool AnalyzerQueenMaryBeats::finalize() {
     std::vector<double> beats;
     tt.calculateBeats(df, beatPeriod, beats);
 
-    m_resultBeats.reserve(beats.size());
+    m_resultBeats.reserve(static_cast<int>(beats.size()));
     for (size_t i = 0; i < beats.size(); ++i) {
         double result = (beats.at(i) * m_stepSize) - m_stepSize / 2;
         m_resultBeats.push_back(result);
diff --git a/src/analyzer/plugins/buffering_utils.cpp b/src/analyzer/plugins/buffering_utils.cpp
index 6edecb5ca4..680b792831 100644
--- a/src/analyzer/plugins/buffering_utils.cpp
+++ b/src/analyzer/plugins/buffering_utils.cpp
@@ -7,7 +7,9 @@
 
 namespace mixxx {
 
-bool DownmixAndOverlapHelper::initialize(size_t windowSize, size_t stepSize, WindowReadyCallback callback) {
+bool DownmixAndOverlapHelper::initialize(size_t windowSize,
+        size_t stepSize,
+        const WindowReadyCallback& callback) {
     m_buffer.assign(windowSize, 0.0);
     m_callback = callback;
     m_windowSize = windowSize;
diff --git a/src/analyzer/plugins/buffering_utils.h b/src/analyzer/plugins/buffering_utils.h
index 8e4ade0d4d..46598c3373 100644
--- a/src/analyzer/plugins/buffering_utils.h
+++ b/src/analyzer/plugins/buffering_utils.h
@@ -19,7 +19,7 @@ class DownmixAndOverlapHelper {
     bool initialize(
             size_t windowSize,
             size_t stepSize,
-            WindowReadyCallback callback);
+            const WindowReadyCallback& callback);
 
     bool processStereoSamples(
             const CSAMPLE* pInput,
diff --git a/src/analyzer/trackanalysisscheduler.cpp b/src/analyzer/trackanalysisscheduler.cpp
index bced859428..876b6e4963 100644
--- a/src/analyzer/trackanalysisscheduler.cpp
+++ b/src/analyzer/trackanalysisscheduler.cpp
@@ -109,7 +109,7 @@ void TrackAnalysisScheduler::emitProgressOrFinished() {
     DEBUG_ASSERT(m_pendingTrackIds.size() <=
             static_cast<size_t>(m_dequeuedTracksCount));
     const int finishedTracksCount =
-            m_dequeuedTracksCount - m_pendingTrackIds.size();
+            m_dequeuedTracksCount - static_cast<int>(m_pendingTrackIds.size());
 
     AnalyzerProgress workerProgressSum = 0;
     int workerProgressCount = 0;
@@ -164,7 +164,7 @@ void TrackAnalysisScheduler::emitProgressOrFinished() {
         }
     }
     const int totalTracksCount =
-            m_dequeuedTracksCount + m_queuedTrackIds.size();
+            m_dequeuedTracksCount + static_cast<int>(m_queuedTrackIds.size());
     DEBUG_ASSERT(m_currentTrackNumber <= m_dequeuedTracksCount);
     DEBUG_ASSERT(m_dequeuedTracksCount <= totalTracksCount);
     emit progress(
@@ -331,7 +331,7 @@ void TrackAnalysisScheduler::stop() {
 
 QList<TrackId> TrackAnalysisScheduler::stopAndCollectScheduledTrackIds() {
     QList<TrackId> scheduledTrackIds;
-    scheduledTrackIds.reserve(m_queuedTrackIds.size() + m_pendingTrackIds.size());
+    scheduledTrackIds.reserve(static_cast<int>(m_queuedTrackIds.size() + m_pendingTrackIds.size()));
     for (auto queuedTrackId: m_queuedTrackIds) {
         scheduledTrackIds.append(std::move(queuedTrackId));
     }