diff options
| author | Artem Sokolovskii <artem.sokolovskii@qt.io> | 2022-07-28 11:30:41 +0200 |
|---|---|---|
| committer | Artem Sokolovskii <artem.sokolovskii@qt.io> | 2022-07-28 13:09:38 +0000 |
| commit | 80b4e6a9107c955c5bba6c47198d0e01dfcad341 (patch) | |
| tree | 14a4f65e5f86fd2c8fd21e25109a6637cb2d9c1d /src/plugins/clangformat | |
| parent | 5509f7f1d38f8c8ab7a81995de04c10df2a86614 (diff) | |
ClangFormat: Update clangformatchecks.ui file
File updated by scripts/generateClangFormatChecksUI.py
Fixes: QTCREATORBUG-27952
Change-Id: Ib7ffbf1f416a4edffc130a00ae8348d2ac9ed010
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/clangformat')
| -rw-r--r-- | src/plugins/clangformat/clangformatchecks.ui | 2478 | ||||
| -rw-r--r-- | src/plugins/clangformat/clangformatconfigwidget.cpp | 3 |
2 files changed, 2056 insertions, 425 deletions
diff --git a/src/plugins/clangformat/clangformatchecks.ui b/src/plugins/clangformat/clangformatchecks.ui index 56b1c54f48..58d0388f32 100644 --- a/src/plugins/clangformat/clangformatchecks.ui +++ b/src/plugins/clangformat/clangformatchecks.ui @@ -4,19 +4,19 @@ <widget class="QWidget" name="ClangFormat::ClangFormatChecksWidget"> <property name="maximumSize"> <size> - <width>480</width> + <width>580</width> <height>16777215</height> </size> </property> <layout class="QGridLayout" name="checksLayout"> - <item row="0" column="0"> + <item row="1" column="0"> <widget class="QLabel" name="labelBasedOnStyle"> <property name="text"> <string notr="true">BasedOnStyle</string> </property> </widget> </item> - <item row="0" column="1"> + <item row="1" column="1"> <widget class="QComboBox" name="BasedOnStyle"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -46,16 +46,55 @@ <string notr="true">WebKit</string> </property> </item> + <item> + <property name="text"> + <string notr="true">Microsoft</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">GNU</string> + </property> + </item> </widget> </item> - <item row="1" column="0"> + <item row="2" column="0"> + <widget class="QLabel" name="labelInheritsParentConfig"> + <property name="text"> + <string notr="true">InheritsParentConfig</string> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QComboBox" name="InheritsParentConfig"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="3" column="0"> <widget class="QLabel" name="labelAccessModifierOffset"> <property name="text"> <string notr="true">AccessModifierOffset</string> </property> </widget> </item> - <item row="1" column="1"> + <item row="3" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="AccessModifierOffset"> @@ -76,117 +115,239 @@ </item> </layout> </item> - <item row="2" column="0"> + <item row="4" column="0"> <widget class="QLabel" name="labelAlignAfterOpenBracket"> <property name="text"> <string notr="true">AlignAfterOpenBracket</string> </property> </widget> </item> - <item row="2" column="1"> + <item row="4" column="1"> <widget class="QComboBox" name="AlignAfterOpenBracket"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> + <string notr="true">Align</string> </property> </item> <item> <property name="text"> - <string notr="true">Align</string> + <string notr="true">DontAlign</string> </property> </item> <item> <property name="text"> - <string notr="true">DontAlign</string> + <string notr="true">AlwaysBreak</string> </property> </item> <item> <property name="text"> - <string notr="true">AlwaysBreak</string> + <string notr="true">BlockIndent</string> </property> </item> </widget> </item> - <item row="3" column="0"> + <item row="5" column="0"> + <widget class="QLabel" name="labelAlignArrayOfStructures"> + <property name="text"> + <string notr="true">AlignArrayOfStructures</string> + </property> + </widget> + </item> + <item row="5" column="1"> + <widget class="QComboBox" name="AlignArrayOfStructures"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Left</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Right</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">None</string> + </property> + </item> + </widget> + </item> + <item row="6" column="0"> + <widget class="QLabel" name="labelAlignConsecutiveMacros"> + <property name="text"> + <string notr="true">AlignConsecutiveMacros</string> + </property> + </widget> + </item> + <item row="6" column="1"> + <widget class="QComboBox" name="AlignConsecutiveMacros"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">None</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Consecutive</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AcrossEmptyLines</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AcrossComments</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AcrossEmptyLinesAndComments</string> + </property> + </item> + </widget> + </item> + <item row="7" column="0"> <widget class="QLabel" name="labelAlignConsecutiveAssignments"> <property name="text"> <string notr="true">AlignConsecutiveAssignments</string> </property> </widget> </item> - <item row="3" column="1"> + <item row="7" column="1"> <widget class="QComboBox" name="AlignConsecutiveAssignments"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> + <string notr="true">None</string> </property> </item> <item> <property name="text"> - <string notr="true">true</string> + <string notr="true">Consecutive</string> </property> </item> <item> <property name="text"> - <string notr="true">false</string> + <string notr="true">AcrossEmptyLines</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AcrossComments</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AcrossEmptyLinesAndComments</string> </property> </item> </widget> </item> - <item row="4" column="0"> + <item row="8" column="0"> + <widget class="QLabel" name="labelAlignConsecutiveBitFields"> + <property name="text"> + <string notr="true">AlignConsecutiveBitFields</string> + </property> + </widget> + </item> + <item row="8" column="1"> + <widget class="QComboBox" name="AlignConsecutiveBitFields"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">None</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Consecutive</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AcrossEmptyLines</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AcrossComments</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AcrossEmptyLinesAndComments</string> + </property> + </item> + </widget> + </item> + <item row="9" column="0"> <widget class="QLabel" name="labelAlignConsecutiveDeclarations"> <property name="text"> <string notr="true">AlignConsecutiveDeclarations</string> </property> </widget> </item> - <item row="4" column="1"> + <item row="9" column="1"> <widget class="QComboBox" name="AlignConsecutiveDeclarations"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> + <string notr="true">None</string> </property> </item> <item> <property name="text"> - <string notr="true">true</string> + <string notr="true">Consecutive</string> </property> </item> <item> <property name="text"> - <string notr="true">false</string> + <string notr="true">AcrossEmptyLines</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AcrossComments</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AcrossEmptyLinesAndComments</string> </property> </item> </widget> </item> - <item row="5" column="0"> + <item row="10" column="0"> <widget class="QLabel" name="labelAlignEscapedNewlines"> <property name="text"> <string notr="true">AlignEscapedNewlines</string> </property> </widget> </item> - <item row="5" column="1"> + <item row="10" column="1"> <widget class="QComboBox" name="AlignEscapedNewlines"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> - </property> - </item> - <item> - <property name="text"> <string notr="true">DontAlign</string> </property> </item> @@ -202,43 +363,43 @@ </item> </widget> </item> - <item row="6" column="0"> + <item row="11" column="0"> <widget class="QLabel" name="labelAlignOperands"> <property name="text"> <string notr="true">AlignOperands</string> </property> </widget> </item> - <item row="6" column="1"> + <item row="11" column="1"> <widget class="QComboBox" name="AlignOperands"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> + <string notr="true">DontAlign</string> </property> </item> <item> <property name="text"> - <string notr="true">true</string> + <string notr="true">Align</string> </property> </item> <item> <property name="text"> - <string notr="true">false</string> + <string notr="true">AlignAfterOperator</string> </property> </item> </widget> </item> - <item row="7" column="0"> + <item row="12" column="0"> <widget class="QLabel" name="labelAlignTrailingComments"> <property name="text"> <string notr="true">AlignTrailingComments</string> </property> </widget> </item> - <item row="7" column="1"> + <item row="12" column="1"> <widget class="QComboBox" name="AlignTrailingComments"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -260,14 +421,72 @@ </item> </widget> </item> - <item row="8" column="0"> + <item row="13" column="0"> + <widget class="QLabel" name="labelAllowAllArgumentsOnNextLine"> + <property name="text"> + <string notr="true">AllowAllArgumentsOnNextLine</string> + </property> + </widget> + </item> + <item row="13" column="1"> + <widget class="QComboBox" name="AllowAllArgumentsOnNextLine"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="14" column="0"> + <widget class="QLabel" name="labelAllowAllConstructorInitializersOnNextLine"> + <property name="text"> + <string notr="true">AllowAllConstructorInitializersOnNextLine</string> + </property> + </widget> + </item> + <item row="14" column="1"> + <widget class="QComboBox" name="AllowAllConstructorInitializersOnNextLine"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="15" column="0"> <widget class="QLabel" name="labelAllowAllParametersOfDeclarationOnNextLine"> <property name="text"> <string notr="true">AllowAllParametersOfDeclarationOnNextLine</string> </property> </widget> </item> - <item row="8" column="1"> + <item row="15" column="1"> <widget class="QComboBox" name="AllowAllParametersOfDeclarationOnNextLine"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -289,15 +508,15 @@ </item> </widget> </item> - <item row="9" column="0"> - <widget class="QLabel" name="labelAllowShortBlocksOnASingleLine"> + <item row="16" column="0"> + <widget class="QLabel" name="labelAllowShortEnumsOnASingleLine"> <property name="text"> - <string notr="true">AllowShortBlocksOnASingleLine</string> + <string notr="true">AllowShortEnumsOnASingleLine</string> </property> </widget> </item> - <item row="9" column="1"> - <widget class="QComboBox" name="AllowShortBlocksOnASingleLine"> + <item row="16" column="1"> + <widget class="QComboBox" name="AllowShortEnumsOnASingleLine"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -318,14 +537,43 @@ </item> </widget> </item> - <item row="10" column="0"> + <item row="17" column="0"> + <widget class="QLabel" name="labelAllowShortBlocksOnASingleLine"> + <property name="text"> + <string notr="true">AllowShortBlocksOnASingleLine</string> + </property> + </widget> + </item> + <item row="17" column="1"> + <widget class="QComboBox" name="AllowShortBlocksOnASingleLine"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Never</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Empty</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Always</string> + </property> + </item> + </widget> + </item> + <item row="18" column="0"> <widget class="QLabel" name="labelAllowShortCaseLabelsOnASingleLine"> <property name="text"> <string notr="true">AllowShortCaseLabelsOnASingleLine</string> </property> </widget> </item> - <item row="10" column="1"> + <item row="18" column="1"> <widget class="QComboBox" name="AllowShortCaseLabelsOnASingleLine"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -347,25 +595,20 @@ </item> </widget> </item> - <item row="11" column="0"> + <item row="19" column="0"> <widget class="QLabel" name="labelAllowShortFunctionsOnASingleLine"> <property name="text"> <string notr="true">AllowShortFunctionsOnASingleLine</string> </property> </widget> </item> - <item row="11" column="1"> + <item row="19" column="1"> <widget class="QComboBox" name="AllowShortFunctionsOnASingleLine"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> - </property> - </item> - <item> - <property name="text"> <string notr="true">None</string> </property> </item> @@ -391,43 +634,82 @@ </item> </widget> </item> - <item row="12" column="0"> + <item row="20" column="0"> <widget class="QLabel" name="labelAllowShortIfStatementsOnASingleLine"> <property name="text"> <string notr="true">AllowShortIfStatementsOnASingleLine</string> </property> </widget> </item> - <item row="12" column="1"> + <item row="20" column="1"> <widget class="QComboBox" name="AllowShortIfStatementsOnASingleLine"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> + <string notr="true">Never</string> </property> </item> <item> <property name="text"> - <string notr="true">true</string> + <string notr="true">WithoutElse</string> </property> </item> <item> <property name="text"> - <string notr="true">false</string> + <string notr="true">OnlyFirstIf</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AllIfsAndElse</string> </property> </item> </widget> </item> - <item row="13" column="0"> + <item row="21" column="0"> + <widget class="QLabel" name="labelAllowShortLambdasOnASingleLine"> + <property name="text"> + <string notr="true">AllowShortLambdasOnASingleLine</string> + </property> + </widget> + </item> + <item row="21" column="1"> + <widget class="QComboBox" name="AllowShortLambdasOnASingleLine"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">None</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Empty</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Inline</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">All</string> + </property> + </item> + </widget> + </item> + <item row="22" column="0"> <widget class="QLabel" name="labelAllowShortLoopsOnASingleLine"> <property name="text"> <string notr="true">AllowShortLoopsOnASingleLine</string> </property> </widget> </item> - <item row="13" column="1"> + <item row="22" column="1"> <widget class="QComboBox" name="AllowShortLoopsOnASingleLine"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -449,25 +731,20 @@ </item> </widget> </item> - <item row="14" column="0"> + <item row="23" column="0"> <widget class="QLabel" name="labelAlwaysBreakAfterDefinitionReturnType"> <property name="text"> <string notr="true">AlwaysBreakAfterDefinitionReturnType</string> </property> </widget> </item> - <item row="14" column="1"> + <item row="23" column="1"> <widget class="QComboBox" name="AlwaysBreakAfterDefinitionReturnType"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> - </property> - </item> - <item> - <property name="text"> <string notr="true">None</string> </property> </item> @@ -483,25 +760,20 @@ </item> </widget> </item> - <item row="15" column="0"> + <item row="24" column="0"> <widget class="QLabel" name="labelAlwaysBreakAfterReturnType"> <property name="text"> <string notr="true">AlwaysBreakAfterReturnType</string> </property> </widget> </item> - <item row="15" column="1"> + <item row="24" column="1"> <widget class="QComboBox" name="AlwaysBreakAfterReturnType"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> - </property> - </item> - <item> - <property name="text"> <string notr="true">None</string> </property> </item> @@ -527,14 +799,14 @@ </item> </widget> </item> - <item row="16" column="0"> + <item row="25" column="0"> <widget class="QLabel" name="labelAlwaysBreakBeforeMultilineStrings"> <property name="text"> <string notr="true">AlwaysBreakBeforeMultilineStrings</string> </property> </widget> </item> - <item row="16" column="1"> + <item row="25" column="1"> <widget class="QComboBox" name="AlwaysBreakBeforeMultilineStrings"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -556,25 +828,20 @@ </item> </widget> </item> - <item row="17" column="0"> + <item row="26" column="0"> <widget class="QLabel" name="labelAlwaysBreakTemplateDeclarations"> <property name="text"> <string notr="true">AlwaysBreakTemplateDeclarations</string> </property> </widget> </item> - <item row="17" column="1"> + <item row="26" column="1"> <widget class="QComboBox" name="AlwaysBreakTemplateDeclarations"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> - </property> - </item> - <item> - <property name="text"> <string notr="true">No</string> </property> </item> @@ -590,14 +857,51 @@ </item> </widget> </item> - <item row="18" column="0"> + <item row="27" column="0"> + <widget class="QLabel" name="labelAttributeMacros"> + <property name="text"> + <string notr="true">AttributeMacros</string> + </property> + </widget> + </item> + <item row="27" column="1"> + <layout class="QHBoxLayout"> + <item> + <widget class="QPlainTextEdit" name="AttributeMacros"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"/> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>50</height> + </size> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="setAttributeMacros"> + <property name="maximumSize"> + <size> + <width>40</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string notr="true">Set</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="28" column="0"> <widget class="QLabel" name="labelBinPackArguments"> <property name="text"> <string notr="true">BinPackArguments</string> </property> </widget> </item> - <item row="18" column="1"> + <item row="28" column="1"> <widget class="QComboBox" name="BinPackArguments"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -619,14 +923,38 @@ </item> </widget> </item> - <item row="19" column="0"> + <item row="29" column="0"> + <widget class="QLabel" name="labelInsertTrailingCommas"> + <property name="text"> + <string notr="true">InsertTrailingCommas</string> + </property> + </widget> + </item> + <item row="29" column="1"> + <widget class="QComboBox" name="InsertTrailingCommas"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">None</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Wrapped</string> + </property> + </item> + </widget> + </item> + <item row="30" column="0"> <widget class="QLabel" name="labelBinPackParameters"> <property name="text"> <string notr="true">BinPackParameters</string> </property> </widget> </item> - <item row="19" column="1"> + <item row="30" column="1"> <widget class="QComboBox" name="BinPackParameters"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -648,21 +976,138 @@ </item> </widget> </item> - <item row="20" column="0"> + <item row="31" column="0"> + <widget class="QLabel" name="labelBreakBeforeBinaryOperators"> + <property name="text"> + <string notr="true">BreakBeforeBinaryOperators</string> + </property> + </widget> + </item> + <item row="31" column="1"> + <widget class="QComboBox" name="BreakBeforeBinaryOperators"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">None</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">NonAssignment</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">All</string> + </property> + </item> + </widget> + </item> + <item row="32" column="0"> + <widget class="QLabel" name="labelBreakBeforeBraces"> + <property name="text"> + <string notr="true">BreakBeforeBraces</string> + </property> + </widget> + </item> + <item row="32" column="1"> + <widget class="QComboBox" name="BreakBeforeBraces"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Attach</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Linux</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Mozilla</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Stroustrup</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Allman</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Whitesmiths</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">GNU</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">WebKit</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Custom</string> + </property> + </item> + </widget> + </item> + <item row="33" column="0"> <widget class="QLabel" name="labelBraceWrapping"> <property name="text"> <string notr="true">BraceWrapping</string> </property> </widget> </item> - <item row="21" column="0"> + <item row="34" column="0"> + <widget class="QLabel" name="labelAfterCaseLabel"> + <property name="text"> + <string notr="true"> AfterCaseLabel</string> + </property> + </widget> + </item> + <item row="34" column="1"> + <widget class="QComboBox" name="AfterCaseLabel"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="35" column="0"> <widget class="QLabel" name="labelAfterClass"> <property name="text"> <string notr="true"> AfterClass</string> </property> </widget> </item> - <item row="21" column="1"> + <item row="35" column="1"> <widget class="QComboBox" name="AfterClass"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -684,43 +1129,43 @@ </item> </widget> </item> - <item row="22" column="0"> + <item row="36" column="0"> <widget class="QLabel" name="labelAfterControlStatement"> <property name="text"> <string notr="true"> AfterControlStatement</string> </property> </widget> </item> - <item row="22" column="1"> + <item row="36" column="1"> <widget class="QComboBox" name="AfterControlStatement"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> + <string notr="true">Never</string> </property> </item> <item> <property name="text"> - <string notr="true">true</string> + <string notr="true">MultiLine</string> </property> </item> <item> <property name="text"> - <string notr="true">false</string> + <string notr="true">Always</string> </property> </item> </widget> </item> - <item row="23" column="0"> + <item row="37" column="0"> <widget class="QLabel" name="labelAfterEnum"> <property name="text"> <string notr="true"> AfterEnum</string> </property> </widget> </item> - <item row="23" column="1"> + <item row="37" column="1"> <widget class="QComboBox" name="AfterEnum"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -742,14 +1187,14 @@ </item> </widget> </item> - <item row="24" column="0"> + <item row="38" column="0"> <widget class="QLabel" name="labelAfterFunction"> <property name="text"> <string notr="true"> AfterFunction</string> </property> </widget> </item> - <item row="24" column="1"> + <item row="38" column="1"> <widget class="QComboBox" name="AfterFunction"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -771,14 +1216,14 @@ </item> </widget> </item> - <item row="25" column="0"> + <item row="39" column="0"> <widget class="QLabel" name="labelAfterNamespace"> <property name="text"> <string notr="true"> AfterNamespace</string> </property> </widget> </item> - <item row="25" column="1"> + <item row="39" column="1"> <widget class="QComboBox" name="AfterNamespace"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -800,14 +1245,14 @@ </item> </widget> </item> - <item row="26" column="0"> + <item row="40" column="0"> <widget class="QLabel" name="labelAfterObjCDeclaration"> <property name="text"> <string notr="true"> AfterObjCDeclaration</string> </property> </widget> </item> - <item row="26" column="1"> + <item row="40" column="1"> <widget class="QComboBox" name="AfterObjCDeclaration"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -829,14 +1274,14 @@ </item> </widget> </item> - <item row="27" column="0"> + <item row="41" column="0"> <widget class="QLabel" name="labelAfterStruct"> <property name="text"> <string notr="true"> AfterStruct</string> </property> </widget> </item> - <item row="27" column="1"> + <item row="41" column="1"> <widget class="QComboBox" name="AfterStruct"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -858,14 +1303,14 @@ </item> </widget> </item> - <item row="28" column="0"> + <item row="42" column="0"> <widget class="QLabel" name="labelAfterUnion"> <property name="text"> <string notr="true"> AfterUnion</string> </property> </widget> </item> - <item row="28" column="1"> + <item row="42" column="1"> <widget class="QComboBox" name="AfterUnion"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -887,14 +1332,14 @@ </item> </widget> </item> - <item row="29" column="0"> + <item row="43" column="0"> <widget class="QLabel" name="labelAfterExternBlock"> <property name="text"> <string notr="true"> AfterExternBlock</string> </property> </widget> </item> - <item row="29" column="1"> + <item row="43" column="1"> <widget class="QComboBox" name="AfterExternBlock"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -916,14 +1361,14 @@ </item> </widget> </item> - <item row="30" column="0"> + <item row="44" column="0"> <widget class="QLabel" name="labelBeforeCatch"> <property name="text"> <string notr="true"> BeforeCatch</string> </property> </widget> </item> - <item row="30" column="1"> + <item row="44" column="1"> <widget class="QComboBox" name="BeforeCatch"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -945,14 +1390,14 @@ </item> </widget> </item> - <item row="31" column="0"> + <item row="45" column="0"> <widget class="QLabel" name="labelBeforeElse"> <property name="text"> <string notr="true"> BeforeElse</string> </property> </widget> </item> - <item row="31" column="1"> + <item row="45" column="1"> <widget class="QComboBox" name="BeforeElse"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -974,15 +1419,15 @@ </item> </widget> </item> - <item row="32" column="0"> - <widget class="QLabel" name="labelIndentBraces"> + <item row="46" column="0"> + <widget class="QLabel" name="labelBeforeLambdaBody"> <property name="text"> - <string notr="true"> IndentBraces</string> + <string notr="true"> BeforeLambdaBody</string> </property> </widget> </item> - <item row="32" column="1"> - <widget class="QComboBox" name="IndentBraces"> + <item row="46" column="1"> + <widget class="QComboBox" name="BeforeLambdaBody"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -1003,15 +1448,15 @@ </item> </widget> </item> - <item row="33" column="0"> - <widget class="QLabel" name="labelSplitEmptyFunction"> + <item row="47" column="0"> + <widget class="QLabel" name="labelBeforeWhile"> <property name="text"> - <string notr="true"> SplitEmptyFunction</string> + <string notr="true"> BeforeWhile</string> </property> </widget> </item> - <item row="33" column="1"> - <widget class="QComboBox" name="SplitEmptyFunction"> + <item row="47" column="1"> + <widget class="QComboBox" name="BeforeWhile"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -1032,15 +1477,15 @@ </item> </widget> </item> - <item row="34" column="0"> - <widget class="QLabel" name="labelSplitEmptyRecord"> + <item row="48" column="0"> + <widget class="QLabel" name="labelIndentBraces"> <property name="text"> - <string notr="true"> SplitEmptyRecord</string> + <string notr="true"> IndentBraces</string> </property> </widget> </item> - <item row="34" column="1"> - <widget class="QComboBox" name="SplitEmptyRecord"> + <item row="48" column="1"> + <widget class="QComboBox" name="IndentBraces"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -1061,15 +1506,15 @@ </item> </widget> </item> - <item row="35" column="0"> - <widget class="QLabel" name="labelSplitEmptyNamespace"> + <item row="49" column="0"> + <widget class="QLabel" name="labelSplitEmptyFunction"> <property name="text"> - <string notr="true"> SplitEmptyNamespace</string> + <string notr="true"> SplitEmptyFunction</string> </property> </widget> </item> - <item row="35" column="1"> - <widget class="QComboBox" name="SplitEmptyNamespace"> + <item row="49" column="1"> + <widget class="QComboBox" name="SplitEmptyFunction"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -1090,15 +1535,15 @@ </item> </widget> </item> - <item row="36" column="0"> - <widget class="QLabel" name="labelBreakAfterJavaFieldAnnotations"> + <item row="50" column="0"> + <widget class="QLabel" name="labelSplitEmptyRecord"> <property name="text"> - <string notr="true">BreakAfterJavaFieldAnnotations</string> + <string notr="true"> SplitEmptyRecord</string> </property> </widget> </item> - <item row="36" column="1"> - <widget class="QComboBox" name="BreakAfterJavaFieldAnnotations"> + <item row="50" column="1"> + <widget class="QComboBox" name="SplitEmptyRecord"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -1119,15 +1564,15 @@ </item> </widget> </item> - <item row="37" column="0"> - <widget class="QLabel" name="labelBreakBeforeBinaryOperators"> + <item row="51" column="0"> + <widget class="QLabel" name="labelSplitEmptyNamespace"> <property name="text"> - <string notr="true">BreakBeforeBinaryOperators</string> + <string notr="true"> SplitEmptyNamespace</string> </property> </widget> </item> - <item row="37" column="1"> - <widget class="QComboBox" name="BreakBeforeBinaryOperators"> + <item row="51" column="1"> + <widget class="QComboBox" name="SplitEmptyNamespace"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -1138,30 +1583,25 @@ </item> <item> <property name="text"> - <string notr="true">None</string> - </property> - </item> - <item> - <property name="text"> - <string notr="true">NonAssignment</string> + <string notr="true">true</string> </property> </item> <item> <property name="text"> - <string notr="true">All</string> + <string notr="true">false</string> </property> </item> </widget> </item> - <item row="38" column="0"> - <widget class="QLabel" name="labelBreakBeforeBraces"> + <item row="52" column="0"> + <widget class="QLabel" name="labelBreakBeforeConceptDeclarations"> <property name="text"> - <string notr="true">BreakBeforeBraces</string> + <string notr="true">BreakBeforeConceptDeclarations</string> </property> </widget> </item> - <item row="38" column="1"> - <widget class="QComboBox" name="BreakBeforeBraces"> + <item row="52" column="1"> + <widget class="QComboBox" name="BreakBeforeConceptDeclarations"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -1172,54 +1612,24 @@ </item> <item> <property name="text"> - <string notr="true">Attach</string> - </property> - </item> - <item> - <property name="text"> - <string notr="true">Linux</string> - </property> - </item> - <item> - <property name="text"> - <string notr="true">Mozilla</string> - </property> - </item> - <item> - <property name="text"> - <string notr="true">Stroustrup</string> - </property> - </item> - <item> - <property name="text"> - <string notr="true">Allman</string> - </property> - </item> - <item> - <property name="text"> - <string notr="true">GNU</string> - </property> - </item> - <item> - <property name="text"> - <string notr="true">WebKit</string> + <string notr="true">true</string> </property> </item> <item> <property name="text"> - <string notr="true">Custom</string> + <string notr="true">false</string> </property> </item> </widget> </item> - <item row="39" column="0"> + <item row="53" column="0"> <widget class="QLabel" name="labelBreakBeforeTernaryOperators"> <property name="text"> <string notr="true">BreakBeforeTernaryOperators</string> </property> </widget> </item> - <item row="39" column="1"> + <item row="53" column="1"> <widget class="QComboBox" name="BreakBeforeTernaryOperators"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -1241,25 +1651,20 @@ </item> </widget> </item> - <item row="40" column="0"> + <item row="54" column="0"> <widget class="QLabel" name="labelBreakConstructorInitializers"> <property name="text"> <string notr="true">BreakConstructorInitializers</string> </property> </widget> </item> - <item row="40" column="1"> + <item row="54" column="1"> <widget class="QComboBox" name="BreakConstructorInitializers"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> - </property> - </item> - <item> - <property name="text"> <string notr="true">BeforeColon</string> </property> </item> @@ -1275,15 +1680,15 @@ </item> </widget> </item> - <item row="41" column="0"> - <widget class="QLabel" name="labelBreakInheritanceList"> + <item row="55" column="0"> + <widget class="QLabel" name="labelBreakAfterJavaFieldAnnotations"> <property name="text"> - <string notr="true">BreakInheritanceList</string> + <string notr="true">BreakAfterJavaFieldAnnotations</string> </property> </widget> </item> - <item row="41" column="1"> - <widget class="QComboBox" name="BreakInheritanceList"> + <item row="55" column="1"> + <widget class="QComboBox" name="BreakAfterJavaFieldAnnotations"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -1294,29 +1699,24 @@ </item> <item> <property name="text"> - <string notr="true">BeforeColon</string> - </property> - </item> - <item> - <property name="text"> - <string notr="true">BeforeComma</string> + <string notr="true">true</string> </property> </item> <item> <property name="text"> - <string notr="true">AfterColon</string> + <string notr="true">false</string> </property> </item> </widget> </item> - <item row="42" column="0"> + <item row="56" column="0"> <widget class="QLabel" name="labelBreakStringLiterals"> <property name="text"> <string notr="true">BreakStringLiterals</string> </property> </widget> </item> - <item row="42" column="1"> + <item row="56" column="1"> <widget class="QComboBox" name="BreakStringLiterals"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -1338,14 +1738,14 @@ </item> </widget> </item> - <item row="43" column="0"> + <item row="57" column="0"> <widget class="QLabel" name="labelColumnLimit"> <property name="text"> <string notr="true">ColumnLimit</string> </property> </widget> </item> - <item row="43" column="1"> + <item row="57" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="ColumnLimit"> @@ -1366,14 +1766,14 @@ </item> </layout> </item> - <item row="44" column="0"> + <item row="58" column="0"> <widget class="QLabel" name="labelCommentPragmas"> <property name="text"> <string notr="true">CommentPragmas</string> </property> </widget> </item> - <item row="44" column="1"> + <item row="58" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="CommentPragmas"> @@ -1394,14 +1794,119 @@ </item> </layout> </item> - <item row="45" column="0"> + <item row="59" column="0"> + <widget class="QLabel" name="labelQualifierAlignment"> + <property name="text"> + <string notr="true">QualifierAlignment</string> + </property> + </widget> + </item> + <item row="59" column="1"> + <widget class="QComboBox" name="QualifierAlignment"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Leave</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Left</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Right</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Custom</string> + </property> + </item> + </widget> + </item> + <item row="60" column="0"> + <widget class="QLabel" name="labelQualifierOrder"> + <property name="text"> + <string notr="true">QualifierOrder</string> + </property> + </widget> + </item> + <item row="60" column="1"> + <layout class="QHBoxLayout"> + <item> + <widget class="QPlainTextEdit" name="QualifierOrder"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"/> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>50</height> + </size> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="setQualifierOrder"> + <property name="maximumSize"> + <size> + <width>40</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string notr="true">Set</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="61" column="0"> + <widget class="QLabel" name="labelBreakInheritanceList"> + <property name="text"> + <string notr="true">BreakInheritanceList</string> + </property> + </widget> + </item> + <item row="61" column="1"> + <widget class="QComboBox" name="BreakInheritanceList"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">BeforeColon</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">BeforeComma</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AfterColon</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AfterComma</string> + </property> + </item> + </widget> + </item> + <item row="62" column="0"> <widget class="QLabel" name="labelCompactNamespaces"> <property name="text"> <string notr="true">CompactNamespaces</string> </property> </widget> </item> - <item row="45" column="1"> + <item row="62" column="1"> <widget class="QComboBox" name="CompactNamespaces"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -1423,14 +1928,14 @@ </item> </widget> </item> - <item row="46" column="0"> + <item row="63" column="0"> <widget class="QLabel" name="labelConstructorInitializerAllOnOneLineOrOnePerLine"> <property name="text"> <string notr="true">ConstructorInitializerAllOnOneLineOrOnePerLine</string> </property> </widget> </item> - <item row="46" column="1"> + <item row="63" column="1"> <widget class="QComboBox" name="ConstructorInitializerAllOnOneLineOrOnePerLine"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -1452,14 +1957,14 @@ </item> </widget> </item> - <item row="47" column="0"> + <item row="64" column="0"> <widget class="QLabel" name="labelConstructorInitializerIndentWidth"> <property name="text"> <string notr="true">ConstructorInitializerIndentWidth</string> </property> </widget> </item> - <item row="47" column="1"> + <item row="64" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="ConstructorInitializerIndentWidth"> @@ -1480,14 +1985,14 @@ </item> </layout> </item> - <item row="48" column="0"> + <item row="65" column="0"> <widget class="QLabel" name="labelContinuationIndentWidth"> <property name="text"> <string notr="true">ContinuationIndentWidth</string> </property> </widget> </item> - <item row="48" column="1"> + <item row="65" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="ContinuationIndentWidth"> @@ -1508,14 +2013,14 @@ </item> </layout> </item> - <item row="49" column="0"> + <item row="66" column="0"> <widget class="QLabel" name="labelCpp11BracedListStyle"> <property name="text"> <string notr="true">Cpp11BracedListStyle</string> </property> </widget> </item> - <item row="49" column="1"> + <item row="66" column="1"> <widget class="QComboBox" name="Cpp11BracedListStyle"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -1537,14 +2042,43 @@ </item> </widget> </item> - <item row="50" column="0"> + <item row="67" column="0"> + <widget class="QLabel" name="labelDeriveLineEnding"> + <property name="text"> + <string notr="true">DeriveLineEnding</string> + </property> + </widget> + </item> + <item row="67" column="1"> + <widget class="QComboBox" name="DeriveLineEnding"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="68" column="0"> <widget class="QLabel" name="labelDerivePointerAlignment"> <property name="text"> <string notr="true">DerivePointerAlignment</string> </property> </widget> </item> - <item row="50" column="1"> + <item row="68" column="1"> <widget class="QComboBox" name="DerivePointerAlignment"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -1566,14 +2100,14 @@ </item> </widget> </item> - <item row="51" column="0"> + <item row="69" column="0"> <widget class="QLabel" name="labelDisableFormat"> <property name="text"> <string notr="true">DisableFormat</string> </property> </widget> </item> - <item row="51" column="1"> + <item row="69" column="1"> <widget class="QComboBox" name="DisableFormat"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -1595,14 +2129,77 @@ </item> </widget> </item> - <item row="52" column="0"> + <item row="70" column="0"> + <widget class="QLabel" name="labelEmptyLineAfterAccessModifier"> + <property name="text"> + <string notr="true">EmptyLineAfterAccessModifier</string> + </property> + </widget> + </item> + <item row="70" column="1"> + <widget class="QComboBox" name="EmptyLineAfterAccessModifier"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Never</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Leave</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Always</string> + </property> + </item> + </widget> + </item> + <item row="71" column="0"> + <widget class="QLabel" name="labelEmptyLineBeforeAccessModifier"> + <property name="text"> + <string notr="true">EmptyLineBeforeAccessModifier</string> + </property> + </widget> + </item> + <item row="71" column="1"> + <widget class="QComboBox" name="EmptyLineBeforeAccessModifier"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Never</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Leave</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">LogicalBlock</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Always</string> + </property> + </item> + </widget> + </item> + <item row="72" column="0"> <widget class="QLabel" name="labelExperimentalAutoDetectBinPacking"> <property name="text"> <string notr="true">ExperimentalAutoDetectBinPacking</string> </property> </widget> </item> - <item row="52" column="1"> + <item row="72" column="1"> <widget class="QComboBox" name="ExperimentalAutoDetectBinPacking"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -1624,14 +2221,48 @@ </item> </widget> </item> - <item row="53" column="0"> + <item row="73" column="0"> + <widget class="QLabel" name="labelPackConstructorInitializers"> + <property name="text"> + <string notr="true">PackConstructorInitializers</string> + </property> + </widget> + </item> + <item row="73" column="1"> + <widget class="QComboBox" name="PackConstructorInitializers"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Never</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">BinPack</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">CurrentLine</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">NextLine</string> + </property> + </item> + </widget> + </item> + <item row="74" column="0"> <widget class="QLabel" name="labelFixNamespaceComments"> <property name="text"> <string notr="true">FixNamespaceComments</string> </property> </widget> </item> - <item row="53" column="1"> + <item row="74" column="1"> <widget class="QComboBox" name="FixNamespaceComments"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -1653,14 +2284,14 @@ </item> </widget> </item> - <item row="54" column="0"> + <item row="75" column="0"> <widget class="QLabel" name="labelForEachMacros"> <property name="text"> <string notr="true">ForEachMacros</string> </property> </widget> </item> - <item row="54" column="1"> + <item row="75" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QPlainTextEdit" name="ForEachMacros"> @@ -1690,51 +2321,128 @@ </item> </layout> </item> - <item row="55" column="0"> - <widget class="QLabel" name="labelIncludeBlocks"> + <item row="76" column="0"> + <widget class="QLabel" name="labelIfMacros"> <property name="text"> - <string notr="true">IncludeBlocks</string> + <string notr="true">IfMacros</string> </property> </widget> </item> - <item row="55" column="1"> - <widget class="QComboBox" name="IncludeBlocks"> - <property name="focusPolicy"> - <enum>Qt::StrongFocus</enum> - </property> + <item row="76" column="1"> + <layout class="QHBoxLayout"> <item> - <property name="text"> - <string notr="true">Default</string> - </property> + <widget class="QPlainTextEdit" name="IfMacros"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"/> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>50</height> + </size> + </property> + </widget> </item> <item> - <property name="text"> - <string notr="true">Preserve</string> - </property> + <widget class="QPushButton" name="setIfMacros"> + <property name="maximumSize"> + <size> + <width>40</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string notr="true">Set</string> + </property> + </widget> </item> + </layout> + </item> + <item row="77" column="0"> + <widget class="QLabel" name="labelTypenameMacros"> + <property name="text"> + <string notr="true">TypenameMacros</string> + </property> + </widget> + </item> + <item row="77" column="1"> + <layout class="QHBoxLayout"> <item> - <property name="text"> - <string notr="true">Merge</string> - </property> + <widget class="QPlainTextEdit" name="TypenameMacros"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"/> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>50</height> + </size> + </property> + </widget> </item> <item> - <property name="text"> - <string notr="true">Regroup</string> - </property> + <widget class="QPushButton" name="setTypenameMacros"> + <property name="maximumSize"> + <size> + <width>40</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string notr="true">Set</string> + </property> + </widget> </item> + </layout> + </item> + <item row="78" column="0"> + <widget class="QLabel" name="labelStatementMacros"> + <property name="text"> + <string notr="true">StatementMacros</string> + </property> </widget> </item> - <item row="56" column="0"> - <widget class="QLabel" name="labelIncludeCategories"> + <item row="78" column="1"> + <layout class="QHBoxLayout"> + <item> + <widget class="QPlainTextEdit" name="StatementMacros"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"/> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>50</height> + </size> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="setStatementMacros"> + <property name="maximumSize"> + <size> + <width>40</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string notr="true">Set</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="79" column="0"> + <widget class="QLabel" name="labelNamespaceMacros"> <property name="text"> - <string notr="true">IncludeCategories</string> + <string notr="true">NamespaceMacros</string> </property> </widget> </item> - <item row="56" column="1"> + <item row="79" column="1"> <layout class="QHBoxLayout"> <item> - <widget class="QPlainTextEdit" name="IncludeCategories"> + <widget class="QPlainTextEdit" name="NamespaceMacros"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"/> </property> @@ -1747,7 +2455,7 @@ </widget> </item> <item> - <widget class="QPushButton" name="setIncludeCategories"> + <widget class="QPushButton" name="setNamespaceMacros"> <property name="maximumSize"> <size> <width>40</width> @@ -1761,21 +2469,30 @@ </item> </layout> </item> - <item row="57" column="0"> - <widget class="QLabel" name="labelIncludeIsMainRegex"> + <item row="80" column="0"> + <widget class="QLabel" name="labelWhitespaceSensitiveMacros"> <property name="text"> - <string notr="true">IncludeIsMainRegex</string> + <string notr="true">WhitespaceSensitiveMacros</string> </property> </widget> </item> - <item row="57" column="1"> + <item row="80" column="1"> <layout class="QHBoxLayout"> <item> - <widget class="QLineEdit" name="IncludeIsMainRegex"> + <widget class="QPlainTextEdit" name="WhitespaceSensitiveMacros"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"/> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>50</height> + </size> + </property> </widget> </item> <item> - <widget class="QPushButton" name="setIncludeIsMainRegex"> + <widget class="QPushButton" name="setWhitespaceSensitiveMacros"> <property name="maximumSize"> <size> <width>40</width> @@ -1789,14 +2506,43 @@ </item> </layout> </item> - <item row="58" column="0"> + <item row="82" column="0"> + <widget class="QLabel" name="labelIndentAccessModifiers"> + <property name="text"> + <string notr="true">IndentAccessModifiers</string> + </property> + </widget> + </item> + <item row="82" column="1"> + <widget class="QComboBox" name="IndentAccessModifiers"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="83" column="0"> <widget class="QLabel" name="labelIndentCaseLabels"> <property name="text"> <string notr="true">IndentCaseLabels</string> </property> </widget> </item> - <item row="58" column="1"> + <item row="83" column="1"> <widget class="QComboBox" name="IndentCaseLabels"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -1818,43 +2564,159 @@ </item> </widget> </item> - <item row="59" column="0"> + <item row="84" column="0"> + <widget class="QLabel" name="labelIndentCaseBlocks"> + <property name="text"> + <string notr="true">IndentCaseBlocks</string> + </property> + </widget> + </item> + <item row="84" column="1"> + <widget class="QComboBox" name="IndentCaseBlocks"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="85" column="0"> + <widget class="QLabel" name="labelIndentGotoLabels"> + <property name="text"> + <string notr="true">IndentGotoLabels</string> + </property> + </widget> + </item> + <item row="85" column="1"> + <widget class="QComboBox" name="IndentGotoLabels"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="86" column="0"> <widget class="QLabel" name="labelIndentPPDirectives"> <property name="text"> <string notr="true">IndentPPDirectives</string> </property> </widget> </item> - <item row="59" column="1"> + <item row="86" column="1"> <widget class="QComboBox" name="IndentPPDirectives"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> + <string notr="true">None</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">AfterHash</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">BeforeHash</string> + </property> + </item> + </widget> + </item> + <item row="87" column="0"> + <widget class="QLabel" name="labelIndentExternBlock"> + <property name="text"> + <string notr="true">IndentExternBlock</string> + </property> + </widget> + </item> + <item row="87" column="1"> + <widget class="QComboBox" name="IndentExternBlock"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">AfterExternBlock</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">NoIndent</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Indent</string> + </property> + </item> + </widget> + </item> + <item row="88" column="0"> + <widget class="QLabel" name="labelIndentRequires"> + <property name="text"> + <string notr="true">IndentRequires</string> + </property> + </widget> + </item> + <item row="88" column="1"> + <widget class="QComboBox" name="IndentRequires"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> <string notr="true">Default</string> </property> </item> <item> <property name="text"> - <string notr="true">None</string> + <string notr="true">true</string> </property> </item> <item> <property name="text"> - <string notr="true">AfterHash</string> + <string notr="true">false</string> </property> </item> </widget> </item> - <item row="60" column="0"> + <item row="89" column="0"> <widget class="QLabel" name="labelIndentWidth"> <property name="text"> <string notr="true">IndentWidth</string> </property> </widget> </item> - <item row="60" column="1"> + <item row="89" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="IndentWidth"> @@ -1875,14 +2737,14 @@ </item> </layout> </item> - <item row="61" column="0"> + <item row="90" column="0"> <widget class="QLabel" name="labelIndentWrappedFunctionNames"> <property name="text"> <string notr="true">IndentWrappedFunctionNames</string> </property> </widget> </item> - <item row="61" column="1"> + <item row="90" column="1"> <widget class="QComboBox" name="IndentWrappedFunctionNames"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -1904,14 +2766,14 @@ </item> </widget> </item> - <item row="62" column="0"> + <item row="91" column="0"> <widget class="QLabel" name="labelJavaImportGroups"> <property name="text"> <string notr="true">JavaImportGroups</string> </property> </widget> </item> - <item row="62" column="1"> + <item row="91" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QPlainTextEdit" name="JavaImportGroups"> @@ -1941,25 +2803,20 @@ </item> </layout> </item> - <item row="63" column="0"> + <item row="92" column="0"> <widget class="QLabel" name="labelJavaScriptQuotes"> <property name="text"> <string notr="true">JavaScriptQuotes</string> </property> </widget> </item> - <item row="63" column="1"> + <item row="92" column="1"> <widget class="QComboBox" name="JavaScriptQuotes"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> - </property> - </item> - <item> - <property name="text"> <string notr="true">Leave</string> </property> </item> @@ -1975,14 +2832,14 @@ </item> </widget> </item> - <item row="64" column="0"> + <item row="93" column="0"> <widget class="QLabel" name="labelJavaScriptWrapImports"> <property name="text"> <string notr="true">JavaScriptWrapImports</string> </property> </widget> </item> - <item row="64" column="1"> + <item row="93" column="1"> <widget class="QComboBox" name="JavaScriptWrapImports"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2004,14 +2861,14 @@ </item> </widget> </item> - <item row="65" column="0"> + <item row="94" column="0"> <widget class="QLabel" name="labelKeepEmptyLinesAtTheStartOfBlocks"> <property name="text"> <string notr="true">KeepEmptyLinesAtTheStartOfBlocks</string> </property> </widget> </item> - <item row="65" column="1"> + <item row="94" column="1"> <widget class="QComboBox" name="KeepEmptyLinesAtTheStartOfBlocks"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2033,34 +2890,31 @@ </item> </widget> </item> - <item row="66" column="0"> + <item row="95" column="0"> <widget class="QLabel" name="labelLanguage"> <property name="text"> <string notr="true">Language</string> </property> </widget> </item> - <item row="66" column="1"> + <item row="95" column="1"> <widget class="QComboBox" name="Language"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> - <property name="enabled"> - <bool>false</bool> - </property> <item> <property name="text"> - <string notr="true">Default</string> + <string notr="true">None</string> </property> </item> <item> <property name="text"> - <string notr="true">None</string> + <string notr="true">Cpp</string> </property> </item> <item> <property name="text"> - <string notr="true">Cpp</string> + <string notr="true">CSharp</string> </property> </item> <item> @@ -2075,6 +2929,11 @@ </item> <item> <property name="text"> + <string notr="true">Json</string> + </property> + </item> + <item> + <property name="text"> <string notr="true">ObjC</string> </property> </item> @@ -2095,14 +2954,38 @@ </item> </widget> </item> - <item row="67" column="0"> + <item row="96" column="0"> + <widget class="QLabel" name="labelLambdaBodyIndentation"> + <property name="text"> + <string notr="true">LambdaBodyIndentation</string> + </property> + </widget> + </item> + <item row="96" column="1"> + <widget class="QComboBox" name="LambdaBodyIndentation"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Signature</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">OuterScope</string> + </property> + </item> + </widget> + </item> + <item row="97" column="0"> <widget class="QLabel" name="labelMacroBlockBegin"> <property name="text"> <string notr="true">MacroBlockBegin</string> </property> </widget> </item> - <item row="67" column="1"> + <item row="97" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="MacroBlockBegin"> @@ -2123,14 +3006,14 @@ </item> </layout> </item> - <item row="68" column="0"> + <item row="98" column="0"> <widget class="QLabel" name="labelMacroBlockEnd"> <property name="text"> <string notr="true">MacroBlockEnd</string> </property> </widget> </item> - <item row="68" column="1"> + <item row="98" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="MacroBlockEnd"> @@ -2151,14 +3034,14 @@ </item> </layout> </item> - <item row="69" column="0"> + <item row="99" column="0"> <widget class="QLabel" name="labelMaxEmptyLinesToKeep"> <property name="text"> <string notr="true">MaxEmptyLinesToKeep</string> </property> </widget> </item> - <item row="69" column="1"> + <item row="99" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="MaxEmptyLinesToKeep"> @@ -2179,25 +3062,20 @@ </item> </layout> </item> - <item row="70" column="0"> + <item row="100" column="0"> <widget class="QLabel" name="labelNamespaceIndentation"> <property name="text"> <string notr="true">NamespaceIndentation</string> </property> </widget> </item> - <item row="70" column="1"> + <item row="100" column="1"> <widget class="QComboBox" name="NamespaceIndentation"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> - </property> - </item> - <item> - <property name="text"> <string notr="true">None</string> </property> </item> @@ -2213,25 +3091,20 @@ </item> </widget> </item> - <item row="71" column="0"> + <item row="101" column="0"> <widget class="QLabel" name="labelObjCBinPackProtocolList"> <property name="text"> <string notr="true">ObjCBinPackProtocolList</string> </property> </widget> </item> - <item row="71" column="1"> + <item row="101" column="1"> <widget class="QComboBox" name="ObjCBinPackProtocolList"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> - </property> - </item> - <item> - <property name="text"> <string notr="true">Auto</string> </property> </item> @@ -2247,14 +3120,14 @@ </item> </widget> </item> - <item row="72" column="0"> + <item row="102" column="0"> <widget class="QLabel" name="labelObjCBlockIndentWidth"> <property name="text"> <string notr="true">ObjCBlockIndentWidth</string> </property> </widget> </item> - <item row="72" column="1"> + <item row="102" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="ObjCBlockIndentWidth"> @@ -2275,14 +3148,14 @@ </item> </layout> </item> - <item row="73" column="0"> + <item row="103" column="0"> <widget class="QLabel" name="labelObjCSpaceAfterProperty"> <property name="text"> <string notr="true">ObjCSpaceAfterProperty</string> </property> </widget> </item> - <item row="73" column="1"> + <item row="103" column="1"> <widget class="QComboBox" name="ObjCSpaceAfterProperty"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2304,14 +3177,43 @@ </item> </widget> </item> - <item row="74" column="0"> + <item row="104" column="0"> + <widget class="QLabel" name="labelObjCBreakBeforeNestedBlockParam"> + <property name="text"> + <string notr="true">ObjCBreakBeforeNestedBlockParam</string> + </property> + </widget> + </item> + <item row="104" column="1"> + <widget class="QComboBox" name="ObjCBreakBeforeNestedBlockParam"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="105" column="0"> <widget class="QLabel" name="labelObjCSpaceBeforeProtocolList"> <property name="text"> <string notr="true">ObjCSpaceBeforeProtocolList</string> </property> </widget> </item> - <item row="74" column="1"> + <item row="105" column="1"> <widget class="QComboBox" name="ObjCSpaceBeforeProtocolList"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2333,14 +3235,14 @@ </item> </widget> </item> - <item row="75" column="0"> + <item row="106" column="0"> <widget class="QLabel" name="labelPenaltyBreakAssignment"> <property name="text"> <string notr="true">PenaltyBreakAssignment</string> </property> </widget> </item> - <item row="75" column="1"> + <item row="106" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="PenaltyBreakAssignment"> @@ -2361,14 +3263,14 @@ </item> </layout> </item> - <item row="76" column="0"> + <item row="107" column="0"> <widget class="QLabel" name="labelPenaltyBreakBeforeFirstCallParameter"> <property name="text"> <string notr="true">PenaltyBreakBeforeFirstCallParameter</string> </property> </widget> </item> - <item row="76" column="1"> + <item row="107" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="PenaltyBreakBeforeFirstCallParameter"> @@ -2389,14 +3291,14 @@ </item> </layout> </item> - <item row="77" column="0"> + <item row="108" column="0"> <widget class="QLabel" name="labelPenaltyBreakComment"> <property name="text"> <string notr="true">PenaltyBreakComment</string> </property> </widget> </item> - <item row="77" column="1"> + <item row="108" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="PenaltyBreakComment"> @@ -2417,14 +3319,14 @@ </item> </layout> </item> - <item row="78" column="0"> + <item row="109" column="0"> <widget class="QLabel" name="labelPenaltyBreakFirstLessLess"> <property name="text"> <string notr="true">PenaltyBreakFirstLessLess</string> </property> </widget> </item> - <item row="78" column="1"> + <item row="109" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="PenaltyBreakFirstLessLess"> @@ -2445,14 +3347,42 @@ </item> </layout> </item> - <item row="79" column="0"> + <item row="110" column="0"> + <widget class="QLabel" name="labelPenaltyBreakOpenParenthesis"> + <property name="text"> + <string notr="true">PenaltyBreakOpenParenthesis</string> + </property> + </widget> + </item> + <item row="110" column="1"> + <layout class="QHBoxLayout"> + <item> + <widget class="QLineEdit" name="PenaltyBreakOpenParenthesis"> + </widget> + </item> + <item> + <widget class="QPushButton" name="setPenaltyBreakOpenParenthesis"> + <property name="maximumSize"> + <size> + <width>40</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string notr="true">Set</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="111" column="0"> <widget class="QLabel" name="labelPenaltyBreakString"> <property name="text"> <string notr="true">PenaltyBreakString</string> </property> </widget> </item> - <item row="79" column="1"> + <item row="111" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="PenaltyBreakString"> @@ -2473,14 +3403,14 @@ </item> </layout> </item> - <item row="80" column="0"> + <item row="112" column="0"> <widget class="QLabel" name="labelPenaltyBreakTemplateDeclaration"> <property name="text"> <string notr="true">PenaltyBreakTemplateDeclaration</string> </property> </widget> </item> - <item row="80" column="1"> + <item row="112" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="PenaltyBreakTemplateDeclaration"> @@ -2501,14 +3431,14 @@ </item> </layout> </item> - <item row="81" column="0"> + <item row="113" column="0"> <widget class="QLabel" name="labelPenaltyExcessCharacter"> <property name="text"> <string notr="true">PenaltyExcessCharacter</string> </property> </widget> </item> - <item row="81" column="1"> + <item row="113" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="PenaltyExcessCharacter"> @@ -2529,14 +3459,14 @@ </item> </layout> </item> - <item row="82" column="0"> + <item row="114" column="0"> <widget class="QLabel" name="labelPenaltyReturnTypeOnItsOwnLine"> <property name="text"> <string notr="true">PenaltyReturnTypeOnItsOwnLine</string> </property> </widget> </item> - <item row="82" column="1"> + <item row="114" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="PenaltyReturnTypeOnItsOwnLine"> @@ -2557,25 +3487,48 @@ </item> </layout> </item> - <item row="83" column="0"> + <item row="115" column="0"> + <widget class="QLabel" name="labelPenaltyIndentedWhitespace"> + <property name="text"> + <string notr="true">PenaltyIndentedWhitespace</string> + </property> + </widget> + </item> + <item row="115" column="1"> + <layout class="QHBoxLayout"> + <item> + <widget class="QLineEdit" name="PenaltyIndentedWhitespace"> + </widget> + </item> + <item> + <widget class="QPushButton" name="setPenaltyIndentedWhitespace"> + <property name="maximumSize"> + <size> + <width>40</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string notr="true">Set</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="116" column="0"> <widget class="QLabel" name="labelPointerAlignment"> <property name="text"> <string notr="true">PointerAlignment</string> </property> </widget> </item> - <item row="83" column="1"> + <item row="116" column="1"> <widget class="QComboBox" name="PointerAlignment"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> - </property> - </item> - <item> - <property name="text"> <string notr="true">Left</string> </property> </item> @@ -2591,30 +3544,21 @@ </item> </widget> </item> - <item row="84" column="0"> - <widget class="QLabel" name="labelRawStringFormats"> + <item row="117" column="0"> + <widget class="QLabel" name="labelPPIndentWidth"> <property name="text"> - <string notr="true">RawStringFormats</string> + <string notr="true">PPIndentWidth</string> </property> </widget> </item> - <item row="84" column="1"> + <item row="117" column="1"> <layout class="QHBoxLayout"> <item> - <widget class="QPlainTextEdit" name="RawStringFormats"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Fixed"/> - </property> - <property name="maximumSize"> - <size> - <width>16777215</width> - <height>50</height> - </size> - </property> + <widget class="QLineEdit" name="PPIndentWidth"> </widget> </item> <item> - <widget class="QPushButton" name="setRawStringFormats"> + <widget class="QPushButton" name="setPPIndentWidth"> <property name="maximumSize"> <size> <width>40</width> @@ -2628,14 +3572,48 @@ </item> </layout> </item> - <item row="85" column="0"> + <item row="119" column="0"> + <widget class="QLabel" name="labelReferenceAlignment"> + <property name="text"> + <string notr="true">ReferenceAlignment</string> + </property> + </widget> + </item> + <item row="119" column="1"> + <widget class="QComboBox" name="ReferenceAlignment"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Pointer</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Left</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Right</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Middle</string> + </property> + </item> + </widget> + </item> + <item row="120" column="0"> <widget class="QLabel" name="labelReflowComments"> <property name="text"> <string notr="true">ReflowComments</string> </property> </widget> </item> - <item row="85" column="1"> + <item row="120" column="1"> <widget class="QComboBox" name="ReflowComments"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2657,15 +3635,15 @@ </item> </widget> </item> - <item row="86" column="0"> - <widget class="QLabel" name="labelSortIncludes"> + <item row="121" column="0"> + <widget class="QLabel" name="labelRemoveBracesLLVM"> <property name="text"> - <string notr="true">SortIncludes</string> + <string notr="true">RemoveBracesLLVM</string> </property> </widget> </item> - <item row="86" column="1"> - <widget class="QComboBox" name="SortIncludes"> + <item row="121" column="1"> + <widget class="QComboBox" name="RemoveBracesLLVM"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -2686,14 +3664,124 @@ </item> </widget> </item> - <item row="87" column="0"> + <item row="122" column="0"> + <widget class="QLabel" name="labelSeparateDefinitionBlocks"> + <property name="text"> + <string notr="true">SeparateDefinitionBlocks</string> + </property> + </widget> + </item> + <item row="122" column="1"> + <widget class="QComboBox" name="SeparateDefinitionBlocks"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Leave</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Always</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Never</string> + </property> + </item> + </widget> + </item> + <item row="123" column="0"> + <widget class="QLabel" name="labelShortNamespaceLines"> + <property name="text"> + <string notr="true">ShortNamespaceLines</string> + </property> + </widget> + </item> + <item row="123" column="1"> + <layout class="QHBoxLayout"> + <item> + <widget class="QLineEdit" name="ShortNamespaceLines"> + </widget> + </item> + <item> + <widget class="QPushButton" name="setShortNamespaceLines"> + <property name="maximumSize"> + <size> + <width>40</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string notr="true">Set</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="124" column="0"> + <widget class="QLabel" name="labelSortIncludes"> + <property name="text"> + <string notr="true">SortIncludes</string> + </property> + </widget> + </item> + <item row="124" column="1"> + <widget class="QComboBox" name="SortIncludes"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Never</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">CaseSensitive</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">CaseInsensitive</string> + </property> + </item> + </widget> + </item> + <item row="125" column="0"> + <widget class="QLabel" name="labelSortJavaStaticImport"> + <property name="text"> + <string notr="true">SortJavaStaticImport</string> + </property> + </widget> + </item> + <item row="125" column="1"> + <widget class="QComboBox" name="SortJavaStaticImport"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Before</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">After</string> + </property> + </item> + </widget> + </item> + <item row="126" column="0"> <widget class="QLabel" name="labelSortUsingDeclarations"> <property name="text"> <string notr="true">SortUsingDeclarations</string> </property> </widget> </item> - <item row="87" column="1"> + <item row="126" column="1"> <widget class="QComboBox" name="SortUsingDeclarations"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2715,14 +3803,14 @@ </item> </widget> </item> - <item row="88" column="0"> + <item row="127" column="0"> <widget class="QLabel" name="labelSpaceAfterCStyleCast"> <property name="text"> <string notr="true">SpaceAfterCStyleCast</string> </property> </widget> </item> - <item row="88" column="1"> + <item row="127" column="1"> <widget class="QComboBox" name="SpaceAfterCStyleCast"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2744,14 +3832,43 @@ </item> </widget> </item> - <item row="89" column="0"> + <item row="128" column="0"> + <widget class="QLabel" name="labelSpaceAfterLogicalNot"> + <property name="text"> + <string notr="true">SpaceAfterLogicalNot</string> + </property> + </widget> + </item> + <item row="128" column="1"> + <widget class="QComboBox" name="SpaceAfterLogicalNot"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="129" column="0"> <widget class="QLabel" name="labelSpaceAfterTemplateKeyword"> <property name="text"> <string notr="true">SpaceAfterTemplateKeyword</string> </property> </widget> </item> - <item row="89" column="1"> + <item row="129" column="1"> <widget class="QComboBox" name="SpaceAfterTemplateKeyword"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2773,14 +3890,48 @@ </item> </widget> </item> - <item row="90" column="0"> + <item row="130" column="0"> + <widget class="QLabel" name="labelSpaceAroundPointerQualifiers"> + <property name="text"> + <string notr="true">SpaceAroundPointerQualifiers</string> + </property> + </widget> + </item> + <item row="130" column="1"> + <widget class="QComboBox" name="SpaceAroundPointerQualifiers"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Before</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">After</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Both</string> + </property> + </item> + </widget> + </item> + <item row="131" column="0"> <widget class="QLabel" name="labelSpaceBeforeAssignmentOperators"> <property name="text"> <string notr="true">SpaceBeforeAssignmentOperators</string> </property> </widget> </item> - <item row="90" column="1"> + <item row="131" column="1"> <widget class="QComboBox" name="SpaceBeforeAssignmentOperators"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2802,14 +3953,43 @@ </item> </widget> </item> - <item row="91" column="0"> + <item row="132" column="0"> + <widget class="QLabel" name="labelSpaceBeforeCaseColon"> + <property name="text"> + <string notr="true">SpaceBeforeCaseColon</string> + </property> + </widget> + </item> + <item row="132" column="1"> + <widget class="QComboBox" name="SpaceBeforeCaseColon"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="133" column="0"> <widget class="QLabel" name="labelSpaceBeforeCpp11BracedList"> <property name="text"> <string notr="true">SpaceBeforeCpp11BracedList</string> </property> </widget> </item> - <item row="91" column="1"> + <item row="133" column="1"> <widget class="QComboBox" name="SpaceBeforeCpp11BracedList"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2831,14 +4011,14 @@ </item> </widget> </item> - <item row="92" column="0"> + <item row="134" column="0"> <widget class="QLabel" name="labelSpaceBeforeCtorInitializerColon"> <property name="text"> <string notr="true">SpaceBeforeCtorInitializerColon</string> </property> </widget> </item> - <item row="92" column="1"> + <item row="134" column="1"> <widget class="QComboBox" name="SpaceBeforeCtorInitializerColon"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2860,14 +4040,14 @@ </item> </widget> </item> - <item row="93" column="0"> + <item row="135" column="0"> <widget class="QLabel" name="labelSpaceBeforeInheritanceColon"> <property name="text"> <string notr="true">SpaceBeforeInheritanceColon</string> </property> </widget> </item> - <item row="93" column="1"> + <item row="135" column="1"> <widget class="QComboBox" name="SpaceBeforeInheritanceColon"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2889,31 +4069,36 @@ </item> </widget> </item> - <item row="94" column="0"> + <item row="136" column="0"> <widget class="QLabel" name="labelSpaceBeforeParens"> <property name="text"> <string notr="true">SpaceBeforeParens</string> </property> </widget> </item> - <item row="94" column="1"> + <item row="136" column="1"> <widget class="QComboBox" name="SpaceBeforeParens"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> + <string notr="true">Never</string> </property> </item> <item> <property name="text"> - <string notr="true">Never</string> + <string notr="true">ControlStatements</string> </property> </item> <item> <property name="text"> - <string notr="true">ControlStatements</string> + <string notr="true">ControlStatementsExceptControlMacros</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">NonEmptyParentheses</string> </property> </item> <item> @@ -2921,16 +4106,231 @@ <string notr="true">Always</string> </property> </item> + <item> + <property name="text"> + <string notr="true">Custom</string> + </property> + </item> </widget> </item> - <item row="95" column="0"> + <item row="137" column="0"> + <widget class="QLabel" name="labelSpaceBeforeParensOptions"> + <property name="text"> + <string notr="true">SpaceBeforeParensOptions</string> + </property> + </widget> + </item> + <item row="138" column="0"> + <widget class="QLabel" name="labelAfterControlStatements"> + <property name="text"> + <string notr="true"> AfterControlStatements</string> + </property> + </widget> + </item> + <item row="138" column="1"> + <widget class="QComboBox" name="AfterControlStatements"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="139" column="0"> + <widget class="QLabel" name="labelAfterForeachMacros"> + <property name="text"> + <string notr="true"> AfterForeachMacros</string> + </property> + </widget> + </item> + <item row="139" column="1"> + <widget class="QComboBox" name="AfterForeachMacros"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="140" column="0"> + <widget class="QLabel" name="labelAfterFunctionDeclarationName"> + <property name="text"> + <string notr="true"> AfterFunctionDeclarationName</string> + </property> + </widget> + </item> + <item row="140" column="1"> + <widget class="QComboBox" name="AfterFunctionDeclarationName"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="141" column="0"> + <widget class="QLabel" name="labelAfterFunctionDefinitionName"> + <property name="text"> + <string notr="true"> AfterFunctionDefinitionName</string> + </property> + </widget> + </item> + <item row="141" column="1"> + <widget class="QComboBox" name="AfterFunctionDefinitionName"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="142" column="0"> + <widget class="QLabel" name="labelAfterIfMacros"> + <property name="text"> + <string notr="true"> AfterIfMacros</string> + </property> + </widget> + </item> + <item row="142" column="1"> + <widget class="QComboBox" name="AfterIfMacros"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="143" column="0"> + <widget class="QLabel" name="labelAfterOverloadedOperator"> + <property name="text"> + <string notr="true"> AfterOverloadedOperator</string> + </property> + </widget> + </item> + <item row="143" column="1"> + <widget class="QComboBox" name="AfterOverloadedOperator"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="144" column="0"> + <widget class="QLabel" name="labelBeforeNonEmptyParentheses"> + <property name="text"> + <string notr="true"> BeforeNonEmptyParentheses</string> + </property> + </widget> + </item> + <item row="144" column="1"> + <widget class="QComboBox" name="BeforeNonEmptyParentheses"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="145" column="0"> <widget class="QLabel" name="labelSpaceBeforeRangeBasedForLoopColon"> <property name="text"> <string notr="true">SpaceBeforeRangeBasedForLoopColon</string> </property> </widget> </item> - <item row="95" column="1"> + <item row="145" column="1"> <widget class="QComboBox" name="SpaceBeforeRangeBasedForLoopColon"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2952,14 +4352,43 @@ </item> </widget> </item> - <item row="96" column="0"> + <item row="146" column="0"> + <widget class="QLabel" name="labelSpaceInEmptyBlock"> + <property name="text"> + <string notr="true">SpaceInEmptyBlock</string> + </property> + </widget> + </item> + <item row="146" column="1"> + <widget class="QComboBox" name="SpaceInEmptyBlock"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="147" column="0"> <widget class="QLabel" name="labelSpaceInEmptyParentheses"> <property name="text"> <string notr="true">SpaceInEmptyParentheses</string> </property> </widget> </item> - <item row="96" column="1"> + <item row="147" column="1"> <widget class="QComboBox" name="SpaceInEmptyParentheses"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -2981,14 +4410,14 @@ </item> </widget> </item> - <item row="97" column="0"> + <item row="148" column="0"> <widget class="QLabel" name="labelSpacesBeforeTrailingComments"> <property name="text"> <string notr="true">SpacesBeforeTrailingComments</string> </property> </widget> </item> - <item row="97" column="1"> + <item row="148" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="SpacesBeforeTrailingComments"> @@ -3009,44 +4438,44 @@ </item> </layout> </item> - <item row="98" column="0"> + <item row="149" column="0"> <widget class="QLabel" name="labelSpacesInAngles"> <property name="text"> <string notr="true">SpacesInAngles</string> </property> </widget> </item> - <item row="98" column="1"> + <item row="149" column="1"> <widget class="QComboBox" name="SpacesInAngles"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> <item> <property name="text"> - <string notr="true">Default</string> + <string notr="true">Never</string> </property> </item> <item> <property name="text"> - <string notr="true">true</string> + <string notr="true">Always</string> </property> </item> <item> <property name="text"> - <string notr="true">false</string> + <string notr="true">Leave</string> </property> </item> </widget> </item> - <item row="99" column="0"> - <widget class="QLabel" name="labelSpacesInCStyleCastParentheses"> + <item row="150" column="0"> + <widget class="QLabel" name="labelSpacesInConditionalStatement"> <property name="text"> - <string notr="true">SpacesInCStyleCastParentheses</string> + <string notr="true">SpacesInConditionalStatement</string> </property> </widget> </item> - <item row="99" column="1"> - <widget class="QComboBox" name="SpacesInCStyleCastParentheses"> + <item row="150" column="1"> + <widget class="QComboBox" name="SpacesInConditionalStatement"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -3067,14 +4496,14 @@ </item> </widget> </item> - <item row="100" column="0"> + <item row="151" column="0"> <widget class="QLabel" name="labelSpacesInContainerLiterals"> <property name="text"> <string notr="true">SpacesInContainerLiterals</string> </property> </widget> </item> - <item row="100" column="1"> + <item row="151" column="1"> <widget class="QComboBox" name="SpacesInContainerLiterals"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -3096,14 +4525,106 @@ </item> </widget> </item> - <item row="101" column="0"> + <item row="152" column="0"> + <widget class="QLabel" name="labelSpacesInCStyleCastParentheses"> + <property name="text"> + <string notr="true">SpacesInCStyleCastParentheses</string> + </property> + </widget> + </item> + <item row="152" column="1"> + <widget class="QComboBox" name="SpacesInCStyleCastParentheses"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Default</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="153" column="0"> + <widget class="QLabel" name="labelSpacesInLineCommentPrefix"> + <property name="text"> + <string notr="true">SpacesInLineCommentPrefix</string> + </property> + </widget> + </item> + <item row="154" column="0"> + <widget class="QLabel" name="labelMinimum"> + <property name="text"> + <string notr="true"> Minimum</string> + </property> + </widget> + </item> + <item row="154" column="1"> + <layout class="QHBoxLayout"> + <item> + <widget class="QLineEdit" name="Minimum"> + </widget> + </item> + <item> + <widget class="QPushButton" name="setMinimum"> + <property name="maximumSize"> + <size> + <width>40</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string notr="true">Set</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="155" column="0"> + <widget class="QLabel" name="labelMaximum"> + <property name="text"> + <string notr="true"> Maximum</string> + </property> + </widget> + </item> + <item row="155" column="1"> + <layout class="QHBoxLayout"> + <item> + <widget class="QLineEdit" name="Maximum"> + </widget> + </item> + <item> + <widget class="QPushButton" name="setMaximum"> + <property name="maximumSize"> + <size> + <width>40</width> + <height>16777215</height> + </size> + </property> + <property name="text"> + <string notr="true">Set</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="156" column="0"> <widget class="QLabel" name="labelSpacesInParentheses"> <property name="text"> <string notr="true">SpacesInParentheses</string> </property> </widget> </item> - <item row="101" column="1"> + <item row="156" column="1"> <widget class="QComboBox" name="SpacesInParentheses"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -3125,14 +4646,14 @@ </item> </widget> </item> - <item row="102" column="0"> + <item row="157" column="0"> <widget class="QLabel" name="labelSpacesInSquareBrackets"> <property name="text"> <string notr="true">SpacesInSquareBrackets</string> </property> </widget> </item> - <item row="102" column="1"> + <item row="157" column="1"> <widget class="QComboBox" name="SpacesInSquareBrackets"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> @@ -3154,15 +4675,15 @@ </item> </widget> </item> - <item row="103" column="0"> - <widget class="QLabel" name="labelStandard"> + <item row="158" column="0"> + <widget class="QLabel" name="labelSpaceBeforeSquareBrackets"> <property name="text"> - <string notr="true">Standard</string> + <string notr="true">SpaceBeforeSquareBrackets</string> </property> </widget> </item> - <item row="103" column="1"> - <widget class="QComboBox" name="Standard"> + <item row="158" column="1"> + <widget class="QComboBox" name="SpaceBeforeSquareBrackets"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -3173,6 +4694,64 @@ </item> <item> <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="159" column="0"> + <widget class="QLabel" name="labelBitFieldColonSpacing"> + <property name="text"> + <string notr="true">BitFieldColonSpacing</string> + </property> + </widget> + </item> + <item row="159" column="1"> + <widget class="QComboBox" name="BitFieldColonSpacing"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> + <string notr="true">Both</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">None</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Before</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">After</string> + </property> + </item> + </widget> + </item> + <item row="160" column="0"> + <widget class="QLabel" name="labelStandard"> + <property name="text"> + <string notr="true">Standard</string> + </property> + </widget> + </item> + <item row="160" column="1"> + <widget class="QComboBox" name="Standard"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> <string notr="true">Cpp03</string> </property> </item> @@ -3183,22 +4762,42 @@ </item> <item> <property name="text"> + <string notr="true">Cpp14</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Cpp17</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Cpp20</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">Latest</string> + </property> + </item> + <item> + <property name="text"> <string notr="true">Auto</string> </property> </item> </widget> </item> - <item row="104" column="0"> - <widget class="QLabel" name="labelStatementMacros"> + <item row="161" column="0"> + <widget class="QLabel" name="labelStatementAttributeLikeMacros"> <property name="text"> - <string notr="true">StatementMacros</string> + <string notr="true">StatementAttributeLikeMacros</string> </property> </widget> </item> - <item row="104" column="1"> + <item row="161" column="1"> <layout class="QHBoxLayout"> <item> - <widget class="QPlainTextEdit" name="StatementMacros"> + <widget class="QPlainTextEdit" name="StatementAttributeLikeMacros"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed"/> </property> @@ -3211,7 +4810,7 @@ </widget> </item> <item> - <widget class="QPushButton" name="setStatementMacros"> + <widget class="QPushButton" name="setStatementAttributeLikeMacros"> <property name="maximumSize"> <size> <width>40</width> @@ -3225,14 +4824,14 @@ </item> </layout> </item> - <item row="105" column="0"> + <item row="162" column="0"> <widget class="QLabel" name="labelTabWidth"> <property name="text"> <string notr="true">TabWidth</string> </property> </widget> </item> - <item row="105" column="1"> + <item row="162" column="1"> <layout class="QHBoxLayout"> <item> <widget class="QLineEdit" name="TabWidth"> @@ -3253,15 +4852,15 @@ </item> </layout> </item> - <item row="106" column="0"> - <widget class="QLabel" name="labelUseTab"> + <item row="163" column="0"> + <widget class="QLabel" name="labelUseCRLF"> <property name="text"> - <string notr="true">UseTab</string> + <string notr="true">UseCRLF</string> </property> </widget> </item> - <item row="106" column="1"> - <widget class="QComboBox" name="UseTab"> + <item row="163" column="1"> + <widget class="QComboBox" name="UseCRLF"> <property name="focusPolicy"> <enum>Qt::StrongFocus</enum> </property> @@ -3272,6 +4871,30 @@ </item> <item> <property name="text"> + <string notr="true">true</string> + </property> + </item> + <item> + <property name="text"> + <string notr="true">false</string> + </property> + </item> + </widget> + </item> + <item row="164" column="0"> + <widget class="QLabel" name="labelUseTab"> + <property name="text"> + <string notr="true">UseTab</string> + </property> + </widget> + </item> + <item row="164" column="1"> + <widget class="QComboBox" name="UseTab"> + <property name="focusPolicy"> + <enum>Qt::StrongFocus</enum> + </property> + <item> + <property name="text"> <string notr="true">Never</string> </property> </item> @@ -3287,6 +4910,11 @@ </item> <item> <property name="text"> + <string notr="true">AlignWithSpaces</string> + </property> + </item> + <item> + <property name="text"> <string notr="true">Always</string> </property> </item> diff --git a/src/plugins/clangformat/clangformatconfigwidget.cpp b/src/plugins/clangformat/clangformatconfigwidget.cpp index 841b33faf3..9178156391 100644 --- a/src/plugins/clangformat/clangformatconfigwidget.cpp +++ b/src/plugins/clangformat/clangformatconfigwidget.cpp @@ -30,7 +30,10 @@ #include "clangformatfile.h" #include "clangformatsettings.h" #include "clangformatutils.h" + +// the file was generated by scripts/generateClangFormatChecksUI.py #include "ui_clangformatchecks.h" + #include "ui_clangformatconfigwidget.h" #include <clang/Format/Format.h> |