From 24a55ed0785b4ec02b69e3a7a3e36ee9a45cc458 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Sat, 25 Apr 2020 17:20:18 +0300
Subject: Cleanup

- Don't run configuration fuzzer as test
- Remove plugins/ConfigurationEditor
- Move exported interfaces to include/smolbote
- Install plugin interfaces
---
 include/filterinterface.h            | 36 ---------------------------------
 include/meson.build                  |  7 +++----
 include/plugininterface.h            | 29 ---------------------------
 include/smolbote/filterinterface.hpp | 39 ++++++++++++++++++++++++++++++++++++
 include/smolbote/plugininterface.hpp | 25 +++++++++++++++++++++++
 5 files changed, 67 insertions(+), 69 deletions(-)
 delete mode 100644 include/filterinterface.h
 delete mode 100644 include/plugininterface.h
 create mode 100644 include/smolbote/filterinterface.hpp
 create mode 100644 include/smolbote/plugininterface.hpp

(limited to 'include')

diff --git a/include/filterinterface.h b/include/filterinterface.h
deleted file mode 100644
index fb04e25..0000000
--- a/include/filterinterface.h
+++ /dev/null
@@ -1,36 +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
- */
-
-#pragma once
-
-#include <QWebEngineUrlRequestInfo>
-#include <QtPlugin>
-
-class Filter
-{
-public:
-    virtual ~Filter() = default;
-
-    virtual void filter(QWebEngineUrlRequestInfo &info) const = 0;
-
-    virtual bool isUpToDate() const = 0;
-};
-
-// A class to provide filter interfaces
-class QIODevice;
-class FilterPlugin
-{
-public:
-    virtual ~FilterPlugin() = default;
-
-    virtual Filter* load(QIODevice* from) const = 0;
-};
-
-#define FilterPluginIid "net.iserlohn-fortress.smolbote.FilterPlugin"
-Q_DECLARE_INTERFACE(FilterPlugin, FilterPluginIid)
-
diff --git a/include/meson.build b/include/meson.build
index c2bf758..7601966 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -1,6 +1,5 @@
-dep_plugininterface = declare_dependency(
-  include_directories: include_directories('.')
-)
+plugininterfaces_include = include_directories('.')
 
-plugininterface_include = include_directories('.')
+install_headers('smolbote/filterinterface.hpp', 'smolbote/plugininterface.hpp',
+  subdir: 'smolbote')
 
diff --git a/include/plugininterface.h b/include/plugininterface.h
deleted file mode 100644
index 4c36d8a..0000000
--- a/include/plugininterface.h
+++ /dev/null
@@ -1,29 +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
- */
-
-#pragma once
-
-#include <QtPlugin>
-#include <QHash>
-#include <memory>
-#include <functional>
-#include <QApplication>
-
-typedef QHash<QString, std::function<int()>> CommandHash_t;
-
-class QDialog;
-class PluginInterface
-{
-public:
-    virtual ~PluginInterface() = default;
-    virtual CommandHash_t commands() = 0;
-    virtual QDialog *createWidget(QWidget *parent = nullptr) const = 0;
-};
-
-#define PluginInterfaceIid "net.iserlohn-fortress.smolbote.PluginInterface"
-Q_DECLARE_INTERFACE(PluginInterface, PluginInterfaceIid)
diff --git a/include/smolbote/filterinterface.hpp b/include/smolbote/filterinterface.hpp
new file mode 100644
index 0000000..3bbddf2
--- /dev/null
+++ b/include/smolbote/filterinterface.hpp
@@ -0,0 +1,39 @@
+/*
+ * 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_SMOLBLOK_INTERFACE_HPP
+#define SMOLBOTE_SMOLBLOK_INTERFACE_HPP
+
+#include <QWebEngineUrlRequestInfo>
+#include <QtPlugin>
+#include <QIODevice>
+
+class FilterList
+{
+public:
+    virtual ~FilterList() = default;
+
+    [[nodiscard]] virtual bool filter(QWebEngineUrlRequestInfo &info) const = 0;
+    [[nodiscard]] virtual bool isUpToDate() const = 0;
+};
+
+// A class to provide filter interfaces
+class FilterPlugin
+{
+public:
+    virtual ~FilterPlugin() = default;
+
+    virtual FilterList *load(QIODevice&) const = 0;
+    virtual bool parse(FilterList *list, QIODevice &) const = 0;
+};
+
+#define FilterPluginIid "net.iserlohn-fortress.smolbote.FilterPlugin"
+Q_DECLARE_INTERFACE(FilterPlugin, FilterPluginIid)
+
+#endif // SMOLBOTE_SMOLBLOK_INTERFACE_HPP
+
diff --git a/include/smolbote/plugininterface.hpp b/include/smolbote/plugininterface.hpp
new file mode 100644
index 0000000..5fa4530
--- /dev/null
+++ b/include/smolbote/plugininterface.hpp
@@ -0,0 +1,25 @@
+/*
+ * 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_PLUGIN_INTERFACE_HPP
+#define SMOLBOTE_PLUGIN_INTERFACE_HPP
+
+#include <QtPlugin>
+
+class QDialog;
+class PluginInterface
+{
+public:
+    virtual ~PluginInterface() = default;
+    virtual QDialog *createWidget(QWidget *parent = nullptr) const = 0;
+};
+
+#define PluginInterfaceIid "net.iserlohn-fortress.smolbote.PluginInterface"
+Q_DECLARE_INTERFACE(PluginInterface, PluginInterfaceIid)
+
+#endif // SMOLBOTE_PLUGIN_INTERFACE_HPP
-- 
cgit v1.2.1