From b8f6dc09b4b35cab3bebb54b3d4eec0b57fb7387 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Mon, 20 May 2013 21:55:44 +0200 Subject: [PATCH] Const'ify. Use QLatin1String --- src/rotoscoping/rotowidget.cpp | 2 +- src/rotoscoping/rotowidget.h | 2 +- .../audioscopes/abstractaudioscopewidget.cpp | 8 +++-- .../audioscopes/abstractaudioscopewidget.h | 4 +-- src/scopes/audioscopes/audiosignal.cpp | 2 +- src/scopes/audioscopes/audiosignal.h | 2 +- src/scopes/audioscopes/audiospectrum.cpp | 30 +++++++++++++++---- src/scopes/audioscopes/audiospectrum.h | 2 +- src/scopes/audioscopes/spectrogram.cpp | 7 +++-- src/scopes/audioscopes/spectrogram.h | 2 +- 10 files changed, 42 insertions(+), 19 deletions(-) diff --git a/src/rotoscoping/rotowidget.cpp b/src/rotoscoping/rotowidget.cpp index 127df07b..e8d83ec3 100644 --- a/src/rotoscoping/rotowidget.cpp +++ b/src/rotoscoping/rotowidget.cpp @@ -324,7 +324,7 @@ void RotoWidget::keyframeTimelineFullUpdate() } } -void RotoWidget::setupTrackingListen(ItemInfo info) +void RotoWidget::setupTrackingListen(const ItemInfo &info) { if (info.startPos < GenTime()) { // TODO: track effects diff --git a/src/rotoscoping/rotowidget.h b/src/rotoscoping/rotowidget.h index 444d673e..f3e8d9bd 100644 --- a/src/rotoscoping/rotowidget.h +++ b/src/rotoscoping/rotowidget.h @@ -81,7 +81,7 @@ private: QList getPoints(int keyframe); /** @brief Adds tracking_finished as listener for "tracking-finished" event in MLT rotoscoping filter. */ - void setupTrackingListen(ItemInfo info); + void setupTrackingListen(const ItemInfo &info); /** @brief Passes list of keyframe positions to keyframe timeline widget. */ void keyframeTimelineFullUpdate(); diff --git a/src/scopes/audioscopes/abstractaudioscopewidget.cpp b/src/scopes/audioscopes/abstractaudioscopewidget.cpp index 74ad5200..86ebb3aa 100644 --- a/src/scopes/audioscopes/abstractaudioscopewidget.cpp +++ b/src/scopes/audioscopes/abstractaudioscopewidget.cpp @@ -36,7 +36,7 @@ AbstractAudioScopeWidget::AbstractAudioScopeWidget(bool trackMouse, QWidget *par { } -void AbstractAudioScopeWidget::slotReceiveAudio(QVector sampleData, int freq, int num_channels, int num_samples) +void AbstractAudioScopeWidget::slotReceiveAudio(const QVector& sampleData, int freq, int num_channels, int num_samples) { #ifdef DEBUG_AASW qDebug() << "Received audio for " << widgetName() << "."; @@ -51,11 +51,13 @@ void AbstractAudioScopeWidget::slotReceiveAudio(QVector sampleData, int AbstractScopeWidget::slotRenderZoneUpdated(); } -AbstractAudioScopeWidget::~AbstractAudioScopeWidget() {} +AbstractAudioScopeWidget::~AbstractAudioScopeWidget() +{ +} QImage AbstractAudioScopeWidget::renderScope(uint accelerationFactor) { - int newData = m_newData.fetchAndStoreAcquire(0); + const int newData = m_newData.fetchAndStoreAcquire(0); return renderAudioScope(accelerationFactor, m_audioFrame, m_freq, m_nChannels, m_nSamples, newData); } diff --git a/src/scopes/audioscopes/abstractaudioscopewidget.h b/src/scopes/audioscopes/abstractaudioscopewidget.h index 54bf7da0..15bb974f 100644 --- a/src/scopes/audioscopes/abstractaudioscopewidget.h +++ b/src/scopes/audioscopes/abstractaudioscopewidget.h @@ -33,7 +33,7 @@ public: virtual ~AbstractAudioScopeWidget(); public slots: - void slotReceiveAudio(QVector sampleData, int freq, int num_channels, int num_samples); + void slotReceiveAudio(const QVector &sampleData, int freq, int num_channels, int num_samples); protected: /** @brief This is just a wrapper function, subclasses can use renderAudioScope. */ @@ -44,7 +44,7 @@ protected: when calculation has finished, to allow multi-threading. accelerationFactor hints how much faster than usual the calculation should be accomplished, if possible. */ virtual QImage renderAudioScope(uint accelerationFactor, - const QVector audioFrame, const int freq, const int num_channels, const int num_samples, + const QVector &audioFrame, const int freq, const int num_channels, const int num_samples, const int newData) = 0; int m_freq; diff --git a/src/scopes/audioscopes/audiosignal.cpp b/src/scopes/audioscopes/audiosignal.cpp index 6e9643a2..989f90b3 100644 --- a/src/scopes/audioscopes/audiosignal.cpp +++ b/src/scopes/audioscopes/audiosignal.cpp @@ -45,7 +45,7 @@ AudioSignal::~AudioSignal() { } -QImage AudioSignal::renderAudioScope(uint, const QVector audioFrame, +QImage AudioSignal::renderAudioScope(uint, const QVector &audioFrame, const int, const int num_channels, const int samples, const int) { QTime start = QTime::currentTime(); diff --git a/src/scopes/audioscopes/audiosignal.h b/src/scopes/audioscopes/audiosignal.h index bf8b7a67..d555cc57 100644 --- a/src/scopes/audioscopes/audiosignal.h +++ b/src/scopes/audioscopes/audiosignal.h @@ -43,7 +43,7 @@ public: QRect scopeRect(); QImage renderHUD(uint accelerationFactor); QImage renderBackground(uint accelerationFactor); - QImage renderAudioScope(uint accelerationFactor, const QVector audioFrame, const int, const int num_channels, const int samples, const int); + QImage renderAudioScope(uint accelerationFactor, const QVector &audioFrame, const int, const int num_channels, const int samples, const int); QString widgetName() const { return "audioSignal"; } bool isHUDDependingOnInput() const { return false; } diff --git a/src/scopes/audioscopes/audiospectrum.cpp b/src/scopes/audioscopes/audiospectrum.cpp index e60ceab0..a4ee112e 100644 --- a/src/scopes/audioscopes/audiospectrum.cpp +++ b/src/scopes/audioscopes/audiospectrum.cpp @@ -150,14 +150,32 @@ void AudioSpectrum::writeConfig() scopeConfig.sync(); } -QString AudioSpectrum::widgetName() const { return QString("AudioSpectrum"); } -bool AudioSpectrum::isBackgroundDependingOnInput() const { return false; } -bool AudioSpectrum::isScopeDependingOnInput() const { return true; } -bool AudioSpectrum::isHUDDependingOnInput() const { return false; } +QString AudioSpectrum::widgetName() const +{ + return QLatin1String("AudioSpectrum"); +} -QImage AudioSpectrum::renderBackground(uint) { return QImage(); } +bool AudioSpectrum::isBackgroundDependingOnInput() const +{ + return false; +} + +bool AudioSpectrum::isScopeDependingOnInput() const +{ + return true; +} + +bool AudioSpectrum::isHUDDependingOnInput() const +{ + return false; +} + +QImage AudioSpectrum::renderBackground(uint) +{ + return QImage(); +} -QImage AudioSpectrum::renderAudioScope(uint, const QVector audioFrame, const int freq, const int num_channels, +QImage AudioSpectrum::renderAudioScope(uint, const QVector &audioFrame, const int freq, const int num_channels, const int num_samples, const int) { if ( diff --git a/src/scopes/audioscopes/audiospectrum.h b/src/scopes/audioscopes/audiospectrum.h index 94c8b294..e3517631 100644 --- a/src/scopes/audioscopes/audiospectrum.h +++ b/src/scopes/audioscopes/audiospectrum.h @@ -51,7 +51,7 @@ protected: ///// Implemented methods ///// QRect scopeRect(); QImage renderHUD(uint accelerationFactor); - QImage renderAudioScope(uint accelerationFactor, const QVector audioFrame, const int freq, const int num_channels, const int num_samples, const int newData); + QImage renderAudioScope(uint accelerationFactor, const QVector &audioFrame, const int freq, const int num_channels, const int num_samples, const int newData); QImage renderBackground(uint accelerationFactor); bool isHUDDependingOnInput() const; bool isScopeDependingOnInput() const; diff --git a/src/scopes/audioscopes/spectrogram.cpp b/src/scopes/audioscopes/spectrogram.cpp index 0edc6dff..87b6c6a4 100644 --- a/src/scopes/audioscopes/spectrogram.cpp +++ b/src/scopes/audioscopes/spectrogram.cpp @@ -140,7 +140,10 @@ void Spectrogram::writeConfig() scopeConfig.sync(); } -QString Spectrogram::widgetName() const { return QString("Spectrogram"); } +QString Spectrogram::widgetName() const +{ + return QLatin1String("Spectrogram"); +} QRect Spectrogram::scopeRect() { @@ -301,7 +304,7 @@ QImage Spectrogram::renderHUD(uint) return QImage(); } } -QImage Spectrogram::renderAudioScope(uint, const QVector audioFrame, const int freq, +QImage Spectrogram::renderAudioScope(uint, const QVector &audioFrame, const int freq, const int num_channels, const int num_samples, const int newData) { if ( audioFrame.size() > 63 diff --git a/src/scopes/audioscopes/spectrogram.h b/src/scopes/audioscopes/spectrogram.h index a8255e70..4274eeb1 100644 --- a/src/scopes/audioscopes/spectrogram.h +++ b/src/scopes/audioscopes/spectrogram.h @@ -45,7 +45,7 @@ protected: ///// Implemented methods ///// QRect scopeRect(); QImage renderHUD(uint accelerationFactor); - QImage renderAudioScope(uint accelerationFactor, const QVector audioFrame, const int freq, const int num_channels, const int num_samples, const int newData); + QImage renderAudioScope(uint accelerationFactor, const QVector &audioFrame, const int freq, const int num_channels, const int num_samples, const int newData); QImage renderBackground(uint accelerationFactor); bool isHUDDependingOnInput() const; bool isScopeDependingOnInput() const; -- 2.39.2