diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-20 15:56:00 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-20 16:01:11 +0100 |
commit | f5aa8d46584d0c0b3605fad55a2d084002e021ef (patch) | |
tree | 40a2090a845fb536e3ddd6e81f47ab7b8b8d8383 /src/plugins/locator/locatorwidget.cpp | |
parent | fa20c2a95e0d670fb1666aefa19c35dbe42cd7bd (diff) |
Locator: Compile with QT_NO_CAST_FROM_ASCII.
Change-Id: I7b4b5e25aba9f2de9cbfde0f4553685cd4e01346
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/locator/locatorwidget.cpp')
-rw-r--r-- | src/plugins/locator/locatorwidget.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/locator/locatorwidget.cpp b/src/plugins/locator/locatorwidget.cpp index 7b600fd5cd..7550acbf80 100644 --- a/src/plugins/locator/locatorwidget.cpp +++ b/src/plugins/locator/locatorwidget.cpp @@ -183,7 +183,8 @@ QVariant LocatorModel::data(const QModelIndex &index, int role) const if (mEntries.at(index.row()).extraInfo.isEmpty()) return QVariant(mEntries.at(index.row()).displayName); else - return QVariant(mEntries.at(index.row()).displayName + "\n\n" + mEntries.at(index.row()).extraInfo); + return QVariant(mEntries.at(index.row()).displayName + + QLatin1String("\n\n") + mEntries.at(index.row()).extraInfo); } else if (role == Qt::DecorationRole && index.column() == 0) { FilterEntry &entry = mEntries[index.row()]; if (entry.resolveFileIcon && entry.displayIcon.isNull()) { @@ -313,7 +314,7 @@ LocatorWidget::LocatorWidget(LocatorPlugin *qop) : layout->addWidget(m_fileLineEdit); setWindowIcon(QIcon(QLatin1String(":/locator/images/locator.png"))); - QPixmap image(Core::Constants::ICON_MAGNIFIER); + const QPixmap image = QPixmap(QLatin1String(Core::Constants::ICON_MAGNIFIER)); m_fileLineEdit->setButtonPixmap(Utils::FancyLineEdit::Left, image); m_fileLineEdit->setButtonToolTip(Utils::FancyLineEdit::Left, tr("Options")); m_fileLineEdit->setFocusPolicy(Qt::ClickFocus); @@ -660,6 +661,6 @@ void LocatorWidget::showEvent(QShowEvent *event) void LocatorWidget::showConfigureDialog() { - Core::ICore::instance()->showOptionsDialog(Core::Constants::SETTINGS_CATEGORY_CORE, - Constants::FILTER_OPTIONS_PAGE); + Core::ICore::instance()->showOptionsDialog(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE), + QLatin1String(Constants::FILTER_OPTIONS_PAGE)); } |