made requeste changes
2 files changed, 6 insertions, 6 deletions
diff --git a/src/ui/UserProfile.cpp b/src/ui/UserProfile.cpp
index e2adffcd..9e8d45b5 100644
--- a/src/ui/UserProfile.cpp
+++ b/src/ui/UserProfile.cpp
@@ -116,7 +116,7 @@ UserProfile::userid()
QString
UserProfile::displayName()
{
- return globalUserProfile() ? globalUsername : cache::displayName(roomid_, userid_);
+ return isGlobalUserProfile() ? globalUsername : cache::displayName(roomid_, userid_);
}
QString
@@ -126,9 +126,9 @@ UserProfile::avatarUrl()
}
bool
-UserProfile::globalUserProfile() const
+UserProfile::isGlobalUserProfile() const
{
- return (roomid_ == "") && isSelf();
+ return roomid_ == "";
}
bool
@@ -241,7 +241,7 @@ UserProfile::startChat()
void
UserProfile::changeUsername(QString username)
{
- if (globalUserProfile()) {
+ if (isGlobalUserProfile()) {
// change global
http::client()->set_displayname(
username.toStdString(), [this](mtx::http::RequestErr err) {
diff --git a/src/ui/UserProfile.h b/src/ui/UserProfile.h
index 5ccb54b3..d450d58f 100644
--- a/src/ui/UserProfile.h
+++ b/src/ui/UserProfile.h
@@ -83,7 +83,7 @@ class UserProfile : public QObject
Q_PROPERTY(QString userid READ userid CONSTANT)
Q_PROPERTY(QString avatarUrl READ avatarUrl CONSTANT)
Q_PROPERTY(DeviceInfoModel *deviceList READ deviceList CONSTANT)
- Q_PROPERTY(bool globalUserProfile READ globalUserProfile CONSTANT)
+ Q_PROPERTY(bool isGlobalUserProfile READ isGlobalUserProfile CONSTANT)
Q_PROPERTY(bool isUserVerified READ getUserStatus NOTIFY userStatusChanged)
Q_PROPERTY(
bool userVerificationEnabled READ userVerificationEnabled NOTIFY userStatusChanged)
@@ -101,7 +101,7 @@ public:
QString userid();
QString displayName();
QString avatarUrl();
- bool globalUserProfile() const;
+ bool isGlobalUserProfile() const;
bool getUserStatus();
bool userVerificationEnabled() const;
bool isSelf() const;
|