ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some clazy warning and deprecations

Browse Source
This commit is contained in:
Carl Schwan
2020-11-10 19:52:22 +01:00
parent b0700726f9
commit 53397bf970
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/controller.h
View File

@@ -47,7 +47,7 @@ public:
Q_INVOKABLE void loginWithCredentials(QString, QString, QString, QString); Q_INVOKABLE void loginWithCredentials(QString, QString, QString, QString);
Q_INVOKABLE void loginWithAccessToken(QString, QString, QString, QString); Q_INVOKABLE void loginWithAccessToken(QString, QString, QString, QString);
Q_INVOKABLE void changePassword(Connection *connection, const QString &currentPassword, const QString &newPassword); Q_INVOKABLE void changePassword(Quotient::Connection *connection, const QString &currentPassword, const QString &newPassword);
int accountCount() const; int accountCount() const;
@@ -104,7 +104,7 @@ Q_SIGNALS:
void connectionChanged(); void connectionChanged();
void isOnlineChanged(); void isOnlineChanged();
void aboutDataChanged(); void aboutDataChanged();
void passwordStatus(PasswordStatus status); void passwordStatus(Controller::PasswordStatus status);
public Q_SLOTS: public Q_SLOTS:
void logout(Quotient::Connection *conn); void logout(Quotient::Connection *conn);

6
src/neochatroom.cpp
View File

@@ -297,15 +297,15 @@ QString NeoChatRoom::eventToString(const RoomEvent &evt, Qt::TextFormat format,
} }
QString text {}; QString text {};
if (e.isRename()) { if (e.isRename()) {
if (e.displayName().isEmpty()) if (e.newDisplayName()->isEmpty())
text = tr("cleared their display name"); text = tr("cleared their display name");
else else
text = tr("changed their display name to %1").arg(e.displayName().toHtmlEscaped()); text = tr("changed their display name to %1").arg(e.newDisplayName()->toHtmlEscaped());
} }
if (e.isAvatarUpdate()) { if (e.isAvatarUpdate()) {
if (!text.isEmpty()) if (!text.isEmpty())
text += " and "; text += " and ";
if (e.avatarUrl().isEmpty()) if (e.newAvatarUrl()->isEmpty())
text += tr("cleared their avatar"); text += tr("cleared their avatar");
else if (e.prevContent()->avatarUrl->isEmpty()) else if (e.prevContent()->avatarUrl->isEmpty())
text += tr("set an avatar"); text += tr("set an avatar");