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

@@ -224,9 +224,9 @@ QVariantMap QbsBuildStep::toMap() const
 void QbsBuildStep::buildingDone(bool success)
 {
     // Report errors:
-    foreach (const qbs::ErrorData &data, m_job->error().entries())
+    foreach (const qbs::ErrorItem &item, m_job->error().items())
-        createTaskAndOutput(ProjectExplorer::Task::Error, data.description(),
+        createTaskAndOutput(ProjectExplorer::Task::Error, item.description(),
-                            data.codeLocation().fileName(), data.codeLocation().line());
+                            item.codeLocation().fileName(), item.codeLocation().line());
 
     QTC_ASSERT(m_fi, return);
     m_fi->reportResult(success);

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()) {
+    foreach (const qbs::ErrorItem &item, m_job->error().items()) {
-        createTaskAndOutput(ProjectExplorer::Task::Error, data.description(),
+        createTaskAndOutput(ProjectExplorer::Task::Error, item.description(),
-                            data.codeLocation().fileName(), data.codeLocation().line());
+                            item.codeLocation().fileName(), item.codeLocation().line());
     }
 
     QTC_ASSERT(m_fi, return);

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()) {
+    foreach (const qbs::ErrorItem &item, m_job->error().items()) {
-        createTaskAndOutput(ProjectExplorer::Task::Error, data.description(),
+        createTaskAndOutput(ProjectExplorer::Task::Error, item.description(),
-                            data.codeLocation().fileName(), data.codeLocation().line());
+                            item.codeLocation().fileName(), item.codeLocation().line());
     }
 
     QTC_ASSERT(m_fi, return);

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(),
+                                           item.description(),
-                                           Utils::FileName::fromString(data.codeLocation().fileName()),
+                                           Utils::FileName::fromString(item.codeLocation().fileName()),
-                                           data.codeLocation().line(),
+                                           item.codeLocation().line(),
                                            ProjectExplorer::Constants::TASK_CATEGORY_BUILDSYSTEM));
 }
 

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;

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(),
+                                                 item.description(),
-                                                 Utils::FileName::fromString(data.codeLocation().fileName()),
+                                                 Utils::FileName::fromString(item.codeLocation().fileName()),
-                                                 data.codeLocation().line(),
+                                                 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());
+    qbs::ErrorInfo err = params.expandBuildConfiguration(m_manager->settings());
-    if (!err.entries().isEmpty()) {
+    if (!err.hasError()) {
         generateErrors(err);
         return;
     }

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);

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())
+        foreach (const qbs::ErrorItem &item, m_job->error().items())
-            createTaskAndOutput(ProjectExplorer::Task::Error, data.description(),
+            createTaskAndOutput(ProjectExplorer::Task::Error, item.description(),
-                                data.codeLocation().fileName(), data.codeLocation().line());
+                                item.codeLocation().fileName(), item.codeLocation().line());
         m_job->deleteLater();
         m_job = 0;
     }