From 8ecbb39dc6303fcf3ae36ad033d7e90ea29b9003 Mon Sep 17 00:00:00 2001 From: Loren Burkholder <55629213+LorenDB@users.noreply.github.com> Date: Mon, 3 Oct 2022 17:57:30 -0400 Subject: [PATCH] cppcheck stuff (#1200) * cppcheck stuff * Update src/ui/RoomSettings.cpp Co-authored-by: DeepBlueV7.X * Update src/ui/RoomSettings.cpp Co-authored-by: DeepBlueV7.X * Fix linting Co-authored-by: DeepBlueV7.X --- src/CompletionProxyModel.cpp | 4 +- src/CompletionProxyModel.h | 2 +- src/LoginPage.cpp | 55 ++++++++++++----------- src/LoginPage.h | 8 ++-- src/RegisterPage.cpp | 14 +++--- src/RegisterPage.h | 11 ++--- src/TrayIcon.cpp | 2 +- src/encryption/DeviceVerificationFlow.cpp | 38 ++++++++-------- src/encryption/DeviceVerificationFlow.h | 26 ++++++----- src/encryption/Olm.cpp | 4 +- src/encryption/Olm.h | 4 +- src/encryption/SelfVerificationStatus.cpp | 4 +- src/encryption/SelfVerificationStatus.h | 3 +- src/timeline/CommunitiesModel.cpp | 4 +- src/timeline/CommunitiesModel.h | 2 +- src/timeline/EventStore.cpp | 5 ++- src/timeline/InputBar.cpp | 8 ++-- src/timeline/InputBar.h | 6 +-- src/timeline/RoomlistModel.cpp | 8 ++-- src/timeline/RoomlistModel.h | 10 ++--- src/timeline/TimelineModel.cpp | 4 +- src/timeline/TimelineModel.h | 4 +- src/timeline/TimelineViewManager.cpp | 6 +-- src/timeline/TimelineViewManager.h | 7 +-- src/ui/MxcMediaProxy.cpp | 2 +- src/ui/NhekoGlobalObject.cpp | 6 +-- src/ui/NhekoGlobalObject.h | 6 +-- src/ui/RoomSettings.cpp | 12 ++--- src/ui/RoomSettings.h | 4 +- src/ui/UIA.cpp | 8 ++-- src/ui/UIA.h | 8 ++-- src/ui/UserProfile.cpp | 13 +++--- src/ui/UserProfile.h | 10 ++--- 33 files changed, 162 insertions(+), 146 deletions(-) diff --git a/src/CompletionProxyModel.cpp b/src/CompletionProxyModel.cpp index 5712cd30..f46a6367 100644 --- a/src/CompletionProxyModel.cpp +++ b/src/CompletionProxyModel.cpp @@ -74,7 +74,7 @@ CompletionProxyModel::CompletionProxyModel(QAbstractItemModel *model, this, &CompletionProxyModel::newSearchString, this, - [this](QString s) { + [this](const QString &s) { searchString_ = s.toLower(); invalidate(); }, @@ -167,7 +167,7 @@ CompletionProxyModel::completionAt(int i) const } void -CompletionProxyModel::setSearchString(QString s) +CompletionProxyModel::setSearchString(const QString &s) { emit newSearchString(s); } diff --git a/src/CompletionProxyModel.h b/src/CompletionProxyModel.h index e4a1b9cd..0a6d6c47 100644 --- a/src/CompletionProxyModel.h +++ b/src/CompletionProxyModel.h @@ -182,7 +182,7 @@ public: public slots: QVariant completionAt(int i) const; - void setSearchString(QString s); + void setSearchString(const QString &s); QString searchString() const { return searchString_; } signals: diff --git a/src/LoginPage.cpp b/src/LoginPage.cpp index 08b7335a..84118337 100644 --- a/src/LoginPage.cpp +++ b/src/LoginPage.cpp @@ -60,7 +60,7 @@ LoginPage::showError(const QString &msg) } void -LoginPage::setHomeserver(QString hs) +LoginPage::setHomeserver(const QString &hs) { if (hs != homeserver_) { homeserver_ = hs; @@ -261,9 +261,9 @@ LoginPage::versionOk(bool passwordSupported, bool ssoSupported, QVariantList idp void LoginPage::onLoginButtonClicked(LoginMethod loginMethod, - QString userid, - QString password, - QString deviceName) + const QString &userid, + const QString &password, + const QString &deviceName) { clearErrors(); @@ -305,31 +305,34 @@ LoginPage::onLoginButtonClicked(LoginMethod loginMethod, }); } else { auto sso = new SSOHandler(); - connect( - sso, &SSOHandler::ssoSuccess, this, [this, sso, userid, deviceName](std::string token) { - mtx::requests::Login req{}; - req.token = token; - req.type = mtx::user_interactive::auth_types::token; - req.initial_device_display_name = - deviceName.trimmed().isEmpty() ? initialDeviceName_() : deviceName.toStdString(); - http::client()->login( - req, [this](const mtx::responses::Login &res, mtx::http::RequestErr err) { - if (err) { - showError(QString::fromStdString(err->matrix_error.error)); - emit errorOccurred(); - return; - } + connect(sso, + &SSOHandler::ssoSuccess, + this, + [this, sso, userid, deviceName](const std::string &token) { + mtx::requests::Login req{}; + req.token = token; + req.type = mtx::user_interactive::auth_types::token; + req.initial_device_display_name = deviceName.trimmed().isEmpty() + ? initialDeviceName_() + : deviceName.toStdString(); + http::client()->login( + req, [this](const mtx::responses::Login &res, mtx::http::RequestErr err) { + if (err) { + showError(QString::fromStdString(err->matrix_error.error)); + emit errorOccurred(); + return; + } - if (res.well_known) { - http::client()->set_server(res.well_known->homeserver.base_url); - nhlog::net()->info("Login requested to use server: " + - res.well_known->homeserver.base_url); - } + if (res.well_known) { + http::client()->set_server(res.well_known->homeserver.base_url); + nhlog::net()->info("Login requested to use server: " + + res.well_known->homeserver.base_url); + } - emit loginOk(res); + emit loginOk(res); + }); + sso->deleteLater(); }); - sso->deleteLater(); - }); connect(sso, &SSOHandler::ssoFailed, this, [this, sso]() { showError(tr("SSO login failed")); emit errorOccurred(); diff --git a/src/LoginPage.h b/src/LoginPage.h index 47896fda..7e9b601c 100644 --- a/src/LoginPage.h +++ b/src/LoginPage.h @@ -79,7 +79,7 @@ public: QString error() { return error_; } QString mxidError() { return mxidError_; } - void setHomeserver(QString hs); + void setHomeserver(const QString &hs); void setMxid(QString id) { if (id != mxid_) { @@ -130,9 +130,9 @@ public slots: // Callback for the login button. void onLoginButtonClicked(LoginMethod loginMethod, - QString userid, - QString password, - QString deviceName); + const QString &userid, + const QString &password, + const QString &deviceName); // Callback for errors produced during server probing void versionError(const QString &error_message); diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp index 75c08203..51a68265 100644 --- a/src/RegisterPage.cpp +++ b/src/RegisterPage.cpp @@ -27,7 +27,7 @@ RegisterPage::RegisterPage(QObject *parent) } void -RegisterPage::setError(QString err) +RegisterPage::setError(const QString &err) { registrationError_ = err; emit errorChanged(); @@ -35,7 +35,7 @@ RegisterPage::setError(QString err) emit registeringChanged(); } void -RegisterPage::setHsError(QString err) +RegisterPage::setHsError(const QString &err) { hsError_ = err; emit hsErrorChanged(); @@ -50,7 +50,7 @@ RegisterPage::initialDeviceName() const } void -RegisterPage::setServer(QString server) +RegisterPage::setServer(const QString &server) { if (server == lastServer) return; @@ -165,7 +165,7 @@ RegisterPage::versionsCheck() } void -RegisterPage::checkUsername(QString name) +RegisterPage::checkUsername(const QString &name) { usernameAvailable_ = usernameUnavailable_ = false; usernameError_.clear(); @@ -197,7 +197,9 @@ RegisterPage::checkUsername(QString name) } void -RegisterPage::startRegistration(QString username, QString password, QString devicename) +RegisterPage::startRegistration(const QString &username, + const QString &password, + const QString &devicename) { // These inputs should still be alright, but check just in case if (!username.isEmpty() && !password.isEmpty() && usernameAvailable_ && supported_) { @@ -206,7 +208,7 @@ RegisterPage::startRegistration(QString username, QString password, QString devi registering_ = true; emit registeringChanged(); - connect(UIA::instance(), &UIA::error, this, [this](QString msg) { + connect(UIA::instance(), &UIA::error, this, [this](const QString &msg) { setError(msg); disconnect(UIA::instance(), &UIA::error, this, nullptr); }); diff --git a/src/RegisterPage.h b/src/RegisterPage.h index 5e857e33..9a4e052b 100644 --- a/src/RegisterPage.h +++ b/src/RegisterPage.h @@ -29,9 +29,10 @@ class RegisterPage : public QObject public: RegisterPage(QObject *parent = nullptr); - Q_INVOKABLE void setServer(QString server); - Q_INVOKABLE void checkUsername(QString name); - Q_INVOKABLE void startRegistration(QString username, QString password, QString deviceName); + Q_INVOKABLE void setServer(const QString &server); + Q_INVOKABLE void checkUsername(const QString &name); + Q_INVOKABLE void + startRegistration(const QString &username, const QString &password, const QString &deviceName); Q_INVOKABLE QString initialDeviceName() const; bool registering() const { return registering_; } @@ -58,8 +59,8 @@ signals: private: void versionsCheck(); - void setHsError(QString err); - void setError(QString err); + void setHsError(const QString &err); + void setError(const QString &err); QString registrationError_, hsError_, usernameError_; diff --git a/src/TrayIcon.cpp b/src/TrayIcon.cpp index 28da9558..336da129 100644 --- a/src/TrayIcon.cpp +++ b/src/TrayIcon.cpp @@ -20,8 +20,8 @@ MsgCountComposedIcon::MsgCountComposedIcon(const QString &filename) : QIconEngine() + , icon_{QIcon{filename}} { - icon_ = QIcon(filename); } void diff --git a/src/encryption/DeviceVerificationFlow.cpp b/src/encryption/DeviceVerificationFlow.cpp index b0e8a73b..df5e0c3e 100644 --- a/src/encryption/DeviceVerificationFlow.cpp +++ b/src/encryption/DeviceVerificationFlow.cpp @@ -31,8 +31,8 @@ key_verification_mac(mtx::crypto::SAS *sas, DeviceVerificationFlow::DeviceVerificationFlow(QObject *, DeviceVerificationFlow::Type flow_type, TimelineModel *model, - QString userID, - std::vector deviceIds_) + const QString &userID, + const std::vector &deviceIds_) : sender(false) , type(flow_type) , deviceIds(std::move(deviceIds_)) @@ -86,12 +86,14 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *, }); if (model) { - connect( - this->model_, &TimelineModel::updateFlowEventId, this, [this](std::string event_id_) { - this->relation.rel_type = mtx::common::RelationType::Reference; - this->relation.event_id = event_id_; - this->transaction_id = event_id_; - }); + connect(this->model_, + &TimelineModel::updateFlowEventId, + this, + [this](const std::string &event_id_) { + this->relation.rel_type = mtx::common::RelationType::Reference; + this->relation.event_id = event_id_; + this->transaction_id = event_id_; + }); } connect(timeout, &QTimer::timeout, this, [this]() { @@ -548,7 +550,7 @@ DeviceVerificationFlow::isSelfVerification() const } void -DeviceVerificationFlow::setEventId(std::string event_id_) +DeviceVerificationFlow::setEventId(const std::string &event_id_) { this->relation.rel_type = mtx::common::RelationType::Reference; this->relation.event_id = event_id_; @@ -864,8 +866,8 @@ QSharedPointer DeviceVerificationFlow::NewInRoomVerification(QObject *parent_, TimelineModel *timelineModel_, const mtx::events::msg::KeyVerificationRequest &msg, - QString other_user_, - QString event_id_) + const QString &other_user_, + const QString &event_id_) { QSharedPointer flow( new DeviceVerificationFlow(parent_, @@ -887,8 +889,8 @@ DeviceVerificationFlow::NewInRoomVerification(QObject *parent_, QSharedPointer DeviceVerificationFlow::NewToDeviceVerification(QObject *parent_, const mtx::events::msg::KeyVerificationRequest &msg, - QString other_user_, - QString txn_id_) + const QString &other_user_, + const QString &txn_id_) { QSharedPointer flow(new DeviceVerificationFlow( parent_, Type::ToDevice, nullptr, other_user_, {QString::fromStdString(msg.from_device)})); @@ -905,8 +907,8 @@ DeviceVerificationFlow::NewToDeviceVerification(QObject *parent_, QSharedPointer DeviceVerificationFlow::NewToDeviceVerification(QObject *parent_, const mtx::events::msg::KeyVerificationStart &msg, - QString other_user_, - QString txn_id_) + const QString &other_user_, + const QString &txn_id_) { QSharedPointer flow(new DeviceVerificationFlow( parent_, Type::ToDevice, nullptr, other_user_, {QString::fromStdString(msg.from_device)})); @@ -919,7 +921,7 @@ DeviceVerificationFlow::NewToDeviceVerification(QObject *parent_, QSharedPointer DeviceVerificationFlow::InitiateUserVerification(QObject *parent_, TimelineModel *timelineModel_, - QString userid) + const QString &userid) { QSharedPointer flow( new DeviceVerificationFlow(parent_, Type::RoomMsg, timelineModel_, userid, {})); @@ -928,8 +930,8 @@ DeviceVerificationFlow::InitiateUserVerification(QObject *parent_, } QSharedPointer DeviceVerificationFlow::InitiateDeviceVerification(QObject *parent_, - QString userid, - std::vector devices) + const QString &userid, + const std::vector &devices) { assert(!devices.empty()); diff --git a/src/encryption/DeviceVerificationFlow.h b/src/encryption/DeviceVerificationFlow.h index a4dce236..afaddb37 100644 --- a/src/encryption/DeviceVerificationFlow.h +++ b/src/encryption/DeviceVerificationFlow.h @@ -110,22 +110,26 @@ public: NewInRoomVerification(QObject *parent_, TimelineModel *timelineModel_, const mtx::events::msg::KeyVerificationRequest &msg, - QString other_user_, - QString event_id_); + const QString &other_user_, + const QString &event_id_); static QSharedPointer NewToDeviceVerification(QObject *parent_, const mtx::events::msg::KeyVerificationRequest &msg, - QString other_user_, - QString txn_id_); + const QString &other_user_, + const QString &txn_id_); static QSharedPointer NewToDeviceVerification(QObject *parent_, const mtx::events::msg::KeyVerificationStart &msg, - QString other_user_, - QString txn_id_); + const QString &other_user_, + const QString &txn_id_); static QSharedPointer - InitiateUserVerification(QObject *parent_, TimelineModel *timelineModel_, QString userid); + InitiateUserVerification(QObject *parent_, + TimelineModel *timelineModel_, + const QString &userid); static QSharedPointer - InitiateDeviceVerification(QObject *parent, QString userid, std::vector devices); + InitiateDeviceVerification(QObject *parent, + const QString &userid, + const std::vector &devices); // getters QString state(); @@ -137,7 +141,7 @@ public: QString transactionId() { return QString::fromStdString(this->transaction_id); } // setters void setDeviceId(QString deviceID); - void setEventId(std::string event_id); + void setEventId(const std::string &event_id); bool isDeviceVerification() const { return this->type == DeviceVerificationFlow::Type::ToDevice; @@ -164,8 +168,8 @@ private: DeviceVerificationFlow(QObject *, DeviceVerificationFlow::Type flow_type, TimelineModel *model, - QString userID, - std::vector deviceIds_); + const QString &userID, + const std::vector &deviceIds_); void setState(State state) { if (state != state_) { diff --git a/src/encryption/Olm.cpp b/src/encryption/Olm.cpp index 6ab55b32..03d0e983 100644 --- a/src/encryption/Olm.cpp +++ b/src/encryption/Olm.cpp @@ -951,7 +951,7 @@ download_full_keybackup() }); } void -lookup_keybackup(const std::string room, const std::string session_id) +lookup_keybackup(const std::string &room, const std::string &session_id) { if (!UserSettings::instance()->useOnlineKeyBackup()) { // Online key backup disabled @@ -1283,7 +1283,7 @@ calculate_trust(const std::string &user_id, const MegolmSessionIndex &index) //! Send encrypted to device messages, targets is a map from userid to device ids or {} for all //! devices void -send_encrypted_to_device_messages(const std::map> targets, +send_encrypted_to_device_messages(const std::map> &targets, const mtx::events::collections::DeviceEvents &event, bool force_new_session) { diff --git a/src/encryption/Olm.h b/src/encryption/Olm.h index 1189fffa..e48fde67 100644 --- a/src/encryption/Olm.h +++ b/src/encryption/Olm.h @@ -72,7 +72,7 @@ void import_inbound_megolm_session( const mtx::events::DeviceEvent &roomKey); void -lookup_keybackup(const std::string room, const std::string session_id); +lookup_keybackup(const std::string &room, const std::string &session_id); void download_full_keybackup(); @@ -119,7 +119,7 @@ send_megolm_key_to_device(const std::string &user_id, //! Send encrypted to device messages, targets is a map from userid to device ids or {} for all //! devices void -send_encrypted_to_device_messages(const std::map> targets, +send_encrypted_to_device_messages(const std::map> &targets, const mtx::events::collections::DeviceEvents &event, bool force_new_session = false); diff --git a/src/encryption/SelfVerificationStatus.cpp b/src/encryption/SelfVerificationStatus.cpp index 86733cee..fac7f6a2 100644 --- a/src/encryption/SelfVerificationStatus.cpp +++ b/src/encryption/SelfVerificationStatus.cpp @@ -33,7 +33,9 @@ SelfVerificationStatus::SelfVerificationStatus(QObject *o) } void -SelfVerificationStatus::setupCrosssigning(bool useSSSS, QString password, bool useOnlineKeyBackup) +SelfVerificationStatus::setupCrosssigning(bool useSSSS, + const QString &password, + bool useOnlineKeyBackup) { nhlog::db()->info("Clicked setup crossigning"); diff --git a/src/encryption/SelfVerificationStatus.h b/src/encryption/SelfVerificationStatus.h index 9e20bd9d..ec80fc6b 100644 --- a/src/encryption/SelfVerificationStatus.h +++ b/src/encryption/SelfVerificationStatus.h @@ -25,7 +25,8 @@ public: }; Q_ENUM(Status) - Q_INVOKABLE void setupCrosssigning(bool useSSSS, QString password, bool useOnlineKeyBackup); + Q_INVOKABLE void + setupCrosssigning(bool useSSSS, const QString &password, bool useOnlineKeyBackup); Q_INVOKABLE void verifyMasterKey(); Q_INVOKABLE void verifyMasterKeyWithPassphrase(); Q_INVOKABLE void verifyUnverifiedDevices(); diff --git a/src/timeline/CommunitiesModel.cpp b/src/timeline/CommunitiesModel.cpp index 083f9668..ef023cee 100644 --- a/src/timeline/CommunitiesModel.cpp +++ b/src/timeline/CommunitiesModel.cpp @@ -693,7 +693,7 @@ enum Categories }; Categories -tagIdToCat(QString tagId) +tagIdToCat(const QString &tagId) { if (tagId.isEmpty()) return World; @@ -757,7 +757,7 @@ FilteredCommunitiesModel::filterAcceptsRow(int sourceRow, const QModelIndex &) c } QVariantList -CommunitiesModel::spaceChildrenListFromIndex(QString room, int idx) const +CommunitiesModel::spaceChildrenListFromIndex(const QString &room, int idx) const { if (idx < -1) return {}; diff --git a/src/timeline/CommunitiesModel.h b/src/timeline/CommunitiesModel.h index 786516e0..001c538d 100644 --- a/src/timeline/CommunitiesModel.h +++ b/src/timeline/CommunitiesModel.h @@ -167,7 +167,7 @@ public: return false; } - Q_INVOKABLE QVariantList spaceChildrenListFromIndex(QString room, int idx = -1) const; + Q_INVOKABLE QVariantList spaceChildrenListFromIndex(const QString &room, int idx = -1) const; Q_INVOKABLE void updateSpaceStatus(QString space, QString room, bool setParent, diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp index 81f2eb9c..0b7a7b1b 100644 --- a/src/timeline/EventStore.cpp +++ b/src/timeline/EventStore.cpp @@ -43,8 +43,9 @@ EventStore::EventStore(std::string room_id, QObject *) this, &EventStore::eventFetched, this, - [this]( - std::string id, std::string relatedTo, mtx::events::collections::TimelineEvents timeline) { + [this](const std::string &id, + const std::string &relatedTo, + mtx::events::collections::TimelineEvents timeline) { cache::client()->storeEvent(room_id_, id, {timeline}); if (!relatedTo.empty()) { diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp index 6854fce3..a9afb01c 100644 --- a/src/timeline/InputBar.cpp +++ b/src/timeline/InputBar.cpp @@ -803,8 +803,8 @@ InputBar::command(const QString &command, QString args) } MediaUpload::MediaUpload(std::unique_ptr source_, - QString mimetype, - QString originalFilename, + const QString &mimetype, + const QString &originalFilename, bool encrypt, QObject *parent) : QObject(parent) @@ -911,7 +911,7 @@ MediaUpload::MediaUpload(std::unique_ptr source_, connect(mediaPlayer, qOverload(&QMediaPlayer::metaDataChanged), this, - [this, mediaPlayer](QString t, QVariant) { + [this, mediaPlayer](const QString &t, const QVariant &) { nhlog::ui()->debug("Got metadata {}", t.toStdString()); if (mediaPlayer->duration() > 0) @@ -1029,7 +1029,7 @@ MediaUpload::startUpload() } void -InputBar::finalizeUpload(MediaUpload *upload, QString url) +InputBar::finalizeUpload(MediaUpload *upload, const QString &url) { auto mime = upload->mimetype(); auto filename = upload->filename(); diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h index d130fb8b..066074f7 100644 --- a/src/timeline/InputBar.h +++ b/src/timeline/InputBar.h @@ -83,8 +83,8 @@ public: Q_ENUM(MediaType) explicit MediaUpload(std::unique_ptr data, - QString mimetype, - QString originalFilename, + const QString &mimetype, + const QString &originalFilename, bool encrypt, QObject *parent = nullptr); @@ -218,7 +218,7 @@ private slots: void startTyping(); void stopTyping(); - void finalizeUpload(MediaUpload *upload, QString url); + void finalizeUpload(MediaUpload *upload, const QString &url); void removeRunUpload(MediaUpload *upload); signals: diff --git a/src/timeline/RoomlistModel.cpp b/src/timeline/RoomlistModel.cpp index 6e95ef8e..181c2136 100644 --- a/src/timeline/RoomlistModel.cpp +++ b/src/timeline/RoomlistModel.cpp @@ -249,7 +249,7 @@ RoomlistModel::data(const QModelIndex &index, int role) const } void -RoomlistModel::updateReadStatus(const std::map roomReadStatus_) +RoomlistModel::updateReadStatus(const std::map &roomReadStatus_) { std::vector roomsToUpdate; roomsToUpdate.resize(roomReadStatus_.size()); @@ -657,7 +657,7 @@ RoomlistModel::clear() } void -RoomlistModel::joinPreview(QString roomid) +RoomlistModel::joinPreview(const QString &roomid) { if (previewedRooms.contains(roomid)) { ChatPage::instance()->joinRoomVia( @@ -742,7 +742,7 @@ RoomlistModel::getRoomPreviewById(QString roomid) const } void -RoomlistModel::setCurrentRoom(QString roomid) +RoomlistModel::setCurrentRoom(const QString &roomid) { if ((currentRoom_ && currentRoom_->roomId() == roomid) || (currentRoomPreview_ && currentRoomPreview_->roomid() == roomid)) @@ -1078,7 +1078,7 @@ FilteredRoomlistModel::filterAcceptsRow(int sourceRow, const QModelIndex &) cons } void -FilteredRoomlistModel::toggleTag(QString roomid, QString tag, bool on) +FilteredRoomlistModel::toggleTag(const QString &roomid, const QString &tag, bool on) { if (on) { http::client()->put_tag( diff --git a/src/timeline/RoomlistModel.h b/src/timeline/RoomlistModel.h index 2f2ea066..1abeb812 100644 --- a/src/timeline/RoomlistModel.h +++ b/src/timeline/RoomlistModel.h @@ -96,7 +96,7 @@ public slots: void initializeRooms(); void sync(const mtx::responses::Sync &sync_); void clear(); - int roomidToIndex(QString roomid) + int roomidToIndex(const QString &roomid) { for (int i = 0; i < (int)roomids.size(); i++) { if (roomids[i] == roomid) @@ -105,13 +105,13 @@ public slots: return -1; } - void joinPreview(QString roomid); + void joinPreview(const QString &roomid); void acceptInvite(QString roomid); void declineInvite(QString roomid); void leave(QString roomid, QString reason = ""); TimelineModel *currentRoom() const { return currentRoom_.get(); } RoomPreview currentRoomPreview() const { return currentRoomPreview_.value_or(RoomPreview{}); } - void setCurrentRoom(QString roomid); + void setCurrentRoom(const QString &roomid); void resetCurrentRoom() { currentRoom_ = nullptr; @@ -120,7 +120,7 @@ public slots: } private slots: - void updateReadStatus(const std::map roomReadStatus_); + void updateReadStatus(const std::map &roomReadStatus_); signals: void totalUnreadMessageCountUpdated(int unreadMessages); @@ -173,7 +173,7 @@ public slots: void acceptInvite(QString roomid) { roomlistmodel->acceptInvite(roomid); } void declineInvite(QString roomid) { roomlistmodel->declineInvite(roomid); } void leave(QString roomid, QString reason = "") { roomlistmodel->leave(roomid, reason); } - void toggleTag(QString roomid, QString tag, bool on); + void toggleTag(const QString &roomid, const QString &tag, bool on); void copyLink(QString roomid); TimelineModel *currentRoom() const { return roomlistmodel->currentRoom(); } diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 13ebd506..6c967633 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -1269,7 +1269,7 @@ TimelineModel::relatedInfo(const QString &id) } void -TimelineModel::showReadReceipts(QString id) +TimelineModel::showReadReceipts(const QString &id) { emit openReadReceiptsDialog(new ReadReceiptsProxy{id, roomId(), this}); } @@ -1372,7 +1372,7 @@ TimelineModel::markEventsAsRead(const std::vector &event_ids) } void -TimelineModel::updateLastReadId(QString currentRoomId) +TimelineModel::updateLastReadId(const QString ¤tRoomId) { if (currentRoomId == room_id_) { last_event_id = cache::getFullyReadEventId(room_id_.toStdString()); diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index 54a1cb3f..3a862cc9 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -285,7 +285,7 @@ public: Q_INVOKABLE void openUserProfile(QString userid); Q_INVOKABLE void unpin(const QString &id); Q_INVOKABLE void pin(const QString &id); - Q_INVOKABLE void showReadReceipts(QString id); + Q_INVOKABLE void showReadReceipts(const QString &id); Q_INVOKABLE void redactEvent(const QString &id, const QString &reason = ""); Q_INVOKABLE void redactAllFromUser(const QString &userid, const QString &reason = ""); Q_INVOKABLE int idToIndex(const QString &id) const; @@ -349,7 +349,7 @@ public slots: int currentIndex() const { return idToIndex(currentId); } void eventShown(); void markEventsAsRead(const std::vector &event_ids); - void updateLastReadId(QString currentRoomId); + void updateLastReadId(const QString ¤tRoomId); void lastReadIdOnWindowFocus(); void checkAfterFetch(); QVariantMap getDump(const QString &eventId, const QString &relatedTo) const; diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index b705606a..a75a79d1 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -246,8 +246,8 @@ TimelineViewManager::escapeEmoji(QString str) const void TimelineViewManager::openImageOverlay(TimelineModel *room, - QString mxcUrl, - QString eventId, + const QString &mxcUrl, + const QString &eventId, double originalWidth, double proportionalHeight) { @@ -384,7 +384,7 @@ TimelineViewManager::focusMessageInput() } QObject * -TimelineViewManager::completerFor(QString completerName, QString roomId) +TimelineViewManager::completerFor(const QString &completerName, const QString &roomId) { if (completerName == QLatin1String("user")) { auto userModel = new UsersModel(roomId.toStdString()); diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h index 0ba732fe..572e3e22 100644 --- a/src/timeline/TimelineViewManager.h +++ b/src/timeline/TimelineViewManager.h @@ -54,8 +54,8 @@ public: Q_INVOKABLE bool isInitialSync() const { return isInitialSync_; } bool isConnected() const { return isConnected_; } Q_INVOKABLE void openImageOverlay(TimelineModel *room, - QString mxcUrl, - QString eventId, + const QString &mxcUrl, + const QString &eventId, double originalWidth, double proportionalHeight); Q_INVOKABLE void openImagePackSettings(QString roomid); @@ -112,7 +112,8 @@ public slots: void setVideoCallItem(); - QObject *completerFor(QString completerName, QString roomId = QLatin1String(QLatin1String(""))); + QObject *completerFor(const QString &completerName, + const QString &roomId = QLatin1String(QLatin1String(""))); void forwardMessageToRoom(mtx::events::collections::TimelineEvents *e, QString roomId); RoomlistModel *rooms() { return rooms_; } diff --git a/src/ui/MxcMediaProxy.cpp b/src/ui/MxcMediaProxy.cpp index 96ef89b5..3676a74e 100644 --- a/src/ui/MxcMediaProxy.cpp +++ b/src/ui/MxcMediaProxy.cpp @@ -42,7 +42,7 @@ MxcMediaProxy::MxcMediaProxy(QObject *parent) }); connect(this, qOverload(&MxcMediaProxy::metaDataChanged), - [this](QString t, QVariant) { + [this](const QString &t, const QVariant &) { if (t == QMediaMetaData::Orientation) emit orientationChanged(); }); diff --git a/src/ui/NhekoGlobalObject.cpp b/src/ui/NhekoGlobalObject.cpp index b24e68a9..0573d5ee 100644 --- a/src/ui/NhekoGlobalObject.cpp +++ b/src/ui/NhekoGlobalObject.cpp @@ -137,9 +137,9 @@ Nheko::setTransientParent(QWindow *window, QWindow *parentWindow) const void Nheko::createRoom(bool space, - QString name, - QString topic, - QString aliasLocalpart, + const QString &name, + const QString &topic, + const QString &aliasLocalpart, bool isEncrypted, int preset) { diff --git a/src/ui/NhekoGlobalObject.h b/src/ui/NhekoGlobalObject.h index e9034ebc..77ec50d7 100644 --- a/src/ui/NhekoGlobalObject.h +++ b/src/ui/NhekoGlobalObject.h @@ -57,9 +57,9 @@ public: Q_INVOKABLE void showUserSettingsPage() const; Q_INVOKABLE void logout() const; Q_INVOKABLE void createRoom(bool space, - QString name, - QString topic, - QString aliasLocalpart, + const QString &name, + const QString &topic, + const QString &aliasLocalpart, bool isEncrypted, int preset); Q_INVOKABLE PowerlevelEditingModels *editPowerlevels(QString room_id_) const diff --git a/src/ui/RoomSettings.cpp b/src/ui/RoomSettings.cpp index 9b81e777..546cda29 100644 --- a/src/ui/RoomSettings.cpp +++ b/src/ui/RoomSettings.cpp @@ -35,14 +35,14 @@ RoomSettings::RoomSettings(QString roomid, QObject *parent) "global", "override", roomid_.toStdString(), - [this](const mtx::pushrules::PushRule &rule, mtx::http::RequestErr &err) { + [this](const mtx::pushrules::PushRule &rule, mtx::http::RequestErr err) { if (err) { if (err->status_code == 404) http::client()->get_pushrules( "global", "room", roomid_.toStdString(), - [this](const mtx::pushrules::PushRule &rule, mtx::http::RequestErr &err) { + [this](const mtx::pushrules::PushRule &rule, mtx::http::RequestErr err) { if (err) { notifications_ = 2; // all messages emit notificationsChanged(); @@ -424,7 +424,7 @@ RoomSettings::changeAccessRules(bool private_, } void -RoomSettings::changeName(QString name) +RoomSettings::changeName(const QString &name) { // Check if the values are changed from the originals. auto newName = name.trimmed().toStdString(); @@ -435,7 +435,7 @@ RoomSettings::changeName(QString name) using namespace mtx::events; auto proxy = std::make_shared(); - connect(proxy.get(), &ThreadProxy::nameEventSent, this, [this](QString newRoomName) { + connect(proxy.get(), &ThreadProxy::nameEventSent, this, [this](const QString &newRoomName) { this->info_.name = newRoomName.toStdString(); emit roomNameChanged(); }); @@ -458,7 +458,7 @@ RoomSettings::changeName(QString name) } void -RoomSettings::changeTopic(QString topic) +RoomSettings::changeTopic(const QString &topic) { // Check if the values are changed from the originals. auto newTopic = topic.trimmed().toStdString(); @@ -469,7 +469,7 @@ RoomSettings::changeTopic(QString topic) using namespace mtx::events; auto proxy = std::make_shared(); - connect(proxy.get(), &ThreadProxy::topicEventSent, this, [this](QString newRoomTopic) { + connect(proxy.get(), &ThreadProxy::topicEventSent, this, [this](const QString &newRoomTopic) { this->info_.topic = newRoomTopic.toStdString(); emit roomTopicChanged(); }); diff --git a/src/ui/RoomSettings.h b/src/ui/RoomSettings.h index 35698310..f4aa664d 100644 --- a/src/ui/RoomSettings.h +++ b/src/ui/RoomSettings.h @@ -138,8 +138,8 @@ public: bool knockingAllowed, bool restrictedAllowed); Q_INVOKABLE void changeNotifications(int currentIndex); - Q_INVOKABLE void changeTopic(QString topic); - Q_INVOKABLE void changeName(QString name); + Q_INVOKABLE void changeTopic(const QString &topic); + Q_INVOKABLE void changeName(const QString &name); Q_INVOKABLE void applyAllowedFromModel(); diff --git a/src/ui/UIA.cpp b/src/ui/UIA.cpp index 93fd6c94..d67d1ba9 100644 --- a/src/ui/UIA.cpp +++ b/src/ui/UIA.cpp @@ -164,7 +164,7 @@ UIA::genericHandler(QString context) } void -UIA::continuePassword(QString password) +UIA::continuePassword(const QString &password) { mtx::user_interactive::auth::Password p{}; p.identifier_type = mtx::user_interactive::auth::Password::UserId; @@ -176,7 +176,7 @@ UIA::continuePassword(QString password) } void -UIA::continueEmail(QString email) +UIA::continueEmail(const QString &email) { mtx::requests::RequestEmailToken r{}; r.client_secret = this->client_secret = mtx::client::utils::random_token(128, false); @@ -207,7 +207,7 @@ UIA::continueEmail(QString email) }); } void -UIA::continuePhoneNumber(QString countryCode, QString phoneNumber) +UIA::continuePhoneNumber(const QString &countryCode, const QString &phoneNumber) { mtx::requests::RequestMSISDNToken r{}; r.client_secret = this->client_secret = mtx::client::utils::random_token(128, false); @@ -257,7 +257,7 @@ UIA::continue3pidReceived() } void -UIA::submit3pidToken(QString token) +UIA::submit3pidToken(const QString &token) { mtx::requests::IdentitySubmitToken t{}; t.client_secret = this->client_secret; diff --git a/src/ui/UIA.h b/src/ui/UIA.h index 9c10dade..a97df4ac 100644 --- a/src/ui/UIA.h +++ b/src/ui/UIA.h @@ -28,10 +28,10 @@ public: QString title() const { return title_; } public slots: - void continuePassword(QString password); - void continueEmail(QString email); - void continuePhoneNumber(QString countryCode, QString phoneNumber); - void submit3pidToken(QString token); + void continuePassword(const QString &password); + void continueEmail(const QString &email); + void continuePhoneNumber(const QString &countryCode, const QString &phoneNumber); + void submit3pidToken(const QString &token); void continue3pidReceived(); signals: diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp index bd02b308..a3bc87de 100644 --- a/src/ui/UserProfile.cpp +++ b/src/ui/UserProfile.cpp @@ -21,18 +21,17 @@ #include "timeline/TimelineViewManager.h" #include "ui/UIA.h" -UserProfile::UserProfile(QString roomid, - QString userid, +UserProfile::UserProfile(const QString &roomid, + const QString &userid, TimelineViewManager *manager_, TimelineModel *parent) : QObject(parent) , roomid_(roomid) , userid_(userid) + , globalAvatarUrl{QLatin1String("")} , manager(manager_) , model(parent) { - globalAvatarUrl = QLatin1String(""); - connect(this, &UserProfile::globalUsernameRetrieved, this, @@ -325,7 +324,7 @@ UserProfile::startChat() } void -UserProfile::changeUsername(QString username) +UserProfile::changeUsername(const QString &username) { if (isGlobalUserProfile()) { // change global @@ -349,7 +348,7 @@ UserProfile::changeUsername(QString username) } void -UserProfile::changeDeviceName(QString deviceID, QString deviceName) +UserProfile::changeDeviceName(const QString &deviceID, const QString &deviceName) { http::client()->set_device_name( deviceID.toStdString(), deviceName.toStdString(), [this](mtx::http::RequestErr err) { @@ -372,7 +371,7 @@ UserProfile::verify(QString device) } void -UserProfile::unverify(QString device) +UserProfile::unverify(const QString &device) { cache::markDeviceUnverified(userid_.toStdString(), device.toStdString()); } diff --git a/src/ui/UserProfile.h b/src/ui/UserProfile.h index 1675c0e5..90e39b89 100644 --- a/src/ui/UserProfile.h +++ b/src/ui/UserProfile.h @@ -134,8 +134,8 @@ class UserProfile : public QObject Q_PROPERTY(bool isSelf READ isSelf CONSTANT) Q_PROPERTY(TimelineModel *room READ room CONSTANT) public: - UserProfile(QString roomid, - QString userid, + UserProfile(const QString &roomid, + const QString &userid, TimelineViewManager *manager_, TimelineModel *parent = nullptr); @@ -152,7 +152,7 @@ public: TimelineModel *room() const { return model; } Q_INVOKABLE void verify(QString device = QLatin1String("")); - Q_INVOKABLE void unverify(QString device = QLatin1String("")); + Q_INVOKABLE void unverify(const QString &device = QLatin1String("")); Q_INVOKABLE void fetchDeviceList(const QString &userID); Q_INVOKABLE void refreshDevices(); Q_INVOKABLE void banUser(); @@ -161,8 +161,8 @@ public: Q_INVOKABLE void kickUser(); Q_INVOKABLE void startChat(); Q_INVOKABLE void startChat(bool encryptionEnabled); - Q_INVOKABLE void changeUsername(QString username); - Q_INVOKABLE void changeDeviceName(QString deviceID, QString deviceName); + Q_INVOKABLE void changeUsername(const QString &username); + Q_INVOKABLE void changeDeviceName(const QString &deviceID, const QString &deviceName); Q_INVOKABLE void changeAvatar(); Q_INVOKABLE void openGlobalProfile();