~ubuntu-branches/ubuntu/trusty/quassel/trusty

« back to all changes in this revision

Viewing changes to src/core/coreuserinputhandler.cpp

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman
  • Date: 2014-02-18 23:18:25 UTC
  • mfrom: (1.1.54)
  • Revision ID: package-import@ubuntu.com-20140218231825-6vvoh451otn95pkn
Tags: 0.10~beta1-0ubuntu1
* New upstream beta relase
  - Drop debian/patches/upstream_fix_fullscreen_mode.diff which had been
    cherrypicked from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
/***************************************************************************
2
 
 *   Copyright (C) 2005-2013 by the Quassel Project                        *
 
2
 *   Copyright (C) 2005-2014 by the Quassel Project                        *
3
3
 *   devel@quassel-irc.org                                                 *
4
4
 *                                                                         *
5
5
 *   This program is free software; you can redistribute it and/or modify  *
169
169
    QString verboseMessage = tr("sending CTCP-%1 request to %2").arg(ctcpTag).arg(nick);
170
170
 
171
171
    if (ctcpTag == "PING") {
172
 
        uint now = QDateTime::currentDateTime().toTime_t();
173
 
        message = QString::number(now);
 
172
#if QT_VERSION >= 0x040700
 
173
        message = QString::number(QDateTime::currentMSecsSinceEpoch());
 
174
#else
 
175
        message = QString::number(QDateTime::currentDateTime().toTime_t());
 
176
#endif
174
177
    }
175
178
 
176
179
    // FIXME make this a proper event