diff --git a/.clang-format b/.clang-format index ad4911499e54f49caea1d2a9ac944df842be41c7..09b042fd1bafb6006d553bc69d29b7e623a4e215 100644 --- a/.clang-format +++ b/.clang-format @@ -12,4 +12,4 @@ IndentWidth: 4 PointerAlignment: Left Standard: C++11 TabWidth: 4 -UseTab: ForIndentation +UseTab: Never diff --git a/.editorconfig b/.editorconfig index d85c0244d68e671d2aaed6bf80a8dee8aab5f4f7..087559332a7cf8a74555548aa737e72db6118716 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,7 +1,7 @@ root = true [*] -indent_style = tab +indent_style = spaces insert_final_newline = true charset = utf-8 trim_trailing_whitespace = true diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml index 30fb380499bf2806ab68bbb138dffc28f8f26ba8..8c28057f2f1a943f30ee91271be31f78e2b97843 100644 --- a/.idea/codeStyleSettings.xml +++ b/.idea/codeStyleSettings.xml @@ -9,7 +9,7 @@ <option name="INDENT_SIZE" value="4" /> <option name="CONTINUATION_INDENT_SIZE" value="8" /> <option name="TAB_SIZE" value="4" /> - <option name="USE_TAB_CHARACTER" value="true" /> + <option name="USE_TAB_CHARACTER" value="false" /> <option name="SMART_TABS" value="false" /> <option name="LABEL_INDENT_SIZE" value="0" /> <option name="LABEL_INDENT_ABSOLUTE" value="false" /> @@ -55,24 +55,24 @@ </XML> <codeStyleSettings language="CMake"> <indentOptions> - <option name="USE_TAB_CHARACTER" value="true" /> + <option name="USE_TAB_CHARACTER" value="false" /> </indentOptions> </codeStyleSettings> <codeStyleSettings language="ObjectiveC"> <option name="CLASS_BRACE_STYLE" value="2" /> <indentOptions> <option name="CONTINUATION_INDENT_SIZE" value="4" /> - <option name="USE_TAB_CHARACTER" value="true" /> + <option name="USE_TAB_CHARACTER" value="false" /> <option name="SMART_TABS" value="true" /> </indentOptions> </codeStyleSettings> <codeStyleSettings language="XML"> <indentOptions> - <option name="USE_TAB_CHARACTER" value="true" /> + <option name="USE_TAB_CHARACTER" value="false" /> </indentOptions> </codeStyleSettings> </value> </option> <option name="USE_PER_PROJECT_SETTINGS" value="true" /> </component> -</project> \ No newline at end of file +</project> diff --git a/scripts/style/uncrustify.cfg b/scripts/style/uncrustify.cfg index 394274a2d794d3f9b782ddd5c66e364f29eaee32..a11abe067b51a9540b65330788eeb0829fd30424 100644 --- a/scripts/style/uncrustify.cfg +++ b/scripts/style/uncrustify.cfg @@ -96,7 +96,7 @@ input_tab_size=4 code_width=100 nl_max=2 mod_add_long_ifdef_else_comment=10 -indent_with_tabs=1 +indent_with_tabs=0 sp_arith=add sp_assign=add sp_enum_assign=add @@ -120,4 +120,4 @@ mod_full_brace_for=remove mod_full_brace_if=remove mod_full_brace_while=remove mod_paren_on_return=remove -pp_indent=remove \ No newline at end of file +pp_indent=remove