AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve readability of the autogenerated arrays in qurltlds_p.h

Browse Source 
The next time qurltlds_p.h is generated, array sizes shall be explicit.
Also added some helpful comments. And updated copyright date.

Change-Id: I2bc9a78bcc2982845fce75a413e2048b0bfd12a0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Dimitrios Apostolou 2020-05-19 18:05:53 +02:00
parent cfbb30decd
commit 5b3c3ff97e
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
util/corelib/qurl-generateTLDs/main.cpp
View File

@ -1,6 +1,6 @@
/****************************************************************************
**
** Copyright (C) 2019 The Qt Company Ltd.
** Copyright (C) 2020 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the utils of the Qt Toolkit.
@ -145,8 +145,12 @@ int main(int argc, char **argv)
entry.append(st);
entry.append("\\0");
}
outFile.write("static const quint32 tldIndices[] = {\n");
outDataBuffer.write("\nstatic const char *tldData[] = {");
outFile.write("// After the tldCount \"real\" entries in tldIndices, include a final entry\n");
outFile.write("// that records the sum of the lengths of all the chunks, i.e. the index\n");
outFile.write("// just past the end of tldChunks.\n");
outFile.write("static const quint32 tldIndices[tldCount + 1] = {\n");
outDataBuffer.write("static const char *tldData[tldChunkCount] = {");
int totalUtf8Size = 0;
int chunkSize = 0; // strlen of the current chunk (sizeof is bigger by 1)
@ -177,17 +181,23 @@ int main(int argc, char **argv)
}
}
chunks.append(QString::number(totalUtf8Size));
// Write one extra entry, at tldIndices[tldCount], that contains the total size.
outFile.write(QByteArray::number(totalUtf8Size));
outFile.write("\n};\n");
outDataBuffer.write("\n};\n");
outDataBuffer.close();
outFile.write(outDataBufferBA);
// write chunk information
// First we have to define tldChunkCount.
outFile.write("\nstatic const quint16 tldChunkCount = ");
outFile.write(QByteArray::number(chunks.count()));
outFile.write(";\nstatic const quint32 tldChunks[] = {");
outFile.write(";\n");
// Write tldData[tldChunkCount] = {...}.
outFile.write(outDataBufferBA);
outFile.write("static const quint32 tldChunks[tldChunkCount] = {");
outFile.write(chunks.join(", ").toLatin1());
outFile.write("};\n");
outFile.close();