Add global Cancelled unit struct

The Cancelled struct from HttpUpload is going to be used in other
places.

3 files changed, 12 insertions, 6 deletions

diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h
index 88f73070..0e336b2f 100644
--- a/src/base/QXmppGlobal.h
+++ b/src/base/QXmppGlobal.h
@@ -145,6 +145,15 @@ struct Success
 {
 };
 
+///
+/// Unit struct used to indicate that a process has been cancelled.
+///
+/// \since QXmpp 1.5
+///
+struct Cancelled
+{
+};
+
 }  // namespace QXmpp
 
 #endif  // QXMPPGLOBAL_H
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();