From 9c4dd932c6d692178bb8d5265c634126cb415767 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Tue, 26 May 2020 22:23:25 +0300 Subject: Turn on more warnings by default - fix clazy warnings - fix various other compiler warnings - bugfix: connect profiles' downloadRequested signal --- lib/session_formats/session_json.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'lib/session_formats/session_json.cpp') diff --git a/lib/session_formats/session_json.cpp b/lib/session_formats/session_json.cpp index eca96f2..96319ac 100644 --- a/lib/session_formats/session_json.cpp +++ b/lib/session_formats/session_json.cpp @@ -10,7 +10,7 @@ #include #include -[[nodiscard]] QVector toWindowList(const QString &profile, const QStringList &urls) +[[nodiscard]] inline QVector toWindowList(const QString &profile, const QStringList &urls) { Session::SubWindow main_; main_.profile = profile; @@ -22,7 +22,7 @@ return { main }; } -[[nodiscard]] QJsonObject toJson(const QVector &windows) +[[nodiscard]] inline QJsonObject toJson(const QVector &windows) { QJsonObject root; QJsonArray windows_; @@ -76,12 +76,18 @@ QByteArray JsonSession::serialize() const QVector JsonSession::get() const { QVector windows; - for(const auto &windowData : root["windows"].toArray()) { + const auto root_array = root["windows"].toArray(); + for(const auto &windowData : root_array) { Session::MainWindow window; - for(const auto &subwindowData : windowData.toObject()["subwindows"].toArray()) { + + const auto subwindows_array = windowData.toObject()["subwindows"].toArray(); + for(const auto &subwindowData : subwindows_array) { Session::SubWindow subwindow; + subwindow.profile = subwindowData.toObject()["profile"].toString(); - for(const auto &tabData : subwindowData.toObject()["tabs"].toArray()) { + + const auto tabs_array = subwindowData.toObject()["tabs"].toArray(); + for(const auto &tabData : tabs_array) { Session::WebView tab{ tabData.toObject()["profile"].toString(), tabData.toObject()["url"].toString(), -- cgit v1.2.1