From 13bcdc0f50d04dc5b48ecd1a21da3fa754d10602 Mon Sep 17 00:00:00 2001 From: Anton Kudryavtsev Date: Fri, 26 Feb 2016 12:01:36 +0300 Subject: ItemModels: replace QLatin1String with QStringLiteral ... wherever it allocates memory. Since the string literal is used in more than one function, to avoid duplication of .rodata, wrap the QStringLiteral in an inline function. Change-Id: If4fca7443b3150b1c8360c850da32f5c567c1065 Reviewed-by: Marc Mutz --- src/gui/itemmodels/qstandarditemmodel.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/gui/itemmodels/qstandarditemmodel.cpp') diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 479a4283b0..9b0c6163b4 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -57,6 +57,11 @@ QT_BEGIN_NAMESPACE +static inline QString qStandardItemModelDataListMimeType() +{ + return QStringLiteral("application/x-qstandarditemmodeldatalist"); +} + class QStandardItemModelLessThan { public: @@ -2977,7 +2982,7 @@ void QStandardItemModel::sort(int column, Qt::SortOrder order) */ QStringList QStandardItemModel::mimeTypes() const { - return QAbstractItemModel::mimeTypes() << QLatin1String("application/x-qstandarditemmodeldatalist"); + return QAbstractItemModel::mimeTypes() << qStandardItemModelDataListMimeType(); } /*! @@ -2989,7 +2994,7 @@ QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const if(!data) return 0; - QString format = QLatin1String("application/x-qstandarditemmodeldatalist"); + const QString format = qStandardItemModelDataListMimeType(); if (!mimeTypes().contains(format)) return data; QByteArray encoded; @@ -3084,7 +3089,7 @@ bool QStandardItemModel::dropMimeData(const QMimeData *data, Qt::DropAction acti if (!data || !(action == Qt::CopyAction || action == Qt::MoveAction)) return false; // check if the format is supported - QString format = QLatin1String("application/x-qstandarditemmodeldatalist"); + const QString format = qStandardItemModelDataListMimeType(); if (!data->hasFormat(format)) return QAbstractItemModel::dropMimeData(data, action, row, column, parent); -- cgit v1.2.3