diff options
Diffstat (limited to 'src/assistant/assistant/bookmarkmanagerwidget.cpp')
| -rw-r--r-- | src/assistant/assistant/bookmarkmanagerwidget.cpp | 39 |
1 files changed, 8 insertions, 31 deletions
diff --git a/src/assistant/assistant/bookmarkmanagerwidget.cpp b/src/assistant/assistant/bookmarkmanagerwidget.cpp index cd704a889..fc2f24def 100644 --- a/src/assistant/assistant/bookmarkmanagerwidget.cpp +++ b/src/assistant/assistant/bookmarkmanagerwidget.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 "bookmarkmanagerwidget.h" #include "bookmarkitem.h" #include "bookmarkmodel.h" @@ -44,6 +19,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + BookmarkManagerWidget::BookmarkManagerWidget(BookmarkModel *sourceModel, QWidget *parent) : QWidget(parent) @@ -129,7 +106,7 @@ void BookmarkManagerWidget::selectNextIndex(bool direction) const { QModelIndex current = ui.treeView->currentIndex(); if (current.isValid() && !cache.isEmpty()) { - current = cache.at(nextIndex(cache.indexOf(current), cache.count(), + current = cache.at(nextIndex(cache.indexOf(current), cache.size(), direction)); } ui.treeView->setCurrentIndex(current); @@ -205,10 +182,10 @@ void BookmarkManagerWidget::importBookmarks() void BookmarkManagerWidget::exportBookmarks() { TRACE_OBJ - QString fileName = QFileDialog::getSaveFileName(nullptr, tr("Save File"), - QLatin1String("untitled.xbel"), tr("Files (*.xbel)")); + QString fileName = QFileDialog::getSaveFileName(nullptr, tr("Save File"), "untitled.xbel"_L1, + tr("Files (*.xbel)")); - const QLatin1String suffix(".xbel"); + const QLatin1StringView suffix(".xbel"); if (!fileName.endsWith(suffix)) fileName.append(suffix); |