#ifdef HAVE_SSL
# include <QSslSocket>
+#else
+# include <QTcpSocket>
#endif
#include "remotepeer.h"
using namespace Protocol;
RemotePeer::RemotePeer(QTcpSocket *socket, QObject *parent)
- : SignalProxy::AbstractPeer(parent),
+ : Peer(parent),
_socket(socket),
_signalProxy(0),
_heartBeatTimer(new QTimer(this)),
void RemotePeer::handle(const HeartBeatReply &heartBeatReply)
{
_heartBeatCount = 0;
-#if QT_VERSION < 0x040700
- emit lagUpdated(heartBeatReply.timestamp().time().msecsTo(QTime::currentTime()) / 2);
+#if QT_VERSION >= 0x040900
+ emit lagUpdated(heartBeatReply.timestamp().msecsTo(QDateTime::currentDateTime().toUTC()) / 2);
#else
- emit lagUpdated(heartBeatReply.timestamp().msecsTo(QDateTime::currentDateTime()) / 2);
+ emit lagUpdated(heartBeatReply.timestamp().time().msecsTo(QDateTime::currentDateTime().toUTC().time()) / 2);
#endif
}
emit lagUpdated(_lag);
}
- dispatch(HeartBeat(QDateTime::currentDateTime()));
+ dispatch(HeartBeat(QDateTime::currentDateTime().toUTC()));
++_heartBeatCount;
}
-
-