From d1287f43964633035938f4f4d4133bb6d9da7b3e Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Mon, 10 Feb 2020 20:58:39 +0200
Subject: staging: smolblok

smolblok is a replacement for the current lib/urlfilter AdBlockPlus
and hostlist format filter parser. It is a library that uses plugins to
provide support for different filter formats.

staging/adblock: AdBlockPlus parser plugin
plugins/smolblok_hostlist: hostlist format parser plugin

Headers will be installed to include/smolbote/

Remove lib/urlfilter
---
 include/meson.build          |  5 +++--
 include/session.hpp          | 41 -----------------------------------------
 include/smolbote/session.hpp | 41 +++++++++++++++++++++++++++++++++++++++++
 include/version.h.in         |  8 --------
 4 files changed, 44 insertions(+), 51 deletions(-)
 delete mode 100644 include/session.hpp
 create mode 100644 include/smolbote/session.hpp
 delete mode 100644 include/version.h.in

(limited to 'include')

diff --git a/include/meson.build b/include/meson.build
index 1cd9957..1372c86 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -1,6 +1,7 @@
 plugininterfaces_include = include_directories('.')
 smolbote_include = include_directories('.')
 
-install_headers('smolbote/filterinterface.hpp', 'smolbote/plugininterface.hpp',
-  subdir: 'smolbote')
+install_headers('smolbote/plugininterface.hpp', 'smolbote/filterinterface.hpp', 'smolbote/session.hpp',
+  subdir: 'smolbote'
+)
 
diff --git a/include/session.hpp b/include/session.hpp
deleted file mode 100644
index 0146802..0000000
--- a/include/session.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * This file is part of smolbote. It's copyrighted by the contributors recorded
- * in the version control history of the file, available from its original
- * location: https://library.iserlohn-fortress.net/aqua/smolbote.git
- *
- * SPDX-License-Identifier: MIT
- */
-
-#ifndef SMOLBOTE_SESSION_HPP
-#define SMOLBOTE_SESSION_HPP
-
-#include <QByteArray>
-#include <QString>
-#include <QStringList>
-#include <QVector>
-
-class [[nodiscard]] Session
-{
-public:
-    struct WebView {
-        QString profile;
-        QString url;
-        QByteArray history;
-    };
-
-    struct SubWindow {
-        QString profile;
-        QVector<WebView> tabs;
-    };
-
-    struct MainWindow {
-        QVector<SubWindow> subwindows;
-    };
-
-    virtual ~Session() = default;
-
-    [[nodiscard]] virtual QByteArray serialize() const = 0;
-    [[nodiscard]] virtual QVector<MainWindow> get() const = 0;
-};
-
-#endif // SMOLBOTE_SESSION_HPP
diff --git a/include/smolbote/session.hpp b/include/smolbote/session.hpp
new file mode 100644
index 0000000..0146802
--- /dev/null
+++ b/include/smolbote/session.hpp
@@ -0,0 +1,41 @@
+/*
+ * This file is part of smolbote. It's copyrighted by the contributors recorded
+ * in the version control history of the file, available from its original
+ * location: https://library.iserlohn-fortress.net/aqua/smolbote.git
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#ifndef SMOLBOTE_SESSION_HPP
+#define SMOLBOTE_SESSION_HPP
+
+#include <QByteArray>
+#include <QString>
+#include <QStringList>
+#include <QVector>
+
+class [[nodiscard]] Session
+{
+public:
+    struct WebView {
+        QString profile;
+        QString url;
+        QByteArray history;
+    };
+
+    struct SubWindow {
+        QString profile;
+        QVector<WebView> tabs;
+    };
+
+    struct MainWindow {
+        QVector<SubWindow> subwindows;
+    };
+
+    virtual ~Session() = default;
+
+    [[nodiscard]] virtual QByteArray serialize() const = 0;
+    [[nodiscard]] virtual QVector<MainWindow> get() const = 0;
+};
+
+#endif // SMOLBOTE_SESSION_HPP
diff --git a/include/version.h.in b/include/version.h.in
deleted file mode 100644
index 44f10d9..0000000
--- a/include/version.h.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef SMOLBOTE_VERSION_H
-#define SMOLBOTE_VERSION_H
-
-// output of 'git describe --long --abbrev=40':
-// x.y.z-0-g0123456789012345678901234567890123456789
-#define poi_Version "@VCS_TAG@"
-
-#endif // SMOLBOTE_VERSION_H
-- 
cgit v1.2.1