Skip to content
Permalink
Browse files

Merge pull request #2684 from SebDieBln/AstyleOptionsFile

Move the options for the QGISSTYLE tool to a separate file
  • Loading branch information
jef-n committed Jan 17, 2016
2 parents ed5284f + dc22820 commit f966c422c54d5ac98a199bc084d60dfa77748f5c
Showing with 18 additions and 16 deletions.
  1. +16 −0 scripts/astyle.options
  2. +2 −16 scripts/astyle.sh
@@ -0,0 +1,16 @@
--preserve-date
--indent-preprocessor
--brackets=break
--convert-tabs
--indent=spaces=2
--indent-classes
--indent-labels
--indent-namespaces
--indent-switches
--one-line=keep-blocks
--max-instatement-indent=40
--min-conditional-indent=-1
--suffix=none
--pad=oper
--pad=paren-in
--unpad=paren
@@ -53,22 +53,8 @@ set -e
astyleit()
{
$ASTYLE \
--preserve-date \
--indent-preprocessor \
--brackets=break \
--convert-tabs \
--indent=spaces=2 \
--indent-classes \
--indent-labels \
--indent-namespaces \
--indent-switches \
--one-line=keep-blocks \
--max-instatement-indent=40 \
--min-conditional-indent=-1 \
--suffix=none \
--pad=oper \
--pad=paren-in \
--unpad=paren "$1"
"--options=$(dirname $0)/astyle.options" \
"$1"

scripts/unify_includes.pl "$1"
}

0 comments on commit f966c42

Please sign in to comment.
You can’t perform that action at this time.