diff --git a/core/filetransferjob.cpp b/core/filetransferjob.cpp index 5df738c3d..8cbc699a6 100644 --- a/core/filetransferjob.cpp +++ b/core/filetransferjob.cpp @@ -28,7 +28,7 @@ #include "kdebugnamespace.h" -FileTransferJob::FileTransferJob(const QSharedPointer& origin, int size, const KUrl& destination): KJob() +FileTransferJob::FileTransferJob(const QSharedPointer& origin, int size, const QUrl &destination): KJob() { Q_ASSERT(destination.isLocalFile()); //TODO: Make a precondition before calling this function that destination file exists @@ -61,7 +61,7 @@ void FileTransferJob::doStart() QPair(i18nc("File transfer origin", "From"), QString(mDeviceName)) ); - KUrl destCheck = mDestination; + QUrl destCheck = mDestination; if (QFile::exists(destCheck.path())) { QFileInfo destInfo(destCheck.path()); KIO::RenameDialog *dialog = new KIO::RenameDialog(Q_NULLPTR, diff --git a/core/filetransferjob.h b/core/filetransferjob.h index a3d197f67..bc0e9e9bd 100644 --- a/core/filetransferjob.h +++ b/core/filetransferjob.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include @@ -37,9 +37,9 @@ class FileTransferJob Q_OBJECT public: - FileTransferJob(const QSharedPointer& origin, int size, const KUrl& destination); + FileTransferJob(const QSharedPointer& origin, int size, const QUrl &destination); virtual void start(); - KUrl destination() const { return mDestination; } + QUrl destination() const { return mDestination; } void setDeviceName(const QString &deviceName) {mDeviceName = deviceName;}; public Q_SLOTS: diff --git a/core/networkpackage.cpp b/core/networkpackage.cpp index 25fc971da..0e17aea25 100644 --- a/core/networkpackage.cpp +++ b/core/networkpackage.cpp @@ -207,7 +207,7 @@ bool NetworkPackage::decrypt(QCA::PrivateKey& key, NetworkPackage* out) const } -FileTransferJob* NetworkPackage::createPayloadTransferJob(const KUrl& destination) const +FileTransferJob* NetworkPackage::createPayloadTransferJob(const QUrl &destination) const { return new FileTransferJob(payload(), payloadSize(), destination); } diff --git a/core/networkpackage.h b/core/networkpackage.h index 33737d915..550ef9d77 100644 --- a/core/networkpackage.h +++ b/core/networkpackage.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "kdeconnectcore_export.h" #include "kdebugnamespace.h" @@ -77,7 +77,7 @@ public: void setPayload(const QSharedPointer& device, int payloadSize) { mPayload = device; mPayloadSize = payloadSize; Q_ASSERT(mPayloadSize >= -1); } bool hasPayload() const { return (mPayloadSize != 0); } int payloadSize() const { return mPayloadSize; } //-1 means it is an endless stream - FileTransferJob* createPayloadTransferJob(const KUrl& destination) const; + FileTransferJob* createPayloadTransferJob(const QUrl &destination) const; //To be called by a particular DeviceLink QVariantMap payloadTransferInfo() const { return mPayloadTransferInfo; }