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
---
 src/browser.cpp             | 2 --
 src/browser.h               | 2 +-
 src/builtins.h              | 1 +
 src/mainwindow/mainwindow.h | 2 +-
 src/session/sessiondialog.h | 2 +-
 src/subwindow/subwindow.h   | 2 +-
 src/version.h.in            | 8 ++++++++
 src/webengine/webview.h     | 2 +-
 8 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 src/version.h.in

(limited to 'src')

diff --git a/src/browser.cpp b/src/browser.cpp
index f748e2f..ff948e4 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -9,12 +9,10 @@
 #include "browser.h"
 #include "aboutdialog.h"
 #include "aboutplugin.h"
-#include "adblock/adblocklist.h"
 #include "applicationmenu.h"
 #include "bookmarks/bookmarkswidget.h"
 #include "configuration.h"
 #include "downloadswidget.h"
-#include "hostlist/hostlist.h"
 #include "mainwindow/addressbar.h"
 #include "mainwindow/mainwindow.h"
 #include "mainwindow/menubar.h"
diff --git a/src/browser.h b/src/browser.h
index 5b4785b..0a0b201 100644
--- a/src/browser.h
+++ b/src/browser.h
@@ -9,8 +9,8 @@
 #ifndef SMOLBOTE_BROWSER_H
 #define SMOLBOTE_BROWSER_H
 
-#include "session.hpp"
 #include "webengine/webprofilemanager.h"
+#include "smolbote/session.hpp"
 #include <QJsonObject>
 #include <QMenu>
 #include <QPluginLoader>
diff --git a/src/builtins.h b/src/builtins.h
index cdf6642..9fdca98 100644
--- a/src/builtins.h
+++ b/src/builtins.h
@@ -9,6 +9,7 @@
 #ifndef SMOLBOTE_BUILTINS_H
 #define SMOLBOTE_BUILTINS_H
 
+#include "smolbote/plugininterface.hpp"
 #include <args.hxx>
 
 typedef std::function<int(const std::string &, std::vector<std::string>::const_iterator, std::vector<std::string>::const_iterator)> subcommand_func;
diff --git a/src/mainwindow/mainwindow.h b/src/mainwindow/mainwindow.h
index c5d573e..5026ae7 100644
--- a/src/mainwindow/mainwindow.h
+++ b/src/mainwindow/mainwindow.h
@@ -9,7 +9,7 @@
 #ifndef SMOLBOTE_MAINWINDOW_H
 #define SMOLBOTE_MAINWINDOW_H
 
-#include "session.hpp"
+#include "smolbote/session.hpp"
 #include "subwindow/subwindow.h"
 #include <QJsonArray>
 #include <QJsonObject>
diff --git a/src/session/sessiondialog.h b/src/session/sessiondialog.h
index 0a04940..ecbfe46 100644
--- a/src/session/sessiondialog.h
+++ b/src/session/sessiondialog.h
@@ -9,7 +9,7 @@
 #ifndef SMOLBOTE_SESSIONDIALOG_H
 #define SMOLBOTE_SESSIONDIALOG_H
 
-#include "session.hpp"
+#include "smolbote/session.hpp"
 #include <QDialog>
 
 namespace Ui
diff --git a/src/subwindow/subwindow.h b/src/subwindow/subwindow.h
index 68f7cf9..80e8520 100644
--- a/src/subwindow/subwindow.h
+++ b/src/subwindow/subwindow.h
@@ -9,7 +9,7 @@
 #ifndef SMOLBOTE_SUBWINDOW_H
 #define SMOLBOTE_SUBWINDOW_H
 
-#include "session.hpp"
+#include "smolbote/session.hpp"
 #include "tabwidget.h"
 #include "webengine/webview.h"
 #include <QMenu>
diff --git a/src/version.h.in b/src/version.h.in
new file mode 100644
index 0000000..44f10d9
--- /dev/null
+++ b/src/version.h.in
@@ -0,0 +1,8 @@
+#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
diff --git a/src/webengine/webview.h b/src/webengine/webview.h
index 34c77bf..538ffa9 100644
--- a/src/webengine/webview.h
+++ b/src/webengine/webview.h
@@ -9,10 +9,10 @@
 #ifndef SMOLBOTE_WEBVIEW_H
 #define SMOLBOTE_WEBVIEW_H
 
+#include "smolbote/session.hpp"
 #include "webpage.h"
 #include <QWebEngineView>
 #include <functional>
-#include <session.hpp>
 
 class WebProfile;
 class WebViewContextMenu;
-- 
cgit v1.2.1