fixed clang warnings

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@10243 90c681e8-e032-0410-971d-27865f9a5e38

3 files changed, 66 insertions, 71 deletions

diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpegm4b.h b/src/plugins/Input/ffmpeg/decoder_ffmpegm4b.h
index 3d6081a55..9f340364c 100644
--- a/src/plugins/Input/ffmpeg/decoder_ffmpegm4b.h
+++ b/src/plugins/Input/ffmpeg/decoder_ffmpegm4b.h
@@ -47,7 +47,7 @@ public:
 private:
     Decoder *m_decoder = nullptr;
     char *m_buf = nullptr; //buffer for remainig data
-    int m_track = 0, m_count = 0;
+    int m_track = 0;
     qint64 m_duration = 0;
     qint64 m_offset = 0;
     qint64 m_trackSize = 0;
diff --git a/src/plugins/Input/modplug/settingsdialog.cpp b/src/plugins/Input/modplug/settingsdialog.cpp
index 74c9dfcc9..6d766d503 100644
--- a/src/plugins/Input/modplug/settingsdialog.cpp
+++ b/src/plugins/Input/modplug/settingsdialog.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   Copyright (C) 2008-2021 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,88 +20,85 @@
 
 #include <QSettings>
 #include <QDir>
-
 #include <libmodplug/stdafx.h>
 #include <libmodplug/it_defs.h>
 #include <libmodplug/sndfile.h>
-
 #include "decoder_modplug.h"
 #include "settingsdialog.h"
 
 SettingsDialog::SettingsDialog(QWidget *parent)
         : QDialog(parent)
 {
-    ui.setupUi(this);
+    m_ui.setupUi(this);
     setAttribute(Qt::WA_DeleteOnClose);
 
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("ModPlug");
     //general
-    ui.noiseCheckBox->setChecked(settings.value("NoiseReduction", false).toBool());
-    ui.fileNameCheckBox->setChecked(settings.value("UseFileName", false).toBool());
-    ui.amigaCheckBox->setChecked(settings.value("GrabAmigaMOD", true).toBool());
+    m_ui.noiseCheckBox->setChecked(settings.value("NoiseReduction", false).toBool());
+    m_ui.fileNameCheckBox->setChecked(settings.value("UseFileName", false).toBool());
+    m_ui.amigaCheckBox->setChecked(settings.value("GrabAmigaMOD", true).toBool());
     //settings.value("Oversampling", true).toBool();
     //settings.value("VolumeRamp", true).toBool();
     //settings.value("FastInfo", true).toBool();
     //channels number
     if (settings.value("Channels", 2).toInt() == 2)
-        ui.stereoRadioButton->setChecked(true);
+        m_ui.stereoRadioButton->setChecked(true);
     else
-        ui.monoRadioButton->setChecked(true);
+        m_ui.monoRadioButton->setChecked(true);
     //bits number
     if (settings.value("Bits", 16).toInt() == 8)
-        ui.bit8RadioButton->setChecked(true);
+        m_ui.bit8RadioButton->setChecked(true);
     else
-        ui.bit16RadioButton->setChecked(true);
+        m_ui.bit16RadioButton->setChecked(true);
     //resampling frequency
     int freq = settings.value("Frequency", 44100).toInt();
     if (freq == 48000)
-        ui.khz48RadioButton->setChecked(true);
+        m_ui.khz48RadioButton->setChecked(true);
     else if (freq == 44100)
-        ui.khz44RadioButton->setChecked(true);
+        m_ui.khz44RadioButton->setChecked(true);
     else if (freq == 22050)
-        ui.khz22RadioButton->setChecked(true);
+        m_ui.khz22RadioButton->setChecked(true);
     else
-        ui.khz11RadioButton->setChecked(true);
+        m_ui.khz11RadioButton->setChecked(true);
     //resampling mode
     int res = settings.value("ResamplineMode", SRCMODE_POLYPHASE).toInt();
     if (res == SRCMODE_NEAREST)
-        ui.resampNearestRadioButton->setChecked(true);
+        m_ui.resampNearestRadioButton->setChecked(true);
     else if (res == SRCMODE_LINEAR)
-        ui.resampLinearRadioButton->setChecked(true);
+        m_ui.resampLinearRadioButton->setChecked(true);
     else if (res == SRCMODE_SPLINE)
-        ui.resampSplineRadioButton->setChecked(true);
+        m_ui.resampSplineRadioButton->setChecked(true);
     else
-        ui.resampPolyphaseRadioButton->setChecked(true);
+        m_ui.resampPolyphaseRadioButton->setChecked(true);
     //reverberation
-    ui.reverbGroupBox->setChecked(settings.value("Reverb", false).toBool());
-    ui.reverbDepthSlider->setValue(settings.value("ReverbDepth", 30).toInt());
-    ui.reverbDelaySlider->setValue(settings.value("ReverbDelay", 100).toInt());
+    m_ui.reverbGroupBox->setChecked(settings.value("Reverb", false).toBool());
+    m_ui.reverbDepthSlider->setValue(settings.value("ReverbDepth", 30).toInt());
+    m_ui.reverbDelaySlider->setValue(settings.value("ReverbDelay", 100).toInt());
     //surround
-    ui.surGroupBox->setChecked(settings.value("Surround", true).toBool());
-    ui.surDepthSlider->setValue(settings.value("SurroundDepth", 20).toInt());
-    ui.surDelaySlider->setValue(settings.value("SurroundDelay", 20).toInt());
+    m_ui.surGroupBox->setChecked(settings.value("Surround", true).toBool());
+    m_ui.surDepthSlider->setValue(settings.value("SurroundDepth", 20).toInt());
+    m_ui.surDelaySlider->setValue(settings.value("SurroundDelay", 20).toInt());
     //bass
-    ui.bassGroupBox->setChecked(settings.value("Megabass", false).toBool());
-    ui.bassAmountSlider->setValue(settings.value("BassAmount", 40).toInt());
-    ui.bassRangeSlider->setValue(settings.value("BassRange", 30).toInt());
+    m_ui.bassGroupBox->setChecked(settings.value("Megabass", false).toBool());
+    m_ui.bassAmountSlider->setValue(settings.value("BassAmount", 40).toInt());
+    m_ui.bassRangeSlider->setValue(settings.value("BassRange", 30).toInt());
     //preamp
-    ui.preampGroupBox->setChecked(settings.value("PreAmp", false).toBool());
-    connect(ui.preampSlider, SIGNAL(valueChanged(int)), SLOT(setPreamp(int)));
-    ui.preampSlider->setValue(int(settings.value("PreAmpLevel", 0.0f).toDouble()*10));
+    m_ui.preampGroupBox->setChecked(settings.value("PreAmp", false).toBool());
+    connect(m_ui.preampSlider, SIGNAL(valueChanged(int)), SLOT(setPreamp(int)));
+    m_ui.preampSlider->setValue(int(settings.value("PreAmpLevel", 0.0f).toDouble()*10));
     //looping
     int l = settings.value("LoopCount", 0).toInt();
     if (l == 0)
-        ui.dontLoopRadioButton->setChecked(true);
+        m_ui.dontLoopRadioButton->setChecked(true);
     else if (l < 0)
-        ui.loopForeverRadioButton->setChecked(true);
+        m_ui.loopForeverRadioButton->setChecked(true);
     else
     {
-        ui.loopRadioButton->setChecked(true);
-        ui.loopSpinBox->setValue(l);
+        m_ui.loopRadioButton->setChecked(true);
+        m_ui.loopSpinBox->setValue(l);
     }
     settings.endGroup();
-    connect(ui.buttonBox, SIGNAL(clicked (QAbstractButton *)), SLOT(exec(QAbstractButton *)));
 }
 
 
