aboutsummaryrefslogtreecommitdiff
path: root/staging/adblock/filterlist.h
diff options
context:
space:
mode:
Diffstat (limited to 'staging/adblock/filterlist.h')
-rw-r--r--staging/adblock/filterlist.h27
1 files changed, 9 insertions, 18 deletions
diff --git a/staging/adblock/filterlist.h b/staging/adblock/filterlist.h
index 59717af..5ac60b6 100644
--- a/staging/adblock/filterlist.h
+++ b/staging/adblock/filterlist.h
@@ -6,15 +6,13 @@
* SPDX-License-Identifier: GPL-3.0
*/
-#include "filterinterface.h"
+#include <filterinterface.h>
#include <QDateTime>
#include <QObject>
#include <QString>
#include <QStringList>
#include <QVector>
-class QTextStream;
-
namespace AdblockPlus
{
class Rule;
@@ -26,20 +24,13 @@ public:
explicit FilterList() = default;
~FilterList();
- enum ParseResultState {
- Ok,
- InvalidFormat,
- };
- struct ParseResult {
- int lines_total = 0;
- int lines_comments = 0;
- int lines_ignored = 0;
- int lines_parsed = 0;
- int lines_failed = 0;
-
- ParseResultState state;
+ enum ParseResult {
+ Comment,
+ Rule,
+ Unsupported,
+ Failed,
};
- ParseResult parse(QTextStream &stream);
+ ParseResult parse(const QString &line);
void filter(QWebEngineUrlRequestInfo &info) const override;
bool isUpToDate() const override;
@@ -53,12 +44,12 @@ public:
}
private:
- void parseComment(QString &line);
+ void parseComment(const QString &line);
bool parseRule(const QString &line);
QDateTime lastModified;
QDateTime expires;
- QVector<Rule *> m_rules;
+ QVector<AdblockPlus::Rule *> m_rules;
};
} // namespace AdblockPlus