Move to clang-format 13

This commit is contained in:
Albert Astals Cid 2022-03-10 00:14:02 +01:00
parent 46d132a21d
commit 9d3842c796
3 changed files with 4 additions and 4 deletions

View File

@ -53,7 +53,7 @@ clang_format:
- master
before_script:
- apt-get update
- apt-get install --yes --no-install-recommends git clang-format-11
- apt-get install --yes --no-install-recommends git clang-format-13
script:
- find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name "*.cc" \) -exec clang-format-11 -i {} \;
- find . \( -name "*.cpp" -or -name "*.h" -or -name "*.c" -or -name "*.cc" \) -exec clang-format-13 -i {} \;
- git diff --exit-code

View File

@ -7,7 +7,7 @@ To get the clang-format warnings locally instead at CI time we recommend you
to copy the hooks/pre-commit to your .git
cp hooks/pre-commit .git/hooks/
We are using clang-format 11 on CI. Unfortunately clang-format is not totally
We are using clang-format 13 on CI. Unfortunately clang-format is not totally
compatible with older versions of itself. If CI gives you trouble but your local
clang-format disagrees, just apply the changes suggested by CI and then commit
with the --no-verify flag. If you get stuck, don't hesitate to ask the reviewer

View File

@ -48,13 +48,13 @@
#include <QWindow>
#include <QtAlgorithms>
#include <KApplicationTrader>
#include <KAuthorized>
#include <KConfigDialog>
#include <KFormat>
#include <KIO/Global>
#include <KLocalizedString>
#include <KMacroExpander>
#include <KApplicationTrader>
#include <KPluginMetaData>
#include <KProcess>
#include <KRun>