Code fascism.

* Fix compiler warnings in non-3rd-party code. * Add some missing const-references. * Eliminate cases of "if(" "( ... )" and "for(".
mixxxdj · Nov 18, 2014 · a74c65d · a74c65d
1 parent c21f0c6
commit a74c65d
Show file tree

Hide file tree

Showing 138 changed files with 510 additions and 536 deletions.
diff --git a/src/analyserbeats.cpp b/src/analyserbeats.cpp
@@ -30,7 +30,7 @@ AnalyserBeats::AnalyserBeats(ConfigObject<ConfigValue>* pConfig)
           m_iMaxBpm(9999) {
 }
 
-AnalyserBeats::~AnalyserBeats(){
+AnalyserBeats::~AnalyserBeats() {
 }
 
 bool AnalyserBeats::initialise(TrackPointer tio, int sampleRate, int totalSamples) {
@@ -86,7 +86,7 @@ bool AnalyserBeats::initialise(TrackPointer tio, int sampleRate, int totalSample
     bool bShouldAnalyze = !loadStored(tio);
 
     if (bShouldAnalyze) {
-        m_pVamp = new VampAnalyser(m_pConfig);
+        m_pVamp = new VampAnalyser();
         bShouldAnalyze = m_pVamp->Init(library, pluginID, m_iSampleRate, totalSamples,
                                        m_bPreferencesFastAnalysis);
         if (!bShouldAnalyze) {

diff --git a/src/analyserkey.cpp b/src/analyserkey.cpp
@@ -19,7 +19,7 @@ AnalyserKey::AnalyserKey(ConfigObject<ConfigValue>* pConfig)
           m_bPreferencesReanalyzeEnabled(false) {
 }
 
-AnalyserKey::~AnalyserKey(){
+AnalyserKey::~AnalyserKey() {
     delete m_pVamp;
 }
 
@@ -56,7 +56,7 @@ bool AnalyserKey::initialise(TrackPointer tio, int sampleRate, int totalSamples)
     bool bShouldAnalyze = !loadStored(tio);
 
     if (bShouldAnalyze) {
-        m_pVamp = new VampAnalyser(m_pConfig);
+        m_pVamp = new VampAnalyser();
         bShouldAnalyze = m_pVamp->Init(
             library, m_pluginId, sampleRate, totalSamples,
             m_bPreferencesFastAnalysisEnabled);

diff --git a/src/analyserqueue.cpp b/src/analyserqueue.cpp
@@ -372,7 +372,7 @@ void AnalyserQueue::emitUpdateProgress(TrackPointer tio, int progress) {
         // The following tries will success if the previous signal was processed in the GUI Thread
         // This prevent the AnalysisQueue from filling up the GUI Thread event Queue
         // 100 % is emitted in any case
-        if (progress < 1000 - FINALIZE_PERCENT && progress > 0 ) {
+        if (progress < 1000 - FINALIZE_PERCENT && progress > 0) {
             // Signals during processing are not required in any case
             if (!m_progressInfo.sema.tryAcquire()) {
                return;

diff --git a/src/analyserwaveform.cpp b/src/analyserwaveform.cpp
@@ -178,8 +178,8 @@ void AnalyserWaveform::resetFilters(TrackPointer tio, int sampleRate) {
 }
 
 void AnalyserWaveform::destroyFilters() {
-    for( int i = 0; i < FilterCount; i++) {
-        if( m_filter[i]) {
+    for (int i = 0; i < FilterCount; ++i) {
+        if (m_filter[i]) {
             delete m_filter[i];
             m_filter[i] = 0;
         }
@@ -202,7 +202,7 @@ void AnalyserWaveform::process(const CSAMPLE* buffer, const int bufferLength) {
     m_filter[High]->process(buffer, &m_buffers[High][0], bufferLength);
 
 
-    for( int i = 0; i < bufferLength; i+=2) {
+    for (int i = 0; i < bufferLength; i+=2) {
         // Take max value, not average of data
         CSAMPLE cover[2] = { fabs(buffer[i]), fabs(buffer[i+1]) };
         CSAMPLE clow[2] =  { fabs(m_buffers[ Low][i]), fabs(m_buffers[ Low][i+1]) };

diff --git a/src/analyserwaveform.h b/src/analyserwaveform.h
@@ -39,10 +39,10 @@ class WaveformStride {
         m_position = 0;
         m_averagePosition = 0;
         m_averageDivisor = 0;
-        for( int i = 0; i < ChannelCount; i++) {
+        for (int i = 0; i < ChannelCount; ++i) {
             m_overallData[i] = 0.0f;
             m_averageOverallData[i] = 0.0f;
-            for( int f = 0; f < FilterCount; f++) {
+            for (int f = 0; f < FilterCount; ++f) {
                 m_filteredData[i][f] = 0.0f;
                 m_averageFilteredData[i][f] = 0.0f;
             }
@@ -52,18 +52,18 @@ class WaveformStride {
     inline void reset() {
         m_position = 0;
         m_averageDivisor = 0;
-        for( int i = 0; i < ChannelCount; i++) {
+        for (int i = 0; i < ChannelCount; ++i) {
             m_overallData[i] = 0.0f;
             m_averageOverallData[i] = 0.0f;
-            for( int f = 0; f < FilterCount; f++) {
+            for (int f = 0; f < FilterCount; ++f) {
                 m_filteredData[i][f] = 0.0f;
                 m_averageFilteredData[i][f] = 0.0f;
             }
         }
     }
 
     inline void store(WaveformData* data) {
-        for( int i = 0; i < ChannelCount; i++) {
+        for (int i = 0; i < ChannelCount; ++i) {
             WaveformData& datum = *(data + i);
             datum.filtered.all = static_cast<unsigned char>(math_min(255.0,
                     m_postScaleConversion * scaleSignal(m_overallData[i]) + 0.5));
@@ -75,10 +75,10 @@ class WaveformStride {
                     m_postScaleConversion * scaleSignal(m_filteredData[i][High], High) + 0.5));
         }
         m_averageDivisor++;
-        for( int i = 0; i < ChannelCount; i++) {
+        for (int i = 0; i < ChannelCount; ++i) {
             m_averageOverallData[i] += m_overallData[i];
             m_overallData[i] = 0.0f;
-            for( int f = 0; f < FilterCount; f++) {
+            for (int f = 0; f < FilterCount; ++f) {
                 m_averageFilteredData[i][f] += m_filteredData[i][f];
                 m_filteredData[i][f] = 0.0f;
             }
@@ -87,7 +87,7 @@ class WaveformStride {
 
     inline void averageStore(WaveformData* data) {
         if (m_averageDivisor) {
-            for( int i = 0; i < ChannelCount; i++) {
+            for (int i = 0; i < ChannelCount; ++i) {
                 WaveformData& datum = *(data + i);
                 datum.filtered.all = static_cast<unsigned char>(math_min(255.0,
                         m_postScaleConversion * scaleSignal(m_averageOverallData[i] / m_averageDivisor) + 0.5));
@@ -100,7 +100,7 @@ class WaveformStride {
             }
         } else {
             // This is the case if The Overview Waveform has more samples than the detailed waveform
-            for( int i = 0; i < ChannelCount; i++) {
+            for (int i = 0; i < ChannelCount; ++i) {
                 WaveformData& datum = *(data + i);
                 datum.filtered.all = static_cast<unsigned char>(math_min(255.0,
                         m_postScaleConversion * scaleSignal(m_overallData[i]) + 0.5));
@@ -114,9 +114,9 @@ class WaveformStride {
         }
 
         m_averageDivisor = 0;
-        for( int i = 0; i < ChannelCount; i++) {
+        for (int i = 0; i < ChannelCount; ++i) {
             m_averageOverallData[i] = 0.0f;
-            for( int f = 0; f < FilterCount; f++) {
+            for (int f = 0; f < FilterCount; ++f) {
                 m_averageFilteredData[i][f] = 0.0f;
             }
         }

diff --git a/src/audiotagger.cpp b/src/audiotagger.cpp
@@ -116,7 +116,7 @@ bool AudioTagger::save() {
         file = new TagLib::FLAC::File(fileBA.constData());
 
         //If the flac has no ID3v2 tag, we create a new one and add the TBPM and TKEY frame
-        addID3v2Tag(((TagLib::FLAC::File*)file)->ID3v2Tag(true) );
+        addID3v2Tag(((TagLib::FLAC::File*)file)->ID3v2Tag(true));
         //If the flac has no APE tag, we create a new one and add the TBPM and TKEY frame
         addXiphComment(((TagLib::FLAC::File*) file)->xiphComment(true));
 

diff --git a/src/audiotagger.h b/src/audiotagger.h
@@ -14,20 +14,20 @@
 class AudioTagger {
   public:
     AudioTagger(const QString& file, SecurityTokenPointer pToken);
-    virtual ~AudioTagger ( );
-
-    void setArtist (QString artist );
-    void setTitle (QString title );
-    void setAlbum (QString album );
-    void setAlbumArtist (QString albumArtist );
-    void setGenre (QString genre );
-    void setComposer (QString composer );
-    void setGrouping (QString grouping );
-    void setYear (QString year );
-    void setComment (QString comment );
-    void setKey (QString key );
-    void setBpm (QString bpm );
-    void setTracknumber (QString tracknumber );
+    virtual ~AudioTagger();
+
+    void setArtist(QString artist);
+    void setTitle(QString title);
+    void setAlbum(QString album);
+    void setAlbumArtist(QString albumArtist);
+    void setGenre(QString genre);
+    void setComposer(QString composer);
+    void setGrouping(QString grouping);
+    void setYear(QString year);
+    void setComment(QString comment);
+    void setKey(QString key);
+    void setBpm(QString bpm);
+    void setTracknumber(QString tracknumber);
     bool save();
 
   private:

diff --git a/src/configobject.cpp b/src/configobject.cpp
@@ -93,12 +93,12 @@ void ConfigValueKbd::valCopy(const ConfigValueKbd& v)
     QTextStream(&value) << m_qKey.toString();
 }
 
-bool operator==(const ConfigValue & s1, const ConfigValue & s2)
+bool operator==(const ConfigValue& s1, const ConfigValue& s2)
 {
     return (s1.value.toUpper() == s2.value.toUpper());
 }
 
-bool operator==(const ConfigValueKbd & s1, const ConfigValueKbd & s2)
+bool operator==(const ConfigValueKbd& s1, const ConfigValueKbd& s2)
 {
     return (s1.value.toUpper() == s2.value.toUpper());
 }
@@ -192,7 +192,7 @@ ConfigKey *ConfigObject<ValueType>::get(ValueType v)
     while (iterator.hasNext())
     {
         it = iterator.next();
-        if (QString::compare(it->val->value, v.value, Qt::CaseInsensitive) == 0){
+        if (QString::compare(it->val->value, v.value, Qt::CaseInsensitive) == 0) {
             //qDebug() << "ConfigObject #534: QString::compare match for " << it->key->group << it->key->item;
             return it->key;
         }

diff --git a/src/controllers/controllerengine.cpp b/src/controllers/controllerengine.cpp
@@ -821,9 +821,8 @@ QScriptValue ControllerEngine::connectControl(QString group, QString name,
 
             ControllerEngineConnection conn = i.value();
             return m_pEngine->newQObject(
-                        new ControllerEngineConnectionScriptValue(conn),
-                        QScriptEngine::ScriptOwnership
-                    );
+                new ControllerEngineConnectionScriptValue(conn),
+                QScriptEngine::ScriptOwnership);
         }
     }
     else if (callback.isFunction()) {

diff --git a/src/controllers/controllerpresetinfo.cpp b/src/controllers/controllerpresetinfo.cpp
@@ -134,8 +134,7 @@ QHash<QString,QString> PresetInfo::parseOSCProduct(const QDomElement& element) c
     return product;
 }
 
-PresetInfoEnumerator::PresetInfoEnumerator(ConfigObject<ConfigValue>* pConfig)
-        : m_pConfig(pConfig) {
+PresetInfoEnumerator::PresetInfoEnumerator(ConfigObject<ConfigValue>* pConfig) {
     controllerDirPaths.append(localPresetsPath(pConfig));
     controllerDirPaths.append(resourcePresetsPath(pConfig));
 

diff --git a/src/controllers/controllerpresetinfo.h b/src/controllers/controllerpresetinfo.h
@@ -83,7 +83,6 @@ class PresetInfoEnumerator {
 
   private:
     QList<QString> fileExtensions;
-    ConfigObject<ConfigValue>* m_pConfig;
 
     // List of paths for controller presets
     QList<QString> controllerDirPaths;

diff --git a/src/controlobjectslave.h b/src/controlobjectslave.h
@@ -31,7 +31,7 @@ class ControlObjectSlave : public QObject {
     bool connectValueChanged(const QObject* receiver,
             const char* method, Qt::ConnectionType type = Qt::AutoConnection);
     bool connectValueChanged(
-            const char* method, Qt::ConnectionType type = Qt::AutoConnection );
+            const char* method, Qt::ConnectionType type = Qt::AutoConnection);
 
     // Called from update();
     inline void emitValueChanged() {

diff --git a/src/controlobjectthread.h b/src/controlobjectthread.h
@@ -36,7 +36,7 @@ class ControlObjectThread : public QObject {
     bool connectValueChanged(const QObject* receiver,
             const char* method, Qt::ConnectionType type = Qt::AutoConnection);
     bool connectValueChanged(
-            const char* method, Qt::ConnectionType type = Qt::AutoConnection );
+            const char* method, Qt::ConnectionType type = Qt::AutoConnection);
 
     QString name() const;
     QString description() const;

diff --git a/src/controlvaluedelegate.cpp b/src/controlvaluedelegate.cpp
@@ -18,11 +18,10 @@ QStringList ControlValueDelegate::m_flangerControlValues;
 QStringList ControlValueDelegate::m_microphoneControlValues;
 
 
-ControlValueDelegate::ControlValueDelegate(QObject *parent)
-         : QItemDelegate(parent)
-{
-    if (m_channelControlValues.isEmpty()) //List is static/shared across all objects, so only fill once.
-    {
+ControlValueDelegate::ControlValueDelegate(QObject* parent)
+         : QItemDelegate(parent) {
+    // List is static/shared across all objects, so only fill once.
+    if (m_channelControlValues.isEmpty()) {
         m_channelControlValues.append("beatsync");
         m_channelControlValues.append("cue_default");
         m_channelControlValues.append("filterHigh");
@@ -170,9 +169,8 @@ ControlValueDelegate::ControlValueDelegate(QObject *parent)
     }
 }
 
-void ControlValueDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
-                         const QModelIndex &index) const
-{
+void ControlValueDelegate::paint(QPainter *painter, const QStyleOptionViewItem& option,
+                                 const QModelIndex& index) const {
     if (index.data().canConvert<QString>()) {
         QString value = index.data().value<QString>();
 
@@ -192,10 +190,9 @@ void ControlValueDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
     }
 }
 
-QWidget *ControlValueDelegate::createEditor(QWidget *parent,
-        const QStyleOptionViewItem &/* option */,
-        const QModelIndex &index ) const
-{
+QWidget* ControlValueDelegate::createEditor(QWidget* parent,
+                                            const QStyleOptionViewItem& /* option */,
+                                            const QModelIndex& index) const {
     //TODO: Use index to grab the value of the ControlGroup column next to
     //      this item. We want to do this because some of the possible
     //      ControlValues only apply to Channel1/2, and not Master (for example).
@@ -238,18 +235,16 @@ QWidget *ControlValueDelegate::createEditor(QWidget *parent,
     return editor;
 }
 
-void ControlValueDelegate::setEditorData(QWidget *editor,
-                                    const QModelIndex &index) const
-{
+void ControlValueDelegate::setEditorData(QWidget* editor,
+                                         const QModelIndex& index) const {
     QString value = index.model()->data(index, Qt::EditRole).toString();
 
     QComboBox *comboBox = static_cast<QComboBox*>(editor);
     comboBox->setCurrentIndex(comboBox->findText(value));
 }
 
-void ControlValueDelegate::setModelData(QWidget *editor, QAbstractItemModel *model,
-                                    const QModelIndex &index) const
-{
+void ControlValueDelegate::setModelData(QWidget* editor, QAbstractItemModel* model,
+                                        const QModelIndex& index) const {
     QString midiType = 0;
     QComboBox *comboBox = static_cast<QComboBox*>(editor);
     //comboBox->interpretText();
@@ -260,10 +255,9 @@ void ControlValueDelegate::setModelData(QWidget *editor, QAbstractItemModel *mod
     model->setData(index, text, Qt::EditRole);
 }
 
-void ControlValueDelegate::updateEditorGeometry(QWidget *editor,
-                                           const QStyleOptionViewItem &option,
-                                           const QModelIndex &/* index */) const
-{
+void ControlValueDelegate::updateEditorGeometry(QWidget* editor,
+                                                const QStyleOptionViewItem& option,
+                                                const QModelIndex& /* index */) const {
     editor->setGeometry(option.rect);
 }
 
@@ -273,9 +267,9 @@ void ControlValueDelegate::updateEditorGeometry(QWidget *editor,
     @param controlGroup The group that has just been selected and should be verified against.
     @param index The model index of the ControlValue.
 */
-bool ControlValueDelegate::verifyControlValueValidity(QString controlGroup, QAbstractItemModel *model,
-                                                      const QModelIndex& index)
-{
+bool ControlValueDelegate::verifyControlValueValidity(QString controlGroup,
+                                                      QAbstractItemModel* model,
+                                                      const QModelIndex& index) {
     QString value = index.data().value<QString>();
 
     if (controlGroup == CONTROLGROUP_CHANNEL1_STRING ||