Merge pull request #1 from Qv2ray/track

Track

.clang-format

@@ -1,47 +1,50 @@
 ---
 BasedOnStyle: Microsoft
-AccessModifierOffset: '-2'
+AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
-AllowAllArgumentsOnNextLine: 'false'
-AllowAllConstructorInitializersOnNextLine: 'false'
-AllowAllParametersOfDeclarationOnNextLine: 'false'
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: Inline
-AllowShortLoopsOnASingleLine: 'true'
+AllowShortLoopsOnASingleLine: true
 AlwaysBreakAfterDefinitionReturnType: None
 AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: 'false'
-AlwaysBreakTemplateDeclarations: 'Yes'
-BinPackArguments: 'true'
-BinPackParameters: 'true'
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: true
+BinPackParameters: true
 BreakBeforeBraces: Allman
-BreakBeforeTernaryOperators: 'false'
+BreakBeforeTernaryOperators: false
 BreakInheritanceList: BeforeComma
-BreakStringLiterals: 'false'
-CompactNamespaces: 'false'
-ConstructorInitializerAllOnOneLineOrOnePerLine: 'false'
-Cpp11BracedListStyle: 'false'
-ExperimentalAutoDetectBinPacking: 'false'
-FixNamespaceComments: 'true'
+BreakStringLiterals: false
+ColumnLimit: 145
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+Cpp11BracedListStyle: false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
 IncludeBlocks: Regroup
-IndentCaseLabels: 'true'
+IndentCaseLabels: true
 IndentPPDirectives: BeforeHash
-IndentWidth: '4'
+IndentWidth: 4
 Language: Cpp
-MaxEmptyLinesToKeep: '2'
+MaxEmptyLinesToKeep: 1
 NamespaceIndentation: All
-PenaltyBreakString: '0'
-ReflowComments: 'true'
-SortIncludes: 'true'
-SortUsingDeclarations: 'true'
-SpaceAfterCStyleCast: 'true'
-SpaceAfterTemplateKeyword: 'false'
+ReflowComments: true
+SortIncludes: true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterTemplateKeyword: false
 SpaceBeforeParens: ControlStatements
-SpaceBeforeRangeBasedForLoopColon: 'true'
-SpacesInParentheses: 'false'
+SpaceBeforeRangeBasedForLoopColon: true
+SpacesInParentheses: false
 Standard: Cpp11
-TabWidth: '4'
+StatementMacros: [ Q_UNUSED LOG DEBUG ]
+TabWidth: 4
 UseTab: Never
 
 ...

.gitignore

@@ -1,7 +1,6 @@
+*.user
 *.py
 *.pyc
-*.user
+build/
 _build
 CMakeLists.txt.user
-build/
-examples/build*/

.travis.yml

@@ -3,7 +3,7 @@ language: cpp
 matrix:
   include:
     - os: osx
-      osx_image: xcode8.3
+      osx_image: xcode11.3
       compiler: clang
       env: Qt5_DIR=/usr/local/opt/qt5/lib/cmake/Qt5