From 8b9207d5a04386957d8eab8dd251421eaaa7c0d2 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Sun, 20 Oct 2019 19:13:56 +0900
Subject: 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::.
---
 lib/jobs/basejob.h | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'lib/jobs/basejob.h')

diff --git a/lib/jobs/basejob.h b/lib/jobs/basejob.h
index 6c1b802c..c4da40f5 100644
--- a/lib/jobs/basejob.h
+++ b/lib/jobs/basejob.h
@@ -184,11 +184,11 @@ public:
     using duration_ms_t = std::chrono::milliseconds::rep; // normally int64_t
 
     std::chrono::seconds getCurrentTimeout() const;
-    Q_INVOKABLE duration_ms_t getCurrentTimeoutMs() const;
+    Q_INVOKABLE Quotient::BaseJob::duration_ms_t getCurrentTimeoutMs() const;
     std::chrono::seconds getNextRetryInterval() const;
-    Q_INVOKABLE duration_ms_t getNextRetryMs() const;
+    Q_INVOKABLE Quotient::BaseJob::duration_ms_t getNextRetryMs() const;
     std::chrono::milliseconds timeToRetry() const;
-    Q_INVOKABLE duration_ms_t millisToRetry() const;
+    Q_INVOKABLE Quotient::BaseJob::duration_ms_t millisToRetry() const;
 
     friend QDebug operator<<(QDebug dbg, const BaseJob* j)
     {
@@ -215,7 +215,7 @@ signals:
     void sentRequest();
 
     /** The job has changed its status */
-    void statusChanged(Status newStatus);
+    void statusChanged(Quotient::BaseJob::Status newStatus);
 
     /**
      * The previous network request has failed; the next attempt will
@@ -225,7 +225,8 @@ signals:
      * @param inMilliseconds the interval after which the next attempt will be
      * taken
      */
-    void retryScheduled(int nextAttempt, duration_ms_t inMilliseconds);
+    void retryScheduled(int nextAttempt,
+                        Quotient::BaseJob::duration_ms_t inMilliseconds);
 
     /**
      * The previous network request has been rate-limited; the next attempt
@@ -251,7 +252,7 @@ signals:
      *
      * @see result, success, failure
      */
-    void finished(BaseJob* job);
+    void finished(Quotient::BaseJob* job);
 
     /**
      * Emitted when the job is finished (except when abandoned).
@@ -262,14 +263,14 @@ signals:
      *
      * @see success, failure
      */
-    void result(BaseJob* job);
+    void result(Quotient::BaseJob* job);
 
     /**
      * Emitted together with result() in case there's no error.
      *
      * @see result, failure
      */
-    void success(BaseJob*);
+    void success(Quotient::BaseJob*);
 
     /**
      * Emitted together with result() if there's an error.
@@ -277,7 +278,7 @@ signals:
      *
      * @see result, success
      */
-    void failure(BaseJob*);
+    void failure(Quotient::BaseJob*);
 
     void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
     void uploadProgress(qint64 bytesSent, qint64 bytesTotal);
-- 
cgit v1.2.3