diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-08-09 23:02:17 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2019-08-09 23:02:17 +0900 |
| commit | 01570f70926c716441cdb62928231a35af72ebc3 (patch) | |
| tree | 832bbdc4c75247fb93ce18e76eed02c6674bf55c /lib/room.cpp | |
| parent | b0f259c3aa4ca619a6998184d16f9ab2daf5b5f4 (diff) | |
| parent | 38f063e75757e97bfe1fda9655ab460454ba99db (diff) | |
| download | libquotient-01570f70926c716441cdb62928231a35af72ebc3.tar.gz libquotient-01570f70926c716441cdb62928231a35af72ebc3.zip | |
Merge branch 'renaming'
Diffstat (limited to 'lib/room.cpp')
| -rw-r--r-- | lib/room.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/room.cpp b/lib/room.cpp index 52f86616..d8fee5aa 100644 --- a/lib/room.cpp +++ b/lib/room.cpp @@ -71,7 +71,7 @@ #include <message.h> // QtOlm #include <session.h> // QtOlm -using namespace QMatrixClient; +using namespace Quotient; using namespace std::placeholders; using std::move; #if !(defined __GLIBCXX__ && __GLIBCXX__ <= 20150123) @@ -1085,7 +1085,7 @@ QUrl Room::fileSource(const QString& id) const QString Room::prettyPrint(const QString& plainText) const { - return QMatrixClient::prettyPrint(plainText); + return Quotient::prettyPrint(plainText); } QList<User*> Room::usersTyping() const { return d->usersTyping; } |