Generate QXmppUpload/Download only by FileSharingManager

Previously all the providers had to subclass the QXmppUpload/Download.
It should be much easier to do additional tasks (e.g. hashing after
downloading) now because the manager (and not the provider) decides when
to emit the finished signal.

Making the encrypted source provider able to handle arbitrary
unencrypted sources should be possible too.

1 files changed, 0 insertions, 13 deletions

diff --git a/src/client/QXmppUpload.h b/src/client/QXmppUpload.h
index c948496f..ec423bd9 100644
--- a/src/client/QXmppUpload.h
+++ b/src/client/QXmppUpload.h
@@ -7,16 +7,11 @@
 
 #include "QXmppBitsOfBinaryDataList.h"
 #include "QXmppError.h"
-#include "QXmppFileMetadata.h"
 #include "QXmppFileShare.h"
 #include "QXmppFileTransfer.h"
 
 #include <variant>
 
-namespace QXmpp::Private {
-using UploadResult = std::variant<std::any /* source */, QXmpp::Cancelled, QXmppError>;
-}
-
 class QXMPP_EXPORT QXmppUpload : public QXmppFileTransfer
 {
     Q_OBJECT
@@ -30,18 +25,10 @@ public:
     using Result = std::variant<FileResult, QXmpp::Cancelled, QXmppError>;
     Q_SIGNAL void finished(QXmppUpload::Result);
 
-protected:
-    /// \cond
-    Q_SIGNAL void uploadFinished(QXmpp::Private::UploadResult);
-    /// \endcond
-
 private:
-    QXmppFileMetadata metadata;
-
     friend class QXmppFileSharingManager;
 };
 
 Q_DECLARE_METATYPE(QXmppUpload::Result);
-Q_DECLARE_METATYPE(QXmpp::Private::UploadResult);
 
 #endif  // QXMPPUPLOAD_H