refactoring

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

2 files changed, 34 insertions, 48 deletions

diff --git a/src/plugins/Ui/qsui/equalizer.cpp b/src/plugins/Ui/qsui/equalizer.cpp
index df986828e..a3bd6833b 100644
--- a/src/plugins/Ui/qsui/equalizer.cpp
+++ b/src/plugins/Ui/qsui/equalizer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2011-2013 by Ilya Kotov                                 *
+ *   Copyright (C) 2011-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -145,26 +145,20 @@ void Equalizer::loadPresets()
         preset_path = ":/qsui/eq16.preset";
     QSettings eq_preset (preset_path, QSettings::IniFormat);
     int i = 0;
-    forever
+    while(eq_preset.contains("Presets/Preset"+QString("%1").arg(++i)))
     {
-        i++;
-        if (eq_preset.contains("Presets/Preset"+QString("%1").arg(i)))
+        QString name = eq_preset.value(QString("Presets/Preset%1").arg(i), tr("preset")).toString();
+        EQPreset *preset = new EQPreset();
+        //preset->setText(name);
+        eq_preset.beginGroup(name);
+        for (int j = 0; j < EqSettings::EQ_BANDS_15; ++j)
         {
-            QString name = eq_preset.value(QString("Presets/Preset%1").arg(i), tr("preset")).toString();
-            EQPreset *preset = new EQPreset();
-            //preset->setText(name);
-            eq_preset.beginGroup(name);
-            for (int j = 0; j < EqSettings::EQ_BANDS_15; ++j)
-            {
-                preset->setGain(j,eq_preset.value(QString("Band%1").arg(j), 0).toDouble());
-            }
-            preset->setPreamp(eq_preset.value("Preamp",0).toDouble());
-            m_presets.append(preset);
-            m_presetComboBox->addItem(name);
-            eq_preset.endGroup();
+            preset->setGain(j,eq_preset.value(QString("Band%1").arg(j), 0).toDouble());
         }
-        else
-            break;
+        preset->setPreamp(eq_preset.value("Preamp",0).toDouble());
+        m_presets.append(preset);
+        m_presetComboBox->addItem(name);
+        eq_preset.endGroup();
     }
     m_presetComboBox->clearEditText();
 }
diff --git a/src/plugins/Ui/skinned/eqwidget.cpp b/src/plugins/Ui/skinned/eqwidget.cpp
index b28afeae2..2c595a7e4 100644
--- a/src/plugins/Ui/skinned/eqwidget.cpp
+++ b/src/plugins/Ui/skinned/eqwidget.cpp
@@ -149,45 +149,37 @@ void EqWidget::readSettings()
     if(!QFile::exists(preset_path))
         preset_path = ":/skinned/eq.preset";
     QSettings eq_preset (preset_path, QSettings::IniFormat);
-    for (int i = 1; true; ++i)
+    int i = 0;
+    while(eq_preset.contains("Presets/Preset"+QString("%1").arg(++i)))
     {
-        if (eq_preset.contains("Presets/Preset"+QString("%1").arg(i)))
+        QString name = eq_preset.value(QString("Presets/Preset%1").arg(i), tr("preset")).toString();
+        EQPreset *preset = new EQPreset();
+        preset->setText(name);
+        eq_preset.beginGroup(name);
+        for (int j = 0; j < 10; ++j)
         {
-            QString name = eq_preset.value(QString("Presets/Preset%1").arg(i), tr("preset")).toString();
-            EQPreset *preset = new EQPreset();
-            preset->setText(name);
-            eq_preset.beginGroup(name);
-            for (int j = 0; j < 10; ++j)
-            {
-                preset->setGain(j,eq_preset.value(QString("Band%1").arg(j), 0).toDouble());
-            }
-            preset->setPreamp(eq_preset.value("Preamp",0).toDouble());
-            m_presets.append(preset);
-            eq_preset.endGroup();
+            preset->setGain(j,eq_preset.value(QString("Band%1").arg(j), 0).toDouble());
         }
-        else
-            break;
+        preset->setPreamp(eq_preset.value("Preamp",0).toDouble());
+        m_presets.append(preset);
+        eq_preset.endGroup();
     }
     //equalizer auto-load presets
     QSettings eq_auto (Qmmp::configDir() + "eq.auto_preset", QSettings::IniFormat);
-    for (int i = 1; true; ++i)
+    i = 0;
+    while(eq_auto.contains(QString("Presets/Preset%1").arg(++i)))
     {
-        if (eq_auto.contains(QString("Presets/Preset%1").arg(i)))
+        QString name = eq_auto.value(QString("Presets/Preset%1").arg(i), tr("preset")).toString();
+        EQPreset *preset = new EQPreset();
+        preset->setText(name);
+        eq_auto.beginGroup(name);
+        for (int j = 0; j < 10; ++j)
         {
-            QString name = eq_auto.value(QString("Presets/Preset%1").arg(i), tr("preset")).toString();
-            EQPreset *preset = new EQPreset();
-            preset->setText(name);
-            eq_auto.beginGroup(name);
-            for (int j = 0; j < 10; ++j)
-            {
-                preset->setGain(j,eq_auto.value(QString("Band%1").arg(j), 0).toDouble());
-            }
-            preset->setPreamp(eq_auto.value("Preamp",0).toDouble());
-            m_autoPresets.append(preset);
-            eq_auto.endGroup();
+            preset->setGain(j,eq_auto.value(QString("Band%1").arg(j), 0).toDouble());
         }
-        else
-            break;
+        preset->setPreamp(eq_auto.value("Preamp",0).toDouble());
+        m_autoPresets.append(preset);
+        eq_auto.endGroup();
     }
 }