feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ExternalTool: Namespace cosmetics

Browse Source 
Change-Id: I90b6508608ccca6d938f3d99bd2cac0b94c96616
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
hjk
2014-10-15 13:11:46 +02:00
parent 0a933a5da5
commit 6c34058a5e
1 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/coreplugin/externaltool.cpp
View File

@@ -46,20 +46,20 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <QAction>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDateTime>
#include <QDebug>
#include <QDir>
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include <QXmlStreamWriter> #include <QXmlStreamWriter>
#include <QDir>
#include <QDateTime>
#include <QAction>
#include <QDebug>
using namespace Utils; using namespace Utils;
using namespace Core;
using namespace Core::Internal; using namespace Core::Internal;
namespace { namespace Core {
namespace Internal {
const char kExternalTool[] = "externaltool"; const char kExternalTool[] = "externaltool";
const char kId[] = "id"; const char kId[] = "id";
const char kDescription[] = "description"; const char kDescription[] = "description";
@@ -85,7 +85,6 @@ namespace {
const char kFalse[] = "false"; const char kFalse[] = "false";
const char kSpecialUncategorizedSetting[] = "SpecialEmptyCategoryForUncategorizedTools"; const char kSpecialUncategorizedSetting[] = "SpecialEmptyCategoryForUncategorizedTools";
}
// #pragma mark -- ExternalTool // #pragma mark -- ExternalTool
@@ -438,7 +437,7 @@ ExternalTool * ExternalTool::createFromXml(const QByteArray &xml, QString *error
ExternalTool * ExternalTool::createFromFile(const QString &fileName, QString *errorMessage, const QString &locale) ExternalTool * ExternalTool::createFromFile(const QString &fileName, QString *errorMessage, const QString &locale)
{ {
QString absFileName = QFileInfo(fileName).absoluteFilePath(); QString absFileName = QFileInfo(fileName).absoluteFilePath();
Utils::FileReader reader; FileReader reader;
if (!reader.fetch(absFileName, errorMessage)) if (!reader.fetch(absFileName, errorMessage))
return 0; return 0;
ExternalTool *tool = ExternalTool::createFromXml(reader.data(), errorMessage, locale); ExternalTool *tool = ExternalTool::createFromXml(reader.data(), errorMessage, locale);
@@ -465,7 +464,7 @@ bool ExternalTool::save(QString *errorMessage) const
{ {
if (m_fileName.isEmpty()) if (m_fileName.isEmpty())
return false; return false;
Utils::FileSaver saver(m_fileName); FileSaver saver(m_fileName);
if (!saver.hasError()) { if (!saver.hasError()) {
QXmlStreamWriter out(saver.file()); QXmlStreamWriter out(saver.file());
out.setAutoFormatting(true); out.setAutoFormatting(true);
@@ -553,14 +552,13 @@ bool ExternalToolRunner::resolve()
m_resolvedArguments.clear(); m_resolvedArguments.clear();
m_resolvedWorkingDirectory.clear(); m_resolvedWorkingDirectory.clear();
Utils::MacroExpander *expander = globalMacroExpander(); MacroExpander *expander = globalMacroExpander();
{ // executable { // executable
QStringList expandedExecutables; /* for error message */ QStringList expandedExecutables; /* for error message */
foreach (const QString &executable, m_tool->executables()) { foreach (const QString &executable, m_tool->executables()) {
QString expanded = expander->expandedString(executable); QString expanded = expander->expandedString(executable);
expandedExecutables << expanded; expandedExecutables << expanded;
m_resolvedExecutable = m_resolvedExecutable = Environment::systemEnvironment().searchInPath(expanded);
Utils::Environment::systemEnvironment().searchInPath(expanded);
if (!m_resolvedExecutable.isEmpty()) if (!m_resolvedExecutable.isEmpty())
break; break;
} }
@@ -578,7 +576,7 @@ bool ExternalToolRunner::resolve()
} }
} }
{ // arguments { // arguments
m_resolvedArguments = Utils::QtcProcess::expandMacros(m_tool->arguments(), expander); m_resolvedArguments = QtcProcess::expandMacros(m_tool->arguments(), expander);
} }
{ // input { // input
m_resolvedInput = expander->expandedString(m_tool->input()); m_resolvedInput = expander->expandedString(m_tool->input());
@@ -605,7 +603,7 @@ void ExternalToolRunner::run()
DocumentManager::expectFileChange(m_expectedFileName); DocumentManager::expectFileChange(m_expectedFileName);
} }
} }
m_process = new Utils::QtcProcess(this); m_process = new QtcProcess(this);
connect(m_process, SIGNAL(started()), this, SLOT(started())); connect(m_process, SIGNAL(started()), this, SLOT(started()));
connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(finished(int,QProcess::ExitStatus))); connect(m_process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(finished(int,QProcess::ExitStatus)));
connect(m_process, SIGNAL(error(QProcess::ProcessError)), this, SLOT(error(QProcess::ProcessError))); connect(m_process, SIGNAL(error(QProcess::ProcessError)), this, SLOT(error(QProcess::ProcessError)));
@@ -674,6 +672,8 @@ void ExternalToolRunner::readStandardError()
m_processOutput.append(output); m_processOutput.append(output);
} }
} // namespace Internal
// ExternalToolManager // ExternalToolManager
struct ExternalToolManagerPrivate struct ExternalToolManagerPrivate
@@ -966,3 +966,5 @@ void ExternalToolManager::emitReplaceSelectionRequested(const QString &output)
{ {
emit m_instance->replaceSelectionRequested(output); emit m_instance->replaceSelectionRequested(output);
} }
} // namespace Core