Drop boost dependency

- wrote not-invented-here config file parser and conf class
- spent obscene amount of time plugging in said conf class

1 files changed, 10 insertions, 8 deletions

diff --git a/src/mainwindow/widgets/navigationbar.cpp b/src/mainwindow/widgets/navigationbar.cpp
index e77ce6d..f57d678 100644
--- a/src/mainwindow/widgets/navigationbar.cpp
+++ b/src/mainwindow/widgets/navigationbar.cpp
@@ -20,12 +20,14 @@
 #include <QWebEngineHistory>
 #include "webprofile.h"
 
-NavigationBar::NavigationBar(const Configuration *config, QWidget *parent)
+NavigationBar::NavigationBar(QWidget *parent)
     : QToolBar(parent)
 {
+    Configuration config;
+
     // Back button
     backAction = addAction(Util::icon(QStyle::SP_ArrowBack), tr("Back"));
-    config->setShortcut(backAction, "navigation.shortcuts.back");
+    setShortcut(backAction, "shortcuts.navigation.back");
     connect(backAction, &QAction::triggered, this, [this]() {
         m_view->history()->back();
     });
@@ -43,7 +45,7 @@ NavigationBar::NavigationBar(const Configuration *config, QWidget *parent)
     });
     backAction->setMenu(backMenu);
 
-    auto *backMenuShortcut = new QShortcut(QKeySequence(config->value<QString>("navigation.shortcuts.backMenu").value()), this);
+    auto *backMenuShortcut = new QShortcut(QKeySequence(config.value<QString>("shortcuts.navigation.backmenu").value()), this);
     connect(backMenuShortcut, &QShortcut::activated, backMenu, [this, backMenu]() {
         if(backAction->isEnabled()) {
             auto *widget = this->widgetForAction(backAction);
@@ -53,7 +55,7 @@ NavigationBar::NavigationBar(const Configuration *config, QWidget *parent)
 
     // Forward button
     forwardAction = addAction(Util::icon(QStyle::SP_ArrowForward), tr("Forward"));
-    config->setShortcut(forwardAction, "navigation.shortcuts.forward");
+    setShortcut(forwardAction, "shortcuts.navigation.forward");
     connect(forwardAction, &QAction::triggered, this, [this]() {
         m_view->history()->forward();
     });
@@ -71,7 +73,7 @@ NavigationBar::NavigationBar(const Configuration *config, QWidget *parent)
     });
     forwardAction->setMenu(forwardMenu);
 
-    auto *forwardMenuShortcut = new QShortcut(QKeySequence(config->value<QString>("navigation.shortcuts.forwardMenu").value()), this);
+    auto *forwardMenuShortcut = new QShortcut(QKeySequence(config.value<QString>("shortcuts.navigation.forwardmenu").value()), this);
     connect(forwardMenuShortcut, &QShortcut::activated, forwardMenu, [this, forwardMenu]() {
         if(forwardAction->isEnabled()) {
             auto *widget = this->widgetForAction(forwardAction);
@@ -81,7 +83,7 @@ NavigationBar::NavigationBar(const Configuration *config, QWidget *parent)
 
     // Stop/Refresh button
     stopReloadAction = addAction(Util::icon(QStyle::SP_BrowserReload), tr("Refresh"));
-    config->setShortcut(stopReloadAction, "navigation.shortcuts.refresh");
+    setShortcut(stopReloadAction, "shortcuts.navigation.refresh");
     connect(stopReloadAction, &QAction::triggered, this, [this]() {
         if(m_view->isLoaded())
             m_view->reload();
@@ -89,14 +91,14 @@ NavigationBar::NavigationBar(const Configuration *config, QWidget *parent)
             m_view->stop();
     });
 
-    auto *reloadShortcut = new QShortcut(QKeySequence(config->value<QString>("navigation.shortcuts.reload").value()), this);
+    auto *reloadShortcut = new QShortcut(QKeySequence(config.value<QString>("shortcuts.navigation.reload").value()), this);
     connect(reloadShortcut, &QShortcut::activated, this, [this]() {
         m_view->triggerPageAction(QWebEnginePage::ReloadAndBypassCache);
     });
 
     // Home button
     homeAction = addAction(Util::icon(QStyle::SP_DirHomeIcon), tr("Home"));
-    config->setShortcut(homeAction, "navigation.shortcuts.home");
+    setShortcut(homeAction, "shortcuts.navigation.home");
     connect(homeAction, &QAction::triggered, this, [this]() {
         m_view->load(m_view->profile()->homepage());
     });