diff options
Diffstat (limited to 'src/qdbus/qdbusviewer/propertydialog.cpp')
| -rw-r--r-- | src/qdbus/qdbusviewer/propertydialog.cpp | 39 |
1 files changed, 8 insertions, 31 deletions
diff --git a/src/qdbus/qdbusviewer/propertydialog.cpp b/src/qdbus/qdbusviewer/propertydialog.cpp index fb3949379..5fbfd94bc 100644 --- a/src/qdbus/qdbusviewer/propertydialog.cpp +++ b/src/qdbus/qdbusviewer/propertydialog.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the tools applications of the Qt Toolkit. -** -** $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 https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "propertydialog.h" @@ -32,6 +7,8 @@ #include <QLayout> #include <QDebug> +using namespace Qt::StringLiterals; + PropertyDialog::PropertyDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) { @@ -41,7 +18,7 @@ PropertyDialog::PropertyDialog(QWidget *parent, Qt::WindowFlags f) buttonBox->setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); propertyTable->setColumnCount(2); - const QStringList labels = QStringList() << QLatin1String("Name") << QLatin1String("Value"); + const QStringList labels = QStringList() << tr("Name") << tr("Value"); propertyTable->setHorizontalHeaderLabels(labels); propertyTable->horizontalHeader()->setStretchLastSection(true); propertyTable->setEditTriggers(QAbstractItemView::AllEditTriggers); @@ -67,10 +44,10 @@ void PropertyDialog::addProperty(const QString &aname, int type) QString name = aname; if (name.isEmpty()) - name = QLatin1String("argument ") + QString::number(rowCount + 1); - name += QLatin1String(" ("); + name = tr("argument %1").arg(rowCount + 1); + name += " ("_L1; name += QLatin1String(QMetaType(type).name()); - name += QLatin1String(")"); + name += ")"_L1; QTableWidgetItem *nameItem = new QTableWidgetItem(name); nameItem->setFlags(nameItem->flags() & ~(Qt::ItemIsEditable | Qt::ItemIsSelectable)); |