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

Work around clazy claiming we connect a lambda

Browse source
This commit is contained in:
Nicolas Werner 2023-12-13 14:59:55 +01:00
parent 328613eb4b
commit c67f301f8b
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -46,7 +46,7 @@ build-clazy:
TRAVIS_OS_NAME: linux TRAVIS_OS_NAME: linux
before_script: before_script:
- echo -e "\e[0Ksection_start:`date +%s`:install_deps[collapsed=true]\r\e[0K\e[1m\e[95mInstalling apk dependencies" - echo -e "\e[0Ksection_start:`date +%s`:install_deps[collapsed=true]\r\e[0K\e[1m\e[95mInstalling apk dependencies"
- apk add asciidoctor cmake cmark-dev gst-plugins-bad-dev gst-plugins-base-dev gstreamer-dev lmdb-dev lmdbxx nlohmann-json olm-dev openssl-dev qt6-qtbase-dev qt6-qtdeclarative-dev qt6-qtmultimedia-dev qt6-qtsvg-dev qt6-qttools-dev samurai spdlog-dev xcb-util-wm-dev zlib-dev ccache curl-dev libevent-dev meson clazy clang16 gcc musl-dev git re2-dev libsecret-dev clang16 - apk add asciidoctor cmake cmark-dev gst-plugins-bad-dev gst-plugins-base-dev gstreamer-dev lmdb-dev lmdbxx nlohmann-json olm-dev openssl-dev qt6-qtbase-dev qt6-qtdeclarative-dev qt6-qtmultimedia-dev qt6-qtsvg-dev qt6-qttools-dev samurai spdlog-dev xcb-util-wm-dev zlib-dev ccache curl-dev libevent-dev meson clazy clang16 gcc musl-dev git re2-dev libsecret-dev
- echo -e "\e[0Ksection_end:`date +%s`:install_deps\r\e[0K" - echo -e "\e[0Ksection_end:`date +%s`:install_deps\r\e[0K"
script: script:
- export PATH="/usr/lib/ccache:${PATH}" - export PATH="/usr/lib/ccache:${PATH}"

3
src/encryption/SelfVerificationStatus.cpp
View file

@ -24,11 +24,12 @@ SelfVerificationStatus::SelfVerificationStatus(QObject *o)
: QObject(o) : QObject(o)
{ {
connect(ChatPage::instance(), &ChatPage::contentLoaded, this, [this] { connect(ChatPage::instance(), &ChatPage::contentLoaded, this, [this] {
// We connect INSIDE a lambda, not A lambda...
connect(cache::client(), connect(cache::client(),
&Cache::selfVerificationStatusChanged, &Cache::selfVerificationStatusChanged,
this, this,
&SelfVerificationStatus::invalidate, &SelfVerificationStatus::invalidate,
Qt::UniqueConnection); Qt::UniqueConnection); // clazy:exclude=lambda-unique-connection
cache::client()->markUserKeysOutOfDate({http::client()->user_id().to_string()}); cache::client()->markUserKeysOutOfDate({http::client()->user_id().to_string()});
}); });

8
src/timeline/RoomlistModel.cpp
View file

@ -271,11 +271,13 @@ RoomlistModel::addRoom(const QString &room_id, bool suppressInsertNotification)
{ {
if (!models.contains(room_id)) { if (!models.contains(room_id)) {
// ensure we get read status updates and are only connected once // ensure we get read status updates and are only connected once
// WORKAROUND(Nico): This is not a lambda, but clazy on alpine currently doesn't
// believe us...
connect(cache::client(), connect(cache::client(),
&Cache::roomReadStatus, &Cache::roomReadStatus,
this, this,
&RoomlistModel::updateReadStatus, &RoomlistModel::updateReadStatus,
Qt::UniqueConnection); Qt::UniqueConnection); // clazy:exclude=lambda-unique-connection
QSharedPointer<TimelineModel> newRoom(new TimelineModel(manager, room_id)); QSharedPointer<TimelineModel> newRoom(new TimelineModel(manager, room_id));
newRoom->setDecryptDescription(ChatPage::instance()->userSettings()->decryptSidebar()); newRoom->setDecryptDescription(ChatPage::instance()->userSettings()->decryptSidebar());
@ -529,11 +531,13 @@ RoomlistModel::sync(const mtx::responses::Sync &sync_)
addRoom(qroomid); addRoom(qroomid);
const auto &room_model = models.value(qroomid); const auto &room_model = models.value(qroomid);
// WORKAROUND(Nico): This is not a lambda, but clazy on alpine currently doesn't
// believe us
connect(room_model.data(), connect(room_model.data(),
&TimelineModel::newCallEvent, &TimelineModel::newCallEvent,
ChatPage::instance()->callManager(), ChatPage::instance()->callManager(),
&CallManager::syncEvent, &CallManager::syncEvent,
Qt::UniqueConnection); Qt::UniqueConnection); // clazy:exclude=lambda-unique-connection
room_model->sync(room); room_model->sync(room);