Begin tidying up settings refactoring.

[vlc-remote] / src / accountdialog.cpp

diff --git a/src/accountdialog.cpp b/src/accountdialog.cpp
index 0cb777b..cc97fec 100644 (file)
--- a/src/accountdialog.cpp
+++ b/src/accountdialog.cpp
@@ -75,19 +75,6 @@ void AccountDialog::add()
     dialog->exec();
     load();
 }
-QString AccountDialog::currentIp()
-{
-
-    QSettings settings;
-    QString useKey = settings.value("config/currentKey").toString();
-    QString useIp ;
-    if ( !useKey.isEmpty())
-        useIp = settings.value("account/"+useKey).toString();
-
-    else return QString();
-
-    return useIp;
-}
 
 void AccountDialog::load()
 {
@@ -98,12 +85,12 @@ void AccountDialog::load()
 
     QSettings settings;
 
-    QString useKey = settings.value("config/currentKey").toString();
+    QString useKey = AppSettings::getCurrentKey(); // settings.value("config/currentKey").toString();
 
     QList <QListWidgetItem> asycItems;
 
-    settings.beginGroup("account");
-    foreach ( QString key, settings.allKeys())
+    //settings.beginGroup("account");
+    foreach ( QString key, AppSettings::getAllAccounts()) //settings.allKeys())
     {
         QListWidgetItem * item = new QListWidgetItem;
 
@@ -119,7 +106,7 @@ void AccountDialog::load()
             asycItems.append(*item);
         }
     }
-    settings.endGroup();    
+    //settings.endGroup();
 
 
     // ... create and add in the list widget
@@ -209,8 +196,9 @@ void AccountDialog::rem()
 void AccountDialog::use()
 {
     QString currentKey = ui->listWidget->currentItem()->text();
-    QSettings settings;
-    settings.setValue("config/currentKey", currentKey);
+    AppSettings::setCurrentKey(currentKey);
+    //QSettings settings;
+    //settings.setValue("config/currentKey", currentKey);
     load();
     emit accept();
 }