ClangFormat: Regenerate clangformatchecks for clangformat 17

Fixes: QTCREATORBUG-29690
Change-Id: I9bbe0c531087824fc160bae210c8444b3ac67ba5
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Artem Sokolovskii
2023-10-04 11:00:01 +02:00
parent 43f770b087
commit 759535be1a
3 changed files with 97 additions and 43 deletions

View File

@@ -1,7 +1,7 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT! // THIS FILE IS AUTOMATICALLY GENERATED by generateClangFormatChecksLayout. DO NOT EDIT!
#include "clangformatchecks.h" #include "clangformatchecks.h"
@@ -121,6 +121,22 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
m_AlignConsecutiveDeclarationsPadOperators->addItems({"Default","true","false",}); m_AlignConsecutiveDeclarationsPadOperators->addItems({"Default","true","false",});
m_AlignConsecutiveDeclarationsPadOperators->setObjectName("AlignConsecutiveDeclarationsPadOperators"); m_AlignConsecutiveDeclarationsPadOperators->setObjectName("AlignConsecutiveDeclarationsPadOperators");
m_AlignConsecutiveShortCaseStatementsEnabled = new QComboBox(this);
m_AlignConsecutiveShortCaseStatementsEnabled->addItems({"Default","true","false",});
m_AlignConsecutiveShortCaseStatementsEnabled->setObjectName("AlignConsecutiveShortCaseStatementsEnabled");
m_AlignConsecutiveShortCaseStatementsAcrossEmptyLines = new QComboBox(this);
m_AlignConsecutiveShortCaseStatementsAcrossEmptyLines->addItems({"Default","true","false",});
m_AlignConsecutiveShortCaseStatementsAcrossEmptyLines->setObjectName("AlignConsecutiveShortCaseStatementsAcrossEmptyLines");
m_AlignConsecutiveShortCaseStatementsAcrossComments = new QComboBox(this);
m_AlignConsecutiveShortCaseStatementsAcrossComments->addItems({"Default","true","false",});
m_AlignConsecutiveShortCaseStatementsAcrossComments->setObjectName("AlignConsecutiveShortCaseStatementsAcrossComments");
m_AlignConsecutiveShortCaseStatementsAlignCaseColons = new QComboBox(this);
m_AlignConsecutiveShortCaseStatementsAlignCaseColons->addItems({"Default","true","false",});
m_AlignConsecutiveShortCaseStatementsAlignCaseColons->setObjectName("AlignConsecutiveShortCaseStatementsAlignCaseColons");
m_AlignEscapedNewlines = new QComboBox(this); m_AlignEscapedNewlines = new QComboBox(this);
m_AlignEscapedNewlines->addItems({"DontAlign","Left","Right",}); m_AlignEscapedNewlines->addItems({"DontAlign","Left","Right",});
m_AlignEscapedNewlines->setObjectName("AlignEscapedNewlines"); m_AlignEscapedNewlines->setObjectName("AlignEscapedNewlines");
@@ -434,6 +450,10 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
m_JavaScriptWrapImports->addItems({"Default","true","false",}); m_JavaScriptWrapImports->addItems({"Default","true","false",});
m_JavaScriptWrapImports->setObjectName("JavaScriptWrapImports"); m_JavaScriptWrapImports->setObjectName("JavaScriptWrapImports");
m_KeepEmptyLinesAtEOF = new QComboBox(this);
m_KeepEmptyLinesAtEOF->addItems({"Default","true","false",});
m_KeepEmptyLinesAtEOF->setObjectName("KeepEmptyLinesAtEOF");
m_KeepEmptyLinesAtTheStartOfBlocks = new QComboBox(this); m_KeepEmptyLinesAtTheStartOfBlocks = new QComboBox(this);
m_KeepEmptyLinesAtTheStartOfBlocks->addItems({"Default","true","false",}); m_KeepEmptyLinesAtTheStartOfBlocks->addItems({"Default","true","false",});
m_KeepEmptyLinesAtTheStartOfBlocks->setObjectName("KeepEmptyLinesAtTheStartOfBlocks"); m_KeepEmptyLinesAtTheStartOfBlocks->setObjectName("KeepEmptyLinesAtTheStartOfBlocks");
@@ -460,6 +480,12 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
m_setMacroBlockEnd = new QPushButton("Set", this); m_setMacroBlockEnd = new QPushButton("Set", this);
m_setMacroBlockEnd->setObjectName("setMacroBlockEnd"); m_setMacroBlockEnd->setObjectName("setMacroBlockEnd");
m_Macros = new QPlainTextEdit(this);
m_Macros->setObjectName("Macros");
m_Macros->setFixedHeight(100);
m_setMacros = new QPushButton("Set", this);
m_setMacros->setObjectName("setMacros");
m_MaxEmptyLinesToKeep = new QLineEdit(this); m_MaxEmptyLinesToKeep = new QLineEdit(this);
m_MaxEmptyLinesToKeep->setObjectName("MaxEmptyLinesToKeep"); m_MaxEmptyLinesToKeep->setObjectName("MaxEmptyLinesToKeep");
m_setMaxEmptyLinesToKeep = new QPushButton("Set", this); m_setMaxEmptyLinesToKeep = new QPushButton("Set", this);
@@ -497,7 +523,7 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
m_ObjCSpaceBeforeProtocolList->setObjectName("ObjCSpaceBeforeProtocolList"); m_ObjCSpaceBeforeProtocolList->setObjectName("ObjCSpaceBeforeProtocolList");
m_PackConstructorInitializers = new QComboBox(this); m_PackConstructorInitializers = new QComboBox(this);
m_PackConstructorInitializers->addItems({"Never","BinPack","CurrentLine","NextLine",}); m_PackConstructorInitializers->addItems({"Never","BinPack","CurrentLine","NextLine","NextLineOnly",});
m_PackConstructorInitializers->setObjectName("PackConstructorInitializers"); m_PackConstructorInitializers->setObjectName("PackConstructorInitializers");
m_PenaltyBreakAssignment = new QLineEdit(this); m_PenaltyBreakAssignment = new QLineEdit(this);
@@ -581,6 +607,10 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
m_RemoveBracesLLVM->addItems({"Default","true","false",}); m_RemoveBracesLLVM->addItems({"Default","true","false",});
m_RemoveBracesLLVM->setObjectName("RemoveBracesLLVM"); m_RemoveBracesLLVM->setObjectName("RemoveBracesLLVM");
m_RemoveParentheses = new QComboBox(this);
m_RemoveParentheses->addItems({"Leave","MultipleParentheses","ReturnStatement",});
m_RemoveParentheses->setObjectName("RemoveParentheses");
m_RemoveSemicolon = new QComboBox(this); m_RemoveSemicolon = new QComboBox(this);
m_RemoveSemicolon->addItems({"Default","true","false",}); m_RemoveSemicolon->addItems({"Default","true","false",});
m_RemoveSemicolon->setObjectName("RemoveSemicolon"); m_RemoveSemicolon->setObjectName("RemoveSemicolon");
@@ -650,6 +680,10 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
m_SpaceBeforeInheritanceColon->addItems({"Default","true","false",}); m_SpaceBeforeInheritanceColon->addItems({"Default","true","false",});
m_SpaceBeforeInheritanceColon->setObjectName("SpaceBeforeInheritanceColon"); m_SpaceBeforeInheritanceColon->setObjectName("SpaceBeforeInheritanceColon");
m_SpaceBeforeJsonColon = new QComboBox(this);
m_SpaceBeforeJsonColon->addItems({"Default","true","false",});
m_SpaceBeforeJsonColon->setObjectName("SpaceBeforeJsonColon");
m_SpaceBeforeParens = new QComboBox(this); m_SpaceBeforeParens = new QComboBox(this);
m_SpaceBeforeParens->addItems({"Never","ControlStatements","ControlStatementsExceptControlMacros","NonEmptyParentheses","Always","Custom",}); m_SpaceBeforeParens->addItems({"Never","ControlStatements","ControlStatementsExceptControlMacros","NonEmptyParentheses","Always","Custom",});
m_SpaceBeforeParens->setObjectName("SpaceBeforeParens"); m_SpaceBeforeParens->setObjectName("SpaceBeforeParens");
@@ -702,31 +736,10 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
m_SpaceInEmptyBlock->addItems({"Default","true","false",}); m_SpaceInEmptyBlock->addItems({"Default","true","false",});
m_SpaceInEmptyBlock->setObjectName("SpaceInEmptyBlock"); m_SpaceInEmptyBlock->setObjectName("SpaceInEmptyBlock");
m_SpaceInEmptyParentheses = new QComboBox(this);
m_SpaceInEmptyParentheses->addItems({"Default","true","false",});
m_SpaceInEmptyParentheses->setObjectName("SpaceInEmptyParentheses");
m_SpacesBeforeTrailingComments = new QLineEdit(this);
m_SpacesBeforeTrailingComments->setObjectName("SpacesBeforeTrailingComments");
m_setSpacesBeforeTrailingComments = new QPushButton("Set", this);
m_setSpacesBeforeTrailingComments->setObjectName("setSpacesBeforeTrailingComments");
m_SpacesInAngles = new QComboBox(this); m_SpacesInAngles = new QComboBox(this);
m_SpacesInAngles->addItems({"Never","Always","Leave",}); m_SpacesInAngles->addItems({"Never","Always","Leave",});
m_SpacesInAngles->setObjectName("SpacesInAngles"); m_SpacesInAngles->setObjectName("SpacesInAngles");
m_SpacesInConditionalStatement = new QComboBox(this);
m_SpacesInConditionalStatement->addItems({"Default","true","false",});
m_SpacesInConditionalStatement->setObjectName("SpacesInConditionalStatement");
m_SpacesInContainerLiterals = new QComboBox(this);
m_SpacesInContainerLiterals->addItems({"Default","true","false",});
m_SpacesInContainerLiterals->setObjectName("SpacesInContainerLiterals");
m_SpacesInCStyleCastParentheses = new QComboBox(this);
m_SpacesInCStyleCastParentheses->addItems({"Default","true","false",});
m_SpacesInCStyleCastParentheses->setObjectName("SpacesInCStyleCastParentheses");
m_SpacesInLineCommentPrefixMinimum = new QLineEdit(this); m_SpacesInLineCommentPrefixMinimum = new QLineEdit(this);
m_SpacesInLineCommentPrefixMinimum->setObjectName("SpacesInLineCommentPrefixMinimum"); m_SpacesInLineCommentPrefixMinimum->setObjectName("SpacesInLineCommentPrefixMinimum");
m_setSpacesInLineCommentPrefixMinimum = new QPushButton("Set", this); m_setSpacesInLineCommentPrefixMinimum = new QPushButton("Set", this);
@@ -737,9 +750,21 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
m_setSpacesInLineCommentPrefixMaximum = new QPushButton("Set", this); m_setSpacesInLineCommentPrefixMaximum = new QPushButton("Set", this);
m_setSpacesInLineCommentPrefixMaximum->setObjectName("setSpacesInLineCommentPrefixMaximum"); m_setSpacesInLineCommentPrefixMaximum->setObjectName("setSpacesInLineCommentPrefixMaximum");
m_SpacesInParentheses = new QComboBox(this); m_SpacesInParensOptionsInConditionalStatements = new QComboBox(this);
m_SpacesInParentheses->addItems({"Default","true","false",}); m_SpacesInParensOptionsInConditionalStatements->addItems({"Default","true","false",});
m_SpacesInParentheses->setObjectName("SpacesInParentheses"); m_SpacesInParensOptionsInConditionalStatements->setObjectName("SpacesInParensOptionsInConditionalStatements");
m_SpacesInParensOptionsInCStyleCasts = new QComboBox(this);
m_SpacesInParensOptionsInCStyleCasts->addItems({"Default","true","false",});
m_SpacesInParensOptionsInCStyleCasts->setObjectName("SpacesInParensOptionsInCStyleCasts");
m_SpacesInParensOptionsInEmptyParentheses = new QComboBox(this);
m_SpacesInParensOptionsInEmptyParentheses->addItems({"Default","true","false",});
m_SpacesInParensOptionsInEmptyParentheses->setObjectName("SpacesInParensOptionsInEmptyParentheses");
m_SpacesInParensOptionsOther = new QComboBox(this);
m_SpacesInParensOptionsOther->addItems({"Default","true","false",});
m_SpacesInParensOptionsOther->setObjectName("SpacesInParensOptionsOther");
m_SpacesInSquareBrackets = new QComboBox(this); m_SpacesInSquareBrackets = new QComboBox(this);
m_SpacesInSquareBrackets->addItems({"Default","true","false",}); m_SpacesInSquareBrackets->addItems({"Default","true","false",});
@@ -766,6 +791,12 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
m_setTabWidth = new QPushButton("Set", this); m_setTabWidth = new QPushButton("Set", this);
m_setTabWidth->setObjectName("setTabWidth"); m_setTabWidth->setObjectName("setTabWidth");
m_TypeNames = new QPlainTextEdit(this);
m_TypeNames->setObjectName("TypeNames");
m_TypeNames->setFixedHeight(100);
m_setTypeNames = new QPushButton("Set", this);
m_setTypeNames->setObjectName("setTypeNames");
m_TypenameMacros = new QPlainTextEdit(this); m_TypenameMacros = new QPlainTextEdit(this);
m_TypenameMacros->setObjectName("TypenameMacros"); m_TypenameMacros->setObjectName("TypenameMacros");
m_TypenameMacros->setFixedHeight(100); m_TypenameMacros->setFixedHeight(100);
@@ -776,6 +807,10 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
m_UseTab->addItems({"Never","ForIndentation","ForContinuationAndIndentation","AlignWithSpaces","Always",}); m_UseTab->addItems({"Never","ForIndentation","ForContinuationAndIndentation","AlignWithSpaces","Always",});
m_UseTab->setObjectName("UseTab"); m_UseTab->setObjectName("UseTab");
m_VerilogBreakBetweenInstancePorts = new QComboBox(this);
m_VerilogBreakBetweenInstancePorts->addItems({"Default","true","false",});
m_VerilogBreakBetweenInstancePorts->setObjectName("VerilogBreakBetweenInstancePorts");
m_WhitespaceSensitiveMacros = new QPlainTextEdit(this); m_WhitespaceSensitiveMacros = new QPlainTextEdit(this);
m_WhitespaceSensitiveMacros->setObjectName("WhitespaceSensitiveMacros"); m_WhitespaceSensitiveMacros->setObjectName("WhitespaceSensitiveMacros");
m_WhitespaceSensitiveMacros->setFixedHeight(100); m_WhitespaceSensitiveMacros->setFixedHeight(100);
@@ -815,6 +850,11 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
new QLabel(" AcrossComments"), m_AlignConsecutiveDeclarationsAcrossComments, br, new QLabel(" AcrossComments"), m_AlignConsecutiveDeclarationsAcrossComments, br,
new QLabel(" AlignCompound"), m_AlignConsecutiveDeclarationsAlignCompound, br, new QLabel(" AlignCompound"), m_AlignConsecutiveDeclarationsAlignCompound, br,
new QLabel(" PadOperators"), m_AlignConsecutiveDeclarationsPadOperators, br, new QLabel(" PadOperators"), m_AlignConsecutiveDeclarationsPadOperators, br,
new QLabel("AlignConsecutiveShortCaseStatements"), br,
new QLabel(" Enabled"), m_AlignConsecutiveShortCaseStatementsEnabled, br,
new QLabel(" AcrossEmptyLines"), m_AlignConsecutiveShortCaseStatementsAcrossEmptyLines, br,
new QLabel(" AcrossComments"), m_AlignConsecutiveShortCaseStatementsAcrossComments, br,
new QLabel(" AlignCaseColons"), m_AlignConsecutiveShortCaseStatementsAlignCaseColons, br,
new QLabel("AlignEscapedNewlines"), m_AlignEscapedNewlines, br, new QLabel("AlignEscapedNewlines"), m_AlignEscapedNewlines, br,
new QLabel("AlignOperands"), m_AlignOperands, br, new QLabel("AlignOperands"), m_AlignOperands, br,
new QLabel("AlignTrailingComments"), br, new QLabel("AlignTrailingComments"), br,
@@ -893,12 +933,14 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
new QLabel("JavaImportGroups"), Row {m_JavaImportGroups, m_setJavaImportGroups}, br, new QLabel("JavaImportGroups"), Row {m_JavaImportGroups, m_setJavaImportGroups}, br,
new QLabel("JavaScriptQuotes"), m_JavaScriptQuotes, br, new QLabel("JavaScriptQuotes"), m_JavaScriptQuotes, br,
new QLabel("JavaScriptWrapImports"), m_JavaScriptWrapImports, br, new QLabel("JavaScriptWrapImports"), m_JavaScriptWrapImports, br,
new QLabel("KeepEmptyLinesAtEOF"), m_KeepEmptyLinesAtEOF, br,
new QLabel("KeepEmptyLinesAtTheStartOfBlocks"), m_KeepEmptyLinesAtTheStartOfBlocks, br, new QLabel("KeepEmptyLinesAtTheStartOfBlocks"), m_KeepEmptyLinesAtTheStartOfBlocks, br,
new QLabel("LambdaBodyIndentation"), m_LambdaBodyIndentation, br, new QLabel("LambdaBodyIndentation"), m_LambdaBodyIndentation, br,
new QLabel("Language"), m_Language, br, new QLabel("Language"), m_Language, br,
new QLabel("LineEnding"), m_LineEnding, br, new QLabel("LineEnding"), m_LineEnding, br,
new QLabel("MacroBlockBegin"), Row {m_MacroBlockBegin, m_setMacroBlockBegin}, br, new QLabel("MacroBlockBegin"), Row {m_MacroBlockBegin, m_setMacroBlockBegin}, br,
new QLabel("MacroBlockEnd"), Row {m_MacroBlockEnd, m_setMacroBlockEnd}, br, new QLabel("MacroBlockEnd"), Row {m_MacroBlockEnd, m_setMacroBlockEnd}, br,
new QLabel("Macros"), Row {m_Macros, m_setMacros}, br,
new QLabel("MaxEmptyLinesToKeep"), Row {m_MaxEmptyLinesToKeep, m_setMaxEmptyLinesToKeep}, br, new QLabel("MaxEmptyLinesToKeep"), Row {m_MaxEmptyLinesToKeep, m_setMaxEmptyLinesToKeep}, br,
new QLabel("NamespaceIndentation"), m_NamespaceIndentation, br, new QLabel("NamespaceIndentation"), m_NamespaceIndentation, br,
new QLabel("NamespaceMacros"), Row {m_NamespaceMacros, m_setNamespaceMacros}, br, new QLabel("NamespaceMacros"), Row {m_NamespaceMacros, m_setNamespaceMacros}, br,
@@ -925,6 +967,7 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
new QLabel("ReferenceAlignment"), m_ReferenceAlignment, br, new QLabel("ReferenceAlignment"), m_ReferenceAlignment, br,
new QLabel("ReflowComments"), m_ReflowComments, br, new QLabel("ReflowComments"), m_ReflowComments, br,
new QLabel("RemoveBracesLLVM"), m_RemoveBracesLLVM, br, new QLabel("RemoveBracesLLVM"), m_RemoveBracesLLVM, br,
new QLabel("RemoveParentheses"), m_RemoveParentheses, br,
new QLabel("RemoveSemicolon"), m_RemoveSemicolon, br, new QLabel("RemoveSemicolon"), m_RemoveSemicolon, br,
new QLabel("RequiresClausePosition"), m_RequiresClausePosition, br, new QLabel("RequiresClausePosition"), m_RequiresClausePosition, br,
new QLabel("RequiresExpressionIndentation"), m_RequiresExpressionIndentation, br, new QLabel("RequiresExpressionIndentation"), m_RequiresExpressionIndentation, br,
@@ -942,6 +985,7 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
new QLabel("SpaceBeforeCpp11BracedList"), m_SpaceBeforeCpp11BracedList, br, new QLabel("SpaceBeforeCpp11BracedList"), m_SpaceBeforeCpp11BracedList, br,
new QLabel("SpaceBeforeCtorInitializerColon"), m_SpaceBeforeCtorInitializerColon, br, new QLabel("SpaceBeforeCtorInitializerColon"), m_SpaceBeforeCtorInitializerColon, br,
new QLabel("SpaceBeforeInheritanceColon"), m_SpaceBeforeInheritanceColon, br, new QLabel("SpaceBeforeInheritanceColon"), m_SpaceBeforeInheritanceColon, br,
new QLabel("SpaceBeforeJsonColon"), m_SpaceBeforeJsonColon, br,
new QLabel("SpaceBeforeParens"), m_SpaceBeforeParens, br, new QLabel("SpaceBeforeParens"), m_SpaceBeforeParens, br,
new QLabel("SpaceBeforeParensOptions"), br, new QLabel("SpaceBeforeParensOptions"), br,
new QLabel(" AfterControlStatements"), m_SpaceBeforeParensOptionsAfterControlStatements, br, new QLabel(" AfterControlStatements"), m_SpaceBeforeParensOptionsAfterControlStatements, br,
@@ -956,23 +1000,24 @@ ClangFormatChecks::ClangFormatChecks(QWidget *parent)
new QLabel("SpaceBeforeSquareBrackets"), m_SpaceBeforeSquareBrackets, br, new QLabel("SpaceBeforeSquareBrackets"), m_SpaceBeforeSquareBrackets, br,
new QLabel("SpaceBeforeRangeBasedForLoopColon"), m_SpaceBeforeRangeBasedForLoopColon, br, new QLabel("SpaceBeforeRangeBasedForLoopColon"), m_SpaceBeforeRangeBasedForLoopColon, br,
new QLabel("SpaceInEmptyBlock"), m_SpaceInEmptyBlock, br, new QLabel("SpaceInEmptyBlock"), m_SpaceInEmptyBlock, br,
new QLabel("SpaceInEmptyParentheses"), m_SpaceInEmptyParentheses, br,
new QLabel("SpacesBeforeTrailingComments"), Row {m_SpacesBeforeTrailingComments, m_setSpacesBeforeTrailingComments}, br,
new QLabel("SpacesInAngles"), m_SpacesInAngles, br, new QLabel("SpacesInAngles"), m_SpacesInAngles, br,
new QLabel("SpacesInConditionalStatement"), m_SpacesInConditionalStatement, br,
new QLabel("SpacesInContainerLiterals"), m_SpacesInContainerLiterals, br,
new QLabel("SpacesInCStyleCastParentheses"), m_SpacesInCStyleCastParentheses, br,
new QLabel("SpacesInLineCommentPrefix"), br, new QLabel("SpacesInLineCommentPrefix"), br,
new QLabel(" Minimum"), Row {m_SpacesInLineCommentPrefixMinimum, m_setSpacesInLineCommentPrefixMinimum}, br, new QLabel(" Minimum"), Row {m_SpacesInLineCommentPrefixMinimum, m_setSpacesInLineCommentPrefixMinimum}, br,
new QLabel(" Maximum"), Row {m_SpacesInLineCommentPrefixMaximum, m_setSpacesInLineCommentPrefixMaximum}, br, new QLabel(" Maximum"), Row {m_SpacesInLineCommentPrefixMaximum, m_setSpacesInLineCommentPrefixMaximum}, br,
new QLabel("SpacesInParentheses"), m_SpacesInParentheses, br, new QLabel("SpacesInParensOptions"), br,
new QLabel(" InConditionalStatements"), m_SpacesInParensOptionsInConditionalStatements, br,
new QLabel(" InCStyleCasts"), m_SpacesInParensOptionsInCStyleCasts, br,
new QLabel(" InEmptyParentheses"), m_SpacesInParensOptionsInEmptyParentheses, br,
new QLabel(" Other"), m_SpacesInParensOptionsOther, br,
new QLabel("SpacesInSquareBrackets"), m_SpacesInSquareBrackets, br, new QLabel("SpacesInSquareBrackets"), m_SpacesInSquareBrackets, br,
new QLabel("Standard"), m_Standard, br, new QLabel("Standard"), m_Standard, br,
new QLabel("StatementAttributeLikeMacros"), Row {m_StatementAttributeLikeMacros, m_setStatementAttributeLikeMacros}, br, new QLabel("StatementAttributeLikeMacros"), Row {m_StatementAttributeLikeMacros, m_setStatementAttributeLikeMacros}, br,
new QLabel("StatementMacros"), Row {m_StatementMacros, m_setStatementMacros}, br, new QLabel("StatementMacros"), Row {m_StatementMacros, m_setStatementMacros}, br,
new QLabel("TabWidth"), Row {m_TabWidth, m_setTabWidth}, br, new QLabel("TabWidth"), Row {m_TabWidth, m_setTabWidth}, br,
new QLabel("TypeNames"), Row {m_TypeNames, m_setTypeNames}, br,
new QLabel("TypenameMacros"), Row {m_TypenameMacros, m_setTypenameMacros}, br, new QLabel("TypenameMacros"), Row {m_TypenameMacros, m_setTypenameMacros}, br,
new QLabel("UseTab"), m_UseTab, br, new QLabel("UseTab"), m_UseTab, br,
new QLabel("VerilogBreakBetweenInstancePorts"), m_VerilogBreakBetweenInstancePorts, br,
new QLabel("WhitespaceSensitiveMacros"), Row {m_WhitespaceSensitiveMacros, m_setWhitespaceSensitiveMacros}, br, new QLabel("WhitespaceSensitiveMacros"), Row {m_WhitespaceSensitiveMacros, m_setWhitespaceSensitiveMacros}, br,
}.attachTo(this); }.attachTo(this);
} }

