From f51ca9009e7a089881228b46e92600c8e95d7c87 Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Sat, 27 Apr 2024 10:21:40 +0800 Subject: [PATCH] - enhancement: New code format option: "Remove superfluous empty lines exceeding" - enhancement: New code format option: "Remove superfluous spaces" - change: Remove code format option: "Delete continuous empty lines" --- NEWS.md | 4 + RedPandaIDE/settings.cpp | 49 ++++- RedPandaIDE/settings.h | 12 ++ .../settingsdialog/formattergeneralwidget.cpp | 7 + .../settingsdialog/formattergeneralwidget.ui | 172 +++++++++++------- RedPandaIDE/translations/RedPandaIDE_pt_BR.ts | 148 ++++++++------- RedPandaIDE/translations/RedPandaIDE_zh_CN.ts | 148 ++++++++------- RedPandaIDE/translations/RedPandaIDE_zh_TW.ts | 150 +++++++-------- 8 files changed, 419 insertions(+), 271 deletions(-) diff --git a/NEWS.md b/NEWS.md index 84ed192a..bc426bc0 100644 --- a/NEWS.md +++ b/NEWS.md @@ -150,6 +150,10 @@ Red Panda C++ Version 2.27 - fix: In sdcc project, parser are not correctly inited as sdcc parser. - fix: Temp object + member function call is wrongly parsed as constructor. - enhancement: Improve how to manage themes in Options → general → appearance. + - change: Use official astyle program. + - enhancement: New code format option: "Remove superfluous empty lines exceeding" + - enhancement: New code format option: "Remove superfluous spaces" + - change: Remove code format option: "Delete continuous empty lines" Red Panda C++ Version 2.26 - enhancement: Code suggestion for embedded std::vectors. diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index 1c5d97f2..f83e8c10 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -3881,10 +3881,13 @@ void Settings::Environment::setTerminalPath(const QString &terminalPath) QString Settings::Environment::AStylePath() const { + QString path = mAStylePath; if (isGreenEdition()) { - return replacePrefix(mAStylePath, "%*APP_DIR*%", pSettings->dirs().appDir()); + path = replacePrefix(path, "%*APP_DIR*%", pSettings->dirs().appDir()); } - return mAStylePath; + if (path.isEmpty()) + path = includeTrailingPathDelimiter(pSettings->dirs().appLibexecDir())+"astyle"; + return path; } void Settings::Environment::setAStylePath(const QString &aStylePath) @@ -5034,6 +5037,10 @@ QStringList Settings::CodeFormatter::getArguments() result.append("--delete-empty-lines"); if (mFillEmptyLines) result.append("--fill-empty-lines"); + if (mSqueezeLines) + result.append(QString("--squeeze-lines=%1").arg(mSqueezeLinesNumber)); + if (mSqueezeWhitespace) + result.append(QString("--squeeze-ws").arg(mSqueezeLinesNumber)); switch(mAlignPointerStyle) { case FormatterOperatorAlign::foaNone: break; @@ -5619,6 +5626,36 @@ void Settings::CodeFormatter::setIndentAfterParens(bool newIndentAfterParens) mIndentAfterParens = newIndentAfterParens; } +bool Settings::CodeFormatter::squeezeWhitespace() const +{ + return mSqueezeWhitespace; +} + +void Settings::CodeFormatter::setSqueezeWhitespace(bool newSqueezeWhitespace) +{ + mSqueezeWhitespace = newSqueezeWhitespace; +} + +int Settings::CodeFormatter::squeezeLinesNumber() const +{ + return mSqueezeLinesNumber; +} + +void Settings::CodeFormatter::setSqueezeLinesNumber(int newSqueezeLinesNumber) +{ + mSqueezeLinesNumber = newSqueezeLinesNumber; +} + +bool Settings::CodeFormatter::squeezeLines() const +{ + return mSqueezeLines; +} + +void Settings::CodeFormatter::setSqueezeLines(bool newSqueezeLines) +{ + mSqueezeLines = newSqueezeLines; +} + bool Settings::CodeFormatter::indentSwitches() const { return mIndentSwitches; @@ -5665,6 +5702,10 @@ void Settings::CodeFormatter::doSave() saveValue("unpad_paren",mUnpadParen); saveValue("delete_empty_lines",mDeleteEmptyLines); saveValue("fill_empty_lines",mFillEmptyLines); + saveValue("squeeze_lines", mSqueezeLines); + saveValue("squeeze_line_number", mSqueezeLinesNumber); + saveValue("squeeze_whitespace", mSqueezeWhitespace); + saveValue("align_pointer_style",mAlignPointerStyle); saveValue("align_reference_style",mAlignReferenceStyle); saveValue("break_closing_braces",mBreakClosingBraces); @@ -5723,6 +5764,10 @@ void Settings::CodeFormatter::doLoad() mUnpadParen = boolValue("unpad_paren",false); mDeleteEmptyLines = boolValue("delete_empty_lines",false); mFillEmptyLines = boolValue("fill_empty_lines",false); + + mSqueezeLines = boolValue("squeeze_lines", false); + mSqueezeLinesNumber = intValue("squeeze_line_number", 1); + mSqueezeWhitespace = boolValue("squeeze_whitespace", false); mAlignPointerStyle = intValue("align_pointer_style", FormatterOperatorAlign::foaNone); mAlignReferenceStyle = intValue("align_reference_style", FormatterOperatorAlign::foaNone); mBreakClosingBraces = boolValue("break_closing_braces",false); diff --git a/RedPandaIDE/settings.h b/RedPandaIDE/settings.h index f51e9f28..b5f84534 100644 --- a/RedPandaIDE/settings.h +++ b/RedPandaIDE/settings.h @@ -815,6 +815,15 @@ public: bool indentAfterParens() const; void setIndentAfterParens(bool newIndentAfterParens); + bool squeezeLines() const; + void setSqueezeLines(bool newSqueezeLines); + + int squeezeLinesNumber() const; + void setSqueezeLinesNumber(int newSqueezeLinesNumber); + + bool squeezeWhitespace() const; + void setSqueezeWhitespace(bool newSqueezeWhitespace); + private: int mBraceStyle; int mIndentStyle; @@ -850,6 +859,9 @@ public: bool mUnpadParen; bool mDeleteEmptyLines; bool mFillEmptyLines; + bool mSqueezeLines; + int mSqueezeLinesNumber; + bool mSqueezeWhitespace; int mAlignPointerStyle; int mAlignReferenceStyle; bool mBreakClosingBraces; diff --git a/RedPandaIDE/settingsdialog/formattergeneralwidget.cpp b/RedPandaIDE/settingsdialog/formattergeneralwidget.cpp index 5f68a681..3f79d4ee 100644 --- a/RedPandaIDE/settingsdialog/formattergeneralwidget.cpp +++ b/RedPandaIDE/settingsdialog/formattergeneralwidget.cpp @@ -98,6 +98,9 @@ void FormatterGeneralWidget::doLoad() ui->chkUnpadParen->setChecked(format.unpadParen()); ui->chkDeleteEmptyLines->setChecked(format.deleteEmptyLines()); ui->chkFillEmptyLines->setChecked(format.fillEmptyLines()); + ui->chkSqueezeEmptyLines->setChecked(format.squeezeLines()); + ui->spinSqueezeEmptyLines->setValue(format.squeezeLinesNumber()); + ui->chkSqueezeWhitespace->setChecked(format.squeezeWhitespace()); switch(format.alignPointerStyle()) { case FormatterOperatorAlign::foaNone: ui->rbAlignPointNone->setChecked(true); @@ -376,6 +379,10 @@ void FormatterGeneralWidget::updateCodeFormatter(Settings::CodeFormatter &format format.setUnpadParen(ui->chkUnpadParen->isChecked()); format.setDeleteEmptyLines(ui->chkDeleteEmptyLines->isChecked()); format.setFillEmptyLines(ui->chkFillEmptyLines->isChecked()); + format.setSqueezeLines(ui->chkSqueezeEmptyLines->isChecked()); + format.setSqueezeLinesNumber(ui->spinSqueezeEmptyLines->value()); + format.setSqueezeWhitespace(ui->chkSqueezeWhitespace->isChecked()); + if (ui->rbAlignPointNone->isChecked()) { format.setAlignPointerStyle(FormatterOperatorAlign::foaNone); } else if (ui->rbAlignPointType->isChecked()) { diff --git a/RedPandaIDE/settingsdialog/formattergeneralwidget.ui b/RedPandaIDE/settingsdialog/formattergeneralwidget.ui index d32f9c7a..ceb2f145 100644 --- a/RedPandaIDE/settingsdialog/formattergeneralwidget.ui +++ b/RedPandaIDE/settingsdialog/formattergeneralwidget.ui @@ -71,7 +71,7 @@ - 2 + 3 @@ -479,20 +479,6 @@ Padding 1 - - - - Insert spaces around parenthesis - - - - - - - Insert spaces after commas - - - @@ -500,49 +486,7 @@ - - - - Insert spaces around parenthesis on the outside only - - - - - - - Insert spaces around parenthesis on the inside only - - - - - - - Insert spaces around first parenthesis in a series on the out side only - - - - - - - Insert empty lines around all blocks - - - - - - - Insert empty lines arround unrelated blocks - - - - - - - Insert spaces around operators - - - - + Qt::Vertical @@ -555,6 +499,114 @@ + + + + Insert spaces around parenthesis on the inside only + + + + + + + Insert spaces around parenthesis on the outside only + + + + + + + Insert spaces around first parenthesis in a series on the out side only + + + + + + + Insert spaces after commas + + + + + + + Insert empty lines arround unrelated blocks + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Remove superfluous empty lines exceeding + + + + + + + 1 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + Insert spaces around operators + + + + + + + Insert spaces around parenthesis + + + + + + + Insert empty lines around all blocks + + + + + + + Remove superfluous whitespace + + + @@ -985,8 +1037,6 @@ chkIndentPreprocDefine chkIndentCol1Comments chkBreakBlocks - chkPadComma - chkBreakBlocksAll chkPadOper chkPadParenIn chkPadParen @@ -1025,7 +1075,7 @@ - + diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index 1d8a8bfb..2d3ec33a 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -1432,17 +1432,18 @@ Ctrl+clik para mais informações - + astyle not found astyle não encontrado + Can't find astyle in "%1". Impossível encontrar astyle em "%1" - + Break point condition Condição de parada @@ -1457,7 +1458,7 @@ Apenas leitura - + Error Load File Erro ao carregar arquivo @@ -2362,7 +2363,7 @@ - + Open custom themes folder @@ -2372,13 +2373,13 @@ - + Remove custom theme - + *Needs restart *Necessário reiniciar @@ -3137,17 +3138,17 @@ Indentação máxima para linha de continuação - + Indentation 2 Indentação 2 - + Indent labels Indentar labels - + Indent class blocks Indentar blocos de classes @@ -3157,72 +3158,77 @@ Indentar namespaces - + Indent class access modifiers Indentar modificadores de acesso em classe - + Indent after parenthesis '(' or assignment '=' Indentar após abrir parêntese '(' ou atribuir '=' - + Indent preprocessor conditional statements Indentar instruções condicionais do preprocessador - + Indent multi-line preprocessor #define statements Indentar instruções #define com múltiplas linhas no preprocessador - + Indent line comments that start in column one Indentar linha de comentários que comece na primeira coluna - + Indent preprocessor blocks Indentar blocos do preprocessador - + Indent switch blocks Indentar blocos de switch - + Indent cases Indentar cases - + Padding 1 Preenchimento - + + Remove superfluous empty lines exceeding + + + + Insert spaces around operators Inserir espaços em torno de operadores - + Insert spaces after commas Inserir espaços após vírgulas - + Insert spaces after parenthesis headers ('if','for',...) Inserir espaços após parênteses de cabeçalhos em ('if','for',...) - + Insert spaces around parenthesis on the outside only Inserir espaços apenas externamente aos parentêses - + Insert spaces around parenthesis on the inside only Inserir espaços apenas internamente aos parênteses @@ -3231,136 +3237,140 @@ Inserir linhas em branco em torno de blocos não relacionados - + Insert empty lines around all blocks Inserir linhas em branco em todos os blocos - + Insert spaces around first parenthesis in a series on the out side only Inserir espaços apenas externamente em torno do primeiro parêntese em uma série - + Insert spaces around parenthesis Inserir espaços em torno de parêntese - + Padding 2 Preenchimento 2 - + Remove all empty lines. It will NOT delete lines added by the padding options. Remover todas as linhas em branco. NÃO removerá linhas acrescentadas pelas opções de preenchimento. - + Attach a pointer operator to its : Anexar operador de ponteiro a: - Remove all consecutive empty lines. It will NOT delete lines added by the padding options. - Remover todas as linhas em branco consecutivas. NÃO removerá as linhas acrescentadas pelas opções de preeenchimento. + Remover todas as linhas em branco consecutivas. NÃO removerá as linhas acrescentadas pelas opções de preeenchimento. - - + + type(left) tipo (esquerdo) - - + + middle central - + Fill empty lines with the white space of the previous lines. Preencher linhas em branco com white space de linhas anteriores. - - + + name(right) nome (direito) - + Remove unnecessary space adding around parenthesis Remover espaços desnecessários em torno de parênteses - + Attach a reference operator to its : Anexar operador de referência a: - + none nenhum - + Other 1 Outros 1 - + Break one line headers ('if','while','else'...) from the statement on the same line Separar linhas em cabeçalhos ('if','while','else'...) a partir da instrução na mesma linha - + Add one line braces to unbraced one line conditional statements Acrescentar chaves em uma linha às instruções condicionais com apenas uma linha - + Break braces before close headers ('else','catch"...) Separar chaves ao fechar cabeçalhos ('else','catch"...) - + Remove braces from a braced one line conditional statements Remover chaves de instruções condicionais com apenas uma linha - + Break 'else if' statements into two lines Separar em duas linhas instruções em 'else if' - + Add braces to unbraced one line conditional statements Acrescentar chaves às instruções condicionais com apenas uma linha - + Other 2 Outros 2 - + Break return type from the function name in its definition Separar tipo de retorno do nome de função em sua definição - + Don't break blocks residing completely on one line Não separar blocos que estejam em uma linha apenas. - + + Remove superfluous whitespace + + + + Attach return type to the function name in its definition Anexar tipo de retorno ao nome de função em sua definição - + Don't break multiple statements residing on one line Não separar instruções múltiplas que estejam em uma mesma linha @@ -3375,7 +3385,7 @@ Anexar tipo de retorno ao nome da função em sua declaração - + Other 3 Outros 3 @@ -3405,12 +3415,12 @@ Colocar a condição lógica por último na linha anterior, ao separar linhas - + Insert empty lines arround unrelated blocks - + No minimal indent @@ -3457,7 +3467,7 @@ FormatterStyleModel - + Default Padrão @@ -8392,7 +8402,7 @@ - + Can't open file '%1' for read. @@ -8908,7 +8918,7 @@ Usar pipes em lugar de arquivos temporários durante compilação (-pipe) - + Confirm Confirmar @@ -9000,7 +9010,7 @@ Índice %1 fora dos limites - + bytes bytes @@ -10163,7 +10173,7 @@ Settings - + Error Erro @@ -10177,7 +10187,7 @@ SettingsDialog - + Options Opções @@ -10207,7 +10217,7 @@ - + General Geral @@ -10215,7 +10225,7 @@ - + Program Runner Executar @@ -10271,14 +10281,14 @@ - + Compiler Set Compilador - + Compiler Compilador @@ -10360,7 +10370,7 @@ - + Code Formatter Formatador de código @@ -10370,7 +10380,7 @@ Programa - + Tools Ferramentas @@ -10456,7 +10466,7 @@ - + Custom C/C++ Keywords diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index 46c79b0b..1c25c53a 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -1694,17 +1694,18 @@ p, li { white-space: pre-wrap; } 未找到符号'%1'! - + astyle not found 找不到astyle程序 + Can't find astyle in "%1". 找不到astyle程序"%1". - + Break point condition 断点条件 @@ -2682,7 +2683,7 @@ p, li { white-space: pre-wrap; } 自定义 - + Open custom themes folder 打开自定义主题文件夹 @@ -2692,13 +2693,13 @@ p, li { white-space: pre-wrap; } 打开文件夹 - + Remove custom theme 删除自定义主题 - + Language: 语言: @@ -3484,17 +3485,17 @@ p, li { white-space: pre-wrap; } 连续行的最大缩进空格数： - + Indentation 2 缩进2 - + Indent labels 缩进标签(label) - + Indent class blocks 缩进类定义(class) @@ -3504,197 +3505,201 @@ p, li { white-space: pre-wrap; } 缩进命名空间定义(namespace) - + Indent class access modifiers 缩进类访问限制符('public','private'...) - + Indent after parenthesis '(' or assignment '=' 在括号'('或赋值号'='后缩进 - + Indent preprocessor conditional statements 缩进预处理条件指令('#if','#else',...) - + Indent multi-line preprocessor #define statements 缩进多行#define语句 - + Indent line comments that start in column one 缩进在第一列开始的行注释 - + Indent preprocessor blocks 缩进预处理代码段 - + Indent switch blocks 缩进switch语句 - + Indent cases 缩进case语句 - + Padding 1 填充1 - + + Remove superfluous empty lines exceeding + 删除超过指定数量的多余空行 + + + Insert spaces around operators 在运算符周围插入空格 - + Insert spaces after commas 在逗号后插入空格 - + Insert spaces after parenthesis headers ('if','for',...) 在语句和括号间插入空格('if','for'...) - + Insert spaces around parenthesis on the outside only 在括号外侧加入空格 - + Insert spaces around parenthesis on the inside only 在括号内侧加入空格 - + Insert empty lines arround unrelated blocks 在代码段之间加入空行 - + Insert empty lines around all blocks Insert empy lines around all blocks 在所有代码段之间加入空行 - + Insert spaces around first parenthesis in a series on the out side only 在多层嵌套括号的最外侧加入空格 - + Insert spaces around parenthesis 在括号两侧加入空格 - + Padding 2 填充2 - + Remove all empty lines. It will NOT delete lines added by the padding options. 删除所有空行。不影响填充选项自动插入的空行。 - + Attach a pointer operator to its : 将指针运算符('*')放在： - Remove all consecutive empty lines. It will NOT delete lines added by the padding options. - 将连续的多个空行合并成一个。不影响填充选项自动插入的空行。 + 将连续的多个空行合并成一个。不影响填充选项自动插入的空行。 - - + + type(left) 类型侧（左侧） - + Fill empty lines with the white space of the previous lines. 使用前一行的缩进空格填充空行 - - + + middle 中间 - + <html><head/><body><p>Note for the predefined format style</p></body></html> <html><head/><body><p>预定义排版方案说明</p></body></html> - - + + name(right) 名称侧（右侧） - + Remove unnecessary space adding around parenthesis 删除括号周围的多余空格 - + Attach a reference operator to its : 将引用运算符('&')放在： - + none 不变 - + Other 1 其它1 - + Break one line headers ('if','while','else'...) from the statement on the same line 对单行条件('if','while','else')语句分行 - + Add one line braces to unbraced one line conditional statements 用花括号括起单行条件体 - + Break braces before close headers ('else','catch"...) 对结束语句('else','catch')和它之前的花括号断行 - + Remove braces from a braced one line conditional statements 删除括起单行条件体语句的花括号 - + Break 'else if' statements into two lines 将'else if'语句断成两行 - + Add braces to unbraced one line conditional statements 对条件和条件体语句在同一行上的，删除括起条件体语句的花括号 - + Other 2 其它2 @@ -3709,17 +3714,26 @@ p, li { white-space: pre-wrap; } 将函数声明中的函数名和返回值类型断成两行 - + Break return type from the function name in its definition 将函数定义中的函数名和返回值类型断成两行 - + Attach return type to the function name in its definition 将函数定义中的函数名和返回值类型放在同一行 - + Remove superfluous continuous empty lines exceeding + 删除超过指定数量的多余空行 + + + + Remove superfluous whitespace + 删除多余的空格 + + + Don't break blocks residing completely on one line 不对同一行上的多个代码段断行 @@ -3729,7 +3743,7 @@ p, li { white-space: pre-wrap; } 不对同一行上的多条语句断行 - + Other 3 其它3 @@ -3759,7 +3773,7 @@ p, li { white-space: pre-wrap; } 字符 - + No minimal indent 无最小缩进量 @@ -3806,7 +3820,7 @@ p, li { white-space: pre-wrap; } FormatterStyleModel - + Default 默认 @@ -9571,7 +9585,7 @@ p, li { white-space: pre-wrap; } 下标"%1"越界 - + bytes 字节 @@ -9889,7 +9903,7 @@ p, li { white-space: pre-wrap; } - + Can't open file '%1' for read. @@ -9944,7 +9958,7 @@ p, li { white-space: pre-wrap; } 无法检测适用于 “%1” 的终端参数模式。 - + Error executing platform compiler hint add-on 执行平台编译器提示附加组件错误 @@ -10948,7 +10962,7 @@ p, li { white-space: pre-wrap; } Settings - + Error 错误 @@ -11085,7 +11099,7 @@ p, li { white-space: pre-wrap; } SettingsDialog - + Options 选项 @@ -11155,14 +11169,14 @@ p, li { white-space: pre-wrap; } - + Compiler Set 编译器配置集 - + Compiler 编译器 @@ -11178,13 +11192,13 @@ p, li { white-space: pre-wrap; } - + General 通用 - + @@ -11290,7 +11304,7 @@ p, li { white-space: pre-wrap; } - + Code Formatter 代码排版 @@ -11300,7 +11314,7 @@ p, li { white-space: pre-wrap; } 程序 - + Tools 工具 diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index 8f7b6736..dce75392 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -1253,17 +1253,18 @@ - + astyle not found + Can't find astyle in "%1". - + Break point condition @@ -1278,7 +1279,7 @@ - + Error Load File @@ -2165,7 +2166,7 @@ - + Open custom themes folder @@ -2175,13 +2176,13 @@ - + Remove custom theme - + Use custom icon set @@ -2890,17 +2891,17 @@ - + Indentation 2 - + Indent labels - + Indent class blocks @@ -2910,211 +2911,216 @@ - + Indent class access modifiers - + Indent after parenthesis '(' or assignment '=' - + Indent preprocessor conditional statements - + Indent multi-line preprocessor #define statements - + Indent line comments that start in column one - + Indent preprocessor blocks - + Indent switch blocks - + Indent cases - + Padding 1 - + + Remove superfluous empty lines exceeding + + + + Insert spaces around operators - + Insert spaces after commas - + Insert spaces after parenthesis headers ('if','for',...) - + Insert spaces around parenthesis on the outside only - + Insert spaces around parenthesis on the inside only - + Insert empty lines arround unrelated blocks - + Insert empty lines around all blocks - + Insert spaces around first parenthesis in a series on the out side only - + Insert spaces around parenthesis - + Padding 2 - + Remove all empty lines. It will NOT delete lines added by the padding options. - + Attach a pointer operator to its : - - Remove all consecutive empty lines. It will NOT delete lines added by the padding options. - - - - - + + type(left) - - + + middle - + Fill empty lines with the white space of the previous lines. - - + + name(right) - + Remove unnecessary space adding around parenthesis - + Attach a reference operator to its : - + none - + Other 1 - + Break one line headers ('if','while','else'...) from the statement on the same line - + Add one line braces to unbraced one line conditional statements - + Break braces before close headers ('else','catch"...) - + Remove braces from a braced one line conditional statements - + Break 'else if' statements into two lines - + Add braces to unbraced one line conditional statements - + Other 2 - + Break return type from the function name in its definition - + Don't break blocks residing completely on one line - + + Remove superfluous whitespace + + + + Attach return type to the function name in its definition - + Don't break multiple statements residing on one line @@ -3129,7 +3135,7 @@ - + Other 3 @@ -3159,7 +3165,7 @@ - + No minimal indent @@ -3206,7 +3212,7 @@ FormatterStyleModel - + Default @@ -7888,7 +7894,7 @@ - + Can't open file '%1' for read. @@ -8297,7 +8303,7 @@ - + Confirm @@ -8379,7 +8385,7 @@ - + bytes @@ -9324,7 +9330,7 @@ Settings - + Error @@ -9338,7 +9344,7 @@ SettingsDialog - + Options @@ -9368,7 +9374,7 @@ - + General @@ -9376,7 +9382,7 @@ - + Program Runner @@ -9428,14 +9434,14 @@ - + Compiler Set - + Compiler @@ -9517,7 +9523,7 @@ - + Code Formatter @@ -9527,7 +9533,7 @@ - + Tools @@ -9609,7 +9615,7 @@ - + Custom C/C++ Keywords