From 4091fe8516de34e955bcc4be2aa548964e0efe8a Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 25 Aug 2023 15:32:22 +0200 Subject: [PATCH] Core serialization examples: spacing-only clang-format changes Marc disagreed with clang-format on some, which are thus excluded. Task-number: QTBUG-111228 Change-Id: I1402274635dba866a8160a68211874cb11dcfa61 Reviewed-by: Marc Mutz (cherry picked from commit 670f66eed3fd81f4b7c3e6f43d06e5bb79176527) Reviewed-by: Qt Cherry-pick Bot --- .../corelib/serialization/cbordump/cbortag.py | 2 +- .../corelib/serialization/cbordump/main.cpp | 22 +++++++++---------- .../convert/datastreamconverter.cpp | 10 ++++----- .../serialization/convert/nullconverter.cpp | 2 +- .../serialization/convert/textconverter.cpp | 2 +- .../corelib/serialization/savegame/game.cpp | 4 ++-- .../streambookmarks/mainwindow.cpp | 8 +++---- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/examples/corelib/serialization/cbordump/cbortag.py b/examples/corelib/serialization/cbordump/cbortag.py index 8634dcdc200..26a0f969e41 100755 --- a/examples/corelib/serialization/cbordump/cbortag.py +++ b/examples/corelib/serialization/cbordump/cbortag.py @@ -165,7 +165,7 @@ def main(argv, speak): struct CborTagDescription {{ QCborTag tag; - const char *description; // with space and parentheses + const char *description; // with space and parentheses }}; // {title} diff --git a/examples/corelib/serialization/cbordump/main.cpp b/examples/corelib/serialization/cbordump/main.cpp index 4c02abd3046..24bbe625e67 100644 --- a/examples/corelib/serialization/cbordump/main.cpp +++ b/examples/corelib/serialization/cbordump/main.cpp @@ -27,7 +27,7 @@ struct CborTagDescription { QCborTag tag; - const char *description; // with space and parentheses + const char *description; // with space and parentheses }; // Concise Binary Object Representation (CBOR) Tags @@ -131,12 +131,12 @@ static const CborTagDescription tagDescriptions[] = { enum { // See RFC 7049 section 2. - SmallValueBitLength = 5, - SmallValueMask = (1 << SmallValueBitLength) - 1, /* 0x1f */ - Value8Bit = 24, - Value16Bit = 25, - Value32Bit = 26, - Value64Bit = 27 + SmallValueBitLength = 5, + SmallValueMask = (1 << SmallValueBitLength) - 1, /* 0x1f */ + Value8Bit = 24, + Value16Bit = 25, + Value32Bit = 26, + Value64Bit = 27 }; //! [0] @@ -381,7 +381,7 @@ void CborDumper::dumpOne(int nestingLevel) if (reader.next()) { printWidthIndicator(quint64(tag)); printf("("); - dumpOne(nestingLevel); // same level! + dumpOne(nestingLevel); // same level! printf(")"); } @@ -489,7 +489,7 @@ void CborDumper::dumpOneDetailed(int nestingLevel) qsizetype size = reader.currentStringChunkSize(); if (size < 0) - return; // error + return; // error if (size >= ChunkSizeLimit) { fprintf(stderr, "String length too big, %lli\n", qint64(size)); exit(EXIT_FAILURE); @@ -534,7 +534,7 @@ void CborDumper::dumpOneDetailed(int nestingLevel) printf(" %s%s", indent.constData(), section.toHex(' ').constData()); // print the decode - QByteArray spaces(width > 0 ? width - section.size() * 3 + 1: 0, ' '); + QByteArray spaces(width > 0 ? width - section.size() * 3 + 1 : 0, ' '); printf("%s # \"", spaces.constData()); auto ptr = reinterpret_cast(section.constData()); for (int j = 0; j < section.size(); ++j) @@ -546,7 +546,7 @@ void CborDumper::dumpOneDetailed(int nestingLevel) // get the next chunk size = reader.currentStringChunkSize(); if (size < 0) - return; // error + return; // error if (size >= ChunkSizeLimit) { fprintf(stderr, "String length too big, %lli\n", qint64(size)); exit(EXIT_FAILURE); diff --git a/examples/corelib/serialization/convert/datastreamconverter.cpp b/examples/corelib/serialization/convert/datastreamconverter.cpp index 451688e3784..dfbbba8254c 100644 --- a/examples/corelib/serialization/convert/datastreamconverter.cpp +++ b/examples/corelib/serialization/convert/datastreamconverter.cpp @@ -56,11 +56,11 @@ static QString dumpVariant(const QVariant &v, const QString &indent = QLatin1Str result = QLatin1String("Map {"); for (const auto &pair : map) { result += indented + dumpVariant(pair.first, indented); - result.chop(1); // remove comma + result.chop(1); // remove comma result += QLatin1String(" => ") + dumpVariant(pair.second, indented); } - result.chop(1); // remove comma + result.chop(1); // remove comma result += indent + QLatin1String("},"); } else if (type == QMetaType::QVariantList) { const QVariantList list = v.toList(); @@ -68,7 +68,7 @@ static QString dumpVariant(const QVariant &v, const QString &indent = QLatin1Str result = QLatin1String("List ["); for (const auto &item : list) result += indented + dumpVariant(item, indented); - result.chop(1); // remove comma + result.chop(1); // remove comma result += indent + QLatin1String("],"); } else { QDebug debug(&result); @@ -115,7 +115,7 @@ void DataStreamDumper::saveFile(QIODevice *f, const QVariant &contents, const QS { Q_UNUSED(options); QString s = dumpVariant(contents); - s[s.size() - 1] = QLatin1Char('\n'); // replace the comma with newline + s[s.size() - 1] = QLatin1Char('\n'); // replace the comma with newline QTextStream out(f); out << s; @@ -213,7 +213,7 @@ void DataStreamConverter::saveFile(QIODevice *f, const QVariant &contents, const exit(EXIT_FAILURE); } - char c = order == QDataStream::LittleEndian ? 'l' : 'B'; + char c = order == QDataStream::LittleEndian ? 'l' : 'B'; f->write(signature); f->write(&c, 1); diff --git a/examples/corelib/serialization/convert/nullconverter.cpp b/examples/corelib/serialization/convert/nullconverter.cpp index a3f0bcd99b5..73ae67b7965 100644 --- a/examples/corelib/serialization/convert/nullconverter.cpp +++ b/examples/corelib/serialization/convert/nullconverter.cpp @@ -4,7 +4,7 @@ #include "nullconverter.h" static NullConverter nullConverter; -Converter* Converter::null = &nullConverter; +Converter *Converter::null = &nullConverter; QString NullConverter::name() { diff --git a/examples/corelib/serialization/convert/textconverter.cpp b/examples/corelib/serialization/convert/textconverter.cpp index b02ce12f66d..6c27e483233 100644 --- a/examples/corelib/serialization/convert/textconverter.cpp +++ b/examples/corelib/serialization/convert/textconverter.cpp @@ -76,7 +76,7 @@ QVariant TextConverter::loadFile(QIODevice *f, Converter *&outputConverter) QVariantList list; QTextStream in(f); - QString line ; + QString line; while (!in.atEnd()) { in.readLineInto(&line); diff --git a/examples/corelib/serialization/savegame/game.cpp b/examples/corelib/serialization/savegame/game.cpp index 85a2619b423..331fb33d359 100644 --- a/examples/corelib/serialization/savegame/game.cpp +++ b/examples/corelib/serialization/savegame/game.cpp @@ -76,8 +76,8 @@ bool Game::loadGame(Game::SaveFormat saveFormat) QByteArray saveData = loadFile.readAll(); QJsonDocument loadDoc(saveFormat == Json - ? QJsonDocument::fromJson(saveData) - : QJsonDocument(QCborValue::fromCbor(saveData).toMap().toJsonObject())); + ? QJsonDocument::fromJson(saveData) + : QJsonDocument(QCborValue::fromCbor(saveData).toMap().toJsonObject())); read(loadDoc.object()); diff --git a/examples/corelib/serialization/streambookmarks/mainwindow.cpp b/examples/corelib/serialization/streambookmarks/mainwindow.cpp index 5a3cec6fb27..67fbd12e14f 100644 --- a/examples/corelib/serialization/streambookmarks/mainwindow.cpp +++ b/examples/corelib/serialization/streambookmarks/mainwindow.cpp @@ -27,7 +27,7 @@ MainWindow::MainWindow() : treeWidget(new QTreeWidget) { treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch); - treeWidget->setHeaderLabels(QStringList{ tr("Title"), tr("Location") }); + treeWidget->setHeaderLabels(QStringList{tr("Title"), tr("Location")}); #if QT_CONFIG(clipboard) && QT_CONFIG(contextmenu) treeWidget->setContextMenuPolicy(Qt::CustomContextMenu); connect(treeWidget, &QWidget::customContextMenuRequested, @@ -148,8 +148,8 @@ void MainWindow::saveAs() //! [5] void MainWindow::about() { - QMessageBox::about(this, tr("About QXmlStream Bookmarks"), - tr("The QXmlStream Bookmarks example demonstrates how to use Qt's " - "QXmlStream classes to read and write XML documents.")); + QMessageBox::about(this, tr("About QXmlStream Bookmarks"), + tr("The QXmlStream Bookmarks example demonstrates how to use Qt's " + "QXmlStream classes to read and write XML documents.")); } //! [5]