summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/binarycontent.cpp
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2014-07-28 16:15:13 +0200
committerKarsten Heimrich <karsten.heimrich@digia.com>2014-08-29 12:39:58 +0200
commitcf60ba8b28282d9ab08e53850b5d65a4454966f3 (patch)
treee4ca47243445507c84aeae7af1e2b31ad34ece39 /src/libs/installer/binarycontent.cpp
parent42d2b1ba06ad38fe938bc69f34f0d5714b1f201b (diff)
Make BinaryFormatEngineHandler a real singleton.
It is really needed only once. Change-Id: I0b2231432541c2781afe55105f88809db4fe19e1 Reviewed-by: Niels Weber <niels.weber@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/libs/installer/binarycontent.cpp')
-rw-r--r--src/libs/installer/binarycontent.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libs/installer/binarycontent.cpp b/src/libs/installer/binarycontent.cpp
index 049409b16..5e2c77ebe 100644
--- a/src/libs/installer/binarycontent.cpp
+++ b/src/libs/installer/binarycontent.cpp
@@ -145,8 +145,6 @@ public:
QVector<QByteArray> m_resourceMappings;
QVector<Range<qint64> > m_metadataResourceSegments;
-
- BinaryFormatEngineHandler m_binaryFormatEngineHandler;
};
@@ -174,7 +172,6 @@ BinaryContent::Private::Private(const Private &other)
, m_performedOperationsData(other.m_performedOperationsData)
, m_resourceMappings(other.m_resourceMappings)
, m_metadataResourceSegments(other.m_metadataResourceSegments)
- , m_binaryFormatEngineHandler(other.m_binaryFormatEngineHandler)
{}
BinaryContent::Private::~Private()
@@ -411,7 +408,7 @@ void BinaryContent::readBinaryData(BinaryContent &content, const QSharedPointer<
ResourceCollectionManager collectionManager;
collectionManager.read(file, dataBlockStart);
- content.d->m_binaryFormatEngineHandler.registerResources(collectionManager.collections());
+ BinaryFormatEngineHandler::instance()->registerResources(collectionManager.collections());
if (!QInstaller::isVerbose())
return;