← Back to branch summary

~ubuntu-branches/ubuntu/raring/quassel/raring-proposed

« back to all changes in this revision

Viewing changes to src/common/remotepeer.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman
  • Date: 2013-04-09 19:34:42 UTC
  • mfrom: (1.1.50)
  • Revision ID: package-import@ubuntu.com-20130409193442-i88b16quup12v4x7
Tags: 0.9~rc1-0ubuntu1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common/remotepeer.cpp
23
23
 
24
24
#ifdef HAVE_SSL
25
25
#  include <QSslSocket>
 
26
#else
 
27
#  include <QTcpSocket>
26
28
#endif
27
29
 
28
30
#include "remotepeer.h"
166
168
void RemotePeer::handle(const HeartBeatReply &heartBeatReply)
167
169
{
168
170
    _heartBeatCount = 0;
169
 
#if QT_VERSION < 0x040700
170
 
    emit lagUpdated(heartBeatReply.timestamp().time().msecsTo(QTime::currentTime()) / 2);
 
171
#if QT_VERSION >= 0x040900
 
172
    emit lagUpdated(heartBeatReply.timestamp().msecsTo(QDateTime::currentDateTime().toUTC()) / 2);
171
173
#else
172
 
    emit lagUpdated(heartBeatReply.timestamp().msecsTo(QDateTime::currentDateTime()) / 2);
 
174
    emit lagUpdated(heartBeatReply.timestamp().time().msecsTo(QDateTime::currentDateTime().toUTC().time()) / 2);
173
175
#endif
174
176
}
175
177
 
189
191
        emit lagUpdated(_lag);
190
192
    }
191
193
 
192
 
    dispatch(HeartBeat(QDateTime::currentDateTime()));
 
194
    dispatch(HeartBeat(QDateTime::currentDateTime().toUTC()));
193
195
    ++_heartBeatCount;
194
196
}
195
 
 
196