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/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -219,7 +219,7 @@ QWidget *QmlProjectRunConfiguration::createConfigurationWidget()
return m_configurationWidget.data();
}
ProjectExplorer::OutputFormatter *QmlProjectRunConfiguration::createOutputFormatter() const
Utils::OutputFormatter *QmlProjectRunConfiguration::createOutputFormatter() const
{
return new Qt4ProjectManager::QtOutputFormatter(qmlTarget()->qmlProject());
}

2
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
View File

@@ -99,7 +99,7 @@ public:
// RunConfiguration
bool isEnabled(ProjectExplorer::BuildConfiguration *bc) const;
virtual QWidget *createConfigurationWidget();
ProjectExplorer::OutputFormatter *createOutputFormatter() const;
Utils::OutputFormatter *createOutputFormatter() const;
QVariantMap toMap() const;
ProjectExplorer::Abi abi() const;

10
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
View File

@@ -79,8 +79,8 @@ QmlRunControl::QmlRunControl(QmlProjectRunConfiguration *runConfiguration, QStri
}
m_commandLineArguments = runConfiguration->viewerArguments();
connect(&m_applicationLauncher, SIGNAL(appendMessage(QString,ProjectExplorer::OutputFormat)),
this, SLOT(slotAppendMessage(QString, ProjectExplorer::OutputFormat)));
connect(&m_applicationLauncher, SIGNAL(appendMessage(QString,Utils::OutputFormat)),
this, SLOT(slotAppendMessage(QString, Utils::OutputFormat)));
connect(&m_applicationLauncher, SIGNAL(processExited(int)),
this, SLOT(processExited(int)));
connect(&m_applicationLauncher, SIGNAL(bringToForegroundRequested(qint64)),
@@ -100,7 +100,7 @@ void QmlRunControl::start()
emit started();
QString msg = tr("Starting %1 %2\n")
.arg(QDir::toNativeSeparators(m_executable), m_commandLineArguments);
appendMessage(msg, NormalMessageFormat);
appendMessage(msg, Utils::NormalMessageFormat);
}
RunControl::StopResult QmlRunControl::stop()
@@ -124,7 +124,7 @@ void QmlRunControl::slotBringApplicationToForeground(qint64 pid)
bringApplicationToForeground(pid);
}
void QmlRunControl::slotAppendMessage(const QString &line, OutputFormat format)
void QmlRunControl::slotAppendMessage(const QString &line, Utils::OutputFormat format)
{
appendMessage(line, format);
}
@@ -133,7 +133,7 @@ void QmlRunControl::processExited(int exitCode)
{
QString msg = tr("%1 exited with code %2\n")
.arg(QDir::toNativeSeparators(m_executable)).arg(exitCode);
appendMessage(msg, exitCode ? ErrorMessageFormat : NormalMessageFormat);
appendMessage(msg, exitCode ? Utils::ErrorMessageFormat : Utils::NormalMessageFormat);
emit finished();
}

2
src/plugins/qmlprojectmanager/qmlprojectruncontrol.h
View File

@@ -58,7 +58,7 @@ public:
private slots:
void processExited(int exitCode);
void slotBringApplicationToForeground(qint64 pid);
void slotAppendMessage(const QString &line, ProjectExplorer::OutputFormat);
void slotAppendMessage(const QString &line, Utils::OutputFormat);
private:
ProjectExplorer::ApplicationLauncher m_applicationLauncher;