[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:27:55 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=473a34b
The following commit has been merged in the master branch:
commit 473a34b76f9649f5ea9017fbdb53c247887358b5
Author: Àlex Fiestas <afiestas at kde.org>
Date: Sun Sep 21 22:22:06 2014 +0200
Por filetranasferjob to QUrl
Pretty much a straight forward port from KUrl to QUrl, since we are only
forwarding arguments there was not much to port but a simple /kurl/qurl/
---
core/filetransferjob.cpp | 4 ++--
core/filetransferjob.h | 6 +++---
core/networkpackage.cpp | 2 +-
core/networkpackage.h | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/filetransferjob.cpp b/core/filetransferjob.cpp
index 5df738c..8cbc699 100644
--- a/core/filetransferjob.cpp
+++ b/core/filetransferjob.cpp
@@ -28,7 +28,7 @@
#include "kdebugnamespace.h"
-FileTransferJob::FileTransferJob(const QSharedPointer<QIODevice>& origin, int size, const KUrl& destination): KJob()
+FileTransferJob::FileTransferJob(const QSharedPointer<QIODevice>& 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<QString, QString>(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 a3d197f..bc0e9e9 100644
--- a/core/filetransferjob.h
+++ b/core/filetransferjob.h
@@ -26,7 +26,7 @@
#include <QTemporaryFile>
#include <KJob>
-#include <KUrl>
+#include <QUrl>
#include <KIO/FileJob>
#include <KIO/Job>
#include <KSharedPtr>
@@ -37,9 +37,9 @@ class FileTransferJob
Q_OBJECT
public:
- FileTransferJob(const QSharedPointer<QIODevice>& origin, int size, const KUrl& destination);
+ FileTransferJob(const QSharedPointer<QIODevice>& 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 25fc971..0e17aea 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 33737d9..550ef9d 100644
--- a/core/networkpackage.h
+++ b/core/networkpackage.h
@@ -30,7 +30,7 @@
#include <QIODevice>
#include <QtCrypto>
#include <QSharedPointer>
-#include <KUrl>
+#include <QUrl>
#include "kdeconnectcore_export.h"
#include "kdebugnamespace.h"
@@ -77,7 +77,7 @@ public:
void setPayload(const QSharedPointer<QIODevice>& 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; }
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list