d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Misc clang-tidy fixes

Browse source
This commit is contained in:
Nicolas Werner 2021-12-28 19:12:15 +01:00
parent 960cf2995e
commit 2866826356
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/ChatPage.cpp
View file

@ -951,7 +951,7 @@ ChatPage::ensureOneTimeKeyCount(const std::map<std::string, uint16_t> &counts)
"Updated server key count {} {}", count->second, mtx::crypto::SIGNED_CURVE25519); "Updated server key count {} {}", count->second, mtx::crypto::SIGNED_CURVE25519);
if (count->second < MAX_ONETIME_KEYS) { if (count->second < MAX_ONETIME_KEYS) {
const int nkeys = MAX_ONETIME_KEYS - count->second; const size_t nkeys = MAX_ONETIME_KEYS - count->second;
nhlog::crypto()->info("uploading {} {} keys", nkeys, mtx::crypto::SIGNED_CURVE25519); nhlog::crypto()->info("uploading {} {} keys", nkeys, mtx::crypto::SIGNED_CURVE25519);
olm::client()->generate_one_time_keys(nkeys); olm::client()->generate_one_time_keys(nkeys);
@ -1231,18 +1231,18 @@ ChatPage::startChat(QString userid)
} }
static QString static QString
mxidFromSegments(QStringRef sigil, QStringRef mxid) mxidFromSegments(QStringView sigil, QStringView mxid)
{ {
if (mxid.isEmpty()) if (mxid.isEmpty())
return ""; return "";
auto mxid_ = QUrl::fromPercentEncoding(mxid.toUtf8()); auto mxid_ = QUrl::fromPercentEncoding(mxid.toUtf8());
if (sigil == "u") { if (sigil == u"u") {
return "@" + mxid_; return "@" + mxid_;
} else if (sigil == "roomid") { } else if (sigil == u"roomid") {
return "!" + mxid_; return "!" + mxid_;
} else if (sigil == "r") { } else if (sigil == u"r") {
return "#" + mxid_; return "#" + mxid_;
//} else if (sigil == "group") { //} else if (sigil == "group") {
// return "+" + mxid_; // return "+" + mxid_;
@ -1335,7 +1335,7 @@ ChatPage::handleMatrixUri(QString uri)
} }
} }
if (sigil1 == "u") { if (sigil1 == u"u") {
if (action.isEmpty()) { if (action.isEmpty()) {
auto t = view_manager_->rooms()->currentRoom(); auto t = view_manager_->rooms()->currentRoom();
if (t && cache::isRoomMember(mxid1.toStdString(), t->roomId().toStdString())) { if (t && cache::isRoomMember(mxid1.toStdString(), t->roomId().toStdString())) {
@ -1343,11 +1343,11 @@ ChatPage::handleMatrixUri(QString uri)
return true; return true;
} }
emit view_manager_->openGlobalUserProfile(mxid1); emit view_manager_->openGlobalUserProfile(mxid1);
} else if (action == "chat") { } else if (action == u"chat") {
this->startChat(mxid1); this->startChat(mxid1);
} }
return true; return true;
} else if (sigil1 == "roomid") { } else if (sigil1 == u"roomid") {
auto joined_rooms = cache::joinedRooms(); auto joined_rooms = cache::joinedRooms();
auto targetRoomId = mxid1.toStdString(); auto targetRoomId = mxid1.toStdString();
@ -1360,12 +1360,12 @@ ChatPage::handleMatrixUri(QString uri)
} }
} }
if (action == "join" || action.isEmpty()) { if (action == u"join" || action.isEmpty()) {
joinRoomVia(targetRoomId, vias); joinRoomVia(targetRoomId, vias);
return true; return true;
} }
return false; return false;
} else if (sigil1 == "r") { } else if (sigil1 == u"r") {
auto joined_rooms = cache::joinedRooms(); auto joined_rooms = cache::joinedRooms();
auto targetRoomAlias = mxid1.toStdString(); auto targetRoomAlias = mxid1.toStdString();
@ -1381,7 +1381,7 @@ ChatPage::handleMatrixUri(QString uri)
} }
} }
if (action == "join" || action.isEmpty()) { if (action == u"join" || action.isEmpty()) {
joinRoomVia(mxid1.toStdString(), vias); joinRoomVia(mxid1.toStdString(), vias);
return true; return true;
} }

1
src/timeline/TimelineModel.h
View file

@ -427,7 +427,6 @@ private:
mutable EventStore events; mutable EventStore events;
QString currentId, currentReadId; QString currentId, currentReadId;
QString reply_, edit_; QString reply_, edit_;
QString textBeforeEdit, replyBeforeEdit; QString textBeforeEdit, replyBeforeEdit;