diff options
Diffstat (limited to 'src/core/visited_links_manager_qt.cpp')
| -rw-r--r-- | src/core/visited_links_manager_qt.cpp | 64 |
1 files changed, 7 insertions, 57 deletions
diff --git a/src/core/visited_links_manager_qt.cpp b/src/core/visited_links_manager_qt.cpp index 37343cc39..9e1bd7a32 100644 --- a/src/core/visited_links_manager_qt.cpp +++ b/src/core/visited_links_manager_qt.cpp @@ -1,45 +1,10 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "visited_links_manager_qt.h" #include "content_browser_client_qt.h" +#include "profile_adapter.h" #include "profile_qt.h" #include "type_conversion.h" @@ -53,8 +18,8 @@ namespace { class BasicUrlIterator : public visitedlink::VisitedLinkWriter::URLIterator { public: BasicUrlIterator(const QList<QUrl> &urls) : m_urls(urls) {} - virtual const GURL& NextURL() { m_currentUrl = toGurl(m_urls.takeFirst()); return m_currentUrl; } - virtual bool HasNextURL() const { return !m_urls.isEmpty(); } + const GURL &NextURL() override { m_currentUrl = toGurl(m_urls.takeFirst()); return m_currentUrl; } + bool HasNextURL() const override { return !m_urls.isEmpty(); } private: QList<QUrl> m_urls; GURL m_currentUrl; @@ -71,7 +36,7 @@ class VisitedLinkDelegateQt : public visitedlink::VisitedLinkDelegate { public: ~VisitedLinkDelegateQt() {} - void RebuildTable(const scoped_refptr<URLEnumerator>& enumerator) { enumerator->OnComplete(true); } + void RebuildTable(const scoped_refptr<URLEnumerator> &enumerator) override { enumerator->OnComplete(true); } }; void VisitedLinksManagerQt::deleteAllVisitedLinkData() @@ -90,27 +55,12 @@ bool VisitedLinksManagerQt::containsUrl(const QUrl &url) const return m_visitedLinkWriter->IsVisited(toGurl(url)); } -static void ensureDirectoryExists(const base::FilePath &path) -{ - if (base::PathExists(path)) - return; - - base::File::Error error; - if (base::CreateDirectoryAndGetError(path, &error)) - return; - - std::string errorstr = base::File::ErrorToString(error); - qWarning("Cannot create directory %s. Error: %s.", - path.AsUTF8Unsafe().c_str(), - errorstr.c_str()); -} - VisitedLinksManagerQt::VisitedLinksManagerQt(ProfileQt *profile, bool persistVisitedLinks) : m_delegate(new VisitedLinkDelegateQt) { Q_ASSERT(profile); if (persistVisitedLinks) - ensureDirectoryExists(profile->GetPath()); + profile->profileAdapter()->ensureDataPathExists(); m_visitedLinkWriter.reset(new visitedlink::VisitedLinkWriter(profile, m_delegate.data(), persistVisitedLinks)); m_visitedLinkWriter->Init(); } |