rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix linting

Browse Source
This commit is contained in:
Jedi18 2021-01-28 23:53:56 +05:30
parent b3f29f592b
commit 3b82b2ff97
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ChatPage.cpp
View File

@ -111,7 +111,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
connect(sidebarActions_, &SideBarActions::joinRoom, this, &ChatPage::joinRoom); connect(sidebarActions_, &SideBarActions::joinRoom, this, &ChatPage::joinRoom);
connect(sidebarActions_, &SideBarActions::createRoom, this, &ChatPage::createRoom); connect(sidebarActions_, &SideBarActions::createRoom, this, &ChatPage::createRoom);
user_info_widget_ = new UserInfoWidget(sideBar_); user_info_widget_ = new UserInfoWidget(sideBar_);
connect(user_info_widget_, &UserInfoWidget::openGlobalUserProfile, this, [this]() { connect(user_info_widget_, &UserInfoWidget::openGlobalUserProfile, this, [this]() {
view_manager_->activeTimeline()->openUserProfile("", true); view_manager_->activeTimeline()->openUserProfile("", true);
}); });

4
src/timeline/TimelineModel.cpp
View File

@ -814,8 +814,8 @@ void
TimelineModel::openUserProfile(QString userid, bool global) TimelineModel::openUserProfile(QString userid, bool global)
{ {
if (global) { if (global) {
emit openProfile(new UserProfile("",utils::localUser(), emit openProfile(
manager_, this, globalUsername)); new UserProfile("", utils::localUser(), manager_, this, globalUsername));
} else { } else {
emit openProfile(new UserProfile(room_id_, userid, manager_, this)); emit openProfile(new UserProfile(room_id_, userid, manager_, this));
} }

4
src/ui/UserProfile.cpp
View File

@ -4,10 +4,10 @@
#include "DeviceVerificationFlow.h" #include "DeviceVerificationFlow.h"
#include "Logging.h" #include "Logging.h"
#include "Utils.h" #include "Utils.h"
#include <mtx/responses/common.hpp>
#include "mtx/responses/crypto.hpp" #include "mtx/responses/crypto.hpp"
#include "timeline/TimelineModel.h" #include "timeline/TimelineModel.h"
#include "timeline/TimelineViewManager.h" #include "timeline/TimelineViewManager.h"
#include <mtx/responses/common.hpp>
UserProfile::UserProfile(QString roomid, UserProfile::UserProfile(QString roomid,
QString userid, QString userid,
@ -228,7 +228,7 @@ UserProfile::changeUsername(QString username)
if (globalUserProfile()) { if (globalUserProfile()) {
// change global // change global
http::client()->set_displayname( http::client()->set_displayname(
username.toStdString(), [this]( mtx::http::RequestErr err) { username.toStdString(), [this](mtx::http::RequestErr err) {
if (err) { if (err) {
nhlog::net()->warn("could not change username"); nhlog::net()->warn("could not change username");
return; return;

6
src/ui/UserProfile.h
View File

@ -94,7 +94,7 @@ public:
UserProfile(QString roomid, UserProfile(QString roomid,
QString userid, QString userid,
TimelineViewManager *manager_, TimelineViewManager *manager_,
TimelineModel *parent = nullptr, TimelineModel *parent = nullptr,
QString globalUsername = ""); QString globalUsername = "");
DeviceInfoModel *deviceList(); DeviceInfoModel *deviceList();
@ -126,8 +126,8 @@ private:
QString roomid_, userid_; QString roomid_, userid_;
QString globalUsername; QString globalUsername;
DeviceInfoModel deviceList_; DeviceInfoModel deviceList_;
bool isUserVerified = false; bool isUserVerified = false;
bool hasMasterKey = false; bool hasMasterKey = false;
bool usernameEditing = false; bool usernameEditing = false;
TimelineViewManager *manager; TimelineViewManager *manager;
TimelineModel *model; TimelineModel *model;