From f91b9dd4a9b035357dc35f25e97f4b48fc99f3bc Mon Sep 17 00:00:00 2001
From: "C. Balles" <code@ballessay.de>
Date: Mon, 3 Apr 2017 02:18:09 +0200
Subject: [PATCH] Cleanup qsettings parameter

* Set Organization- and ApplicationName QApp wide
  - Setting this here removes the redundancy to write the names every time a QSettings object is needed
* removed redundant QSettings parameter
---
 src/main.cpp            |  3 ++-
 src/mainwindow.cpp      | 14 +++++++-------
 src/newfiledialog.cpp   |  8 ++++----
 src/optionsdialog.cpp   |  4 ++--
 src/widgets/sidebar.cpp |  2 +-
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 3a3ed39e..8bb6d8a4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,7 +11,8 @@
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
-    a.setApplicationName("Iaito");
+    a.setOrganizationName("iaito");
+    a.setApplicationName("iaito");
     a.setApplicationVersion(APP_VERSION);
 
     // Set QString codec to UTF-8
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 870df4b6..339229ee 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -339,7 +339,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
                  QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
     //qDebug() << ret;
     if (ret == QMessageBox::Save) {
-        QSettings settings("iaito", "iaito");
+        QSettings settings;
         settings.setValue("geometry", saveGeometry());
         settings.setValue("size", size());
         settings.setValue("pos", pos());
@@ -350,7 +350,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
         this->core->cmd("Pnj " + notes);
         QMainWindow::closeEvent(event);
     } else if (ret == QMessageBox::Discard) {
-        QSettings settings("iaito", "iaito");
+        QSettings settings;
         settings.setValue("geometry", saveGeometry());
         settings.setValue("size", size());
         settings.setValue("pos", pos());
@@ -362,7 +362,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
 
 void MainWindow::readSettings()
 {
-    QSettings settings("iaito", "iaito");
+    QSettings settings;
     QByteArray geo = settings.value("geometry", QByteArray()).toByteArray();
     restoreGeometry(geo);
     QByteArray state = settings.value("state", QByteArray()).toByteArray();
@@ -376,14 +376,14 @@ void MainWindow::readSettings()
 void MainWindow::dark() {
     qApp->setStyleSheet("QPlainTextEdit { background-color: rgb(64, 64, 64); color: rgb(222, 222, 222);} QTextEdit { background-color: rgb(64, 64, 64); color: rgb(222, 222, 222);} ");
     this->memoryDock->switchTheme(true);
-    QSettings settings("iaito", "iaito");
+    QSettings settings;
     settings.setValue("dark", true);
 }
 
 void MainWindow::def_theme() {
     qApp->setStyleSheet("");
     this->memoryDock->switchTheme(false);
-    QSettings settings("iaito", "iaito");
+    QSettings settings;
     settings.setValue("dark", false);
 }
 
@@ -1091,7 +1091,7 @@ void MainWindow::on_actionForward_triggered()
 void MainWindow::toggleResponsive(bool maybe) {
     this->responsive = maybe;
     // Save options in settings
-    QSettings settings("iaito", "iaito");
+    QSettings settings;
     settings.setValue("responsive", this->responsive);
 }
 
@@ -1107,7 +1107,7 @@ void MainWindow::on_actionReset_settings_triggered()
                  QMessageBox::Ok | QMessageBox::Cancel);
     if (ret == QMessageBox::Ok) {
         // Save options in settings
-        QSettings settings("iaito", "iaito");
+        QSettings settings;
         settings.clear();
     }
 }
diff --git a/src/newfiledialog.cpp b/src/newfiledialog.cpp
index 18c9e980..15cacd6d 100644
--- a/src/newfiledialog.cpp
+++ b/src/newfiledialog.cpp
@@ -52,7 +52,7 @@ NewFileDialog::NewFileDialog(QWidget *parent) :
     ui->recentsList->setIconSize(QSize(48, 48));
 
     // Fill list with recent opened files
-    QSettings settings("iaito", "iaito");
+    QSettings settings;
 
     QStringList files = settings.value("recentFileList").toStringList();
 
@@ -116,7 +116,7 @@ void NewFileDialog::on_newFileButton_clicked()
         ui->newFileEdit->setText(fileName);
 
         // Add file to recent file list
-        QSettings settings("iaito", "iaito");
+        QSettings settings;
         QStringList files = settings.value("recentFileList").toStringList();
         files.removeAll(fileName);
         files.prepend(fileName);
@@ -158,7 +158,7 @@ void NewFileDialog::on_actionRemove_item_triggered()
     QVariant data = item->data( Qt::UserRole );
     QString sitem = data.toString();
 
-    QSettings settings("iaito", "iaito");
+    QSettings settings;
     QStringList files = settings.value("recentFileList").toStringList();
     files.removeAll(sitem);
     settings.setValue("recentFileList", files);
@@ -179,7 +179,7 @@ void NewFileDialog::on_createButton_clicked()
 void NewFileDialog::on_actionClear_all_triggered()
 {
     // Clear recent file list
-    QSettings settings("iaito", "iaito");
+    QSettings settings;
     QStringList files = settings.value("recentFileList").toStringList();
     files.clear();
 
diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp
index b6446f42..70ea1229 100644
--- a/src/optionsdialog.cpp
+++ b/src/optionsdialog.cpp
@@ -28,7 +28,7 @@ OptionsDialog::OptionsDialog(QString filename, QWidget *parent):
     ui->processorComboBox->insertItems(1, plugins);
 
     // Restore settings
-    QSettings settings("iaito", "iaito");
+    QSettings settings;
     ui->bytesCheckBox->setChecked(settings.value("bytes").toBool());
     ui->attCheckBox->setChecked(settings.value("syntax").toBool());
     ui->descriptionCheckBox->setChecked(settings.value("describe").toBool());
@@ -100,7 +100,7 @@ void OptionsDialog::on_okButton_clicked()
     }
 
     // Save options in settings
-    QSettings settings("iaito", "iaito");
+    QSettings settings;
 
     // Show asm bytes
     if (ui->bytesCheckBox->isChecked()) {
diff --git a/src/widgets/sidebar.cpp b/src/widgets/sidebar.cpp
index 7f7b9111..a2a23712 100644
--- a/src/widgets/sidebar.cpp
+++ b/src/widgets/sidebar.cpp
@@ -13,7 +13,7 @@ SideBar::SideBar(MainWindow *main) :
 {
     ui->setupUi(this);
 
-    QSettings settings("iaito", "iaito");
+    QSettings settings;
     if (settings.value("responsive").toBool()) {
         ui->respButton->setChecked(true);
     } else {