Fix the astyle invocation for moder releases and run "make style"
Update xrcDialogs.cpp