Make clang-format <13 and clang-format >=13 behave the same
I think old clang-format is just buggy in those cases, so we should reenable those blocks, once everyone has 13 or up.
This commit is contained in:
parent
b1092c0f2f
commit
a13f492e7d
22 changed files with 116 additions and 114 deletions
|
|
@ -103,22 +103,22 @@ public:
|
|||
};
|
||||
Q_ENUM(Error)
|
||||
|
||||
static QSharedPointer<DeviceVerificationFlow> NewInRoomVerification(
|
||||
QObject *parent_,
|
||||
TimelineModel *timelineModel_,
|
||||
const mtx::events::msg::KeyVerificationRequest &msg,
|
||||
QString other_user_,
|
||||
QString event_id_);
|
||||
static QSharedPointer<DeviceVerificationFlow> NewToDeviceVerification(
|
||||
QObject *parent_,
|
||||
const mtx::events::msg::KeyVerificationRequest &msg,
|
||||
QString other_user_,
|
||||
QString txn_id_);
|
||||
static QSharedPointer<DeviceVerificationFlow> NewToDeviceVerification(
|
||||
QObject *parent_,
|
||||
const mtx::events::msg::KeyVerificationStart &msg,
|
||||
QString other_user_,
|
||||
QString txn_id_);
|
||||
static QSharedPointer<DeviceVerificationFlow>
|
||||
NewInRoomVerification(QObject *parent_,
|
||||
TimelineModel *timelineModel_,
|
||||
const mtx::events::msg::KeyVerificationRequest &msg,
|
||||
QString other_user_,
|
||||
QString event_id_);
|
||||
static QSharedPointer<DeviceVerificationFlow>
|
||||
NewToDeviceVerification(QObject *parent_,
|
||||
const mtx::events::msg::KeyVerificationRequest &msg,
|
||||
QString other_user_,
|
||||
QString txn_id_);
|
||||
static QSharedPointer<DeviceVerificationFlow>
|
||||
NewToDeviceVerification(QObject *parent_,
|
||||
const mtx::events::msg::KeyVerificationStart &msg,
|
||||
QString other_user_,
|
||||
QString txn_id_);
|
||||
static QSharedPointer<DeviceVerificationFlow>
|
||||
InitiateUserVerification(QObject *parent_, TimelineModel *timelineModel_, QString userid);
|
||||
static QSharedPointer<DeviceVerificationFlow>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue