diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-01-05 10:55:56 +0200 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-01-05 14:59:10 +0200 |
| commit | 7918bce1422fb217b59131111c6fb1ccdf52ddc4 (patch) | |
| tree | 369fce128f1b021c0c88455039c0011a2014b9d7 /src/session/session.cpp | |
| parent | Disable plugins as broken (diff) | |
| download | smolbote-7918bce1422fb217b59131111c6fb1ccdf52ddc4.tar.xz | |
Code cleanup
- Replace Browser::getProfileManager with WebProfileManager::instance
- Make WebProfileManager::profileMenu a free function
- Replace Browser::loadProfile with Browser::loadProfiles
Diffstat (limited to 'src/session/session.cpp')
| -rw-r--r-- | src/session/session.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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()) { |