From 5f623dcfc8f02504d745f47f8b9274b2bca5fd67 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Thu, 18 Oct 2018 23:39:28 +0200 Subject: urlfilter: destroy FilterLeaves only when destroying the FilterTree Add QMutex lock when adding rules clang-format pass --- lib/urlfilter/filterleaf.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/urlfilter/filterleaf.cpp') diff --git a/lib/urlfilter/filterleaf.cpp b/lib/urlfilter/filterleaf.cpp index 3bd10bf..87cd91d 100644 --- a/lib/urlfilter/filterleaf.cpp +++ b/lib/urlfilter/filterleaf.cpp @@ -1,13 +1,13 @@ #include "filterleaf.h" -FilterLeaf::FilterLeaf(FilterLeaf && other) +FilterLeaf::FilterLeaf(FilterLeaf &&other) { m_isBlocking = other.m_isBlocking; m_request = std::move(other.m_request); m_redirect = std::move(other.m_redirect); } -FilterLeaf & FilterLeaf::operator=(FilterLeaf && other) +FilterLeaf &FilterLeaf::operator=(FilterLeaf &&other) { m_isBlocking = other.m_isBlocking; m_request = std::move(other.m_request); @@ -17,10 +17,10 @@ FilterLeaf & FilterLeaf::operator=(FilterLeaf && other) const QString FilterLeaf::request() const { - return QString::fromStdString(m_request); + return m_request; } const QString FilterLeaf::redirect() const { - return QString::fromStdString(m_redirect); + return m_redirect; } -- cgit v1.2.1