diff options
author | kh1 <karsten.heimrich@digia.com> | 2014-07-28 14:49:25 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-08-27 13:26:01 +0200 |
commit | a8416e9fb024ee6be79fcdfd121f40972f2f8595 (patch) | |
tree | 7c89b1de60257c1272bb6248fb87fb582002df62 /src | |
parent | 554a7f108ef17d8a042f2960e0a483508ca15cd3 (diff) |
Make use of the new read binary content function.
Change-Id: I8ed0b4177e8e6063d9c14d96f6df4030d1028348
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/installer/createlocalrepositoryoperation.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/libs/installer/createlocalrepositoryoperation.cpp b/src/libs/installer/createlocalrepositoryoperation.cpp index 0f8428382..cfec09585 100644 --- a/src/libs/installer/createlocalrepositoryoperation.cpp +++ b/src/libs/installer/createlocalrepositoryoperation.cpp @@ -257,18 +257,8 @@ bool CreateLocalRepositoryOperation::performOperation() } // start to read the binary layout - BinaryLayout bl = BinaryContent::readBinaryLayout(file.data(), - BinaryContent::findMagicCookie(file.data(), BinaryContent::MagicCookie)); - - // calculate the offset of the component index start inside the binary - const qint64 resourceOffsetAndLengtSize = 2 * sizeof(qint64); - const qint64 resourceSectionSize = resourceOffsetAndLengtSize * bl.resourceCount; - file->seek(bl.endOfData - bl.indexSize - resourceSectionSize - resourceOffsetAndLengtSize); - - const qint64 dataBlockStart = bl.endOfData - bl.dataBlockSize; - file->seek(QInstaller::retrieveInt64(file.data()) + dataBlockStart); ResourceCollectionManager manager; - manager.read(file, dataBlockStart); + BinaryContent::readBinaryContent(file, 0, 0, &manager, 0, BinaryContent::MagicCookie); QDirIterator it(repoPath, QDirIterator::Subdirectories); while (it.hasNext() && !it.next().isEmpty()) { |