[pim/kdepim-addons] plugins/webengineurlinterceptor/adblock: We had enable bool but it's not necessary if we activate plugin we make
Laurent Montel <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit c9f2973972b8677a33fa379655f24bb31631209f by Laurent Montel.
Committed on 15/08/2026 at 12:00.
Pushed by mlaurent into branch 'master'.
We had enable bool but it's not necessary if we activate plugin we make
it enabled
now it works
M +2 -6 plugins/webengineurlinterceptor/adblock/adblockinterceptorinterface.cpp
M +0 -3 plugins/webengineurlinterceptor/adblock/adblockmanager.cpp
M +0 -1 plugins/webengineurlinterceptor/adblock/adblockmanager.h
M +0 -7 plugins/webengineurlinterceptor/adblock/settings/webengineurlinterceptoradblock.kcfg
https://invent.kde.org/pim/kdepim-addons/-/commit/c9f2973972b8677a33fa379655f24bb31631209f
diff --git a/plugins/webengineurlinterceptor/adblock/adblockinterceptorinterface.cpp b/plugins/webengineurlinterceptor/adblock/adblockinterceptorinterface.cpp
index e53061a69..0d656c655 100644
--- a/plugins/webengineurlinterceptor/adblock/adblockinterceptorinterface.cpp
+++ b/plugins/webengineurlinterceptor/adblock/adblockinterceptorinterface.cpp
@@ -7,24 +7,20 @@
#include "adblockinterceptorinterface.h"
#include "adblockinterceptor_debug.h"
#include "adblockmanager.h"
-#include "globalsettings_webengineurlinterceptoradblock.h"
#include <QAction>
+#include <QDebug>
#include <QWebEngineView>
AdblockInterceptorInterface::AdblockInterceptorInterface(QObject *parent)
: WebEngineViewer::NetworkPluginUrlInterceptorInterface(parent)
{
+ qDebug(ADBLOCKINTERCEPTOR_LOG) << "AdblockInterceptorInterface::AdblockInterceptorInterface";
}
AdblockInterceptorInterface::~AdblockInterceptorInterface() = default;
bool AdblockInterceptorInterface::interceptRequest(QWebEngineUrlRequestInfo &info)
{
- if (!AdBlockSettings::self()->adBlockEnabled()) {
- qDebug(ADBLOCKINTERCEPTOR_LOG) << "Disable at the moment";
- return false;
- }
- qDebug(ADBLOCKINTERCEPTOR_LOG) << "Enabled at the moment";
return AdblockManager::self()->interceptRequest(info);
}
diff --git a/plugins/webengineurlinterceptor/adblock/adblockmanager.cpp b/plugins/webengineurlinterceptor/adblock/adblockmanager.cpp
index dcc102fe6..d38d4a3eb 100644
--- a/plugins/webengineurlinterceptor/adblock/adblockmanager.cpp
+++ b/plugins/webengineurlinterceptor/adblock/adblockmanager.cpp
@@ -100,9 +100,6 @@ AdblockManager *AdblockManager::self()
void AdblockManager::reloadConfig()
{
- const bool enabled = AdBlockSettings::self()->adBlockEnabled();
- Q_EMIT enabledChanged(enabled);
-
mAdblockFilterLists.clear();
const auto filterUrls = AdBlockSettings::self()->adblockFilterUrls();
diff --git a/plugins/webengineurlinterceptor/adblock/adblockmanager.h b/plugins/webengineurlinterceptor/adblock/adblockmanager.h
index 38831aa55..2e1e96f10 100644
--- a/plugins/webengineurlinterceptor/adblock/adblockmanager.h
+++ b/plugins/webengineurlinterceptor/adblock/adblockmanager.h
@@ -40,7 +40,6 @@ public:
[[nodiscard]] QString adblockListText(const QString &url);
Q_SIGNALS:
- void enabledChanged(bool enabled);
void adblockInitialized();
void refreshFinished();
diff --git a/plugins/webengineurlinterceptor/adblock/settings/webengineurlinterceptoradblock.kcfg b/plugins/webengineurlinterceptor/adblock/settings/webengineurlinterceptoradblock.kcfg
index b3e166f76..b8e889414 100644
--- a/plugins/webengineurlinterceptor/adblock/settings/webengineurlinterceptoradblock.kcfg
+++ b/plugins/webengineurlinterceptor/adblock/settings/webengineurlinterceptoradblock.kcfg
@@ -4,13 +4,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
<kcfgfile name="webengineurlinterceptoradblockrc" />
<include>adblocklistsutil.h</include>
- <group name="General">
- <entry name="AdBlockEnabled" type="Bool">
- <label>Enabled ad block</label>
- <default>false</default>
- </entry>
- </group>
-
<!-- Store adblock lists -->
<group name="Adblock">
<entry key="adblockFilterUrls" type="UrlList">