MainWindow: Tidied restore_ui_settings

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 3480d8cc2fcaaa62feacb6f85f7f5651f9019328..767ab6f31149bd4881b0db163635c86025c08818 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -509,7 +509,6 @@ void MainWindow::restore_ui_settings()
 
        map<string, string> dev_info;
        list<string> key_list;
 
        map<string, string> dev_info;
        list<string> key_list;

-       string value;

 
        settings.beginGroup("MainWindow");
 
 
        settings.beginGroup("MainWindow");
 


@@ -530,12 +529,12 @@ void MainWindow::restore_ui_settings()
        key_list.push_back("connection_id");
 
        for (string key : key_list) {
        key_list.push_back("connection_id");
 
        for (string key : key_list) {

-               if (!settings.contains(QString::fromUtf8(key.c_str())))
+               const QString k = QString::fromStdString(key);
+               if (!settings.contains(k))

                        continue;
 
                        continue;
 

-               value = settings.value(QString::fromUtf8(key.c_str())).toString().toStdString();
-
-               if (value.size() > 0)
+               const string value = settings.value(k).toString().toStdString();
+               if (!value.empty())

                        dev_info.insert(std::make_pair(key, value));
        }
 
                        dev_info.insert(std::make_pair(key, value));
        }