diff options
| -rw-r--r-- | src/plugins/debugger/debuggerrunner.cpp | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/src/plugins/debugger/debuggerrunner.cpp b/src/plugins/debugger/debuggerrunner.cpp index 3bc0ddd395..da14cb5eca 100644 --- a/src/plugins/debugger/debuggerrunner.cpp +++ b/src/plugins/debugger/debuggerrunner.cpp @@ -75,8 +75,9 @@ #include <QLabel> #include <QMessageBox> -using namespace ProjectExplorer; using namespace Debugger::Internal; +using namespace ProjectExplorer; +using namespace Utils; enum { debug = 0 }; @@ -368,7 +369,7 @@ QIcon DebuggerRunControl::icon() const return QIcon(QLatin1String(ProjectExplorer::Constants::ICON_DEBUG_SMALL)); } -void DebuggerRunControl::setCustomEnvironment(Utils::Environment env) +void DebuggerRunControl::setCustomEnvironment(Environment env) { QTC_ASSERT(d->m_engine, return); d->m_engine->startParameters().environment = env; @@ -380,7 +381,7 @@ void DebuggerRunControl::start() // User canceled input dialog asking for executable when working on library project. if (d->m_engine->startParameters().startMode == StartInternal && d->m_engine->startParameters().executable.isEmpty()) { - appendMessage(tr("No executable specified.\n"), Utils::ErrorMessageFormat); + appendMessage(tr("No executable specified.\n"), ErrorMessageFormat); emit started(); emit finished(); return; @@ -415,12 +416,12 @@ void DebuggerRunControl::start() d->m_engine->startDebugger(this); if (d->m_running) - appendMessage(tr("Debugging starts\n"), Utils::NormalMessageFormat); + appendMessage(tr("Debugging starts\n"), NormalMessageFormat); } void DebuggerRunControl::startFailed() { - appendMessage(tr("Debugging has failed\n"), Utils::NormalMessageFormat); + appendMessage(tr("Debugging has failed\n"), NormalMessageFormat); d->m_running = false; emit finished(); d->m_engine->handleStartFailed(); @@ -428,7 +429,7 @@ void DebuggerRunControl::startFailed() void DebuggerRunControl::handleFinished() { - appendMessage(tr("Debugging has finished\n"), Utils::NormalMessageFormat); + appendMessage(tr("Debugging has finished\n"), NormalMessageFormat); if (d->m_engine) d->m_engine->handleFinished(); debuggerCore()->runControlFinished(d->m_engine); @@ -438,13 +439,13 @@ void DebuggerRunControl::showMessage(const QString &msg, int channel) { switch (channel) { case AppOutput: - appendMessage(msg, Utils::StdOutFormatSameLine); + appendMessage(msg, StdOutFormatSameLine); break; case AppError: - appendMessage(msg, Utils::StdErrFormatSameLine); + appendMessage(msg, StdErrFormatSameLine); break; case AppStuff: - appendMessage(msg, Utils::DebugFormat); + appendMessage(msg, DebugFormat); break; } } @@ -743,7 +744,8 @@ DEBUGGER_EXPORT ConfigurationCheck checkDebugConfiguration(const DebuggerStartPa // Get all applicable types. QList<DebuggerEngineType> requiredTypes = engineTypes(sp); if (requiredTypes.isEmpty()) { - result.errorMessage = QLatin1String("Internal error: Unable to determine debugger engine type for this configuration"); + result.errorMessage = QLatin1String("Internal error: Unable to determine " + "debugger engine type for this configuration"); return result; } if (debug) @@ -809,7 +811,8 @@ DEBUGGER_EXPORT ConfigurationCheck checkDebugConfiguration(const DebuggerStartPa } if (debug) - qDebug() << engineTypeName(result.masterSlaveEngineTypes.first) << engineTypeName(result.masterSlaveEngineTypes.second); + qDebug() << engineTypeName(result.masterSlaveEngineTypes.first) + << engineTypeName(result.masterSlaveEngineTypes.second); return result; } @@ -836,7 +839,7 @@ QString DebuggerRunControlFactory::displayName() const } // Find Qt installation by running qmake -static inline QString findQtInstallPath(const Utils::FileName &qmakePath) +static inline QString findQtInstallPath(const FileName &qmakePath) { QProcess proc; QStringList args; @@ -850,7 +853,7 @@ static inline QString findQtInstallPath(const Utils::FileName &qmakePath) } proc.closeWriteChannel(); if (!proc.waitForFinished()) { - Utils::SynchronousProcess::stopProcess(proc); + SynchronousProcess::stopProcess(proc); qWarning("%s: Timeout running '%s'.", Q_FUNC_INFO, qPrintable(qmakePath.toString())); return QString(); } @@ -881,7 +884,7 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu #if defined(Q_OS_WIN) // Work around QTBUG-17529 (QtDeclarative fails with 'File name case mismatch' ...) - sp.workingDirectory = Utils::normalizePathName(sp.workingDirectory); + sp.workingDirectory = normalizePathName(sp.workingDirectory); #endif sp.executable = rc->executable(); @@ -901,7 +904,7 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu // // The profile could also get a method to extract the required information from // its information to avoid this dependecy (as we do for the environment). - const Utils::FileName qmake = Utils::BuildableHelperLibrary::findSystemQt(sp.environment); + const FileName qmake = BuildableHelperLibrary::findSystemQt(sp.environment); if (!qmake.isEmpty()) sp.qtInstallPath = findQtInstallPath(qmake); } @@ -927,12 +930,10 @@ static DebuggerStartParameters localStartParameters(RunConfiguration *runConfigu // Makes sure that all bindings go through the JavaScript engine, so that // breakpoints are actually hit! const QString optimizerKey = _("QML_DISABLE_OPTIMIZER"); - if (!sp.environment.hasKey(optimizerKey)) { + if (!sp.environment.hasKey(optimizerKey)) sp.environment.set(optimizerKey, _("1")); - } - Utils::QtcProcess::addArg(&sp.processArgs, - QString::fromLatin1("-qmljsdebugger=port:%1,block").arg(sp.qmlServerPort)); + QtcProcess::addArg(&sp.processArgs, QString::fromLatin1("-qmljsdebugger=port:%1,block").arg(sp.qmlServerPort)); } // FIXME: If it's not yet build this will be empty and not filled |