diff options
| author | JF <jf@codingfield.com> | 2021-03-07 20:29:59 (GMT) |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2021-03-07 20:29:59 (GMT) |
| commit | 5cd4b36d6bbf22095e0ff54aa3773febc6e1f22e (patch) | |
| tree | eac51e42451d827c30fd6572b377c5bbf03f0e24 /.idea/codeStyles/Project.xml | |
| parent | b89c92b71d82b4e3bf612519a5cf9b2f12886168 (diff) | |
| parent | e63596b291f973cdeb01cd0ac276861895bd4489 (diff) | |
Merge branch 'develop' of JF/PineTime into master
Diffstat (limited to '.idea/codeStyles/Project.xml')
| -rw-r--r-- | .idea/codeStyles/Project.xml | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 60a86f7..7bdfbcb 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -8,30 +8,10 @@ <option name="INDENT_DIRECTIVE_AS_CODE" value="true" /> <option name="SPACE_BEFORE_TEMPLATE_DECLARATION_LT" value="true" /> <option name="SPACE_BEFORE_POINTER_IN_DECLARATION" value="false" /> - <!-- Disabled until clang-format can do it <option name="SPACE_AFTER_POINTER_IN_DECLARATION" value="true" /> --> + <option name="SPACE_AFTER_POINTER_IN_DECLARATION" value="true" /> <option name="SPACE_BEFORE_REFERENCE_IN_DECLARATION" value="false" /> <option name="SPACE_AFTER_REFERENCE_IN_DECLARATION" value="true" /> </Objective-C> - <Objective-C-extensions> - <rules> - <rule entity="NAMESPACE" visibility="ANY" specifier="ANY" prefix="" style="PASCAL_CASE" suffix="" /> - <rule entity="MACRO" visibility="ANY" specifier="ANY" prefix="" style="SCREAMING_SNAKE_CASE" suffix="" /> - <rule entity="CLASS" visibility="ANY" specifier="ANY" prefix="" style="PASCAL_CASE" suffix="" /> - <rule entity="STRUCT" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="ENUM" visibility="ANY" specifier="ANY" prefix="" style="PASCAL_CASE" suffix="" /> - <rule entity="ENUMERATOR" visibility="ANY" specifier="ANY" prefix="" style="PASCAL_CASE" suffix="" /> - <rule entity="TYPEDEF" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="UNION" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="CLASS_MEMBER_FUNCTION" visibility="ANY" specifier="ANY" prefix="" style="PASCAL_CASE" suffix="" /> - <rule entity="STRUCT_MEMBER_FUNCTION" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="CLASS_MEMBER_FIELD" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="STRUCT_MEMBER_FIELD" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="GLOBAL_FUNCTION" visibility="ANY" specifier="ANY" prefix="" style="PASCAL_CASE" suffix="" /> - <rule entity="GLOBAL_VARIABLE" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="PARAMETER" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - <rule entity="LOCAL_VARIABLE" visibility="ANY" specifier="ANY" prefix="" style="CAMEL_CASE" suffix="" /> - </rules> - </Objective-C-extensions> <codeStyleSettings language="ObjectiveC"> <option name="RIGHT_MARGIN" value="140" /> <option name="IF_BRACE_FORCE" value="3" /> @@ -47,8 +27,5 @@ <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" /> </indentOptions> </codeStyleSettings> - <clangFormatSettings> - <option name="ENABLED" value="true" /> - </clangFormatSettings> </code_scheme> </component>
\ No newline at end of file |