1 files changed, 11 insertions, 16 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 32c282d..6870a65 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -20,7 +20,6 @@
 
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
-#include "settings.h"
 #include <QMenu>
 #include <QMenuBar>
 #include <QCloseEvent>
@@ -42,13 +41,11 @@ MainWindow::MainWindow(QUrl defaultUrl, QWidget *parent) :
     urlLineEdit(new UrlLineEdit(navigationToolBar)),
     progressBar(new LoadingBar(this))
 {
-    Settings settings;
-
     // Load profile and connect its signals
-    loadProfile(settings.value("profile").toString());
+    loadProfile(sSettings->value("general.profile").toString());
 
     ui->setupUi(this);
-    resize(settings.value("window/width", 800).toInt(), settings.value("window/height", 600).toInt());
+    resize(sSettings->value("window.width", 800).toInt(), sSettings->value("window.height", 600).toInt());
 
     // Browser menu
     QMenu *browserMenu = new QMenu(qApp->applicationName(), ui->menuBar);
@@ -64,9 +61,9 @@ MainWindow::MainWindow(QUrl defaultUrl, QWidget *parent) :
     QMenu *toolsMenu = new QMenu(tr("Tools"), ui->menuBar);
     ui->menuBar->addMenu(toolsMenu);
     QAction *downloadsAction = toolsMenu->addAction(tr("Downloads"), Browser::instance()->downloads(), SLOT(show()));
-    downloadsAction->setShortcut(QKeySequence::fromString(settings.value("downloads/dialogShortcut").toString()));
+    downloadsAction->setShortcut(QKeySequence::fromString(sSettings->value("downloads.dialogShortcut").toString()));
     QAction *bookmarksAction = toolsMenu->addAction(tr("Bookmarks"), Browser::instance()->bookmarks(), SLOT(show()));
-    bookmarksAction->setShortcut(QKeySequence(settings.value("bookmarks/dialogShortcut").toString()));
+    bookmarksAction->setShortcut(QKeySequence(sSettings->value("bookmarks.dialogShortcut").toString()));
     toolsMenu->addSeparator();
     toolsMenu->addAction(tr("Blocker"), blocklistManager, SLOT(show()));
 
@@ -78,10 +75,10 @@ MainWindow::MainWindow(QUrl defaultUrl, QWidget *parent) :
     //profileMenu->addAction(tr("Settings"));
     //profileMenu->addAction(tr("Cookies"));
 
-    navigationToolBar->setMovable(settings.value("ui/navtoolbarMovable", true).toBool());
+    navigationToolBar->setMovable(sSettings->value("ui.navtoolbarMovable", true).toBool());
     this->addToolBar(Qt::TopToolBarArea, navigationToolBar);
     this->addToolBarBreak(Qt::TopToolBarArea);
-    tabToolBar->setMovable(settings.value("ui/tabtoolbarMovable", true).toBool());
+    tabToolBar->setMovable(sSettings->value("ui.tabtoolbarMovable", true).toBool());
     this->addToolBar(Qt::TopToolBarArea, tabToolBar);
 
     navigationToolBar->addWidget(urlLineEdit);
@@ -95,14 +92,14 @@ MainWindow::MainWindow(QUrl defaultUrl, QWidget *parent) :
 
     // shortcuts
     QAction *focusAddressAction = new QAction(this);
-    focusAddressAction->setShortcut(QKeySequence::fromString(settings.value("shortcuts/focusAddress").toString()));
+    focusAddressAction->setShortcut(QKeySequence::fromString(sSettings->value("shortcuts.focusAddress").toString()));
     connect(focusAddressAction, SIGNAL(triggered(bool)), this, SLOT(focusAddress()));
     addAction(focusAddressAction);
 
     if(!defaultUrl.isEmpty()) {
         addNewTab(defaultUrl);
     } else {
-        addNewTab(settings.value("homepage", QUrl("about:blank")).toUrl());
+        addNewTab(sSettings->value("general.homepage", QUrl("about:blank")).toUrl());
     }
 }
 
@@ -124,8 +121,7 @@ void MainWindow::addNewTab(const QUrl &url)
     if(!url.isEmpty()) {
         tabBar->addTab(m_profile, url);
     } else {
-        Settings settings;
-        tabBar->addTab(m_profile, settings.value("newtab").toUrl());
+        tabBar->addTab(m_profile, sSettings->value("general.newtab").toUrl());
     }
 }
 
@@ -155,7 +151,7 @@ void MainWindow::about()
                        "<p>This program comes with ABSOLUTELY NO WARRANTY. "
                        "This is free software, and you are welcome to redistribute it under the conditions set by the GNU GPLv3.</p>"
                        "<p>Configuration lives in: %2</p>")
-                       .arg(qApp->applicationVersion()).arg(Settings::staticFilePath()));
+                       .arg(qApp->applicationVersion()).arg(sSettings->filePath()));
 }
 
 void MainWindow::loadProfile(const QString &name)
@@ -226,8 +222,7 @@ void MainWindow::handleUrlChanged()
 
 void MainWindow::handleTitleUpdated(const QString &title)
 {
-    Settings settings;
-    setWindowTitle(settings.value("window/title").toString().replace("$title", title).replace("$profile", m_profile->storageName()));
+    setWindowTitle(sSettings->value("window.title").toString().replace("$title", title).replace("$profile", m_profile->storageName()));
 }
 
 void MainWindow::execProfileEditor()