diff options
Diffstat (limited to 'staging/adblock')
-rw-r--r-- | staging/adblock/filterlist.h | 1 | ||||
-rw-r--r-- | staging/adblock/meson.build | 15 | ||||
-rw-r--r-- | staging/adblock/options.h | 6 |
3 files changed, 8 insertions, 14 deletions
diff --git a/staging/adblock/filterlist.h b/staging/adblock/filterlist.h index 1cdbb86..b67c187 100644 --- a/staging/adblock/filterlist.h +++ b/staging/adblock/filterlist.h @@ -20,7 +20,6 @@ class Rule; class FilterList : public Filter { public: - FilterList() = default; explicit FilterList(QIODevice &from); ~FilterList() { diff --git a/staging/adblock/meson.build b/staging/adblock/meson.build index fb92481..942f325 100644 --- a/staging/adblock/meson.build +++ b/staging/adblock/meson.build @@ -4,6 +4,11 @@ lib_adblockfilter = static_library('adblockfilter', dependencies: [ dep_qt5 ] ) +dep_adblockfilter = declare_dependency( + include_directories: ['.', smolbote_interfaces], + link_with: lib_adblockfilter +) + #AdblockPlusFilterPlugin = shared_library('AdblockPlusPlugin', # [ 'plugin/plugin.cpp', # mod_qt5.preprocess(include_directories: smolbote_interfaces, @@ -18,20 +23,16 @@ lib_adblockfilter = static_library('adblockfilter', test('adblock: rule', executable('libadblockfilter_rule', sources: 'test/rule.cpp', - link_with: lib_adblockfilter, - dependencies: [ dep_qt5, dep_catch ] + dependencies: [ dep_qt5, dep_catch, dep_adblockfilter ] )) test('adblock: options', executable('libadblockfilter_options', sources: 'test/options.cpp', - link_with: lib_adblockfilter, - dependencies: [ dep_qt5, dep_catch ] + dependencies: [ dep_qt5, dep_catch, dep_adblockfilter ] )) test('adblock: filterlist', executable('libadblockfilter_filterlist', sources: 'test/filterlist.cpp', - include_directories: smolbote_interfaces, - link_with: lib_adblockfilter, - dependencies: [ dep_qt5, dep_catch ] + dependencies: [ dep_qt5, dep_catch, dep_adblockfilter ] )) diff --git a/staging/adblock/options.h b/staging/adblock/options.h index d8f7d2b..efc47a6 100644 --- a/staging/adblock/options.h +++ b/staging/adblock/options.h @@ -17,12 +17,6 @@ namespace AdblockPlus { -enum OptionState { - Allow, - Block, - Unset -}; - struct Options { // request handling options bool exception = false; |