Remove structural redundancy in project and product classes.

We had two project classes, each holding a list of products
that was structurally identical, except that no BuildProduct
object existed for a disabled ResolvedProduct. The same kind
of duplication also happened for product dependencies.
This patch gets rid of these parallel structures. BuildProject
and BuildProduct are largely being demoted to data holders and are
aggregated by ResolvedProject and ResolvedProduct, respectively.
The resulting project structure should be easier to understand
and maintain.

Change-Id: I68beef60b9e0d62258f6a8337c9015864e18bd80
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/src/lib/buildgraph/productinstaller.h b/src/lib/buildgraph/productinstaller.h
index 853f04e26..acea496f1 100644
--- a/src/lib/buildgraph/productinstaller.h
+++ b/src/lib/buildgraph/productinstaller.h
@@ -30,6 +30,8 @@
 #define QBS_PRODUCT_INSTALLER_H
 
 #include "forward_decls.h"
+
+#include <language/forward_decls.h>
 #include <logging/logger.h>
 #include <tools/installoptions.h>
 
@@ -42,7 +44,7 @@ class ProgressObserver;
 class ProductInstaller
 {
 public:
-    ProductInstaller(const QList<BuildProductPtr> &products, const InstallOptions &options,
+    ProductInstaller(const QList<ResolvedProductPtr> &products, const InstallOptions &options,
                      ProgressObserver *observer, const Logger &logger);
     void install();
 
@@ -51,7 +53,7 @@ private:
     void copyFile(const Artifact *artifact);
     void handleError(const QString &message);
 
-    const QList<BuildProductPtr> m_products;
+    const QList<ResolvedProductPtr> m_products;
     InstallOptions m_options;
     ProgressObserver * const m_observer;
     Logger m_logger;