Update Qt coding style configuration and .editorconfig

tony-gm · Sep 30, 2018 · 9e8fff6 · 9e8fff6
1 parent 5bf775f
commit 9e8fff6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -5,11 +5,6 @@ root = true
 [*]
 charset = utf-8
 indent_style = space
+indent_size = 2
 end_of_line = lf
 insert_final_newline = true
-
-[*.{cpp,h,pro}]
-indent_size = 4
-
-[{.travis.yml,appveyor.yml}]
-indent_size = 2
diff --git a/dev/CodingStyle_QtCreator.xml b/dev/CodingStyle_QtCreator.xml
@@ -12,7 +12,7 @@
    <value type="bool" key="BindStarToRightSpecifier">false</value>
    <value type="bool" key="BindStarToTypeName">true</value>
    <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">true</value>
-   <value type="bool" key="IndentAccessSpecifiers">true</value>
+   <value type="bool" key="IndentAccessSpecifiers">false</value>
    <value type="bool" key="IndentBlockBody">true</value>
    <value type="bool" key="IndentBlockBraces">false</value>
    <value type="bool" key="IndentBlocksRelativeToSwitchLabels">false</value>
@@ -24,12 +24,12 @@
    <value type="bool" key="IndentFunctionBraces">false</value>
    <value type="bool" key="IndentNamespaceBody">false</value>
    <value type="bool" key="IndentNamespaceBraces">false</value>
-   <value type="int" key="IndentSize">4</value>
+   <value type="int" key="IndentSize">2</value>
    <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
    <value type="bool" key="IndentSwitchLabels">true</value>
    <value type="int" key="PaddingMode">2</value>
    <value type="bool" key="SpacesForTabs">true</value>
-   <value type="int" key="TabSize">4</value>
+   <value type="int" key="TabSize">2</value>
   </valuemap>
  </data>
  <data>