diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2014-04-03 09:22:24 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-01-29 06:16:17 +0000 |
commit | 587c183608f13dd77407bcbcc3012e7520ce9006 (patch) | |
tree | 3c6b8831eb0ff0fc943a0887aa6f346fc72c1597 | |
parent | f2d1f3f1c7b9ab7e356b186d4187f46108d67b8c (diff) |
QFontComboBox: optimize handling of icons for delegate
Instead of move-assigning a new QIcon to the default-
constructed members, initialize them directly in the
ctor-init-list. Do this for the other data member, too,
for consistency.
Also use QStringLiteral instead of QLatin1String as
the argument to the QIcon ctor. This is correct, since
the string will never be modified, and saves two memory
allocations.
Change-Id: I9398bbe9d0fd63db9b6cf856dd240ab334364518
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
-rw-r--r-- | src/widgets/widgets/qfontcombobox.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp index bb802aba89..1d736c8e96 100644 --- a/src/widgets/widgets/qfontcombobox.cpp +++ b/src/widgets/widgets/qfontcombobox.cpp @@ -195,17 +195,17 @@ public: QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; - QIcon truetype; - QIcon bitmap; + const QIcon truetype; + const QIcon bitmap; QFontDatabase::WritingSystem writingSystem; }; QFontFamilyDelegate::QFontFamilyDelegate(QObject *parent) - : QAbstractItemDelegate(parent) + : QAbstractItemDelegate(parent), + truetype(QStringLiteral(":/qt-project.org/styles/commonstyle/images/fonttruetype-16.png")), + bitmap(QStringLiteral(":/qt-project.org/styles/commonstyle/images/fontbitmap-16.png")), + writingSystem(QFontDatabase::Any) { - truetype = QIcon(QLatin1String(":/qt-project.org/styles/commonstyle/images/fonttruetype-16.png")); - bitmap = QIcon(QLatin1String(":/qt-project.org/styles/commonstyle/images/fontbitmap-16.png")); - writingSystem = QFontDatabase::Any; } void QFontFamilyDelegate::paint(QPainter *painter, |