From faa7f72c417b4ccd9b794b32b988312186d62e59 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 28 Dec 2012 16:50:41 +0100 Subject: Krazy Fixes, first shot --- src/adblock/adblockrule.h | 2 +- src/adblock/adblockrulefallbackimpl.h | 3 ++- src/adblock/adblockruleimpl.h | 3 ++- src/adblock/adblockrulenullimpl.h | 3 ++- src/adblock/adblockruletextmatchimpl.h | 3 ++- src/adblock/adblocksettingwidget.h | 6 +++--- 6 files changed, 12 insertions(+), 8 deletions(-) (limited to 'src/adblock') diff --git a/src/adblock/adblockrule.h b/src/adblock/adblockrule.h index 15dea344..448a5ed3 100644 --- a/src/adblock/adblockrule.h +++ b/src/adblock/adblockrule.h @@ -51,7 +51,7 @@ enum RuleTypes class AdBlockRule { public: - AdBlockRule(const QString &filter); + explicit AdBlockRule(const QString &filter); bool match(const QNetworkRequest &request, const QString &encodedUrl, const QString &encodedUrlLowerCase) const { diff --git a/src/adblock/adblockrulefallbackimpl.h b/src/adblock/adblockrulefallbackimpl.h index 4b5716f8..17b89897 100644 --- a/src/adblock/adblockrulefallbackimpl.h +++ b/src/adblock/adblockrulefallbackimpl.h @@ -37,7 +37,8 @@ class AdBlockRuleFallbackImpl : public AdBlockRuleImpl { public: - AdBlockRuleFallbackImpl(const QString &filter); + explicit AdBlockRuleFallbackImpl(const QString &filter); + bool match(const QNetworkRequest &request, const QString &encodedUrl, const QString &encodedUrlLowerCase) const; QString ruleString() const; diff --git a/src/adblock/adblockruleimpl.h b/src/adblock/adblockruleimpl.h index f1d428d5..b1d69ce9 100644 --- a/src/adblock/adblockruleimpl.h +++ b/src/adblock/adblockruleimpl.h @@ -32,8 +32,9 @@ class QNetworkRequest; class AdBlockRuleImpl { public: - AdBlockRuleImpl(const QString &) {} + explicit AdBlockRuleImpl(const QString &) {} virtual ~AdBlockRuleImpl() {} + virtual bool match(const QNetworkRequest &request, const QString &encodedUrl, const QString &encodedUrlLowerCase) const = 0; // This are added just for debugging purposes diff --git a/src/adblock/adblockrulenullimpl.h b/src/adblock/adblockrulenullimpl.h index a8f69652..e5bcd660 100644 --- a/src/adblock/adblockrulenullimpl.h +++ b/src/adblock/adblockrulenullimpl.h @@ -39,7 +39,8 @@ class AdBlockRuleNullImpl : public AdBlockRuleImpl { public: - AdBlockRuleNullImpl(const QString &filter); + explicit AdBlockRuleNullImpl(const QString &filter); + bool match(const QNetworkRequest &, const QString &, const QString &) const; static bool isNullFilter(const QString &filter); diff --git a/src/adblock/adblockruletextmatchimpl.h b/src/adblock/adblockruletextmatchimpl.h index 8600543d..7a99f41d 100644 --- a/src/adblock/adblockruletextmatchimpl.h +++ b/src/adblock/adblockruletextmatchimpl.h @@ -37,7 +37,8 @@ class AdBlockRuleTextMatchImpl : public AdBlockRuleImpl { public: - AdBlockRuleTextMatchImpl(const QString &filter); + explicit AdBlockRuleTextMatchImpl(const QString &filter); + bool match(const QNetworkRequest &request, const QString &encodedUrl, const QString &encodedUrlLowerCase) const; static bool isTextMatchFilter(const QString &filter); diff --git a/src/adblock/adblocksettingwidget.h b/src/adblock/adblocksettingwidget.h index c630d795..2f0fab15 100644 --- a/src/adblock/adblocksettingwidget.h +++ b/src/adblock/adblocksettingwidget.h @@ -24,8 +24,8 @@ * ============================================================ */ -#ifndef ADBLOCK_SETTINGS_WIDGET_H -#define ADBLOCK_SETTINGS_WIDGET_H +#ifndef AD_BLOCK_SETTINGS_WIDGET_H +#define AD_BLOCK_SETTINGS_WIDGET_H // Rekonq Includes @@ -70,4 +70,4 @@ private: KSharedConfig::Ptr _adblockConfig; }; -#endif // ADBLOCK_SETTINGS_WIDGET_H +#endif // AD_BLOCK_SETTINGS_WIDGET_H -- cgit v1.2.1