diff options
Diffstat (limited to 'src/corelib/io/qtldurl.cpp')
| -rw-r--r-- | src/corelib/io/qtldurl.cpp | 47 |
1 files changed, 29 insertions, 18 deletions
diff --git a/src/corelib/io/qtldurl.cpp b/src/corelib/io/qtldurl.cpp index 265055083e..dd0ee6068d 100644 --- a/src/corelib/io/qtldurl.cpp +++ b/src/corelib/io/qtldurl.cpp @@ -1,31 +1,37 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** 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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** 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. ** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** 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$ ** @@ -40,7 +46,7 @@ QT_BEGIN_NAMESPACE -static bool containsTLDEntry(const QString &entry) +static bool containsTLDEntry(const QStringRef &entry) { int index = qt_hash(entry) % tldCount; @@ -63,6 +69,11 @@ static bool containsTLDEntry(const QString &entry) return false; } +static inline bool containsTLDEntry(const QString &entry) +{ + return containsTLDEntry(QStringRef(&entry)); +} + /*! \internal @@ -80,7 +91,7 @@ Q_CORE_EXPORT QString qTopLevelDomain(const QString &domain) QString level, tld; for (int j = sections.count() - 1; j >= 0; --j) { level.prepend(QLatin1Char('.') + sections.at(j)); - if (qIsEffectiveTLD(level.right(level.size() - 1))) + if (qIsEffectiveTLD(level.rightRef(level.size() - 1))) tld = level; } return tld; @@ -92,7 +103,7 @@ Q_CORE_EXPORT QString qTopLevelDomain(const QString &domain) Return true if \a domain is a top-level-domain per Qt's copy of the Mozilla public suffix list. */ -Q_CORE_EXPORT bool qIsEffectiveTLD(const QString &domain) +Q_CORE_EXPORT bool qIsEffectiveTLD(const QStringRef &domain) { // for domain 'foo.bar.com': // 1. return if TLD table contains 'foo.bar.com' @@ -102,7 +113,7 @@ Q_CORE_EXPORT bool qIsEffectiveTLD(const QString &domain) const int dot = domain.indexOf(QLatin1Char('.')); if (dot >= 0) { int count = domain.size() - dot; - QString wildCardDomain = QLatin1Char('*') + domain.rightRef(count); + QString wildCardDomain = QLatin1Char('*') + domain.right(count); // 2. if table contains '*.bar.com', // test if table contains '!foo.bar.com' if (containsTLDEntry(wildCardDomain)) { |