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

TaskHub: Move code to be more conform with other singletons

Browse Source 
Make methods static and add a instance() method for Signals/Slots.

Remove ProjectExplorerPlugin::taskHub() method and use the new
ones instead.

Change-Id: Ifae24ff19579fc524cbd61bddc826095c443adfa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Tobias Hunger
2013-08-15 12:14:46 +02:00
parent 53a49e3a64
commit 85b2017a69
21 changed files with 117 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qbsprojectmanager/qbsproject.cpp
View File

@@ -80,16 +80,6 @@ static const char CONFIG_PRECOMPILEDHEADER[] = "precompiledHeader";
static const char CONFIGURATION_PATH[] = "<configuration>";
// --------------------------------------------------------------------
// HELPERS:
// --------------------------------------------------------------------
ProjectExplorer::TaskHub *taskHub()
{
return ProjectExplorer::ProjectExplorerPlugin::taskHub();
}
namespace QbsProjectManager {
namespace Internal {
@@ -382,11 +372,12 @@ bool QbsProject::fromMap(const QVariantMap &map)
void QbsProject::generateErrors(const qbs::ErrorInfo &e)
{
foreach (const qbs::ErrorItem &item, e.items())
taskHub()->addTask(ProjectExplorer::Task(ProjectExplorer::Task::Error,
item.description(),
Utils::FileName::fromString(item.codeLocation().fileName()),
item.codeLocation().line(),
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
ProjectExplorer::TaskHub::addTask(
ProjectExplorer::Task(ProjectExplorer::Task::Error,
item.description(),
Utils::FileName::fromString(item.codeLocation().fileName()),
item.codeLocation().line(),
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
}
void QbsProject::parse(const QVariantMap &config, const Utils::Environment &env, const QString &dir)
@@ -394,7 +385,7 @@ void QbsProject::parse(const QVariantMap &config, const Utils::Environment &env,
QTC_ASSERT(!dir.isNull(), return);
// Clear buildsystem related tasks:
taskHub()->clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
ProjectExplorer::TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM);
qbs::SetupProjectParameters params;
params.setBuildConfiguration(config);
@@ -452,7 +443,7 @@ void QbsProject::prepareForParsing()
{
m_forceParsing = false;
taskHub()->clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE);
ProjectExplorer::TaskHub::clearTasks(ProjectExplorer::Constants::TASK_CATEGORY_COMPILE);
if (m_qbsUpdateFutureInterface)
m_qbsUpdateFutureInterface->reportCanceled();
delete m_qbsUpdateFutureInterface;