Rename binary format classes and functions. Move to QInstaller.

Adjust some minor implementation details. Some renaming of member
variables and function names is left out but will follow in later
patches. Add some documentation.

Change-Id: I929dcbe13fa701be5224b9e5fdf8d19bfff81235
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>

1 files changed, 11 insertions, 9 deletions

diff --git a/src/libs/installer/binaryformatengine.h b/src/libs/installer/binaryformatengine.h
index b178402b9..be82b3afb 100644
--- a/src/libs/installer/binaryformatengine.h
+++ b/src/libs/installer/binaryformatengine.h
@@ -46,12 +46,14 @@
 
 #include <QtCore/private/qfsfileengine_p.h>
 
-namespace QInstallerCreator {
+namespace QInstaller {
 
 class BinaryFormatEngine : public QAbstractFileEngine
 {
+    Q_DISABLE_COPY(BinaryFormatEngine)
+
 public:
-    BinaryFormatEngine(const ComponentIndex &index, const QString &fileName);
+    BinaryFormatEngine(const ResourceCollectionManager &manager, const QString &fileName);
     ~BinaryFormatEngine();
 
     void setFileName(const QString &file);
@@ -74,14 +76,14 @@ protected:
     void setArchive(const QString &file);
 
 private:
-    const ComponentIndex m_index;
-    bool m_hasComponent;
-    bool m_hasArchive;
-    Component m_component;
-    QSharedPointer<Archive> m_archive;
+    const ResourceCollectionManager m_manager;
+    bool m_hasCollection;
+    bool m_hasResource;
+    ResourceCollection m_collection;
+    QSharedPointer<Resource> m_resource;
     QString m_fileNamePath;
 };
 
-} // namespace QInstallerCreator
+} // namespace QInstaller
 
-#endif
+#endif // BINARYFORMATENGINE_H