Make use of the new functions from binary content.

Change-Id: I343db92a16058062f356388f2351bdc7f0c6b05b
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>

3 files changed, 4 insertions, 8 deletions

diff --git a/installerbuilder/installerbase/installerbase.cpp b/installerbuilder/installerbase/installerbase.cpp
index b4fbd0771..9bc244e55 100644
--- a/installerbuilder/installerbase/installerbase.cpp
+++ b/installerbuilder/installerbase/installerbase.cpp
@@ -247,9 +247,8 @@ int main(int argc, char *argv[])
         // the uninstaller for the recorded list of during the installation performed operations
         QInstaller::init();
 
-        // load the embedded binary resource
-        BinaryContent content = BinaryContent::readFromApplicationFile();
-        content.registerEmbeddedQResources();
+        // load and map the embedded binary resource, registers operations
+        BinaryContent content = BinaryContent::readAndRegisterFromApplicationFile();
 
         // instantiate the installer we are actually going to use
         QInstaller::PackageManagerCore core(content.magicMarker(), content.performedOperations());
diff --git a/installerbuilder/libinstaller/operationrunner.cpp b/installerbuilder/libinstaller/operationrunner.cpp
index 012f2e785..b9dd3cea0 100644
--- a/installerbuilder/libinstaller/operationrunner.cpp
+++ b/installerbuilder/libinstaller/operationrunner.cpp
@@ -74,8 +74,7 @@ OperationRunner::~OperationRunner()
 bool OperationRunner::init()
 {
     try {
-        BinaryContent content = BinaryContent::readFromApplicationFile();
-        content.registerEmbeddedQResources();
+        BinaryContent content = BinaryContent::readAndRegisterFromApplicationFile();
         m_core = new PackageManagerCore(content.magicMarker(), content.performedOperations());
     } catch (const Error &e) {
         std::cerr << qPrintable(e.message()) << std::endl;
diff --git a/installerbuilder/libinstaller/updater.cpp b/installerbuilder/libinstaller/updater.cpp
index f2b6b5092..519c6d18f 100644
--- a/installerbuilder/libinstaller/updater.cpp
+++ b/installerbuilder/libinstaller/updater.cpp
@@ -59,9 +59,7 @@ void Updater::setVerbose(bool verbose)
 
 bool Updater::checkForUpdates()
 {
-    BinaryContent content = BinaryContent::readFromApplicationFile();
-    content.registerEmbeddedQResources();
-
+    BinaryContent content = BinaryContent::readAndRegisterFromApplicationFile();
     if (content.magicMarker() == MagicInstallerMarker) {
         qDebug() << "Impossible to use an installer to check for updates!";
         return false;