From 64a2fa2a5d6e9d1b26c1fde714bed7ce99b58fe2 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@nokia.com>
Date: Fri, 25 Jun 2010 20:17:00 +0200
Subject: [PATCH] Use QLatin1String and QLatin1Char
---
src/plugins/find/searchresulttreeitemdelegate.cpp | 4 ++--
src/plugins/find/searchresulttreemodel.cpp | 4 ++--
src/plugins/find/searchresulttreeview.cpp | 2 +-
src/plugins/find/searchresultwindow.cpp | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/plugins/find/searchresulttreeitemdelegate.cpp b/src/plugins/find/searchresulttreeitemdelegate.cpp
index bec2da78391..d7b1972bc93 100644
--- a/src/plugins/find/searchresulttreeitemdelegate.cpp
+++ b/src/plugins/find/searchresulttreeitemdelegate.cpp
@@ -48,7 +48,7 @@ SearchResultTreeItemDelegate::SearchResultTreeItemDelegate(QObject *parent)
void SearchResultTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
{
- if (index.model()->data(index, ItemDataRoles::TypeRole).toString().compare("file") == 0) {
+ if (index.model()->data(index, ItemDataRoles::TypeRole).toString().compare(QLatin1String("file")) == 0) {
QItemDelegate::paint(painter, option, index);
} else {
painter->save();
@@ -92,7 +92,7 @@ int SearchResultTreeItemDelegate::drawLineNumber(QPainter *painter, const QStyle
int lineNumber = index.model()->data(index, ItemDataRoles::ResultLineNumberRole).toInt();
int lineNumberDigits = (int)floor(log10((double)lineNumber)) + 1;
int minimumLineNumberDigits = qMax((int)m_minimumLineNumberDigits, lineNumberDigits);
- int fontWidth = painter->fontMetrics().width(QString(minimumLineNumberDigits, '0'));
+ int fontWidth = painter->fontMetrics().width(QString(minimumLineNumberDigits, QLatin1Char('0')));
int lineNumberAreaWidth = lineNumberAreaHorizontalPadding + fontWidth + lineNumberAreaHorizontalPadding;
QRect lineNumberAreaRect(option.rect);
lineNumberAreaRect.setWidth(lineNumberAreaWidth);
diff --git a/src/plugins/find/searchresulttreemodel.cpp b/src/plugins/find/searchresulttreemodel.cpp
index 792c1004dca..b9a3d8e2d02 100644
--- a/src/plugins/find/searchresulttreemodel.cpp
+++ b/src/plugins/find/searchresulttreemodel.cpp
@@ -48,7 +48,7 @@ SearchResultTreeModel::SearchResultTreeModel(QObject *parent)
, m_showReplaceUI(false)
{
m_rootItem = new SearchResultTreeItem;
- m_textEditorFont = QFont("Courier");
+ m_textEditorFont = QFont(QLatin1String("Courier"));
}
SearchResultTreeModel::~SearchResultTreeModel()
@@ -212,7 +212,7 @@ QVariant SearchResultTreeModel::data(const SearchResultTextRow *row, int role) c
result = row->searchTermLength();
break;
case ItemDataRoles::TypeRole:
- result = "row";
+ result = QLatin1String("row");
break;
case ItemDataRoles::FileNameRole:
{
diff --git a/src/plugins/find/searchresulttreeview.cpp b/src/plugins/find/searchresulttreeview.cpp
index 4f1bf2c9185..650cfe0b1a3 100644
--- a/src/plugins/find/searchresulttreeview.cpp
+++ b/src/plugins/find/searchresulttreeview.cpp
@@ -77,7 +77,7 @@ void SearchResultTreeView::appendResultLines(const QList<Find::SearchResultItem>
void SearchResultTreeView::emitJumpToSearchResult(const QModelIndex &index)
{
- if (model()->data(index, ItemDataRoles::TypeRole).toString().compare("row") != 0)
+ if (model()->data(index, ItemDataRoles::TypeRole).toString().compare(QLatin1String("row")) != 0)
return;
int position = model()->data(index, ItemDataRoles::ResultIndexRole).toInt();
diff --git a/src/plugins/find/searchresultwindow.cpp b/src/plugins/find/searchresultwindow.cpp
index 575db28dfb1..7af93b2cc40 100644
--- a/src/plugins/find/searchresultwindow.cpp
+++ b/src/plugins/find/searchresultwindow.cpp
@@ -113,7 +113,7 @@ SearchResultWindow::SearchResultWindow() : d(new SearchResultWindowPrivate)
d->m_expandCollapseToolButton = new QToolButton(d->m_widget);
d->m_expandCollapseToolButton->setAutoRaise(true);
d->m_expandCollapseToolButton->setCheckable(true);
- d->m_expandCollapseToolButton->setIcon(QIcon(":/find/images/expand.png"));
+ d->m_expandCollapseToolButton->setIcon(QIcon(QLatin1String(":/find/images/expand.png")));
d->m_expandCollapseToolButton->setToolTip(tr("Expand All"));
d->m_replaceLabel = new QLabel(tr("Replace with:"), d->m_widget);
--
GitLab