Language settings continued.

[yandex-traffic] / settings.cpp

diff --git a/settings.cpp b/settings.cpp
index 53966fc..995aa05 100644 (file)
--- a/settings.cpp
+++ b/settings.cpp
@@ -2,6 +2,17 @@
 #include <settings.hpp>
 
 
+static Settings* _settings;
+
+
+Settings* Settings::instance ()
+{
+    if (!_settings)
+        _settings = new Settings;
+    return _settings;
+}
+
+
 Settings::Settings ()
 {
     load ();
@@ -24,14 +35,9 @@ void Settings::load ()
     _checks[C_UpdateOnGSM] = settings.value ("checks/updateOnGSM", _checks[C_UpdateOnGSM]).toBool ();
     _checks[C_UpdateWhenLocked] = settings.value ("checks/updateWhenLocked", _checks[C_UpdateWhenLocked]).toBool ();
 
-    // Do we really need to cache cities?
-    // loadCities (&settings);
-
     _updateIntervalIndex = minutes2IntervalIndex (settings.value ("updateInterval", intervalIndex2Minutes (_updateIntervalIndex)).toInt ());
 
-    _langIndex = settings.value ("langIndex", _langIndex).toInt ();
-    if (_langIndex < 0 || _langIndex >= _langs.count ())
-        _langIndex = 0;
+    setLanguageIndex (settings.value ("langIndex", _langIndex).toInt ());
 }
 
 
@@ -52,44 +58,6 @@ void Settings::save ()
     settings.setValue ("updateInterval", intervalIndex2Minutes (_updateIntervalIndex));
 
     settings.setValue ("langIndex", _langIndex);
-
-//    saveCities (&settings);
-}
-
-
-void Settings::loadCities (QSettings *settings)
-{
-    QMap<QString, QVariant> v;
-    QMap<QString, QVariant>::const_iterator it;
-
-    v = settings->value ("cities", v).toMap ();
-
-    if (v.size () == 0)
-        return;
-
-    it = v.begin ();
-    _cities.clear ();
-
-    while (it != v.end ()) {
-        _cities[it.key ()] = it.value ().toString ();
-        it++;
-    }
-}
-
-
-void Settings::saveCities (QSettings *settings)
-{
-    QMap<QString, QVariant> v;
-    QMap<QString, QString>::const_iterator it;
-
-    it = _cities.begin ();
-
-    while (it != _cities.end ()) {
-        v[it.key ()] = it.value ();
-        it++;
-    }
-
-    settings->setValue ("cities", v);
 }
 
 
@@ -113,10 +81,10 @@ void Settings::makeDefault ()
     _updateIntervalIndex = 3;
 
     // languages
-    _langIndex = 0;
     _langs.append (Language (QString (""),   tr ("System")));
     _langs.append (Language (QString ("en"), tr ("English")));
     _langs.append (Language (QString ("ru"), tr ("Russian")));
+    setLanguageIndex (0);
 }
 
 
@@ -165,3 +133,12 @@ int Settings::minutes2IntervalIndex (int minutes) const
             return 0;
     }
 }
+
+
+void Settings::setLanguageIndex (int index)
+{
+    if (index < 0 || index >= _langs.count ())
+        _langIndex = 0;
+    else
+        _langIndex = index;
+}