From ad7dc952ce404db3eac20d69c3c8346f0dbf8181 Mon Sep 17 00:00:00 2001
From: Linus Jahn <lnj@kaidan.im>
Date: Tue, 13 Sep 2022 22:36:02 +0200
Subject: Add global Cancelled unit struct

The Cancelled struct from HttpUpload is going to be used in other
places.
---
 src/client/QXmppHttpUploadManager.cpp | 3 ++-
 src/client/QXmppHttpUploadManager.h   | 6 +-----
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'src/client')

diff --git a/src/client/QXmppHttpUploadManager.cpp b/src/client/QXmppHttpUploadManager.cpp
index e0ce05f9..5723246d 100644
--- a/src/client/QXmppHttpUploadManager.cpp
+++ b/src/client/QXmppHttpUploadManager.cpp
@@ -16,6 +16,7 @@
 #include <QNetworkReply>
 #include <QPointer>
 
+using namespace QXmpp;
 using namespace QXmpp::Private;
 
 struct QXmppHttpUploadPrivate
@@ -69,7 +70,7 @@ struct QXmppHttpUploadPrivate
             return *error;
         }
         if (cancelled) {
-            return QXmppHttpUpload::Cancelled();
+            return Cancelled();
         }
         return getUrl;
     }
diff --git a/src/client/QXmppHttpUploadManager.h b/src/client/QXmppHttpUploadManager.h
index 87a55446..ff72e59d 100644
--- a/src/client/QXmppHttpUploadManager.h
+++ b/src/client/QXmppHttpUploadManager.h
@@ -25,11 +25,7 @@ class QXMPP_EXPORT QXmppHttpUpload : public QObject
     Q_PROPERTY(quint64 bytesTotal READ bytesTotal NOTIFY progressChanged)
 
 public:
-    struct Cancelled
-    {
-    };
-
-    using Result = std::variant<QUrl, Cancelled, QXmppError>;
+    using Result = std::variant<QUrl, QXmpp::Cancelled, QXmppError>;
 
     ~QXmppHttpUpload();
 
-- 
cgit v1.2.3