From a1921d91f439f6a5c4d1dd150e52c7841b63a914 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Tue, 18 Jun 2013 12:06:11 +0200
Subject: [PATCH] Qbs: Adapt to the latest round of API changes in Qbs
Change-Id: I59fd151a1a485990ca0da7dac4fdc028f915ec6b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 6 +++---
src/plugins/qbsprojectmanager/qbscleanstep.cpp | 6 +++---
src/plugins/qbsprojectmanager/qbsinstallstep.cpp | 6 +++---
src/plugins/qbsprojectmanager/qbslogsink.cpp | 10 +++++-----
src/plugins/qbsprojectmanager/qbslogsink.h | 2 +-
src/plugins/qbsprojectmanager/qbsproject.cpp | 14 +++++++-------
src/plugins/qbsprojectmanager/qbsproject.h | 2 +-
src/plugins/qbsprojectmanager/qbsstep.cpp | 6 +++---
src/shared/qbs | 2 +-
9 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index e9705a85b24..81a85c68235 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -224,9 +224,9 @@ QVariantMap QbsBuildStep::toMap() const
void QbsBuildStep::buildingDone(bool success)
{
// Report errors:
- foreach (const qbs::ErrorData &data, m_job->error().entries())
- createTaskAndOutput(ProjectExplorer::Task::Error, data.description(),
- data.codeLocation().fileName(), data.codeLocation().line());
+ foreach (const qbs::ErrorItem &item, m_job->error().items())
+ createTaskAndOutput(ProjectExplorer::Task::Error, item.description(),
+ item.codeLocation().fileName(), item.codeLocation().line());
QTC_ASSERT(m_fi, return);
m_fi->reportResult(success);
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
index 6911144cb17..c18e5ab7b0b 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
@@ -179,9 +179,9 @@ QVariantMap QbsCleanStep::toMap() const
void QbsCleanStep::cleaningDone(bool success)
{
// Report errors:
- foreach (const qbs::ErrorData &data, m_job->error().entries()) {
- createTaskAndOutput(ProjectExplorer::Task::Error, data.description(),
- data.codeLocation().fileName(), data.codeLocation().line());
+ foreach (const qbs::ErrorItem &item, m_job->error().items()) {
+ createTaskAndOutput(ProjectExplorer::Task::Error, item.description(),
+ item.codeLocation().fileName(), item.codeLocation().line());
}
QTC_ASSERT(m_fi, return);
diff --git a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
index b08b11ad5b2..e55c637e069 100644
--- a/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsinstallstep.cpp
@@ -188,9 +188,9 @@ qbs::InstallOptions QbsInstallStep::installOptions() const
void QbsInstallStep::installDone(bool success)
{
// Report errors:
- foreach (const qbs::ErrorData &data, m_job->error().entries()) {
- createTaskAndOutput(ProjectExplorer::Task::Error, data.description(),
- data.codeLocation().fileName(), data.codeLocation().line());
+ foreach (const qbs::ErrorItem &item, m_job->error().items()) {
+ createTaskAndOutput(ProjectExplorer::Task::Error, item.description(),
+ item.codeLocation().fileName(), item.codeLocation().line());
}
QTC_ASSERT(m_fi, return);
diff --git a/src/plugins/qbsprojectmanager/qbslogsink.cpp b/src/plugins/qbsprojectmanager/qbslogsink.cpp
index 3d7ac94eae4..e22cd6391cd 100644
--- a/src/plugins/qbsprojectmanager/qbslogsink.cpp
+++ b/src/plugins/qbsprojectmanager/qbslogsink.cpp
@@ -68,13 +68,13 @@ void QbsLogSink::sendMessages()
mm->printToOutputPane(msg, Core::MessageManager::NoModeSwitch);
}
-void QbsLogSink::doPrintWarning(const qbs::Error &warning)
+void QbsLogSink::doPrintWarning(const qbs::ErrorInfo &warning)
{
- foreach (const qbs::ErrorData &data, warning.entries())
+ foreach (const qbs::ErrorItem &item, warning.items())
emit newTask(ProjectExplorer::Task(ProjectExplorer::Task::Warning,
- data.description(),
- Utils::FileName::fromString(data.codeLocation().fileName()),
- data.codeLocation().line(),
+ item.description(),
+ Utils::FileName::fromString(item.codeLocation().fileName()),
+ item.codeLocation().line(),
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
}
diff --git a/src/plugins/qbsprojectmanager/qbslogsink.h b/src/plugins/qbsprojectmanager/qbslogsink.h
index fe40101e884..0da371119e7 100644
--- a/src/plugins/qbsprojectmanager/qbslogsink.h
+++ b/src/plugins/qbsprojectmanager/qbslogsink.h
@@ -54,7 +54,7 @@ private slots:
void sendMessages();
private:
- void doPrintWarning(const qbs::Error &warning);
+ void doPrintWarning(const qbs::ErrorInfo &warning);
void doPrintMessage(qbs::LoggerLevel level, const QString &message, const QString &tag);
QStringList m_messages;
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 99bd14f8f44..6fbb773f27e 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -378,13 +378,13 @@ bool QbsProject::fromMap(const QVariantMap &map)
return true;
}
-void QbsProject::generateErrors(const qbs::Error &e)
+void QbsProject::generateErrors(const qbs::ErrorInfo &e)
{
- foreach (const qbs::ErrorData &data, e.entries())
+ foreach (const qbs::ErrorItem &item, e.items())
taskHub()->addTask(ProjectExplorer::Task(ProjectExplorer::Task::Error,
- data.description(),
- Utils::FileName::fromString(data.codeLocation().fileName()),
- data.codeLocation().line(),
+ item.description(),
+ Utils::FileName::fromString(item.codeLocation().fileName()),
+ item.codeLocation().line(),
ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
}
@@ -394,8 +394,8 @@ void QbsProject::parse(const QVariantMap &config, const Utils::Environment &env,
qbs::SetupProjectParameters params;
params.setBuildConfiguration(config);
- qbs::Error err = params.expandBuildConfiguration(m_manager->settings());
- if (!err.entries().isEmpty()) {
+ qbs::ErrorInfo err = params.expandBuildConfiguration(m_manager->settings());
+ if (!err.hasError()) {
generateErrors(err);
return;
}
diff --git a/src/plugins/qbsprojectmanager/qbsproject.h b/src/plugins/qbsprojectmanager/qbsproject.h
index f6ca85e4898..7c3806a2319 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.h
+++ b/src/plugins/qbsprojectmanager/qbsproject.h
@@ -120,7 +120,7 @@ private:
void parse(const QVariantMap &config, const Utils::Environment &env, const QString &dir);
- void generateErrors(const qbs::Error &e);
+ void generateErrors(const qbs::ErrorInfo &e);
void prepareForParsing();
void updateDocuments(const qbs::ProjectData *prj);
void updateCppCodeModel(const qbs::ProjectData *prj);
diff --git a/src/plugins/qbsprojectmanager/qbsstep.cpp b/src/plugins/qbsprojectmanager/qbsstep.cpp
index fb6e4b7b5d4..b4aee3534e9 100644
--- a/src/plugins/qbsprojectmanager/qbsstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsstep.cpp
@@ -176,9 +176,9 @@ void QbsStep::jobDone(bool success)
{
// Report errors:
if (m_job) {
- foreach (const qbs::ErrorData &data, m_job->error().entries())
- createTaskAndOutput(ProjectExplorer::Task::Error, data.description(),
- data.codeLocation().fileName(), data.codeLocation().line());
+ foreach (const qbs::ErrorItem &item, m_job->error().items())
+ createTaskAndOutput(ProjectExplorer::Task::Error, item.description(),
+ item.codeLocation().fileName(), item.codeLocation().line());
m_job->deleteLater();
m_job = 0;
}
diff --git a/src/shared/qbs b/src/shared/qbs
index c1b431e5389..36c7dba4ae3 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit c1b431e5389eda2f6952077e917f3118f98a6dbd
+Subproject commit 36c7dba4ae3688e354f6e6985b3da4429b9084fd
--
GitLab