aboutsummaryrefslogtreecommitdiff
path: root/lib/room.h
diff options
context:
space:
mode:
authorKitsune Ral <Kitsune-Ral@users.sf.net>2019-08-09 23:02:17 +0900
committerKitsune Ral <Kitsune-Ral@users.sf.net>2019-08-09 23:02:17 +0900
commit01570f70926c716441cdb62928231a35af72ebc3 (patch)
tree832bbdc4c75247fb93ce18e76eed02c6674bf55c /lib/room.h
parentb0f259c3aa4ca619a6998184d16f9ab2daf5b5f4 (diff)
parent38f063e75757e97bfe1fda9655ab460454ba99db (diff)
downloadlibquotient-01570f70926c716441cdb62928231a35af72ebc3.tar.gz
libquotient-01570f70926c716441cdb62928231a35af72ebc3.zip
Merge branch 'renaming'
Diffstat (limited to 'lib/room.h')
-rw-r--r--lib/room.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/room.h b/lib/room.h
index d6fb8a61..8448815d 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -35,7 +35,7 @@
#include <memory>
#include <utility>
-namespace QMatrixClient {
+namespace Quotient {
class Event;
class Avatar;
class SyncRoomData;
@@ -423,7 +423,7 @@ public:
Q_INVOKABLE QUrl fileSource(const QString& id) const;
/** Pretty-prints plain text into HTML
- * As of now, it's exactly the same as QMatrixClient::prettyPrint();
+ * As of now, it's exactly the same as Quotient::prettyPrint();
* in the future, it will also linkify room aliases, mxids etc.
* using the room context.
*/
@@ -668,6 +668,6 @@ public:
private:
const Room* room;
};
-} // namespace QMatrixClient
-Q_DECLARE_METATYPE(QMatrixClient::FileTransferInfo)
-Q_DECLARE_OPERATORS_FOR_FLAGS(QMatrixClient::Room::Changes)
+} // namespace Quotient
+Q_DECLARE_METATYPE(Quotient::FileTransferInfo)
+Q_DECLARE_OPERATORS_FOR_FLAGS(Quotient::Room::Changes)