Fix newer clang format versions
This commit is contained in:
parent
3a707a5ee5
commit
c17734c7a0
4 changed files with 5 additions and 4 deletions
|
|
@ -13,6 +13,8 @@ KeepEmptyLinesAtTheStartOfBlocks: false
|
||||||
PointerAlignment: Right
|
PointerAlignment: Right
|
||||||
Cpp11BracedListStyle: true
|
Cpp11BracedListStyle: true
|
||||||
PenaltyReturnTypeOnItsOwnLine: 0
|
PenaltyReturnTypeOnItsOwnLine: 0
|
||||||
|
StatementAttributeLikeMacros:
|
||||||
|
- emit
|
||||||
---
|
---
|
||||||
BasedOnStyle: WebKit
|
BasedOnStyle: WebKit
|
||||||
Language: ObjC
|
Language: ObjC
|
||||||
|
|
|
||||||
|
|
@ -108,9 +108,9 @@ TrayIcon::TrayIcon(const QString &filename, QWindow *parent)
|
||||||
setContextMenu(menu);
|
setContextMenu(menu);
|
||||||
|
|
||||||
toggleAction_ = new QAction(tr("Show"), this);
|
toggleAction_ = new QAction(tr("Show"), this);
|
||||||
quitAction_ = new QAction(tr("Quit"), this);
|
quitAction_ = new QAction(tr("Quit"), this);
|
||||||
|
|
||||||
connect(toggleAction_, &QAction::triggered, parent, [=, this](){
|
connect(toggleAction_, &QAction::triggered, parent, [=, this]() {
|
||||||
if (parent->isVisible()) {
|
if (parent->isVisible()) {
|
||||||
parent->hide();
|
parent->hide();
|
||||||
toggleAction_->setText(tr("Show"));
|
toggleAction_->setText(tr("Show"));
|
||||||
|
|
|
||||||
|
|
@ -1137,7 +1137,6 @@ TimelineModel::syncState(const mtx::responses::State &s)
|
||||||
avatarChanged = true;
|
avatarChanged = true;
|
||||||
nameChanged = true;
|
nameChanged = true;
|
||||||
memberCountChanged = true;
|
memberCountChanged = true;
|
||||||
|
|
||||||
} else if (std::holds_alternative<StateEvent<state::Encryption>>(e)) {
|
} else if (std::holds_alternative<StateEvent<state::Encryption>>(e)) {
|
||||||
this->isEncrypted_ = cache::isRoomEncrypted(room_id_.toStdString());
|
this->isEncrypted_ = cache::isRoomEncrypted(room_id_.toStdString());
|
||||||
emit encryptionChanged();
|
emit encryptionChanged();
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ EventExpiry::load()
|
||||||
if (auto temp = cache::client()->getAccountData(mtx::events::EventType::NhekoEventExpiry,
|
if (auto temp = cache::client()->getAccountData(mtx::events::EventType::NhekoEventExpiry,
|
||||||
roomid_.toStdString())) {
|
roomid_.toStdString())) {
|
||||||
auto h = std::get<mtx::events::AccountDataEvent<
|
auto h = std::get<mtx::events::AccountDataEvent<
|
||||||
mtx::events::account_data::nheko_extensions::EventExpiry>>(*temp);
|
mtx::events::account_data::nheko_extensions::EventExpiry>>(*temp);
|
||||||
this->event = std::move(h.content);
|
this->event = std::move(h.content);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue