[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498
Maximiliano Curia
maxy at moszumanska.debian.org
Fri Oct 14 14:28:24 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=a5e5b10
The following commit has been merged in the master branch:
commit a5e5b10d9aff4a103d9de2fe3f731780918f0294
Author: Albert Vaca <albertvaka at gmail.com>
Date: Sat Mar 21 23:12:04 2015 -0700
Code styling
---
core/backends/lan/lanlinkprovider.cpp | 8 ++++----
core/backends/lan/socketlinereader.cpp | 2 +-
fileitemactionplugin/CMakeLists.txt | 6 +++++-
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp
index a0334ee..1755e81 100644
--- a/core/backends/lan/lanlinkprovider.cpp
+++ b/core/backends/lan/lanlinkprovider.cpp
@@ -128,14 +128,14 @@ void LanLinkProvider::newUdpConnection()
}
if (receivedPackage->get<QString>("deviceId") == KdeConnectConfig::instance()->deviceId()) {
- //kDebug(debugArea()) << "Ignoring my own broadcast";
+ //qCDebug(KDECONNECT_CORE) << "Ignoring my own broadcast";
delete receivedPackage;
return;
}
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);
receivedIdentityPackages[socket].np = receivedPackage;
@@ -223,7 +223,7 @@ void LanLinkProvider::newConnection()
{
//qCDebug(KDECONNECT_CORE) << "LanLinkProvider newConnection";
- while(mTcpServer->hasPendingConnections()) {
+ while (mTcpServer->hasPendingConnections()) {
QTcpSocket* socket = mTcpServer->nextPendingConnection();
configureSocket(socket);
//This socket is still managed by us (and child of the QTcpServer), if
@@ -249,7 +249,7 @@ void LanLinkProvider::dataReceived()
NetworkPackage 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) {
qCDebug(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Not an identification package (wuh?)";
diff --git a/core/backends/lan/socketlinereader.cpp b/core/backends/lan/socketlinereader.cpp
index 4fdaf14..a6bd85e 100644
--- a/core/backends/lan/socketlinereader.cpp
+++ b/core/backends/lan/socketlinereader.cpp
@@ -31,7 +31,7 @@ SocketLineReader::SocketLineReader(QTcpSocket* socket, QObject* parent)
void SocketLineReader::dataReceived()
{
- while(mSocket->canReadLine()) {
+ while (mSocket->canReadLine()) {
const QByteArray line = mSocket->readLine();
if (line.length() > 1) {
mPackages.enqueue(line);//we don't want single
diff --git a/fileitemactionplugin/CMakeLists.txt b/fileitemactionplugin/CMakeLists.txt
index 3df94ad..fddb897 100644
--- a/fileitemactionplugin/CMakeLists.txt
+++ b/fileitemactionplugin/CMakeLists.txt
@@ -2,6 +2,10 @@ add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-fileitemaction")
include_directories(${CMAKE_SOURCE_DIR})
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(FILES kdeconnectsendfile.desktop DESTINATION ${SERVICES_INSTALL_DIR})
--
kdeconnect packaging
More information about the pkg-kde-commits
mailing list