Use QApplication metadata for persistent storage

Since the application metadata is set in application.c,
we should use it instead of providing it manually every
time we create a QSettings object.

As I understand it, subclassing QApplication in application.c
is only a workaround for bad Qt behavior. In the event
that it is removed, the application metadata should be moved
so that persistent storage still works.

diff --git a/pv/application.cpp b/pv/application.cpp
index 224cc60007dce1a3464368bedad4f77cc36dfbe0..66991dd985b3b5cd3d0765926784e5ec7e34847f 100644 (file)
--- a/pv/application.cpp
+++ b/pv/application.cpp
@@ -28,6 +28,7 @@ Application::Application(int &argc, char* argv[]) :
 {
        setApplicationVersion(PV_VERSION_STRING);
        setApplicationName("PulseView");
+       setOrganizationName("sigrok");
        setOrganizationDomain("sigrok.org");
 }
 

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index dae8f123f8b64d6d8d866dba0e829421f72c7f08..c3747e0256f945f81ce94fa5298ad7ce4c0c2904 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -271,7 +271,7 @@ void MainWindow::setup_ui()
 
 void MainWindow::save_ui_settings()
 {
-       QSettings settings("sigrok", "PulseView");
+       QSettings settings;
 
        settings.beginGroup("MainWindow");
        settings.setValue("state", saveState());
@@ -281,7 +281,7 @@ void MainWindow::save_ui_settings()
 
 void MainWindow::restore_ui_settings()
 {
-       QSettings settings("sigrok", "PulseView");
+       QSettings settings;
 
        settings.beginGroup("MainWindow");