[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:55 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=359194c
The following commit has been merged in the master branch:
commit 359194c2edac088010ed495d657b0111df3e5e9e
Author: Aleix Pol <aleixpol at kde.org>
Date: Mon Jul 4 19:18:13 2016 +0200
Use initializers to construct it
---
core/backends/lan/uploadjob.cpp | 14 +++++---------
core/backends/lan/uploadjob.h | 6 +++---
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/core/backends/lan/uploadjob.cpp b/core/backends/lan/uploadjob.cpp
index 09fe36f..665f200 100644
--- a/core/backends/lan/uploadjob.cpp
+++ b/core/backends/lan/uploadjob.cpp
@@ -29,16 +29,12 @@
UploadJob::UploadJob(const QSharedPointer<QIODevice>& source, const QString& deviceId)
: KJob()
+ , mInput(source)
+ , mServer(new Server(this))
+ , mSocket(nullptr)
+ , mPort(0)
+ , mDeviceId(deviceId) // We will use this info if link is on ssl, to send encrypted payload
{
-// TODO: initialize in constructor
- mInput = source;
- mServer = new Server(this);
- mSocket = nullptr;
- mPort = 0;
-
- // We will use this info if link is on ssl, to send encrypted payload
- this->mDeviceId = deviceId;
-
connect(mInput.data(), SIGNAL(readyRead()), this, SLOT(startUploading()));
connect(mInput.data(), SIGNAL(aboutToClose()), this, SLOT(aboutToClose()));
}
diff --git a/core/backends/lan/uploadjob.h b/core/backends/lan/uploadjob.h
index 775fe44..146a1b2 100644
--- a/core/backends/lan/uploadjob.h
+++ b/core/backends/lan/uploadjob.h
@@ -41,11 +41,11 @@ public:
QVariantMap transferInfo();
private:
- QSharedPointer<QIODevice> mInput;
- Server* mServer;
+ const QSharedPointer<QIODevice> mInput;
+ Server * const mServer;
QSslSocket* mSocket;
quint16 mPort;
- QString mDeviceId;
+ const QString mDeviceId;
private Q_SLOTS:
void startUploading();
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list