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

Move OutputFormatter to Utils lib.

Browse Source
This commit is contained in:
con
2011-04-15 12:59:44 +02:00
parent 28c92cf044
commit 2cf76ead26
38 changed files with 168 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.cpp
View File

@@ -137,7 +137,7 @@ QWidget *MaemoRunConfiguration::createConfigurationWidget()
return new MaemoRunConfigurationWidget(this);
}
ProjectExplorer::OutputFormatter *MaemoRunConfiguration::createOutputFormatter() const
Utils::OutputFormatter *MaemoRunConfiguration::createOutputFormatter() const
{
return new QtOutputFormatter(maemoTarget()->qt4Project());
}

2
src/plugins/qt4projectmanager/qt-maemo/maemorunconfiguration.h
View File

@@ -84,7 +84,7 @@ public:
using ProjectExplorer::RunConfiguration::isEnabled;
bool isEnabled(ProjectExplorer::BuildConfiguration *config) const;
QWidget *createConfigurationWidget();
ProjectExplorer::OutputFormatter *createOutputFormatter() const;
Utils::OutputFormatter *createOutputFormatter() const;
AbstractQt4MaemoTarget *maemoTarget() const;
Qt4BuildConfiguration *activeQt4BuildConfiguration() const;

14
src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
View File

@@ -95,7 +95,7 @@ void MaemoRunControl::handleSshError(const QString &error)
void MaemoRunControl::startExecution()
{
appendMessage(tr("Starting remote process ...\n"), NormalMessageFormat);
appendMessage(tr("Starting remote process ...\n"), Utils::NormalMessageFormat);
m_runner->startExecution(QString::fromLocal8Bit("%1 %2 %3 %4")
.arg(MaemoGlobal::remoteCommandPrefix(m_runner->devConfig()->osVersion(),
m_runner->connection()->connectionParameters().userName,
@@ -109,29 +109,29 @@ void MaemoRunControl::handleRemoteProcessFinished(qint64 exitCode)
{
if (exitCode != MaemoSshRunner::InvalidExitCode) {
appendMessage(tr("Finished running remote process. Exit code was %1.\n")
.arg(exitCode), NormalMessageFormat);
.arg(exitCode), Utils::NormalMessageFormat);
}
setFinished();
}
void MaemoRunControl::handleRemoteOutput(const QByteArray &output)
{
appendMessage(QString::fromUtf8(output), StdOutFormatSameLine);
appendMessage(QString::fromUtf8(output), Utils::StdOutFormatSameLine);
}
void MaemoRunControl::handleRemoteErrorOutput(const QByteArray &output)
{
appendMessage(QString::fromUtf8(output), StdErrFormatSameLine);
appendMessage(QString::fromUtf8(output), Utils::StdErrFormatSameLine);
}
void MaemoRunControl::handleProgressReport(const QString &progressString)
{
appendMessage(progressString + QLatin1Char('\n'), NormalMessageFormat);
appendMessage(progressString + QLatin1Char('\n'), Utils::NormalMessageFormat);
}
void MaemoRunControl::handleMountDebugOutput(const QString &output)
{
appendMessage(output, StdErrFormatSameLine);
appendMessage(output, Utils::StdErrFormatSameLine);
}
bool MaemoRunControl::isRunning() const
@@ -147,7 +147,7 @@ QIcon MaemoRunControl::icon() const
void MaemoRunControl::handleError(const QString &errString)
{
stop();
appendMessage(errString, ErrorMessageFormat);
appendMessage(errString, Utils::ErrorMessageFormat);
QMessageBox::critical(0, tr("Remote Execution Failure"), errString);
}