diff options
Diffstat (limited to 'src/gui/image/qabstractfileiconengine.cpp')
-rw-r--r-- | src/gui/image/qabstractfileiconengine.cpp | 57 |
1 files changed, 14 insertions, 43 deletions
diff --git a/src/gui/image/qabstractfileiconengine.cpp b/src/gui/image/qabstractfileiconengine.cpp index c5800d9119..b9b9abc1f5 100644 --- a/src/gui/image/qabstractfileiconengine.cpp +++ b/src/gui/image/qabstractfileiconengine.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $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 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 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. -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qabstractfileiconengine_p.h" @@ -43,6 +7,8 @@ QT_BEGIN_NAMESPACE +using namespace Qt::StringLiterals; + /*! \class QAbstractFileIconEngine \brief Helper base class for retrieving icons for files for usage by QFileIconProvider and related. @@ -63,6 +29,11 @@ QT_BEGIN_NAMESPACE QPixmap QAbstractFileIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) { + return scaledPixmap(size, mode, state, 1.0); +} + +QPixmap QAbstractFileIconEngine::scaledPixmap(const QSize &size, QIcon::Mode mode, QIcon::State state, qreal scale) +{ Q_UNUSED(mode); Q_UNUSED(state); @@ -71,13 +42,13 @@ QPixmap QAbstractFileIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QString key = cacheKey(); if (key.isEmpty()) - return filePixmap(size, mode, state); + return filePixmap(size * scale, mode, state); - key += QLatin1Char('_') + QString::number(size.width()); + key += u'_' + QString::number(size.width()); QPixmap result; if (!QPixmapCache::find(key, &result)) { - result = filePixmap(size, mode, state); + result = filePixmap(size * scale, mode, state); if (!result.isNull()) QPixmapCache::insert(key, result); } @@ -89,7 +60,7 @@ QSize QAbstractFileIconEngine::actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) { const QList<QSize> &sizes = availableSizes(mode, state); - const int numberSizes = sizes.length(); + const int numberSizes = sizes.size(); if (numberSizes == 0) return QSize(); @@ -122,7 +93,7 @@ QString QAbstractFileIconEngine::cacheKey() const return QString(); const QString &suffix = m_fileInfo.suffix(); - return QLatin1String("qt_.") + return "qt_."_L1 + (suffix.isEmpty() ? m_fileInfo.fileName() : suffix); // handle "Makefile" ;) } |