aboutsummaryrefslogtreecommitdiff
path: root/lib/user.h
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2019-10-20 19:13:56 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2019-10-20 19:17:04 +0900
commit8b9207d5a04386957d8eab8dd251421eaaa7c0d2 (patch)
treeaa0b1c63f5aa7448aa12b2692b485d96648f8ea9 /lib/user.h
parentff78cd3370eccf593be789677dd8c4e2cdcea173 (diff)
downloadlibquotient-8b9207d5a04386957d8eab8dd251421eaaa7c0d2.tar.gz
libquotient-8b9207d5a04386957d8eab8dd251421eaaa7c0d2.zip
Qualify types in signals and Q_INVOKABLEs
Because https://doc.qt.io/qt-5/moc.html#limitations . For direct connections that doesn't matter but it very much does for queued ones. Along with this DirectChatsMap and IgnoredUsersList have been moved from Connection:: to Quotient::.
Diffstat (limited to 'lib/user.h')
-rw-r--r--lib/user.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/user.h b/lib/user.h
index c9e3dbc1..28ec841b 100644
--- a/lib/user.h
+++ b/lib/user.h
@@ -107,9 +107,10 @@ public:
qreal hueF() const;
const Avatar& avatarObject(const Room* room = nullptr) const;
- Q_INVOKABLE QImage avatar(int dimension, const Room* room = nullptr);
+ Q_INVOKABLE QImage avatar(int dimension,
+ const Quotient::Room* room = nullptr);
Q_INVOKABLE QImage avatar(int requestedWidth, int requestedHeight,
- const Room* room = nullptr);
+ const Quotient::Room* room = nullptr);
QImage avatar(int width, int height, const Room* room,
const Avatar::get_callback_t& callback);
@@ -145,9 +146,10 @@ public slots:
signals:
void nameAboutToChange(QString newName, QString oldName,
- const Room* roomContext);
- void nameChanged(QString newName, QString oldName, const Room* roomContext);
- void avatarChanged(User* user, const Room* roomContext);
+ const Quotient::Room* roomContext);
+ void nameChanged(QString newName, QString oldName,
+ const Quotient::Room* roomContext);
+ void avatarChanged(Quotient::User* user, const Quotient::Room* roomContext);
private slots:
void updateName(const QString& newName, const Room* room = nullptr);
@@ -161,4 +163,3 @@ private:
QScopedPointer<Private> d;
};
} // namespace Quotient
-Q_DECLARE_METATYPE(Quotient::User*)