[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:29:45 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=751bd58
The following commit has been merged in the master branch:
commit 751bd5849baf56ad2f8bd32c0eed12fcae705e79
Author: Aleix Pol <aleixpol at kde.org>
Date: Sun Jun 5 23:08:19 2016 +0200
small style changes
---
cli/kdeconnect-cli.cpp | 3 +--
core/backends/lan/downloadjob.cpp | 10 +++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp
index 9c9447f..bb3f11f 100644
--- a/cli/kdeconnect-cli.cpp
+++ b/cli/kdeconnect-cli.cpp
@@ -110,11 +110,10 @@ int main(int argc, char** argv)
QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kdeconnect", "/modules/kdeconnect", "org.kde.kdeconnect.daemon", "forceOnNetworkChange");
QDBusConnection::sessionBus().call(msg);
} else {
- QString device;
if(!parser.isSet("device")) {
QTextStream(stderr) << i18n("No device specified") << endl;
}
- device = parser.value("device");
+ const QString device = parser.value("device");
if(parser.isSet("share")) {
QUrl url = QUrl::fromUserInput(parser.value("share"), QDir::currentPath());
parser.clearPositionalArguments();
diff --git a/core/backends/lan/downloadjob.cpp b/core/backends/lan/downloadjob.cpp
index 1cbdb6a..080d427 100644
--- a/core/backends/lan/downloadjob.cpp
+++ b/core/backends/lan/downloadjob.cpp
@@ -30,12 +30,12 @@
#include "lanlinkprovider.h"
-DownloadJob::DownloadJob(const QHostAddress &address, const QVariantMap &transferInfo): KJob()
+DownloadJob::DownloadJob(const QHostAddress &address, const QVariantMap &transferInfo)
+ : KJob()
+ , mAddress(address)
+ , mPort(transferInfo["port"].toInt())
+ , mSocket(new QSslSocket)
{
- mAddress = address;
- mPort = transferInfo["port"].toInt();
- mSocket = QSharedPointer<QSslSocket>(new QSslSocket);
-
// Setting ssl related properties for socket when using ssl
mSocket->setLocalCertificate(KdeConnectConfig::instance()->certificate());
mSocket->setPrivateKey(KdeConnectConfig::instance()->privateKeyPath());
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list