From 4c23dff2e0457bd4d6b5b392ba689cb965e8d8a2 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Tue, 25 Oct 2022 09:13:40 -0400 Subject: [PATCH] clang-format set ColumnLimit=0 --- .clang-format | 2 +- src/nlohmann_qt_helpers.h | 3 ++- tests/fuzzer/Fuzzer.cpp | 3 ++- tests/qtwidgets/tst_qtwidgets.cpp | 28 ++++++++++++++-------------- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/.clang-format b/.clang-format index 5984fdec..a681ad30 100644 --- a/.clang-format +++ b/.clang-format @@ -47,7 +47,7 @@ AlignAfterOpenBracket: true AlwaysBreakBeforeMultilineStrings: false AlwaysBreakTemplateDeclarations: true BinPackParameters: true -ColumnLimit: 100 +ColumnLimit: 0 Cpp11BracedListStyle: false DerivePointerBinding: false ExperimentalAutoDetectBinPacking: false diff --git a/src/nlohmann_qt_helpers.h b/src/nlohmann_qt_helpers.h index 27b141d6..83b34bab 100644 --- a/src/nlohmann_qt_helpers.h +++ b/src/nlohmann_qt_helpers.h @@ -182,7 +182,8 @@ QT_END_NAMESPACE inline QDebug operator<<(QDebug debug, const nlohmann::json &j) { QDebugStateSaver s(debug); - debug.nospace() << '\n' << j.dump(4).data() << '\n'; + debug.nospace() << '\n' + << j.dump(4).data() << '\n'; return debug; } diff --git a/tests/fuzzer/Fuzzer.cpp b/tests/fuzzer/Fuzzer.cpp index fcd1c539..c926251f 100644 --- a/tests/fuzzer/Fuzzer.cpp +++ b/tests/fuzzer/Fuzzer.cpp @@ -398,7 +398,8 @@ void Fuzzer::fuzz(const QStringList &jsonFiles) void Fuzzer::fuzz(const QString &jsonFile) { m_currentJsonFile = jsonFile; - qDebug() << "\n" << Q_FUNC_INFO << jsonFile; + qDebug() << "\n" + << Q_FUNC_INFO << jsonFile; QFile file(jsonFile); if (file.open(QIODevice::ReadOnly)) { QJsonDocument doc = QJsonDocument::fromJson(file.readAll()); diff --git a/tests/qtwidgets/tst_qtwidgets.cpp b/tests/qtwidgets/tst_qtwidgets.cpp index 3c376eff..3fe28192 100644 --- a/tests/qtwidgets/tst_qtwidgets.cpp +++ b/tests/qtwidgets/tst_qtwidgets.cpp @@ -1427,8 +1427,8 @@ void TestQtWidgets::tst_complex() Controllers::DockWidget::List docks; QVector locations = { - Location_OnLeft, Location_OnLeft, Location_OnLeft, Location_OnRight, - Location_OnRight, Location_OnRight, Location_OnRight, Location_OnBottom, + Location_OnLeft, Location_OnLeft, Location_OnLeft, Location_OnRight, + Location_OnRight, Location_OnRight, Location_OnRight, Location_OnBottom, Location_OnBottom, Location_OnBottom, Location_OnBottom, Location_OnBottom, Location_OnBottom, Location_OnBottom, Location_OnBottom, Location_OnBottom, Location_OnBottom, Location_OnBottom, Location_OnBottom, Location_OnBottom, @@ -1437,24 +1437,24 @@ void TestQtWidgets::tst_complex() QVector options = { InitialVisibilityOption::StartVisible, InitialVisibilityOption::StartVisible, - InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden, + InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartVisible, InitialVisibilityOption::StartHidden, - InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden, - InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden, - InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartVisible, + InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden, + InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden, + InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartVisible, InitialVisibilityOption::StartVisible, InitialVisibilityOption::StartHidden, - InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden, - InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden, - InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden, + InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden, + InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden, + InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden, InitialVisibilityOption::StartHidden }; - QVector floatings = { true, false, true, false, false, false, false, - false, false, false, false, false, true, false, - false, true, true, true, true, true, false }; + QVector floatings = { true, false, true, false, false, false, false, + false, false, false, false, false, true, false, + false, true, true, true, true, true, false }; - QVector minSizes = { QSize(316, 219), QSize(355, 237), QSize(293, 66), QSize(158, 72), - QSize(30, 141), QSize(104, 143), QSize(104, 105), QSize(84, 341), + QVector minSizes = { QSize(316, 219), QSize(355, 237), QSize(293, 66), QSize(158, 72), + QSize(30, 141), QSize(104, 143), QSize(104, 105), QSize(84, 341), QSize(130, 130), QSize(404, 205), QSize(296, 177), QSize(914, 474), QSize(355, 237), QSize(104, 104), QSize(104, 138), QSize(1061, 272), QSize(165, 196), QSize(296, 177), QSize(104, 104), QSize(355, 237),