Locator: Compile with QT_NO_CAST_FROM_ASCII.

Change-Id: I7b4b5e25aba9f2de9cbfde0f4553685cd4e01346
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

src/libs/qtconcurrent/multitask.h

@@ -163,8 +163,10 @@ private:
     {
         QString text;
         foreach (QFutureWatcher<R> *watcher, watchers) {
-            if (!watcher->progressText().isEmpty())
+            if (!watcher->progressText().isEmpty()) {
-                text += watcher->progressText() + "\n";
+                text += watcher->progressText();
+                text += QLatin1Char('\n');
+            }
         }
         text = text.trimmed();
         futureInterface.setProgressValueAndText(futureInterface.progressValue(), text);

src/plugins/locator/basefilefilter.cpp

@@ -56,7 +56,7 @@ QList<FilterEntry> BaseFileFilter::matchesFor(QFutureInterface<Locator::FilterEn
     const QRegExp regexp(asterisk + needle+ asterisk, Qt::CaseInsensitive, QRegExp::Wildcard);
     if (!regexp.isValid())
         return matches;
-    bool hasWildcard = (needle.contains(asterisk) || needle.contains('?'));
+    const bool hasWildcard = needle.contains(asterisk) || needle.contains(QLatin1Char('?'));
     QStringList searchListPaths;
     QStringList searchListNames;
     if (!m_previousEntry.isEmpty() && !m_forceNewSearchList && needle.contains(m_previousEntry)) {

src/plugins/locator/executefilter.cpp

@@ -125,7 +125,7 @@ void ExecuteFilter::accept(FilterEntry selection) const
 
 void ExecuteFilter::finished(int exitCode, QProcess::ExitStatus status)
 {
-    QString log = QString("'%1' ").arg(headCommand());
+    QString log = QLatin1Char('\'') + headCommand() + QLatin1String("' ");
     if (status == QProcess::NormalExit && exitCode == 0)
         ICore::instance()->messageManager()->printToOutputPane(log + tr("finished"), true);
     else
@@ -138,14 +138,14 @@ void ExecuteFilter::finished(int exitCode, QProcess::ExitStatus status)
 
 void ExecuteFilter::readStandardOutput()
 {
-    QByteArray data = m_process->readAllStandardOutput();
+    const QByteArray data = m_process->readAllStandardOutput();
-    ICore::instance()->messageManager()->printToOutputPane(data, true);
+    ICore::instance()->messageManager()->printToOutputPane(QString::fromLocal8Bit(data), true);
 }
 
 void ExecuteFilter::readStandardError()
 {
-    QByteArray data = m_process->readAllStandardError();
+    const QByteArray data = m_process->readAllStandardError();
-    ICore::instance()->messageManager()->printToOutputPane(data, true);
+    ICore::instance()->messageManager()->printToOutputPane(QString::fromLocal8Bit(data), true);
 }
 
 void ExecuteFilter::runHeadCommand()

src/plugins/locator/executefilter.h

@@ -57,7 +57,7 @@ class ExecuteFilter : public Locator::ILocatorFilter
 public:
     ExecuteFilter();
     QString displayName() const { return tr("Execute Custom Commands"); }
-    QString id() const { return "Execute custom commands"; }
+    QString id() const { return QLatin1String("Execute custom commands"); }
     Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Medium; }
     QList<Locator::FilterEntry> matchesFor(QFutureInterface<Locator::FilterEntry> &future,
                                            const QString &entry);

src/plugins/locator/filesystemfilter.h

@@ -57,7 +57,7 @@ class FileSystemFilter : public Locator::ILocatorFilter
 public:
     FileSystemFilter(Core::EditorManager *editorManager, LocatorWidget *locatorWidget);
     QString displayName() const { return tr("Files in File System"); }
-    QString id() const { return "Files in file system"; }
+    QString id() const { return QLatin1String("Files in file system"); }
     Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Medium; }
     QList<Locator::FilterEntry> matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &entry);
     void accept(Locator::FilterEntry selection) const;

src/plugins/locator/locatorfiltersfilter.cpp

@@ -45,7 +45,7 @@ LocatorFiltersFilter::LocatorFiltersFilter(LocatorPlugin *plugin,
                                                LocatorWidget *locatorWidget):
     m_plugin(plugin),
     m_locatorWidget(locatorWidget),
-    m_icon(QIcon(Core::Constants::ICON_NEXT))
+    m_icon(QIcon(QLatin1String(Core::Constants::ICON_NEXT)))
 {
     setIncludedByDefault(true);
     setHidden(true);

src/plugins/locator/locatorplugin.cpp

@@ -119,7 +119,7 @@ bool LocatorPlugin::initialize(const QStringList &, QString *)
     QAction *action = new QAction(m_locatorWidget->windowIcon(), m_locatorWidget->windowTitle(), this);
     Core::Command *cmd = core->actionManager()
         ->registerAction(action, "QtCreator.Locate", Core::Context(Core::Constants::C_GLOBAL));
-    cmd->setDefaultKeySequence(QKeySequence("Ctrl+K"));
+    cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+K")));
     connect(action, SIGNAL(triggered()), this, SLOT(openLocator()));
     connect(cmd, SIGNAL(keySequenceChanged()), this, SLOT(updatePlaceholderText()));
     updatePlaceholderText(cmd);
@@ -158,7 +158,7 @@ void LocatorPlugin::updatePlaceholderText(Core::Command *command)
 
 void LocatorPlugin::openLocator()
 {
-    m_locatorWidget->show("");
+    m_locatorWidget->show(QString());
 }
 
 void LocatorPlugin::extensionsInitialized()
@@ -180,14 +180,14 @@ void LocatorPlugin::loadSettings()
     QSettings *qs = core->settings();
 
     // Backwards compatibility to old settings location
-    if (qs->contains("QuickOpen/FiltersFilter")) {
+    if (qs->contains(QLatin1String("QuickOpen/FiltersFilter"))) {
         loadSettingsHelper(qs);
     } else {
         Core::SettingsDatabase *settings = core->settingsDatabase();
         loadSettingsHelper(settings);
     }
 
-    qs->remove("QuickOpen");
+    qs->remove(QLatin1String("QuickOpen"));
 }
 
 void LocatorPlugin::settingsLoaded()
@@ -203,17 +203,18 @@ void LocatorPlugin::saveSettings()
     Core::ICore *core = Core::ICore::instance();
     if (core && core->settingsDatabase()) {
         Core::SettingsDatabase *s = core->settingsDatabase();
-        s->beginGroup("QuickOpen");
+        s->beginGroup(QLatin1String("QuickOpen"));
-        s->remove("");
+        s->remove(QString());
-        s->setValue("RefreshInterval", refreshInterval());
+        s->setValue(QLatin1String("RefreshInterval"), refreshInterval());
         foreach (ILocatorFilter *filter, m_filters) {
             if (!m_customFilters.contains(filter))
                 s->setValue(filter->id(), filter->saveState());
         }
-        s->beginGroup("CustomFilters");
+        s->beginGroup(QLatin1String("CustomFilters"));
         int i = 0;
         foreach (ILocatorFilter *filter, m_customFilters) {
-            s->setValue(QString("directory%1").arg(i), filter->saveState());
+            s->setValue(QLatin1String("directory") + QString::number(i),
+                        filter->saveState());
             ++i;
         }
         s->endGroup();
@@ -276,7 +277,7 @@ void LocatorPlugin::refresh(QList<ILocatorFilter*> filters)
     QFuture<void> task = QtConcurrent::run(&ILocatorFilter::refresh, filters);
     Core::FutureProgress *progress = Core::ICore::instance()
             ->progressManager()->addTask(task, tr("Indexing"),
-                                         Locator::Constants::TASK_INDEX);
+                                         QLatin1String(Locator::Constants::TASK_INDEX));
     connect(progress, SIGNAL(finished()), this, SLOT(saveSettings()));
 }
 

src/plugins/locator/locatorplugin.h

@@ -103,8 +103,8 @@ private:
 template <typename S>
 void LocatorPlugin::loadSettingsHelper(S *settings)
 {
-    settings->beginGroup("QuickOpen");
+    settings->beginGroup(QLatin1String("QuickOpen"));
-    m_refreshTimer.setInterval(settings->value("RefreshInterval", 60).toInt() * 60000);
+    m_refreshTimer.setInterval(settings->value(QLatin1String("RefreshInterval"), 60).toInt() * 60000);
 
     foreach (ILocatorFilter *filter, m_filters) {
         if (settings->contains(filter->id())) {
@@ -113,7 +113,7 @@ void LocatorPlugin::loadSettingsHelper(S *settings)
                 filter->restoreState(state);
         }
     }
-    settings->beginGroup("CustomFilters");
+    settings->beginGroup(QLatin1String("CustomFilters"));
     QList<ILocatorFilter *> customFilters;
     const QStringList keys = settings->childKeys();
     foreach (const QString &key, keys) {

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,
+    Core::ICore::instance()->showOptionsDialog(QLatin1String(Core::Constants::SETTINGS_CATEGORY_CORE),
-          Constants::FILTER_OPTIONS_PAGE);
+          QLatin1String(Constants::FILTER_OPTIONS_PAGE));
 }

src/plugins/locator/opendocumentsfilter.h

@@ -56,7 +56,7 @@ class OpenDocumentsFilter : public Locator::ILocatorFilter
 public:
     explicit OpenDocumentsFilter(Core::EditorManager *editorManager);
     QString displayName() const { return tr("Open Documents"); }
-    QString id() const { return "Open documents"; }
+    QString id() const { return QLatin1String("Open documents"); }
     Locator::ILocatorFilter::Priority priority() const { return Locator::ILocatorFilter::Medium; }
     QList<Locator::FilterEntry> matchesFor(QFutureInterface<Locator::FilterEntry> &future, const QString &entry);
     void accept(Locator::FilterEntry selection) const;