From 7918bce1422fb217b59131111c6fb1ccdf52ddc4 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Sun, 5 Jan 2020 10:55:56 +0200
Subject: Code cleanup

- Replace Browser::getProfileManager with WebProfileManager::instance
- Make WebProfileManager::profileMenu a free function
- Replace Browser::loadProfile with Browser::loadProfiles
---
 src/session/session.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/session/session.cpp')

diff --git a/src/session/session.cpp b/src/session/session.cpp
index 9e6fa7d..c97c22b 100644
--- a/src/session/session.cpp
+++ b/src/session/session.cpp
@@ -9,15 +9,15 @@
 #include "session.h"
 #include "../webengine/webview.h"
 #include "browser.h"
+#include "configuration.h"
 #include "mainwindow/mainwindow.h"
-#include "webengine/webprofilemanager.h"
 #include "subwindow/subwindow.h"
+#include "webengine/webprofilemanager.h"
 #include "webengine/webview.h"
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QWebEngineHistory>
 #include <memory>
-#include "configuration.h"
 
 QJsonObject Session::fromCommandLine(const QString &profile, const QStringList &urls)
 {
@@ -78,7 +78,7 @@ QJsonObject Session::_window(const MainWindow *window)
 
 QJsonObject Session::_subwindow(const SubWindow *subwindow)
 {
-    auto *profileManager = dynamic_cast<Browser *>(qApp)->getProfileManager();
+    const auto *profileManager = WebProfileManager::instance();
     Q_CHECK_PTR(profileManager);
 
     QJsonObject subwindowData;
@@ -98,7 +98,7 @@ QJsonObject Session::_subwindow(const SubWindow *subwindow)
 
 QJsonObject Session::view(const WebView *view)
 {
-    auto *profileManager = dynamic_cast<Browser *>(qApp)->getProfileManager();
+    const auto *profileManager = WebProfileManager::instance();
     Q_CHECK_PTR(profileManager);
 
     QByteArray historyData;
@@ -116,7 +116,7 @@ QJsonObject Session::view(const WebView *view)
 
 void Session::restoreView(WebView *view, const QJsonObject &data)
 {
-    auto *profileManager = dynamic_cast<Browser *>(qApp)->getProfileManager();
+    const auto *profileManager = WebProfileManager::instance();
     Q_CHECK_PTR(profileManager);
 
     auto *profile = profileManager->profile(data["profile"].toString());
@@ -138,7 +138,7 @@ void Session::restoreSession(const QJsonObject &sessionData)
 {
     auto *browser = dynamic_cast<Browser *>(qApp);
     Q_CHECK_PTR(browser);
-    auto *profileManager = browser->getProfileManager();
+    const auto *profileManager = WebProfileManager::instance();
     Q_CHECK_PTR(profileManager);
 
     for(const auto subwindowData : sessionData["subwindows"].toArray()) {
-- 
cgit v1.2.1