fixed possible regressions

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

4 files changed, 16 insertions, 14 deletions

diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index 2cd1efc7e..96b559889 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -321,12 +321,17 @@ void EqWidget::savePreset()
         preset->setPreamp(m_preamp->value());
         for (int i = 0; i<10; ++i)
             preset->setGain(i, m_sliders.at (i)->value());
-        for(EQPreset *p : qAsConst(m_presets)) //remove preset with same name
+        QList<EQPreset *>::iterator it = m_presets.begin();
+        while(it != m_presets.end()) //remove preset with same name
         {
-            if (p->text() == text)
+            if ((*it)->text() == text)
             {
-                m_presets.removeAll(p);
-                delete p;
+                delete (*it);
+                it = m_presets.erase(it);
+            }
+            else
+            {
+                ++it;
             }
         }
         m_presets.append(preset);
diff --git a/src/plugins/Ui/skinned/skin.cpp b/src/plugins/Ui/skinned/skin.cpp
index 4b96899c8..b5b68b179 100644
--- a/src/plugins/Ui/skinned/skin.cpp
+++ b/src/plugins/Ui/skinned/skin.cpp
@@ -797,10 +797,7 @@ QRegion Skin::createRegion(const QString &path, const QString &key)
     for(const QString &str : qAsConst(value))
     numbers << str.split(" ", QString::SkipEmptyParts);
 
-    QList <QRegion> regions;
-
-    QList<QString>::iterator n;
-    n = numbers.begin();
+    QList<QString>::iterator n = numbers.begin();
     int r = m_double_size ? 2 : 1;
     for (int i = 0; i < numPoints.size(); ++i)
     {
diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp
index 141498aa0..a209b098f 100644
--- a/src/plugins/Ui/skinned/skinnedsettings.cpp
+++ b/src/plugins/Ui/skinned/skinnedsettings.cpp
@@ -117,8 +117,8 @@ void SkinnedSettings::on_resetFontsButton_clicked()
 
 void SkinnedSettings::on_skinInstallButton_clicked()
 {
-    QStringList files = FileDialog::getOpenFileNames(this,tr("Select Skin Files"), QDir::homePath(),
-                                                     tr("Skin files") + " (*.tar.gz *.tgz *.tar.bz2 *.zip *.wsz)");
+    const QStringList files = FileDialog::getOpenFileNames(this,tr("Select Skin Files"), QDir::homePath(),
+                                                           tr("Skin files") + " (*.tar.gz *.tgz *.tar.bz2 *.zip *.wsz)");
     for(const QString &path : qAsConst(files))
     {
         QFile file(path);
@@ -160,7 +160,7 @@ void SkinnedSettings::findSkins(const QString &path)
 {
     QDir dir(path);
     dir.setFilter (QDir::Dirs | QDir::NoDotAndDotDot);
-    QList <QFileInfo> fileList = dir.entryInfoList();
+    const QList <QFileInfo> fileList = dir.entryInfoList();
     if (fileList.count() == 0)
         return;
     for(const QFileInfo &fileInfo : qAsConst(fileList))
diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp
index ae3faa305..cbfa099f9 100644
--- a/src/plugins/Ui/skinned/skinreader.cpp
+++ b/src/plugins/Ui/skinned/skinreader.cpp
@@ -125,7 +125,7 @@ void SkinReader::unpackSkin(const QString &path)
     //remove old skin
     QDir dir(Qmmp::configDir() + "/cache/skin");
     dir.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks);
-    QFileInfoList f = dir.entryInfoList();
+    const QFileInfoList f = dir.entryInfoList();
     for(const QFileInfo &file : qAsConst(f))
         dir.remove(file.fileName());
     //unpack
@@ -156,7 +156,7 @@ void SkinReader::untar(const QString &from, const QString &to, bool preview)
     m_process->waitForFinished();
     array = m_process->readAllStandardOutput ();
     QString str = QString(array);
-    QStringList outputList = str.split("\n", QString::SkipEmptyParts);
+    const QStringList outputList = str.split("\n", QString::SkipEmptyParts);
     for(QString str : qAsConst(outputList))
     {
         str = str.trimmed();
@@ -193,7 +193,7 @@ void SkinReader::unzip(const QString &from, const QString &to, bool preview)
         QProcess::execute("unzip", args);
         QDir dir(to);
         dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
-        QFileInfoList fileList = dir.entryInfoList();
+        const QFileInfoList fileList = dir.entryInfoList();
         for(const QFileInfo &thumbInfo : qAsConst(fileList))
         {
             if (thumbInfo.fileName().startsWith("main.", Qt::CaseInsensitive))