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

Code chages for compatibility with MSVC compiler

Browse source 
Thanks to Xiluembo
This commit is contained in:
Albert Vaca 2013-11-18 02:34:34 +01:00
parent 1bc4fcfa23
commit d782060b39
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,17 +35,23 @@
void LanLinkProvider::configureSocket(QTcpSocket* socket) void LanLinkProvider::configureSocket(QTcpSocket* socket)
{ {
int fd = socket->socketDescriptor(); int fd = socket->socketDescriptor();
int enableKeepAlive = 1; char enableKeepAlive = 1;
setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &enableKeepAlive, sizeof(enableKeepAlive)); setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &enableKeepAlive, sizeof(enableKeepAlive));
#ifdef TCP_KEEPIDLE
int maxIdle = 60; /* seconds */ int maxIdle = 60; /* seconds */
setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &maxIdle, sizeof(maxIdle)); setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &maxIdle, sizeof(maxIdle));
#endif
#ifdef TCP_KEEPCNT
int count = 3; // send up to 3 keepalive packets out, then disconnect if no response int count = 3; // send up to 3 keepalive packets out, then disconnect if no response
setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPCNT, &count, sizeof(count)); setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPCNT, &count, sizeof(count));
#endif
#ifdef TCP_KEEPINTVL
int interval = 5; // send a keepalive packet out every 2 seconds (after the 5 second idle period) int interval = 5; // send a keepalive packet out every 2 seconds (after the 5 second idle period)
setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPINTVL, &interval, sizeof(interval)); setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPINTVL, &interval, sizeof(interval));
#endif
} }

7
kded/device.cpp
View file

@ -1,7 +1,5 @@
#include "device.h" #include "device.h"
#include <QDBusConnection>
#include <KSharedConfig> #include <KSharedConfig>
#include <KConfigGroup> #include <KConfigGroup>
#include <KStandardDirs> #include <KStandardDirs>
@ -17,6 +15,11 @@
#include "backends/linkprovider.h" #include "backends/linkprovider.h"
#include "networkpackage.h" #include "networkpackage.h"
#ifdef interface // MSVC language extension, QDBusConnection uses this as a variable name
#undef interface
#endif
#include <QDBusConnection>
Device::Device(const QString& id) Device::Device(const QString& id)
: m_deviceId(id) : m_deviceId(id)
, m_pairStatus(Device::Paired) , m_pairStatus(Device::Paired)

2
kded/plugins/mpriscontrol/mpriscontrolplugin.h
View file

@ -42,7 +42,7 @@ public Q_SLOTS:
private Q_SLOTS: private Q_SLOTS:
void serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner); void serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner);
void propertiesChanged(const QString& interface, const QVariantMap& properties); void propertiesChanged(const QString& propertyInterface, const QVariantMap& properties);
private: private:
void addPlayer(const QString& ifaceName); void addPlayer(const QString& ifaceName);