diff options
| author | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-01-18 20:24:27 +0300 |
|---|---|---|
| committer | Anton Kudryavtsev <a.kudryavtsev@netris.ru> | 2016-01-19 09:14:26 +0000 |
| commit | 133242824a432a15c0f0ba98848750a353c881bd (patch) | |
| tree | 073801fa3e15ea5070bee79b9f0938af7c351c8c | |
| parent | 2d0018b0b5570d1c1edd3919a9befcf34c62b873 (diff) | |
| download | qtquickcontrols-133242824a432a15c0f0ba98848750a353c881bd.tar.gz | |
Controls: replace QStringLiteral with QLatin1String
... in string comparisons. It's more effective.
Change-Id: Ibba6d78bbea4308d9a84da08ba4688ea93d58c6c
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| -rw-r--r-- | src/controls/Private/qquickcontrolsettings.cpp | 2 | ||||
| -rw-r--r-- | src/controls/Private/qquickstyleitem.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index 8483830b..6f7dc729 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -119,7 +119,7 @@ QUrl QQuickControlSettings::makeStyleComponentUrl(const QString &controlStyleNam { QString styleFilePath = makeStyleComponentPath(controlStyleName, styleDirPath); - if (styleDirPath.startsWith(QStringLiteral(":/"))) + if (styleDirPath.startsWith(QLatin1String(":/"))) return QUrl(QStringLiteral("qrc") + styleFilePath); return QUrl::fromLocalFile(styleFilePath); diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp index 3cf8ebbe..22590f50 100644 --- a/src/controls/Private/qquickstyleitem.cpp +++ b/src/controls/Private/qquickstyleitem.cpp @@ -1120,7 +1120,7 @@ qreal QQuickStyleItem::baselineOffset() case ComboBox: if (const QStyleOptionComboBox *combo = qstyleoption_cast<const QStyleOptionComboBox *>(m_styleoption)) { r = qApp->style()->subControlRect(QStyle::CC_ComboBox, combo, QStyle::SC_ComboBoxEditField); - if (style() != QStringLiteral("mac")) + if (style() != QLatin1String("mac")) r.adjust(0,0,0,1); } break; @@ -1140,7 +1140,7 @@ qreal QQuickStyleItem::baselineOffset() surplus++; int result = r.top() + surplus/2 + fm.ascent(); #ifdef Q_OS_OSX - if (style() == QStringLiteral("mac")) { + if (style() == QLatin1String("mac")) { switch (m_itemType) { case Button: case Edit: |