tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed whitespace

Browse source
This commit is contained in:
Vineet Garg 2015-07-13 19:55:22 +05:30
parent 1ba68150a7
commit 781adac15b
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/backends/lan/lanlinkprovider.cpp
View file

@ -148,7 +148,6 @@ void LanLinkProvider::newUdpConnection()
connect(socket, SIGNAL(connected()), this, SLOT(connected()));
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError()));
socket->connectToHost(sender, tcpPort);
}
}
@ -160,7 +159,7 @@ void LanLinkProvider::connectError()
disconnect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError()));
qCDebug(KDECONNECT_CORE) << socket->errorString();
qCDebug(KDECONNECT_CORE) << "Fallback (1), try reverse connection (send udp packet)";
NetworkPackage np("");
NetworkPackage::createIdentityPackage(&np);
@ -177,7 +176,7 @@ void LanLinkProvider::connectError()
void LanLinkProvider::connected()
{
qCDebug(KDECONNECT_CORE) << "Socket connected";
// TODO : Change the behaviour of these disconnects
QSslSocket* socket = qobject_cast<QSslSocket*>(sender());
if (!socket) return;
@ -248,7 +247,7 @@ void LanLinkProvider::connected()
void LanLinkProvider::encrypted() {
qCDebug(KDECONNECT_CORE) << "Socket encrypted";
QSslSocket* socket = qobject_cast<QSslSocket*>(sender());
if (!socket) return;
disconnect(socket, SIGNAL(encrypted()), this, SLOT(encrypted()));
@ -331,7 +330,7 @@ void LanLinkProvider::dataReceived()
NetworkPackage* np = new NetworkPackage("");
bool success = NetworkPackage::unserialize(data, np);
receivedIdentityPackages[socket].np = np;
// receivedIdentityPackages[socket].sender = sender;
@ -445,5 +444,4 @@ void LanLinkProvider::addLink(QString deviceId, QSslSocket* socket, NetworkPacka
Q_EMIT onConnectionReceived(*receivedPackage, deviceLink);
}
}

4
core/backends/lan/server.h
View file

@ -25,8 +25,8 @@
#include <QSslError>
#include <QtNetwork/qsslsocket.h>
class Server
: public QTcpServer
class Server
: public QTcpServers
{
Q_OBJECT

2
core/kdeconnectconfig.cpp
View file

@ -131,7 +131,7 @@ KdeConnectConfig::KdeConnectConfig()
certificateOptions.setSerialNumber(bigInteger);
certificateOptions.setInfo(certificateInfo);
certificateOptions.setValidityPeriod(startTime, endTime);
certificateOptions.setFormat(QCA::PKCS10);
certificateOptions.setFormat(QCA::PKCS10);
// d->certificate = QCA::Certificate(certificateOptions, d->privateKey);
d->certificate = QSslCertificate(QCA::Certificate(certificateOptions, d->privateKey).toPEM().toLatin1());