diff options
author | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-04-13 21:34:47 +0300 |
---|---|---|
committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-04-21 20:14:56 +0300 |
commit | 8cb6f64820b4bf39c64803db21a58e135465ff4f (patch) | |
tree | 22e28a5ba0c1a31d7555626b7a1b282dff6b4d03 | |
parent | staging/adblock: single line FilterList::parse (diff) | |
download | smolbote-8cb6f64820b4bf39c64803db21a58e135465ff4f.tar.xz |
Move smolbote headers to include/smolbote
Headers will be installed to include/smolbote/
-rw-r--r-- | include/meson.build | 6 | ||||
-rw-r--r-- | include/smolbote/filterinterface.hpp (renamed from include/filterinterface.h) | 6 | ||||
-rw-r--r-- | include/smolbote/plugininterface.h (renamed from include/plugininterface.h) | 0 | ||||
-rw-r--r-- | include/smolbote/session.hpp (renamed from include/session.hpp) | 0 | ||||
-rw-r--r-- | lib/session_formats/session_json.hpp | 2 | ||||
-rw-r--r-- | meson.build | 5 | ||||
-rw-r--r-- | src/browser.cpp | 2 | ||||
-rw-r--r-- | src/browser.h | 2 | ||||
-rw-r--r-- | src/builtins.h | 2 | ||||
-rw-r--r-- | src/main.cpp | 1 | ||||
-rw-r--r-- | src/mainwindow/mainwindow.h | 2 | ||||
-rw-r--r-- | src/session/sessiondialog.h | 2 | ||||
-rw-r--r-- | src/subwindow/subwindow.h | 2 | ||||
-rw-r--r-- | src/version.h.in (renamed from include/version.h.in) | 0 | ||||
-rw-r--r-- | src/webengine/webview.h | 2 | ||||
-rw-r--r-- | staging/adblock/filterlist.h | 2 | ||||
-rw-r--r-- | staging/adblock/meson.build | 7 | ||||
-rw-r--r-- | staging/adblock/plugin/plugin.h | 2 |
18 files changed, 24 insertions, 21 deletions
diff --git a/include/meson.build b/include/meson.build index 70d995a..82ab510 100644 --- a/include/meson.build +++ b/include/meson.build @@ -1,2 +1,6 @@ -plugininterface_include = include_directories('.') +smolbote_interfaces = include_directories('.') + +install_headers('smolbote/plugininterface.h', 'smolbote/filterinterface.hpp', 'smolbote/session.hpp', + subdir: 'smolbote' +) diff --git a/include/filterinterface.h b/include/smolbote/filterinterface.hpp index fb04e25..9c78c97 100644 --- a/include/filterinterface.h +++ b/include/smolbote/filterinterface.hpp @@ -6,7 +6,8 @@ * SPDX-License-Identifier: MIT */ -#pragma once +#ifndef SMOLBOTE_FILTER_HPP +#define SMOLBOTE_FILTER_HPP #include <QWebEngineUrlRequestInfo> #include <QtPlugin> @@ -17,7 +18,6 @@ public: virtual ~Filter() = default; virtual void filter(QWebEngineUrlRequestInfo &info) const = 0; - virtual bool isUpToDate() const = 0; }; @@ -34,3 +34,5 @@ public: #define FilterPluginIid "net.iserlohn-fortress.smolbote.FilterPlugin" Q_DECLARE_INTERFACE(FilterPlugin, FilterPluginIid) +#endif // SMOLBOTE_FILTER_HPP + diff --git a/include/plugininterface.h b/include/smolbote/plugininterface.h index 4c36d8a..4c36d8a 100644 --- a/include/plugininterface.h +++ b/include/smolbote/plugininterface.h diff --git a/include/session.hpp b/include/smolbote/session.hpp index 0146802..0146802 100644 --- a/include/session.hpp +++ b/include/smolbote/session.hpp diff --git a/lib/session_formats/session_json.hpp b/lib/session_formats/session_json.hpp index 3332229..142d9ef 100644 --- a/lib/session_formats/session_json.hpp +++ b/lib/session_formats/session_json.hpp @@ -10,7 +10,7 @@ #define SESSION_JSON_HPP #include <QJsonObject> -#include <session.hpp> +#include "smolbote/session.hpp" class JsonSession : public Session { diff --git a/meson.build b/meson.build index 5a62bc1..92a3c72 100644 --- a/meson.build +++ b/meson.build @@ -13,7 +13,7 @@ cdata = configuration_data(kconf) version_h = vcs_tag( command: [find_program('git').path(), 'describe', '--long', '--abbrev=40'], #fallback: defaults to meson.project_version(), - input: 'include/version.h.in', + input: 'src/version.h.in', output: 'version.h' ) @@ -88,9 +88,6 @@ subdir('lang') subdir('doc') subdir('tools') -#subdir('plugins/ConfigurationEditor') -#subdir('plugins/ProfileEditor') - subdir('test/firefox-bookmarks-json-parser') subdir('test/matcherbenchmark') diff --git a/src/browser.cpp b/src/browser.cpp index 3c39ec7..611a94b 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -36,7 +36,7 @@ #include <QTimer> #include <QTranslator> #include <QVersionNumber> -#include <plugininterface.h> +#include "smolbote/plugininterface.h" #include <pluginloader.h> #include <spdlog/spdlog.h> #include <version.h> diff --git a/src/browser.h b/src/browser.h index 95ce936..ed585fc 100644 --- a/src/browser.h +++ b/src/browser.h @@ -9,7 +9,7 @@ #ifndef SMOLBOTE_BROWSER_H #define SMOLBOTE_BROWSER_H -#include "session.hpp" +#include "smolbote/session.hpp" #include <QJsonObject> #include <QMenu> #include <QPluginLoader> diff --git a/src/builtins.h b/src/builtins.h index f805f6b..9534df0 100644 --- a/src/builtins.h +++ b/src/builtins.h @@ -10,7 +10,7 @@ #define SMOLBOTE_BUILTINS_H #include <args.hxx> -#include <plugininterface.h> +#include "smolbote/plugininterface.h" typedef std::function<int(const std::string &, std::vector<std::string>::const_iterator, std::vector<std::string>::const_iterator)> subcommand_func; typedef std::unordered_map<std::string, subcommand_func> command_map; diff --git a/src/main.cpp b/src/main.cpp index 9ceda77..ca85b65 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -20,7 +20,6 @@ #include <QStandardPaths> #include <iostream> #include <memory> -#include <plugininterface.h> #include <pluginloader.h> #include <spdlog/spdlog.h> diff --git a/src/mainwindow/mainwindow.h b/src/mainwindow/mainwindow.h index 2b9f82b..40f5c2d 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 02f50d0..5bd91cb 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/include/version.h.in b/src/version.h.in index 44f10d9..44f10d9 100644 --- a/include/version.h.in +++ b/src/version.h.in diff --git a/src/webengine/webview.h b/src/webengine/webview.h index 5748691..e7d771a 100644 --- a/src/webengine/webview.h +++ b/src/webengine/webview.h @@ -11,7 +11,7 @@ #include "webpage.h" #include <QWebEngineView> -#include <session.hpp> +#include "smolbote/session.hpp" class WebProfile; class SubWindow; diff --git a/staging/adblock/filterlist.h b/staging/adblock/filterlist.h index 5ac60b6..2e3fba6 100644 --- a/staging/adblock/filterlist.h +++ b/staging/adblock/filterlist.h @@ -6,7 +6,7 @@ * SPDX-License-Identifier: GPL-3.0 */ -#include <filterinterface.h> +#include <smolbote/filterinterface.hpp> #include <QDateTime> #include <QObject> #include <QString> diff --git a/staging/adblock/meson.build b/staging/adblock/meson.build index 8d06fb8..24e87c4 100644 --- a/staging/adblock/meson.build +++ b/staging/adblock/meson.build @@ -1,14 +1,15 @@ lib_adblockfilter = static_library('adblockfilter', [ 'filterlist.cpp', 'rule.cpp', 'options.cpp' ], - include_directories: plugininterface_include, + include_directories: smolbote_interfaces, dependencies: [ dep_qt5 ] ) AdblockPlusFilterPlugin = shared_library('AdblockPlusPlugin', [ 'plugin/plugin.cpp', - mod_qt5.preprocess(include_directories: plugininterface_include, moc_headers: 'plugin/plugin.h', dependencies: dep_qt5) + mod_qt5.preprocess(include_directories: smolbote_interfaces, + moc_headers: 'plugin/plugin.h', dependencies: dep_qt5) ], - include_directories: plugininterface_include, + include_directories: smolbote_interfaces, link_with: lib_adblockfilter, dependencies: dep_qt5, install: true, diff --git a/staging/adblock/plugin/plugin.h b/staging/adblock/plugin/plugin.h index 1ca51aa..db419bd 100644 --- a/staging/adblock/plugin/plugin.h +++ b/staging/adblock/plugin/plugin.h @@ -9,7 +9,7 @@ #ifndef ADBLOCKPLUSFILTER_PLUGIN_H #define ADBLOCKPLUSFILTER_PLUGIN_H -#include <filterinterface.h> +#include <smolbote/filterinterface.hpp> class AdblockPlusFilterPlugin : public QObject, public FilterPlugin { |