View File

@@ -1,7 +1,7 @@
// Copyright (C) 2022 The Qt Company Ltd. // Copyright (C) 2023 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
// THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT! // THIS FILE IS AUTOMATICALLY GENERATED by generateClangFormatChecksLayout. DO NOT EDIT!
#pragma once #pragma once
@@ -52,6 +52,10 @@ private:
QComboBox *m_AlignConsecutiveDeclarationsAcrossComments = nullptr; QComboBox *m_AlignConsecutiveDeclarationsAcrossComments = nullptr;
QComboBox *m_AlignConsecutiveDeclarationsAlignCompound = nullptr; QComboBox *m_AlignConsecutiveDeclarationsAlignCompound = nullptr;
QComboBox *m_AlignConsecutiveDeclarationsPadOperators = nullptr; QComboBox *m_AlignConsecutiveDeclarationsPadOperators = nullptr;
QComboBox *m_AlignConsecutiveShortCaseStatementsEnabled = nullptr;
QComboBox *m_AlignConsecutiveShortCaseStatementsAcrossEmptyLines = nullptr;
QComboBox *m_AlignConsecutiveShortCaseStatementsAcrossComments = nullptr;
QComboBox *m_AlignConsecutiveShortCaseStatementsAlignCaseColons = nullptr;
QComboBox *m_AlignEscapedNewlines = nullptr; QComboBox *m_AlignEscapedNewlines = nullptr;
QComboBox *m_AlignOperands = nullptr; QComboBox *m_AlignOperands = nullptr;
QComboBox *m_AlignTrailingCommentsKind = nullptr; QComboBox *m_AlignTrailingCommentsKind = nullptr;
@@ -136,6 +140,7 @@ private:
QPushButton *m_setJavaImportGroups = nullptr; QPushButton *m_setJavaImportGroups = nullptr;
QComboBox *m_JavaScriptQuotes = nullptr; QComboBox *m_JavaScriptQuotes = nullptr;
QComboBox *m_JavaScriptWrapImports = nullptr; QComboBox *m_JavaScriptWrapImports = nullptr;
QComboBox *m_KeepEmptyLinesAtEOF = nullptr;
QComboBox *m_KeepEmptyLinesAtTheStartOfBlocks = nullptr; QComboBox *m_KeepEmptyLinesAtTheStartOfBlocks = nullptr;
QComboBox *m_LambdaBodyIndentation = nullptr; QComboBox *m_LambdaBodyIndentation = nullptr;
QComboBox *m_Language = nullptr; QComboBox *m_Language = nullptr;
@@ -144,6 +149,8 @@ private:
QPushButton *m_setMacroBlockBegin = nullptr; QPushButton *m_setMacroBlockBegin = nullptr;
QLineEdit *m_MacroBlockEnd = nullptr; QLineEdit *m_MacroBlockEnd = nullptr;
QPushButton *m_setMacroBlockEnd = nullptr; QPushButton *m_setMacroBlockEnd = nullptr;
QPlainTextEdit *m_Macros = nullptr;
QPushButton *m_setMacros = nullptr;
QLineEdit *m_MaxEmptyLinesToKeep = nullptr; QLineEdit *m_MaxEmptyLinesToKeep = nullptr;
QPushButton *m_setMaxEmptyLinesToKeep = nullptr; QPushButton *m_setMaxEmptyLinesToKeep = nullptr;
QComboBox *m_NamespaceIndentation = nullptr; QComboBox *m_NamespaceIndentation = nullptr;
@@ -185,6 +192,7 @@ private:
QComboBox *m_ReferenceAlignment = nullptr; QComboBox *m_ReferenceAlignment = nullptr;
QComboBox *m_ReflowComments = nullptr; QComboBox *m_ReflowComments = nullptr;
QComboBox *m_RemoveBracesLLVM = nullptr; QComboBox *m_RemoveBracesLLVM = nullptr;
QComboBox *m_RemoveParentheses = nullptr;
QComboBox *m_RemoveSemicolon = nullptr; QComboBox *m_RemoveSemicolon = nullptr;
QComboBox *m_RequiresClausePosition = nullptr; QComboBox *m_RequiresClausePosition = nullptr;
QComboBox *m_RequiresExpressionIndentation = nullptr; QComboBox *m_RequiresExpressionIndentation = nullptr;
@@ -203,6 +211,7 @@ private:
QComboBox *m_SpaceBeforeCpp11BracedList = nullptr; QComboBox *m_SpaceBeforeCpp11BracedList = nullptr;
QComboBox *m_SpaceBeforeCtorInitializerColon = nullptr; QComboBox *m_SpaceBeforeCtorInitializerColon = nullptr;
QComboBox *m_SpaceBeforeInheritanceColon = nullptr; QComboBox *m_SpaceBeforeInheritanceColon = nullptr;
QComboBox *m_SpaceBeforeJsonColon = nullptr;
QComboBox *m_SpaceBeforeParens = nullptr; QComboBox *m_SpaceBeforeParens = nullptr;
QComboBox *m_SpaceBeforeParensOptionsAfterControlStatements = nullptr; QComboBox *m_SpaceBeforeParensOptionsAfterControlStatements = nullptr;
QComboBox *m_SpaceBeforeParensOptionsAfterForeachMacros = nullptr; QComboBox *m_SpaceBeforeParensOptionsAfterForeachMacros = nullptr;
@@ -216,18 +225,15 @@ private:
QComboBox *m_SpaceBeforeSquareBrackets = nullptr; QComboBox *m_SpaceBeforeSquareBrackets = nullptr;
QComboBox *m_SpaceBeforeRangeBasedForLoopColon = nullptr; QComboBox *m_SpaceBeforeRangeBasedForLoopColon = nullptr;
QComboBox *m_SpaceInEmptyBlock = nullptr; QComboBox *m_SpaceInEmptyBlock = nullptr;
QComboBox *m_SpaceInEmptyParentheses = nullptr;
QLineEdit *m_SpacesBeforeTrailingComments = nullptr;
QPushButton *m_setSpacesBeforeTrailingComments = nullptr;
QComboBox *m_SpacesInAngles = nullptr; QComboBox *m_SpacesInAngles = nullptr;
QComboBox *m_SpacesInConditionalStatement = nullptr;
QComboBox *m_SpacesInContainerLiterals = nullptr;
QComboBox *m_SpacesInCStyleCastParentheses = nullptr;
QLineEdit *m_SpacesInLineCommentPrefixMinimum = nullptr; QLineEdit *m_SpacesInLineCommentPrefixMinimum = nullptr;
QPushButton *m_setSpacesInLineCommentPrefixMinimum = nullptr; QPushButton *m_setSpacesInLineCommentPrefixMinimum = nullptr;
QLineEdit *m_SpacesInLineCommentPrefixMaximum = nullptr; QLineEdit *m_SpacesInLineCommentPrefixMaximum = nullptr;
QPushButton *m_setSpacesInLineCommentPrefixMaximum = nullptr; QPushButton *m_setSpacesInLineCommentPrefixMaximum = nullptr;
QComboBox *m_SpacesInParentheses = nullptr; QComboBox *m_SpacesInParensOptionsInConditionalStatements = nullptr;
QComboBox *m_SpacesInParensOptionsInCStyleCasts = nullptr;
QComboBox *m_SpacesInParensOptionsInEmptyParentheses = nullptr;
QComboBox *m_SpacesInParensOptionsOther = nullptr;
QComboBox *m_SpacesInSquareBrackets = nullptr; QComboBox *m_SpacesInSquareBrackets = nullptr;
QComboBox *m_Standard = nullptr; QComboBox *m_Standard = nullptr;
QPlainTextEdit *m_StatementAttributeLikeMacros = nullptr; QPlainTextEdit *m_StatementAttributeLikeMacros = nullptr;
@@ -236,9 +242,12 @@ private:
QPushButton *m_setStatementMacros = nullptr; QPushButton *m_setStatementMacros = nullptr;
QLineEdit *m_TabWidth = nullptr; QLineEdit *m_TabWidth = nullptr;
QPushButton *m_setTabWidth = nullptr; QPushButton *m_setTabWidth = nullptr;
QPlainTextEdit *m_TypeNames = nullptr;
QPushButton *m_setTypeNames = nullptr;
QPlainTextEdit *m_TypenameMacros = nullptr; QPlainTextEdit *m_TypenameMacros = nullptr;
QPushButton *m_setTypenameMacros = nullptr; QPushButton *m_setTypenameMacros = nullptr;
QComboBox *m_UseTab = nullptr; QComboBox *m_UseTab = nullptr;
QComboBox *m_VerilogBreakBetweenInstancePorts = nullptr;
QPlainTextEdit *m_WhitespaceSensitiveMacros = nullptr; QPlainTextEdit *m_WhitespaceSensitiveMacros = nullptr;
QPushButton *m_setWhitespaceSensitiveMacros = nullptr; QPushButton *m_setWhitespaceSensitiveMacros = nullptr;

View File

@@ -97,7 +97,7 @@ ClangFormatConfigWidget::ClangFormatConfigWidget(TextEditor::ICodeStylePreferenc
&& !codeStyle->isAdditionalTabDisabled()); && !codeStyle->isAdditionalTabDisabled());
static const int expectedMajorVersion = 16; static const int expectedMajorVersion = 17;
d->clangVersion = new QLabel(Tr::tr("Current clang-format version: ") + LLVM_VERSION_STRING, d->clangVersion = new QLabel(Tr::tr("Current clang-format version: ") + LLVM_VERSION_STRING,
this); this);
d->clangWarningText d->clangWarningText