11 files changed, 20 insertions, 18 deletions
diff --git a/lib/jobs/basejob.cpp b/lib/jobs/basejob.cpp
index a6471ece..ec6b8375 100644
--- a/lib/jobs/basejob.cpp
+++ b/lib/jobs/basejob.cpp
@@ -30,7 +30,7 @@
 
 #include <array>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 struct NetworkReplyDeleter : public QScopedPointerDeleteLater {
     static inline void cleanup(QNetworkReply* reply)
@@ -321,7 +321,7 @@ bool checkContentType(const QByteArray& type, const QByteArrayList& patterns)
 BaseJob::Status BaseJob::doCheckReply(QNetworkReply* reply) const
 {
     // QNetworkReply error codes seem to be flawed when it comes to HTTP;
-    // see, e.g., https://github.com/QMatrixClient/libqmatrixclient/issues/200
+    // see, e.g., https://github.com/quotient-im/libQuotient/issues/200
     // so check genuine HTTP codes. The below processing is based on
     // https://en.wikipedia.org/wiki/List_of_HTTP_status_codes
     const auto httpCodeHeader =
@@ -576,7 +576,7 @@ QUrl BaseJob::errorUrl() const { return d->errorUrl; }
 void BaseJob::setStatus(Status s)
 {
     // The crash that led to this code has been reported in
-    // https://github.com/QMatrixClient/Quaternion/issues/566 - basically,
+    // https://github.com/quotient-im/Quaternion/issues/566 - basically,
     // when cleaning up childrent of a deleted Connection, there's a chance
     // of pending jobs being abandoned, calling setStatus(Abandoned).
     // There's nothing wrong with this; however, the safety check for
diff --git a/lib/jobs/basejob.h b/lib/jobs/basejob.h
index c85d2d90..90c20c37 100644
--- a/lib/jobs/basejob.h
+++ b/lib/jobs/basejob.h
@@ -28,7 +28,7 @@
 class QNetworkReply;
 class QSslError;
 
-namespace QMatrixClient {
+namespace Quotient {
 class ConnectionData;
 
 enum class HttpVerb { Get, Put, Post, Delete };
@@ -364,4 +364,4 @@ inline bool isJobRunning(BaseJob* job)
 {
     return job && job->error() == BaseJob::Pending;
 }
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/jobs/downloadfilejob.cpp b/lib/jobs/downloadfilejob.cpp
index 9722186c..3a03efde 100644
--- a/lib/jobs/downloadfilejob.cpp
+++ b/lib/jobs/downloadfilejob.cpp
@@ -4,7 +4,7 @@
 #include <QtCore/QTemporaryFile>
 #include <QtNetwork/QNetworkReply>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 class DownloadFileJob::Private {
 public:
diff --git a/lib/jobs/downloadfilejob.h b/lib/jobs/downloadfilejob.h
index ebfe5a0d..fa697219 100644
--- a/lib/jobs/downloadfilejob.h
+++ b/lib/jobs/downloadfilejob.h
@@ -2,7 +2,7 @@
 
 #include "csapi/content-repo.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class DownloadFileJob : public GetContentJob {
 public:
     enum { FileError = BaseJob::UserDefinedError + 1 };
@@ -24,4 +24,4 @@ private:
     void beforeAbandon(QNetworkReply*) override;
     Status parseReply(QNetworkReply*) override;
 };
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/jobs/mediathumbnailjob.cpp b/lib/jobs/mediathumbnailjob.cpp
index db2bbc13..0a346392 100644
--- a/lib/jobs/mediathumbnailjob.cpp
+++ b/lib/jobs/mediathumbnailjob.cpp
@@ -18,7 +18,7 @@
 
 #include "mediathumbnailjob.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 QUrl MediaThumbnailJob::makeRequestUrl(QUrl baseUrl, const QUrl& mxcUri,
                                        QSize requestedSize)
diff --git a/lib/jobs/mediathumbnailjob.h b/lib/jobs/mediathumbnailjob.h
index df0a7f31..75e2e55a 100644
--- a/lib/jobs/mediathumbnailjob.h
+++ b/lib/jobs/mediathumbnailjob.h
@@ -22,7 +22,7 @@
 
 #include <QtGui/QPixmap>
 
-namespace QMatrixClient {
+namespace Quotient {
 class MediaThumbnailJob : public GetContentThumbnailJob {
 public:
     using GetContentThumbnailJob::makeRequestUrl;
@@ -42,4 +42,4 @@ protected:
 private:
     QImage _thumbnail;
 };
-} // namespace QMatrixClient
+} // namespace Quotient
diff --git a/lib/jobs/postreadmarkersjob.h b/lib/jobs/postreadmarkersjob.h
index cf482a9a..5a4d942c 100644
--- a/lib/jobs/postreadmarkersjob.h
+++ b/lib/jobs/postreadmarkersjob.h
@@ -22,7 +22,7 @@
 
 #include <QtCore/QJsonObject>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 class PostReadMarkersJob : public BaseJob {
 public:
diff --git a/lib/jobs/requestdata.cpp b/lib/jobs/requestdata.cpp
index 6ad7c007..0c70f085 100644
--- a/lib/jobs/requestdata.cpp
+++ b/lib/jobs/requestdata.cpp
@@ -6,7 +6,7 @@
 #include <QtCore/QJsonDocument>
 #include <QtCore/QJsonObject>
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 auto fromData(const QByteArray& data)
 {
diff --git a/lib/jobs/requestdata.h b/lib/jobs/requestdata.h
index 55987a3b..020d5ef2 100644
--- a/lib/jobs/requestdata.h
+++ b/lib/jobs/requestdata.h
@@ -26,7 +26,7 @@ class QJsonArray;
 class QJsonDocument;
 class QIODevice;
 
-namespace QMatrixClient {
+namespace Quotient {
 /**
  * A simple wrapper that represents the request body.
  * Provides a unified interface to dump an unstructured byte stream
@@ -52,4 +52,6 @@ public:
 private:
     std::unique_ptr<QIODevice> _source;
 };
-} // namespace QMatrixClient
+} // namespace Quotient
+/// \deprecated Use namespace Quotient instead
+namespace QMatrixClient = Quotient;
diff --git a/lib/jobs/syncjob.cpp b/lib/jobs/syncjob.cpp
index f660e1b6..cd7709e1 100644
--- a/lib/jobs/syncjob.cpp
+++ b/lib/jobs/syncjob.cpp
@@ -18,7 +18,7 @@
 
 #include "syncjob.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
 static size_t jobId = 0;
 
diff --git a/lib/jobs/syncjob.h b/lib/jobs/syncjob.h
index 8f925414..df419ba8 100644
--- a/lib/jobs/syncjob.h
+++ b/lib/jobs/syncjob.h
@@ -22,7 +22,7 @@
 #include "../syncdata.h"
 #include "basejob.h"
 
-namespace QMatrixClient {
+namespace Quotient {
 class SyncJob : public BaseJob {
 public:
     explicit SyncJob(const QString& since = {}, const QString& filter = {},
@@ -38,4 +38,4 @@ protected:
 private:
     SyncData d;
 };
-} // namespace QMatrixClient
+} // namespace Quotient