diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-12-15 10:02:05 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-12-15 14:14:27 +0100 |
commit | 36ae08faf04ec68f75f4f0ac9454cee2351f871e (patch) | |
tree | a0645b160ba3e4ee227ad0ede7301033eb742691 /src/distancefieldgenerator | |
parent | c7b25190d804f0a6751b57b2e4694976b2d2f6f0 (diff) |
Qt Designer: port away from QPair
Add fixme comment for public API.
Pick-to: 6.7
Task-number: QTBUG-115841
Change-Id: Id518638b7112b68d5cbbcbb2b66ec9dbb7e3108b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/distancefieldgenerator')
-rw-r--r-- | src/distancefieldgenerator/mainwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/distancefieldgenerator/mainwindow.cpp b/src/distancefieldgenerator/mainwindow.cpp index f03192300..e7aff7636 100644 --- a/src/distancefieldgenerator/mainwindow.cpp +++ b/src/distancefieldgenerator/mainwindow.cpp @@ -291,7 +291,7 @@ void MainWindow::save() outBuffer.write(reinterpret_cast<char *>(&fontDirectoryHeader), sizeof(FontDirectoryHeader)); - QVarLengthArray<QPair<quint32, quint32>> offsetLengthPairs; + QVarLengthArray<std::pair<quint32, quint32>> offsetLengthPairs; offsetLengthPairs.reserve(numTables - 1); // Copy the offset table, updating offsets @@ -302,7 +302,7 @@ void MainWindow::save() quint32 originalOffset = qFromBigEndian(offsetTable->offset); quint32 length = qFromBigEndian(offsetTable->length); - offsetLengthPairs.append(qMakePair(originalOffset, length)); + offsetLengthPairs.append({originalOffset, length}); if (offsetTable->tag == qFromBigEndian(QFont::Tag("head").value())) headOffset = currentOffset; @@ -346,7 +346,7 @@ void MainWindow::save() } // Copy all font tables - for (const QPair<quint32, quint32> &offsetLengthPair : offsetLengthPairs) { + for (const std::pair<quint32, quint32> &offsetLengthPair : offsetLengthPairs) { PAD_BUFFER(outBuffer, output.size()) outBuffer.write(reinterpret_cast<char *>(inData + offsetLengthPair.first), offsetLengthPair.second); |