noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable formatting on "contested lines" (#3714)

Browse source 
These lines are formatted differently between clang-format 10 (on CI) and clang-format 11+ (on most dev systems)
This commit is contained in:
pajlada 2022-05-07 16:57:26 +02:00 committed by GitHub
parent 66b9b04401
commit 4aa5b04e37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/messages/MessageBuilder.hpp
View file

@ -63,7 +63,10 @@ public:
void addLink(const QString &origLink, const QString &matchedLink); void addLink(const QString &origLink, const QString &matchedLink);
template <typename T, typename... Args> template <typename T, typename... Args>
// clang-format off
// clang-format can be enabled once clang-format v11+ has been installed in CI
T *emplace(Args &&...args) T *emplace(Args &&...args)
// clang-format on
{ {
static_assert(std::is_base_of<MessageElement, T>::value, static_assert(std::is_base_of<MessageElement, T>::value,
"T must extend MessageElement"); "T must extend MessageElement");

6
src/util/LayoutCreator.hpp
View file

@ -43,7 +43,10 @@ public:
} }
template <typename T2, typename... Args> template <typename T2, typename... Args>
// clang-format off
// clang-format can be enabled once clang-format v11+ has been installed in CI
LayoutCreator<T2> emplace(Args &&...args) LayoutCreator<T2> emplace(Args &&...args)
// clang-format on
{ {
T2 *t = new T2(std::forward<Args>(args)...); T2 *t = new T2(std::forward<Args>(args)...);
@ -184,7 +187,10 @@ private:
}; };
template <typename T, typename... Args> template <typename T, typename... Args>
// clang-format off
// clang-format can be enabled once clang-format v11+ has been installed in CI
LayoutCreator<T> makeDialog(Args &&...args) LayoutCreator<T> makeDialog(Args &&...args)
// clang-format on
{ {
T *t = new T(std::forward<Args>(args)...); T *t = new T(std::forward<Args>(args)...);
t->setAttribute(Qt::WA_DeleteOnClose); t->setAttribute(Qt::WA_DeleteOnClose);