diff options
Diffstat (limited to 'src/assistant/assistant/bookmarkdialog.cpp')
-rw-r--r-- | src/assistant/assistant/bookmarkdialog.cpp | 37 |
1 files changed, 7 insertions, 30 deletions
diff --git a/src/assistant/assistant/bookmarkdialog.cpp b/src/assistant/assistant/bookmarkdialog.cpp index cb775d30a..cbe2d67d2 100644 --- a/src/assistant/assistant/bookmarkdialog.cpp +++ b/src/assistant/assistant/bookmarkdialog.cpp @@ -1,30 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Assistant 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 "bookmarkdialog.h" #include "bookmarkfiltermodel.h" #include "bookmarkitem.h" @@ -37,6 +12,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + BookmarkDialog::BookmarkDialog(BookmarkModel *sourceModel, const QString &title, const QString &url, QWidget *parent) : QDialog(parent) @@ -155,7 +132,7 @@ void BookmarkDialog::accepted() void BookmarkDialog::rejected() { TRACE_OBJ - for (const QPersistentModelIndex &index : qAsConst(cache)) + for (const QPersistentModelIndex &index : std::as_const(cache)) bookmarkModel->removeItem(index); reject(); } @@ -189,10 +166,10 @@ void BookmarkDialog::toolButtonClicked() if (visible) { resize(QSize(width(), 400)); - ui.toolButton->setText(QLatin1String("-")); + ui.toolButton->setText("-"_L1); } else { resize(width(), minimumHeight()); - ui.toolButton->setText(QLatin1String("+")); + ui.toolButton->setText("+"_L1); } } |