diff options
Diffstat (limited to 'src/dbus/qdbusutil.cpp')
-rw-r--r-- | src/dbus/qdbusutil.cpp | 100 |
1 files changed, 61 insertions, 39 deletions
diff --git a/src/dbus/qdbusutil.cpp b/src/dbus/qdbusutil.cpp index 371b7b184e..28341a71a8 100644 --- a/src/dbus/qdbusutil.cpp +++ b/src/dbus/qdbusutil.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 QtDBus 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$ ** @@ -36,6 +42,7 @@ #include "qdbus_symbols_p.h" #include <QtCore/qstringlist.h> +#include <QtCore/qvector.h> #include "qdbusargument.h" #include "qdbusunixfiledescriptor.h" @@ -77,8 +84,8 @@ static bool variantToString(const QVariant &arg, QString &out) if (argType == QVariant::StringList) { out += QLatin1Char('{'); - QStringList list = arg.toStringList(); - foreach (const QString &item, list) + const QStringList list = arg.toStringList(); + for (const QString &item : list) out += QLatin1Char('\"') + item + QLatin1String("\", "); if (!list.isEmpty()) out.chop(2); @@ -95,8 +102,8 @@ static bool variantToString(const QVariant &arg, QString &out) out += QLatin1Char('}'); } else if (argType == QVariant::List) { out += QLatin1Char('{'); - QList<QVariant> list = arg.toList(); - foreach (const QVariant &item, list) { + const QList<QVariant> list = arg.toList(); + for (const QVariant &item : list) { if (!variantToString(item, out)) return false; out += QLatin1String(", "); @@ -324,10 +331,10 @@ namespace QDBusUtil /*! \internal - \fn bool QDBusUtil::isValidPartOfObjectPath(const QString &part) + \fn bool QDBusUtil::isValidPartOfObjectPath(const QStringRef &part) See QDBusUtil::isValidObjectPath */ - bool isValidPartOfObjectPath(const QString &part) + bool isValidPartOfObjectPath(const QStringRef &part) { if (part.isEmpty()) return false; // can't be valid if it's empty @@ -341,6 +348,13 @@ namespace QDBusUtil } /*! + \internal + \fn bool QDBusUtil::isValidPartOfObjectPath(const QString &part) + + \overload + */ + + /*! \fn bool QDBusUtil::isValidInterfaceName(const QString &ifaceName) Returns \c true if this is \a ifaceName is a valid interface name. @@ -358,36 +372,35 @@ namespace QDBusUtil if (ifaceName.isEmpty() || ifaceName.length() > DBUS_MAXIMUM_NAME_LENGTH) return false; - QStringList parts = ifaceName.split(QLatin1Char('.')); + const auto parts = ifaceName.splitRef(QLatin1Char('.')); if (parts.count() < 2) return false; // at least two parts - for (int i = 0; i < parts.count(); ++i) - if (!isValidMemberName(parts.at(i))) + for (const QStringRef &part : parts) + if (!isValidMemberName(part)) return false; return true; } /*! - \fn bool QDBusUtil::isValidUniqueConnectionName(const QString &connName) + \fn bool QDBusUtil::isValidUniqueConnectionName(const QStringRef &connName) Returns \c true if \a connName is a valid unique connection name. Unique connection names start with a colon (":") and are followed by a list of dot-separated components composed of ASCII letters, digits, the hyphen or the underscore ("_") character. */ - bool isValidUniqueConnectionName(const QString &connName) + bool isValidUniqueConnectionName(const QStringRef &connName) { if (connName.isEmpty() || connName.length() > DBUS_MAXIMUM_NAME_LENGTH || !connName.startsWith(QLatin1Char(':'))) return false; - QStringList parts = connName.mid(1).split(QLatin1Char('.')); + const auto parts = connName.mid(1).split(QLatin1Char('.')); if (parts.count() < 1) return false; - for (int i = 0; i < parts.count(); ++i) { - const QString &part = parts.at(i); + for (const QStringRef &part : parts) { if (part.isEmpty()) return false; @@ -401,6 +414,12 @@ namespace QDBusUtil } /*! + \fn bool QDBusUtil::isValidUniqueConnectionName(const QString &connName) + + \overload + */ + + /*! \fn bool QDBusUtil::isValidBusName(const QString &busName) Returns \c true if \a busName is a valid bus name. @@ -423,12 +442,11 @@ namespace QDBusUtil if (busName.startsWith(QLatin1Char(':'))) return isValidUniqueConnectionName(busName); - QStringList parts = busName.split(QLatin1Char('.')); + const auto parts = busName.splitRef(QLatin1Char('.')); if (parts.count() < 1) return false; - for (int i = 0; i < parts.count(); ++i) { - const QString &part = parts.at(i); + for (const QStringRef &part : parts) { if (part.isEmpty()) return false; @@ -444,12 +462,12 @@ namespace QDBusUtil } /*! - \fn bool QDBusUtil::isValidMemberName(const QString &memberName) + \fn bool QDBusUtil::isValidMemberName(const QStringRef &memberName) Returns \c true if \a memberName is a valid member name. A valid member name does not exceed 255 characters in length, is not empty, is composed only of ASCII letters, digits and underscores, but does not start with a digit. */ - bool isValidMemberName(const QString &memberName) + bool isValidMemberName(const QStringRef &memberName) { if (memberName.isEmpty() || memberName.length() > DBUS_MAXIMUM_NAME_LENGTH) return false; @@ -464,6 +482,12 @@ namespace QDBusUtil } /*! + \fn bool QDBusUtil::isValidMemberName(const QString &memberName) + + \overload + */ + + /*! \fn bool QDBusUtil::isValidErrorName(const QString &errorName) Returns \c true if \a errorName is a valid error name. Valid error names are valid interface names and vice-versa, so this function is actually an alias for isValidInterfaceName. @@ -495,12 +519,10 @@ namespace QDBusUtil path.endsWith(QLatin1Char('/'))) return false; - QStringList parts = path.split(QLatin1Char('/')); - Q_ASSERT(parts.count() >= 1); - parts.removeFirst(); // it starts with /, so we get an empty first part - - for (int i = 0; i < parts.count(); ++i) - if (!isValidPartOfObjectPath(parts.at(i))) + // it starts with /, so we skip the empty first part + const auto parts = path.midRef(1).split(QLatin1Char('/')); + for (const QStringRef &part : parts) + if (!isValidPartOfObjectPath(part)) return false; return true; |