projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Build against Qt 4.6 again
[quassel.git]
/
src
/
common
/
remotepeer.cpp
diff --git
a/src/common/remotepeer.cpp
b/src/common/remotepeer.cpp
index
e33f56a
..
3ac55d1
100644
(file)
--- a/
src/common/remotepeer.cpp
+++ b/
src/common/remotepeer.cpp
@@
-23,6
+23,8
@@
#ifdef HAVE_SSL
# include <QSslSocket>
#ifdef HAVE_SSL
# include <QSslSocket>
+#else
+# include <QTcpSocket>
#endif
#include "remotepeer.h"
#endif
#include "remotepeer.h"
@@
-30,7
+32,7
@@
using namespace Protocol;
RemotePeer::RemotePeer(QTcpSocket *socket, QObject *parent)
using namespace Protocol;
RemotePeer::RemotePeer(QTcpSocket *socket, QObject *parent)
- :
SignalProxy::Abstract
Peer(parent),
+ : Peer(parent),
_socket(socket),
_signalProxy(0),
_heartBeatTimer(new QTimer(this)),
_socket(socket),
_signalProxy(0),
_heartBeatTimer(new QTimer(this)),
@@
-166,10
+168,10
@@
void RemotePeer::handle(const HeartBeat &heartBeat)
void RemotePeer::handle(const HeartBeatReply &heartBeatReply)
{
_heartBeatCount = 0;
void RemotePeer::handle(const HeartBeatReply &heartBeatReply)
{
_heartBeatCount = 0;
-#if QT_VERSION
< 0x0407
00
- emit lagUpdated(heartBeatReply.timestamp().
time().msecsTo(QTime::currentTime
()) / 2);
+#if QT_VERSION
>= 0x0409
00
+ emit lagUpdated(heartBeatReply.timestamp().
msecsTo(QDateTime::currentDateTime().toUTC
()) / 2);
#else
#else
- emit lagUpdated(heartBeatReply.timestamp().
msecsTo(QDateTime::currentDateT
ime()) / 2);
+ emit lagUpdated(heartBeatReply.timestamp().
time().msecsTo(QDateTime::currentDateTime().toUTC().t
ime()) / 2);
#endif
}
#endif
}
@@
-189,8
+191,6
@@
void RemotePeer::sendHeartBeat()
emit lagUpdated(_lag);
}
emit lagUpdated(_lag);
}
- dispatch(HeartBeat(QDateTime::currentDateTime()));
+ dispatch(HeartBeat(QDateTime::currentDateTime()
.toUTC()
));
++_heartBeatCount;
}
++_heartBeatCount;
}
-
-