4 files changed, 203 insertions, 0 deletions
diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h
index 6fdc855..75b5985 100644
--- a/src/corelib/tools/qdatetime.h
+++ b/src/corelib/tools/qdatetime.h
@@ -204,6 +204,7 @@ private:
 
     friend class QDateTime;
     friend class QDateTimePrivate;
+    friend class QTimestamp;
 #ifndef QT_NO_DATASTREAM
     friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QTime &);
     friend Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QTime &);
diff --git a/src/corelib/tools/qtimestamp.h b/src/corelib/tools/qtimestamp.h
new file mode 100644
index 0000000..f923cd4
--- /dev/null
+++ b/src/corelib/tools/qtimestamp.h
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTIMESTAMP_H
+#define QTIMESTAMP_H
+
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Core)
+
+class Q_CORE_EXPORT QTimestamp
+{
+public:
+    static bool isMonotonic();
+
+    void start();
+    qint64 restart()
+    {
+        qint64 r = elapsed();
+        start();
+        return r;
+    }
+
+    qint64 elapsed() const;
+    bool hasExpired(qint64 timeout) const
+    {
+        // if timeout is -1, quint64(timeout) is LLINT_MAX, so this will be
+        // considered as never expired
+        return quint64(elapsed()) > quint64(timeout);
+    }
+
+    qint64 msecsTo(const QTimestamp &other) const;
+    void addMSecs(int ms);
+    qint64 secsTo(const QTimestamp &other) const;
+    void addSecs(int secs);
+
+    bool operator==(const QTimestamp &other) const
+    { return t1 == other.t1 && t2 == other.t2; }
+    bool operator!=(const QTimestamp &other) const
+    { return !(*this == other); }
+
+    friend bool Q_CORE_EXPORT operator<(const QTimestamp &v1, const QTimestamp &v2);
+    friend qint64 operator-(const QTimestamp &v1, const QTimestamp &v2)
+    { return v2.msecsTo(v1); }
+
+    friend QTimestamp &operator+=(QTimestamp &ts, qint64 ms)
+    { ts.addMSecs(ms); return ts; }
+    friend QTimestamp operator+(const QTimestamp &ts, qint64 ms)
+    { QTimestamp copy(ts); return copy += ms; }
+    friend QTimestamp &operator-=(QTimestamp &ts, qint64 ms)
+    { ts.addMSecs(-ms); return ts; }
+    friend QTimestamp operator-(const QTimestamp &ts, qint64 ms)
+    { QTimestamp copy(ts); return copy -= ms; }
+
+private:
+    qint64 t1;
+    qint64 t2;
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QTIMESTAMP_H
diff --git a/src/corelib/tools/qtimestamp_generic.cpp b/src/corelib/tools/qtimestamp_generic.cpp
new file mode 100644
index 0000000..18c5026
--- /dev/null
+++ b/src/corelib/tools/qtimestamp_generic.cpp
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtimestamp.h"
+#include "qdatetime.h"
+
+QT_BEGIN_NAMESPACE
+
+bool QTimestamp::isMonotonic()
+{
+    return false;
+}
+
+void QTimestamp::start()
+{
+    QTime t = QTime::currentTime();
+    t1 = t.mds;
+    t2 = 0;
+}
+
+qint64 QTimestamp::elapsed() const
+{
+    QTime t = QTime::currentTime();
+    return t.mds - t1;
+}
+
+qint64 QTimestamp::msecsTo(const QTimestamp &other) const
+{
+    qint64 diff = other.t1 - t1;
+    if (diff < 0)             // passed midnight
+        diff += 86400 * 1000;
+    return diff;
+}
+
+void QTimestamp::addMSecs(int ms)
+{
+    t1 += ms;
+}
+
+qint64 QTimestamp::secsTo(const QTimestamp &other) const
+{
+    return msecsTo(other) / 1000;
+}
+
+void QTimestamp::addSecs(int secs)
+{
+    t1 += secs * 1000;
+}
+
+bool operator<(const QTimestamp &v1, const QTimestamp &v2)
+{
+    return v1.t1 < v2.t1;
+}
+
+QT_END_NAMESPACE
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri
index 6d64915..49f2f16 100644
--- a/src/corelib/tools/tools.pri
+++ b/src/corelib/tools/tools.pri
@@ -42,6 +42,7 @@ HEADERS +=  \
         tools/qstringmatcher.h \
         tools/qtextboundaryfinder.h \
         tools/qtimeline.h \
+        tools/qtimestamp.h \
         tools/qunicodetables_p.h \
         tools/qvarlengtharray.h \
         tools/qvector.h \
@@ -81,6 +82,8 @@ SOURCES += \
 
 symbian:SOURCES+=tools/qlocale_symbian.cpp
 
+unix:SOURCES += tools/qtimestamp_generic.cpp
+
 #zlib support
 contains(QT_CONFIG, zlib) {
    wince*: DEFINES += NO_ERRNO_H