@@ -113,57 +110,57 @@ void SettingsDialog::writeSettings()
     QSettings settings(Qmmp::configFile(), QSettings::IniFormat);
     settings.beginGroup("ModPlug");
     //general
-    settings.setValue("NoiseReduction", ui.noiseCheckBox->isChecked());
-    settings.setValue("UseFileName", ui.fileNameCheckBox->isChecked());
-    settings.setValue("GrabAmigaMOD", ui.amigaCheckBox->isChecked());
+    settings.setValue("NoiseReduction", m_ui.noiseCheckBox->isChecked());
+    settings.setValue("UseFileName", m_ui.fileNameCheckBox->isChecked());
+    settings.setValue("GrabAmigaMOD", m_ui.amigaCheckBox->isChecked());
     //settings.value("Oversampling", true).toBool();
     //settings.value("VolumeRamp", true).toBool();
     //settings.value("FastInfo", true).toBool();
     //channels number
-    settings.setValue("Channels", ui.stereoRadioButton->isChecked() ? 2 : 1 );
+    settings.setValue("Channels", m_ui.stereoRadioButton->isChecked() ? 2 : 1 );
     //bits number
-    settings.setValue("Bits", ui.bit8RadioButton->isChecked() ? 8 : 16 );
+    settings.setValue("Bits", m_ui.bit8RadioButton->isChecked() ? 8 : 16 );
     //resampling frequency
-    if (ui.khz48RadioButton->isChecked())
+    if (m_ui.khz48RadioButton->isChecked())
         settings.setValue("Frequency", 48000);
-    else if (ui.khz44RadioButton->isChecked())
+    else if (m_ui.khz44RadioButton->isChecked())
         settings.setValue("Frequency", 44100);
-    else if (ui.khz22RadioButton->isChecked())
+    else if (m_ui.khz22RadioButton->isChecked())
         settings.setValue("Frequency", 22050);
     else
         settings.setValue("Frequency", 11025);
     //resampling mode
-    if (ui.resampNearestRadioButton->isChecked())
+    if (m_ui.resampNearestRadioButton->isChecked())
         settings.setValue("ResamplineMode", SRCMODE_NEAREST);
