From 396bc0c1721af8d3ee970228e7df457f6b2c73d5 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Mon, 13 Apr 2020 15:44:09 +0300
Subject: Rewrite Session backend

    Add session.hpp, containing structs that describe session data

    MainWindow, SubWindow and WebView can be created from
    Session::structs

    Opening new window will automatically open a default subwindow and tab
    if none were specified

Add lib/session_formats
    Add JsonSession, to serialize/deserialize Session structs into JSON
    - add some tests

clang-tidy:
    - fix various warnings
    - disable modernize-use-trailing-return-type check
---
 src/meson.build | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/meson.build')

diff --git a/src/meson.build b/src/meson.build
index edc9db4..31f4ffc 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -11,13 +11,13 @@ poi_sourceset.add(mod_qt5.preprocess(
     moc_headers: ['browser.h',
         'mainwindow/mainwindow.h', 'mainwindow/addressbar.h', 'mainwindow/menubar.h', 'mainwindow/widgets/completer.h', 'mainwindow/widgets/urllineedit.h', 'mainwindow/widgets/dockwidget.h', 'mainwindow/widgets/navigationbar.h', 'mainwindow/widgets/searchform.h',
         'bookmarks/bookmarkswidget.h', 'bookmarks/editbookmarkdialog.h',
-        'session/savesessiondialog.h', 'session/sessiondialog.h', 'session/sessionform.h',
+        'session/savesessiondialog.h', 'session/sessiondialog.h',
         'subwindow/subwindow.h', 'subwindow/tabwidget.h',
         'webengine/urlinterceptor.h', 'webengine/webpage.h', 'webengine/webview.h', 'webengine/webprofilemanager.h', 'webengine/webprofile.h'],
     ui_files: [
       'mainwindow/addressbar.ui', 'mainwindow/widgets/searchform.ui',
       'bookmarks/bookmarksform.ui', 'bookmarks/editbookmarkdialog.ui',
-      'session/savesessiondialog.ui', 'session/sessiondialog.ui', 'session/sessionform.ui'],
+      'session/savesessiondialog.ui', 'session/sessiondialog.ui' ],
     qresources: '../data/resources.qrc',
     rcc_extra_arguments: ['--format-version=1'],
     dependencies: dep_qt5
@@ -40,10 +40,8 @@ poi_sourceset.add(files(
 
     'bookmarks/builtins.cpp', 'bookmarks/bookmarkswidget.cpp', 'bookmarks/editbookmarkdialog.cpp', 'bookmarks/bookmarkstoolbar.cpp',
 
-    'session/session.cpp',
     'session/savesessiondialog.cpp',
     'session/sessiondialog.cpp',
-    'session/sessionform.cpp',
 
     'subwindow/subwindow.cpp',
     'subwindow/tabwidget.cpp',
-- 
cgit v1.2.1