From a1b660daae9dd252d84ec44e8a5102277539b395 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 12 Dec 2012 18:47:35 +0100 Subject: - Code style check (codestyle script round) - restored CTRL + ENTER code - applied Vedant's patch about (thanks!!!) CCMAIL: vedant.kota@gmail.com REVIEW: 107662 REVIEWED-BY: Tirtha and me --- src/adblock/adblockhostmatcher.cpp | 7 ++++--- src/adblock/adblockhostmatcher.h | 3 ++- src/adblock/adblockmanager.cpp | 2 +- src/adblock/adblockmanager.h | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'src/adblock') diff --git a/src/adblock/adblockhostmatcher.cpp b/src/adblock/adblockhostmatcher.cpp index 60936ec0..4a1ea443 100644 --- a/src/adblock/adblockhostmatcher.cpp +++ b/src/adblock/adblockhostmatcher.cpp @@ -3,6 +3,7 @@ * This file is a part of the rekonq project * * Copyright (C) 2010-2011 by Benjamin Poulain +* Copyright (C) 2012 by Andrea Diamantini * * * This program is free software; you can redistribute it and/or @@ -55,13 +56,13 @@ bool AdBlockHostMatcher::tryAddFilter(const QString &filter) if (filter.startsWith(QL1S("@@"))) { QString domain = filter.mid(2); - + if (domain.contains(QL1C('^'))) return false; if (domain.contains(QL1C('$'))) return false; - + if (domain.contains(QL1C('*'))) return false; @@ -77,6 +78,6 @@ bool AdBlockHostMatcher::tryAddFilter(const QString &filter) m_hostList.insert(domain); return true; } - + return false; } diff --git a/src/adblock/adblockhostmatcher.h b/src/adblock/adblockhostmatcher.h index 79918239..9e1b68ef 100644 --- a/src/adblock/adblockhostmatcher.h +++ b/src/adblock/adblockhostmatcher.h @@ -3,6 +3,7 @@ * This file is a part of the rekonq project * * Copyright (C) 2010-2011 by Benjamin Poulain +* Copyright (C) 2012 by Andrea Diamantini * * * This program is free software; you can redistribute it and/or @@ -48,7 +49,7 @@ public: { m_hostList.clear(); } - + private: QSet m_hostList; }; diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp index d5a3e27c..f30a997c 100644 --- a/src/adblock/adblockmanager.cpp +++ b/src/adblock/adblockmanager.cpp @@ -243,7 +243,7 @@ bool AdBlockManager::blockRequest(const QNetworkRequest &request) QStringList whiteRefererList = ReKonfig::whiteReferer(); const QString referer = request.rawHeader("referer"); - Q_FOREACH(const QString &host, whiteRefererList) + Q_FOREACH(const QString & host, whiteRefererList) { if (referer.contains(host)) return false; diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h index 993fa9a7..7f044f3e 100644 --- a/src/adblock/adblockmanager.h +++ b/src/adblock/adblockmanager.h @@ -167,7 +167,7 @@ public: void addCustomRule(const QString &, bool reloadPage = true); bool isAdblockEnabledForHost(const QString &host); - + private: AdBlockManager(QObject *parent = 0); -- cgit v1.2.1