aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorLinus Jahn <lnj@kaidan.im>2022-10-02 03:58:06 +0200
committerLinus Jahn <lnj@kaidan.im>2022-10-02 23:01:13 +0200
commit4900dbb3706309ac7558fbe661a64654d7d7d221 (patch)
tree61891873a3ee4b759dbdc18f20336d58c1b1d90c /src/client
parent2f6a91642f2585c8b226011a0bb5a3725a012b15 (diff)
downloadqxmpp-4900dbb3706309ac7558fbe661a64654d7d7d221.tar.gz
Rename EncryptedHttpProvider to EncryptedProvider
Diffstat (limited to 'src/client')
-rw-r--r--src/client/QXmppEncryptedFileSharingProvider.cpp (renamed from src/client/QXmppEncryptedHttpFileSharingProvider.cpp)32
-rw-r--r--src/client/QXmppEncryptedFileSharingProvider.h (renamed from src/client/QXmppEncryptedHttpFileSharingProvider.h)10
-rw-r--r--src/client/QXmppFileSharingManager.h2
3 files changed, 22 insertions, 22 deletions
diff --git a/src/client/QXmppEncryptedHttpFileSharingProvider.cpp b/src/client/QXmppEncryptedFileSharingProvider.cpp
index 2ba0a665..b2638d05 100644
--- a/src/client/QXmppEncryptedHttpFileSharingProvider.cpp
+++ b/src/client/QXmppEncryptedFileSharingProvider.cpp
@@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: LGPL-2.1-or-later
-#include "QXmppEncryptedHttpFileSharingProvider.h"
+#include "QXmppEncryptedFileSharingProvider.h"
#include "QXmppFileEncryption.h"
#include "QXmppFileMetadata.h"
@@ -18,14 +18,14 @@ using namespace QXmpp;
using namespace QXmpp::Private;
///
-/// \class QXmppEncryptedHttpFileSharingProvider
+/// \class QXmppEncryptedFileSharingProvider
///
/// Encrypts or decrypts files on the fly when uploading or downloading.
///
/// \since QXmpp 1.5
///
-class QXmppEncryptedHttpFileSharingProviderPrivate
+class QXmppEncryptedFileSharingProviderPrivate
{
public:
QcaInitializer init;
@@ -34,34 +34,34 @@ public:
};
///
-/// \brief Create a new QXmppEncryptedHttpFileSharingProvider
+/// \brief Create a new QXmppEncryptedFileSharingProvider
///
/// \param manager QXmppFileSharingManager to be used to find other providers for downloading
/// encrypted files.
/// \param uploadBaseProvider Provider to be used for uploading the encrypted files.
///
-QXmppEncryptedHttpFileSharingProvider::QXmppEncryptedHttpFileSharingProvider(
+QXmppEncryptedFileSharingProvider::QXmppEncryptedFileSharingProvider(
QXmppFileSharingManager *manager,
std::shared_ptr<QXmppFileSharingProvider> uploadBaseProvider)
- : d(std::make_unique<QXmppEncryptedHttpFileSharingProviderPrivate>())
+ : d(std::make_unique<QXmppEncryptedFileSharingProviderPrivate>())
{
d->manager = manager;
d->uploadBaseProvider = std::move(uploadBaseProvider);
}
-QXmppEncryptedHttpFileSharingProvider::~QXmppEncryptedHttpFileSharingProvider() = default;
+QXmppEncryptedFileSharingProvider::~QXmppEncryptedFileSharingProvider() = default;
-auto QXmppEncryptedHttpFileSharingProvider::downloadFile(const std::any &source,
- std::unique_ptr<QIODevice> target,
- std::function<void(quint64, quint64)> reportProgress,
- std::function<void(DownloadResult)> reportFinished)
+auto QXmppEncryptedFileSharingProvider::downloadFile(const std::any &source,
+ std::unique_ptr<QIODevice> target,
+ std::function<void(quint64, quint64)> reportProgress,
+ std::function<void(DownloadResult)> reportFinished)
-> std::shared_ptr<Download>
{
QXmppEncryptedFileSource encryptedSource;
try {
encryptedSource = std::any_cast<QXmppEncryptedFileSource>(source);
} catch (const std::bad_any_cast &) {
- qFatal("QXmppEncryptedHttpFileSharingProvider::downloadFile can only handle QXmppEncryptedFileSource sources");
+ qFatal("QXmppEncryptedFileSharingProvider::downloadFile can only handle QXmppEncryptedFileSource sources");
}
auto output = std::make_unique<Encryption::DecryptionDevice>(std::move(target), encryptedSource.cipher(), encryptedSource.iv(), encryptedSource.key());
@@ -76,10 +76,10 @@ auto QXmppEncryptedHttpFileSharingProvider::downloadFile(const std::any &source,
return {};
}
-auto QXmppEncryptedHttpFileSharingProvider::uploadFile(std::unique_ptr<QIODevice> data,
- const QXmppFileMetadata &,
- std::function<void(quint64, quint64)> reportProgress,
- std::function<void(UploadResult)> reportFinished)
+auto QXmppEncryptedFileSharingProvider::uploadFile(std::unique_ptr<QIODevice> data,
+ const QXmppFileMetadata &,
+ std::function<void(quint64, quint64)> reportProgress,
+ std::function<void(UploadResult)> reportFinished)
-> std::shared_ptr<Upload>
{
auto cipher = Aes256CbcPkcs7;
diff --git a/src/client/QXmppEncryptedHttpFileSharingProvider.h b/src/client/QXmppEncryptedFileSharingProvider.h
index dee615b0..d5112348 100644
--- a/src/client/QXmppEncryptedHttpFileSharingProvider.h
+++ b/src/client/QXmppEncryptedFileSharingProvider.h
@@ -10,17 +10,17 @@
#include "QXmppHttpFileSharingProvider.h"
class QXmppFileSharingManager;
-class QXmppEncryptedHttpFileSharingProviderPrivate;
+class QXmppEncryptedFileSharingProviderPrivate;
-class QXMPP_EXPORT QXmppEncryptedHttpFileSharingProvider : public QXmppFileSharingProvider
+class QXMPP_EXPORT QXmppEncryptedFileSharingProvider : public QXmppFileSharingProvider
{
public:
/// \cond
using SourceType = QXmppEncryptedFileSource;
/// \endcond
- QXmppEncryptedHttpFileSharingProvider(QXmppFileSharingManager *manager, std::shared_ptr<QXmppFileSharingProvider> uploadBaseProvider);
- ~QXmppEncryptedHttpFileSharingProvider() override;
+ QXmppEncryptedFileSharingProvider(QXmppFileSharingManager *manager, std::shared_ptr<QXmppFileSharingProvider> uploadBaseProvider);
+ ~QXmppEncryptedFileSharingProvider() override;
auto downloadFile(const std::any &source,
std::unique_ptr<QIODevice> target,
@@ -33,7 +33,7 @@ public:
std::function<void(UploadResult)> reportFinished) -> std::shared_ptr<Upload> override;
private:
- std::unique_ptr<QXmppEncryptedHttpFileSharingProviderPrivate> d;
+ std::unique_ptr<QXmppEncryptedFileSharingProviderPrivate> d;
};
#endif // QXMPPENCRYPTEDHTTPFILESHARINGPROVIDER_H
diff --git a/src/client/QXmppFileSharingManager.h b/src/client/QXmppFileSharingManager.h
index 18966379..b59eb46b 100644
--- a/src/client/QXmppFileSharingManager.h
+++ b/src/client/QXmppFileSharingManager.h
@@ -69,7 +69,7 @@ public:
std::unique_ptr<QIODevice> output);
private:
- friend class QXmppEncryptedHttpFileSharingProvider;
+ friend class QXmppEncryptedFileSharingProvider;
void internalRegisterProvider(std::type_index, std::shared_ptr<QXmppFileSharingProvider> provider);
std::shared_ptr<QXmppFileSharingProvider> providerForSource(const std::any &source) const;