diff --git a/src/plugins/analyzerbase/analyzerbase.pro b/src/plugins/analyzerbase/analyzerbase.pro index e735e82d01b..c371931beca 100644 --- a/src/plugins/analyzerbase/analyzerbase.pro +++ b/src/plugins/analyzerbase/analyzerbase.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = AnalyzerBase -DEFINES += ANALYZER_LIBRARY +DEFINES += ANALYZER_LIBRARY QT_NO_CAST_FROM_ASCII include(../../qtcreatorplugin.pri) include(analyzerbase_dependencies.pri) diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index 815e9e038d5..146651caf5d 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/src/plugins/analyzerbase/analyzermanager.cpp @@ -123,10 +123,10 @@ public: { setContext(Context(C_EDITORMANAGER, C_ANALYZEMODE, C_NAVIGATION_PANE)); setDisplayName(tr("Analyze")); - setIcon(QIcon(":/images/analyzer_mode.png")); + setIcon(QIcon(QLatin1String(":/images/analyzer_mode.png"))); setPriority(P_MODE_ANALYZE); setId(QLatin1String(MODE_ANALYZE)); - setType(MODE_EDIT_TYPE); + setType(QLatin1String(MODE_EDIT_TYPE)); } ~AnalyzerMode() @@ -277,13 +277,13 @@ void AnalyzerManagerPrivate::setupActions() menubar->addMenu(mtools, m_menu); m_startAction = new QAction(tr("Start"), m_menu); - m_startAction->setIcon(QIcon(ANALYZER_CONTROL_START_ICON)); + m_startAction->setIcon(QIcon(QLatin1String(ANALYZER_CONTROL_START_ICON))); command = am->registerAction(m_startAction, "Analyzer.Start", globalcontext); connect(m_startAction, SIGNAL(triggered()), this, SLOT(startTool())); m_stopAction = new QAction(tr("Stop"), m_menu); m_stopAction->setEnabled(false); - m_stopAction->setIcon(QIcon(ANALYZER_CONTROL_STOP_ICON)); + m_stopAction->setIcon(QIcon(QLatin1String(ANALYZER_CONTROL_STOP_ICON))); command = am->registerAction(m_stopAction, "Analyzer.Stop", globalcontext); m_menu->addAction(command, G_ANALYZER_CONTROL); @@ -432,7 +432,7 @@ void AnalyzerManagerPrivate::activateDock(Qt::DockWidgetArea area, QDockWidget * QAction *toggleViewAction = dockWidget->toggleViewAction(); toggleViewAction->setText(dockWidget->windowTitle()); Command *cmd = am->registerAction(toggleViewAction, - Id("Analyzer." + dockWidget->objectName()), globalContext); + Id(QLatin1String("Analyzer.") + dockWidget->objectName()), globalContext); cmd->setAttribute(Command::CA_Hide); ActionContainer *viewsMenu = am->actionContainer(Id(M_WINDOW_VIEWS)); @@ -443,7 +443,7 @@ void AnalyzerManagerPrivate::deactivateDock(QDockWidget *dockWidget) { ActionManager *am = ICore::actionManager(); QAction *toggleViewAction = dockWidget->toggleViewAction(); - am->unregisterAction(toggleViewAction, Id("Analyzer." + dockWidget->objectName())); + am->unregisterAction(toggleViewAction, Id(QLatin1String("Analyzer.") + dockWidget->objectName())); m_mainWindow->removeDockWidget(dockWidget); dockWidget->hide(); // Prevent saveState storing the data of the wrong children. @@ -718,7 +718,7 @@ void AnalyzerManagerPrivate::loadToolSettings(IAnalyzerTool *tool) QTC_ASSERT(m_mainWindow, return); QSettings *settings = ICore::settings(); settings->beginGroup(QLatin1String("AnalyzerViewSettings_") + tool->id().toString()); - if (settings->value("ToolSettingsSaved", false).toBool()) + if (settings->value(QLatin1String("ToolSettingsSaved"), false).toBool()) m_mainWindow->restoreSettings(settings); else m_mainWindow->restoreSettings(m_defaultSettings.value(tool)); @@ -734,7 +734,7 @@ void AnalyzerManagerPrivate::saveToolSettings(IAnalyzerTool *tool, StartMode mod QSettings *settings = ICore::settings(); settings->beginGroup(QLatin1String("AnalyzerViewSettings_") + tool->id().toString()); m_mainWindow->saveSettings(settings); - settings->setValue("ToolSettingsSaved", true); + settings->setValue(QLatin1String("ToolSettingsSaved"), true); settings->endGroup(); settings->setValue(QLatin1String(LAST_ACTIVE_TOOL), tool->actionId(mode).toString()); } diff --git a/src/plugins/analyzerbase/analyzerruncontrol.cpp b/src/plugins/analyzerbase/analyzerruncontrol.cpp index 07d2cca79e6..dfb8b77658a 100644 --- a/src/plugins/analyzerbase/analyzerruncontrol.cpp +++ b/src/plugins/analyzerbase/analyzerruncontrol.cpp @@ -118,7 +118,7 @@ void AnalyzerRunControl::start() // clear about-to-be-outdated tasks ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); TaskHub *hub = pm->getObject(); - hub->clearTasks(Constants::ANALYZERTASK_ID); + hub->clearTasks(QLatin1String(Constants::ANALYZERTASK_ID)); if (d->m_engine->start()) { d->m_isRunning = true; @@ -179,7 +179,7 @@ void AnalyzerRunControl::addTask(Task::TaskType type, const QString &description { ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); TaskHub *hub = pm->getObject(); - hub->addTask(Task(type, description, file, line, Constants::ANALYZERTASK_ID)); + hub->addTask(Task(type, description, file, line, QLatin1String(Constants::ANALYZERTASK_ID))); hub->popup(false); } diff --git a/src/plugins/analyzerbase/ianalyzertool.cpp b/src/plugins/analyzerbase/ianalyzertool.cpp index 75210d164d0..d06b81a01c8 100644 --- a/src/plugins/analyzerbase/ianalyzertool.cpp +++ b/src/plugins/analyzerbase/ianalyzertool.cpp @@ -55,11 +55,11 @@ Id IAnalyzerTool::defaultActionId(const IAnalyzerTool *tool, StartMode mode) Id id = tool->id(); switch (mode) { case StartLocal: - return Id(QLatin1String("Analyzer.") + id.name() + QLatin1String(".Local")); + return Id(QString::fromLatin1("Analyzer." + id.name() + ".Local")); case StartRemote: - return Id(QLatin1String("Analyzer.") + id.name() + QLatin1String(".Remote")); + return Id(QString::fromLatin1("Analyzer." + id.name() + ".Remote")); case StartQml: - return Id(QLatin1String("Analyzer.") + id.name() + QLatin1String(".Qml")); + return Id(QString::fromLatin1("Analyzer." + id.name() + ".Qml")); } return Id(); } diff --git a/src/plugins/analyzerbase/startremotedialog.cpp b/src/plugins/analyzerbase/startremotedialog.cpp index 2174f16beee..a49546dca96 100644 --- a/src/plugins/analyzerbase/startremotedialog.cpp +++ b/src/plugins/analyzerbase/startremotedialog.cpp @@ -50,14 +50,14 @@ StartRemoteDialog::StartRemoteDialog(QWidget *parent) m_ui->keyFile->setExpectedKind(Utils::PathChooser::File); QSettings *settings = Core::ICore::settings(); - settings->beginGroup("AnalyzerStartRemoteDialog"); - m_ui->host->setText(settings->value("host").toString()); - m_ui->port->setValue(settings->value("port", 22).toInt()); - m_ui->user->setText(settings->value("user", qgetenv("USER")).toString()); - m_ui->keyFile->setPath(settings->value("keyFile").toString()); - m_ui->executable->setText(settings->value("executable").toString()); - m_ui->workingDirectory->setText(settings->value("workingDirectory").toString()); - m_ui->arguments->setText(settings->value("arguments").toString()); + settings->beginGroup(QLatin1String("AnalyzerStartRemoteDialog")); + m_ui->host->setText(settings->value(QLatin1String("host")).toString()); + m_ui->port->setValue(settings->value(QLatin1String("port"), 22).toInt()); + m_ui->user->setText(settings->value(QLatin1String("user"), qgetenv("USER")).toString()); + m_ui->keyFile->setPath(settings->value(QLatin1String("keyFile")).toString()); + m_ui->executable->setText(settings->value(QLatin1String("executable")).toString()); + m_ui->workingDirectory->setText(settings->value(QLatin1String("workingDirectory")).toString()); + m_ui->arguments->setText(settings->value(QLatin1String("arguments")).toString()); settings->endGroup(); connect(m_ui->host, SIGNAL(textChanged(QString)), @@ -92,14 +92,14 @@ StartRemoteDialog::~StartRemoteDialog() void StartRemoteDialog::accept() { QSettings *settings = Core::ICore::settings(); - settings->beginGroup("AnalyzerStartRemoteDialog"); - settings->setValue("host", m_ui->host->text()); - settings->setValue("port", m_ui->port->value()); - settings->setValue("user", m_ui->user->text()); - settings->setValue("keyFile", m_ui->keyFile->path()); - settings->setValue("executable", m_ui->executable->text()); - settings->setValue("workingDirectory", m_ui->workingDirectory->text()); - settings->setValue("arguments", m_ui->arguments->text()); + settings->beginGroup(QLatin1String("AnalyzerStartRemoteDialog")); + settings->setValue(QLatin1String("host"), m_ui->host->text()); + settings->setValue(QLatin1String("port"), m_ui->port->value()); + settings->setValue(QLatin1String("user"), m_ui->user->text()); + settings->setValue(QLatin1String("keyFile"), m_ui->keyFile->path()); + settings->setValue(QLatin1String("executable"), m_ui->executable->text()); + settings->setValue(QLatin1String("workingDirectory"), m_ui->workingDirectory->text()); + settings->setValue(QLatin1String("arguments"), m_ui->arguments->text()); settings->endGroup(); QDialog::accept();