-    else if (ui.resampLinearRadioButton->isChecked())
+    else if (m_ui.resampLinearRadioButton->isChecked())
         settings.setValue("ResamplineMode", SRCMODE_LINEAR);
-    else if (ui.resampSplineRadioButton->isChecked())
+    else if (m_ui.resampSplineRadioButton->isChecked())
         settings.setValue("ResamplineMode", SRCMODE_SPLINE);
     else
         settings.setValue("ResamplineMode", SRCMODE_POLYPHASE);
     //reverberation
-    settings.setValue("Reverb",  ui.reverbGroupBox->isChecked());
-    settings.setValue("ReverbDepth", ui.reverbDepthSlider->value());
-    settings.setValue("ReverbDelay", ui.reverbDelaySlider->value());
+    settings.setValue("Reverb",  m_ui.reverbGroupBox->isChecked());
+    settings.setValue("ReverbDepth", m_ui.reverbDepthSlider->value());
+    settings.setValue("ReverbDelay", m_ui.reverbDelaySlider->value());
     //surround
-    settings.setValue("Surround", ui.surGroupBox->isChecked());
-    settings.setValue("SurroundDepth", ui.surDepthSlider->value());
-    settings.setValue("SurroundDelay", ui.surDelaySlider->value());
+    settings.setValue("Surround", m_ui.surGroupBox->isChecked());
+    settings.setValue("SurroundDepth", m_ui.surDepthSlider->value());
+    settings.setValue("SurroundDelay", m_ui.surDelaySlider->value());
     //bass
-    settings.setValue("Megabass", ui.bassGroupBox->isChecked());
-    settings.setValue("BassAmount", ui.bassAmountSlider->value());
-    settings.setValue("BassRange", ui.bassRangeSlider->value());
+    settings.setValue("Megabass", m_ui.bassGroupBox->isChecked());
+    settings.setValue("BassAmount", m_ui.bassAmountSlider->value());
+    settings.setValue("BassRange", m_ui.bassRangeSlider->value());
     //preamp
-    settings.setValue("PreAmp", ui.preampGroupBox->isChecked());
-    connect(ui.preampSlider, SIGNAL(valueChanged(int)), SLOT(setPreamp(int)));
-    settings.setValue("PreAmpLevel", (double) ui.preampSlider->value()/10);
+    settings.setValue("PreAmp", m_ui.preampGroupBox->isChecked());
+    connect(m_ui.preampSlider, SIGNAL(valueChanged(int)), SLOT(setPreamp(int)));
+    settings.setValue("PreAmpLevel", (double) m_ui.preampSlider->value()/10);
     //looping
-    if (ui.dontLoopRadioButton->isChecked())
+    if (m_ui.dontLoopRadioButton->isChecked())
         settings.setValue("LoopCount", 0);
-    else if (ui.loopForeverRadioButton->isChecked())
+    else if (m_ui.loopForeverRadioButton->isChecked())
         settings.setValue("LoopCount", -1);
     else
-        settings.setValue("LoopCount", ui.loopSpinBox->value());
+        settings.setValue("LoopCount", m_ui.loopSpinBox->value());
     settings.endGroup();
     //apply settings for the created decoder
     if (DecoderModPlug::instance())
@@ -176,12 +173,12 @@ void SettingsDialog::writeSettings()
 
 void SettingsDialog::setPreamp(int preamp)
 {
-    ui.preampLabel->setText(QString("%1").arg((double) preamp/10));
+    m_ui.preampLabel->setText(QString("%1").arg((double) preamp/10));
 }
 
-void SettingsDialog::exec(QAbstractButton *button)
+void SettingsDialog::on_buttonBox_clicked(QAbstractButton *button)
 {
-    switch ((int) ui.buttonBox->buttonRole(button))
+    switch ((int) m_ui.buttonBox->buttonRole(button))
     {
     case QDialogButtonBox::AcceptRole:
         writeSettings();
diff --git a/src/plugins/Input/modplug/settingsdialog.h b/src/plugins/Input/modplug/settingsdialog.h
index bbd73129f..86bcf54e3 100644
--- a/src/plugins/Input/modplug/settingsdialog.h
+++ b/src/plugins/Input/modplug/settingsdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2008 by Ilya Kotov                                      *
+ *   Copyright (C) 2008-2021 by Ilya Kotov                                 *
  *   forkotov02@ya.ru                                                      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,8 +21,6 @@
 #define SETTINGSDIALOG_H
 
 #include <QDialog>
-
-
 #include "ui_settingsdialog.h"
 
 /**
@@ -39,10 +37,10 @@ public:
 private slots:
     void writeSettings();
     void setPreamp(int);
-    void exec(QAbstractButton *);
+    void on_buttonBox_clicked(QAbstractButton *);
 
 private: 
-     Ui::SettingsDialog ui;
+     Ui::SettingsDialog m_ui;
 
 };