UString integration done

- now UString works for both Qt (uses QString) and non-Qt (uses modified
CBString) builds
This commit is contained in:
Nikolaj Schlej 2016-07-05 16:18:55 +02:00
parent 9bd71281b9
commit 804a55ba64
8 changed files with 20 additions and 19 deletions

View file

@ -4137,8 +4137,8 @@ USTATUS FfsParser::parseSlicMarkerHeader(const UByteArray & store, const UINT32
markerHeader->Size, markerHeader->Size,
header.size(), header.size(),
markerHeader->Version,
(const char*)UString((const char*)&(markerHeader->OemId), 6),
(const char*)UString((const char*)&(markerHeader->OemTableId), 8),
(const char*)UString((const char*)&(markerHeader->OemId)).left(6).toLocal8Bit(),
(const char*)UString((const char*)&(markerHeader->OemTableId)).left(8).toLocal8Bit(),
markerHeader->SlicVersion);
// Add correct offset