mirror of
https://invent.kde.org/graphics/okular
synced 2024-10-01 05:33:33 +00:00
Move to clang-format 13
This commit is contained in:
parent
46d132a21d
commit
9d3842c796
|
@ -53,7 +53,7 @@ clang_format:
|
||||||
- master
|
- master
|
||||||
before_script:
|
before_script:
|
||||||
- apt-get update
|
- 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:
|
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
|
- git diff --exit-code
|
||||||
|
|
|
@ -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
|
to copy the hooks/pre-commit to your .git
|
||||||
cp hooks/pre-commit .git/hooks/
|
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
|
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
|
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
|
with the --no-verify flag. If you get stuck, don't hesitate to ask the reviewer
|
||||||
|
|
|
@ -48,13 +48,13 @@
|
||||||
#include <QWindow>
|
#include <QWindow>
|
||||||
#include <QtAlgorithms>
|
#include <QtAlgorithms>
|
||||||
|
|
||||||
|
#include <KApplicationTrader>
|
||||||
#include <KAuthorized>
|
#include <KAuthorized>
|
||||||
#include <KConfigDialog>
|
#include <KConfigDialog>
|
||||||
#include <KFormat>
|
#include <KFormat>
|
||||||
#include <KIO/Global>
|
#include <KIO/Global>
|
||||||
#include <KLocalizedString>
|
#include <KLocalizedString>
|
||||||
#include <KMacroExpander>
|
#include <KMacroExpander>
|
||||||
#include <KApplicationTrader>
|
|
||||||
#include <KPluginMetaData>
|
#include <KPluginMetaData>
|
||||||
#include <KProcess>
|
#include <KProcess>
|
||||||
#include <KRun>
|
#include <KRun>
|
||||||
|
|
Loading…
Reference in a new issue