diff options
| author | Jedi18 <targetakhil@gmail.com> | 2021-01-28 23:53:56 +0530 |
|---|---|---|
| committer | Jedi18 <targetakhil@gmail.com> | 2021-01-28 23:53:56 +0530 |
| commit | 3b82b2ff972e4f74904e315008b996202473570c (patch) | |
| tree | 0b56ba8cea17f2d4126335e4716694807d9cde17 /src | |
| parent | Changed edit method from double clicking to an edit button (diff) | |
| download | nheko-3b82b2ff972e4f74904e315008b996202473570c.tar.xz | |
fix linting
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChatPage.cpp | 2 | ||||
| -rw-r--r-- | src/timeline/TimelineModel.cpp | 4 | ||||
| -rw-r--r-- | src/ui/UserProfile.cpp | 4 | ||||
| -rw-r--r-- | src/ui/UserProfile.h | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp index 0d3c98a8..cf50e62a 100644 --- a/src/ChatPage.cpp +++ b/src/ChatPage.cpp @@ -111,7 +111,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent) connect(sidebarActions_, &SideBarActions::joinRoom, this, &ChatPage::joinRoom); 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]() { view_manager_->activeTimeline()->openUserProfile("", true); }); diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp index 41c0b40e..a25e77fd 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp @@ -814,8 +814,8 @@ void TimelineModel::openUserProfile(QString userid, bool global) { if (global) { - emit openProfile(new UserProfile("",utils::localUser(), - manager_, this, globalUsername)); + emit openProfile( + new UserProfile("", utils::localUser(), manager_, this, globalUsername)); } else { emit openProfile(new UserProfile(room_id_, userid, manager_, this)); } diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp index a53d25f4..28757b72 100644 --- a/src/ui/UserProfile.cpp +++ b/src/ui/UserProfile.cpp @@ -4,10 +4,10 @@ #include "DeviceVerificationFlow.h" #include "Logging.h" #include "Utils.h" -#include <mtx/responses/common.hpp> #include "mtx/responses/crypto.hpp" #include "timeline/TimelineModel.h" #include "timeline/TimelineViewManager.h" +#include <mtx/responses/common.hpp> UserProfile::UserProfile(QString roomid, QString userid, @@ -228,7 +228,7 @@ UserProfile::changeUsername(QString username) if (globalUserProfile()) { // change global http::client()->set_displayname( - username.toStdString(), [this]( mtx::http::RequestErr err) { + username.toStdString(), [this](mtx::http::RequestErr err) { if (err) { nhlog::net()->warn("could not change username"); return; diff --git a/src/ui/UserProfile.h b/src/ui/UserProfile.h index 04317766..b1172077 100644 --- a/src/ui/UserProfile.h +++ b/src/ui/UserProfile.h @@ -94,7 +94,7 @@ public: UserProfile(QString roomid, QString userid, TimelineViewManager *manager_, - TimelineModel *parent = nullptr, + TimelineModel *parent = nullptr, QString globalUsername = ""); DeviceInfoModel *deviceList(); @@ -126,8 +126,8 @@ private: QString roomid_, userid_; QString globalUsername; DeviceInfoModel deviceList_; - bool isUserVerified = false; - bool hasMasterKey = false; + bool isUserVerified = false; + bool hasMasterKey = false; bool usernameEditing = false; TimelineViewManager *manager; TimelineModel *model; |