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

Code styling

Browse source
This commit is contained in:
Albert Vaca 2015-03-21 23:12:04 -07:00
parent a649bb5668
commit a5e5b10d9a
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -128,14 +128,14 @@ void LanLinkProvider::newUdpConnection()
} }
if (receivedPackage->get<QString>("deviceId") == KdeConnectConfig::instance()->deviceId()) { if (receivedPackage->get<QString>("deviceId") == KdeConnectConfig::instance()->deviceId()) {
//kDebug(debugArea()) << "Ignoring my own broadcast"; //qCDebug(KDECONNECT_CORE) << "Ignoring my own broadcast";
delete receivedPackage; delete receivedPackage;
return; return;
} }
int tcpPort = receivedPackage->get<int>("tcpPort", port); int tcpPort = receivedPackage->get<int>("tcpPort", port);
//kDebug(debugArea()) << "Received Udp identity package from" << sender << " asking for a tcp connection on port " << tcpPort; //qCDebug(KDECONNECT_CORE) << "Received Udp identity package from" << sender << " asking for a tcp connection on port " << tcpPort;
QTcpSocket* socket = new QTcpSocket(this); QTcpSocket* socket = new QTcpSocket(this);
receivedIdentityPackages[socket].np = receivedPackage; receivedIdentityPackages[socket].np = receivedPackage;
@ -223,7 +223,7 @@ void LanLinkProvider::newConnection()
{ {
//qCDebug(KDECONNECT_CORE) << "LanLinkProvider newConnection"; //qCDebug(KDECONNECT_CORE) << "LanLinkProvider newConnection";
while(mTcpServer->hasPendingConnections()) { while (mTcpServer->hasPendingConnections()) {
QTcpSocket* socket = mTcpServer->nextPendingConnection(); QTcpSocket* socket = mTcpServer->nextPendingConnection();
configureSocket(socket); configureSocket(socket);
//This socket is still managed by us (and child of the QTcpServer), if //This socket is still managed by us (and child of the QTcpServer), if
@ -249,7 +249,7 @@ void LanLinkProvider::dataReceived()
NetworkPackage np(""); NetworkPackage np("");
bool success = NetworkPackage::unserialize(data, &np); bool success = NetworkPackage::unserialize(data, &np);
//kDebug(debugArea()) << "LanLinkProvider received reply:" << data; //qCDebug(KDECONNECT_CORE) << "LanLinkProvider received reply:" << data;
if (!success || np.type() != PACKAGE_TYPE_IDENTITY) { if (!success || np.type() != PACKAGE_TYPE_IDENTITY) {
qCDebug(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Not an identification package (wuh?)"; qCDebug(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Not an identification package (wuh?)";

2
core/backends/lan/socketlinereader.cpp
View file

@ -31,7 +31,7 @@ SocketLineReader::SocketLineReader(QTcpSocket* socket, QObject* parent)
void SocketLineReader::dataReceived() void SocketLineReader::dataReceived()
{ {
while(mSocket->canReadLine()) { while (mSocket->canReadLine()) {
const QByteArray line = mSocket->readLine(); const QByteArray line = mSocket->readLine();
if (line.length() > 1) { if (line.length() > 1) {
mPackages.enqueue(line);//we don't want single \n mPackages.enqueue(line);//we don't want single \n

6
fileitemactionplugin/CMakeLists.txt
View file

@ -2,6 +2,10 @@ add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-fileitemaction")
include_directories(${CMAKE_SOURCE_DIR}) include_directories(${CMAKE_SOURCE_DIR})
add_library(kdeconnectfiletiemaction MODULE sendfileitemaction.cpp) add_library(kdeconnectfiletiemaction MODULE sendfileitemaction.cpp)
target_link_libraries(kdeconnectfiletiemaction KF5::KIOWidgets KF5::I18n kdeconnectinterfaces) target_link_libraries(kdeconnectfiletiemaction
KF5::KIOWidgets
KF5::I18n
kdeconnectinterfaces
)
install(TARGETS kdeconnectfiletiemaction DESTINATION ${PLUGIN_INSTALL_DIR}) install(TARGETS kdeconnectfiletiemaction DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES kdeconnectsendfile.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES kdeconnectsendfile.desktop DESTINATION ${SERVICES_INSTALL_DIR})