diff options
Diffstat (limited to 'tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp')
| -rw-r--r-- | tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp | 43 |
1 files changed, 19 insertions, 24 deletions
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index 2a14d752e1..50e11611f2 100644 --- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -1,31 +1,26 @@ /**************************************************************************** ** -** 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 test suite of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ** 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. -** -** 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 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** 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-3.0.html. ** ** $QT_END_LICENSE$ ** @@ -61,7 +56,7 @@ public: protected: QStringList splitPath(const QString &path) const { - return csv ? path.split(",") : QCompleter::splitPath(path); + return csv ? path.split(QLatin1Char(',')) : QCompleter::splitPath(path); } private: @@ -382,7 +377,7 @@ void tst_QCompleter::csMatchingOnCsSortedModel_data() QTest::addColumn<QString>("completion"); QTest::addColumn<QString>("completionText"); -#define ROWNAME(name) (qPrintable(QString("%1 %2").arg(name).arg(i))) +#define ROWNAME(name) ((QByteArray(name) + ' ' + QByteArray::number(i)).constData()) for (int i = 0; i < 2; i++) { if (i == 1) @@ -1179,7 +1174,7 @@ void tst_QCompleter::dynamicSortOrder() completer.setModelSorting(QCompleter::CaseSensitivelySortedModel); QStandardItem *root = model.invisibleRootItem(); for (int i = 0; i < 20; i++) { - root->appendRow(new QStandardItem(QString("%1").arg(i))); + root->appendRow(new QStandardItem(QString::number(i))); } root->appendRow(new QStandardItem("13")); root->sortChildren(0, Qt::AscendingOrder); @@ -1271,7 +1266,7 @@ void tst_QCompleter::task189564_omitNonSelectableItems() QStringList strings; for (int i = 0; i < n; ++i) - strings << QString("%1%2").arg(prefix).arg(i); + strings << prefix + QString::number(i); const QString omitString(strings.at(n / 2)); task189564_StringListModel model(omitString); model.setStringList(strings); @@ -1568,9 +1563,9 @@ void tst_QCompleter::task247560_keyboardNavigation() QStandardItemModel model; for (int i = 0; i < 5; i++) { - for (int j = 0; j < 5; j++) { - model.setItem(i, j, new QStandardItem(QString("row %1 column %2").arg(i).arg(j))); - } + const QString prefix = QLatin1String("row ") + QString::number(i) + QLatin1String(" column "); + for (int j = 0; j < 5; j++) + model.setItem(i, j, new QStandardItem(prefix + QString::number(j))); } |