Changeset 846 for trunk/src/testlib/qbenchmarkmeasurement_p.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/testlib/qbenchmarkmeasurement_p.h (modified) (5 diffs)

trunk/src/testlib/qbenchmarkmeasurement_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -54 +54 @@
 //
 
-#include <QtCore/qdatetime.h>
+#include <QtCore/q.h>
 #include "3rdparty/cycle_p.h"
+
 
 QT_BEGIN_NAMESPACE
@@ -72 +73 @@
     virtual bool repeatCount() { return 1; } 
     virtual bool needsWarmupIteration() { return false; } 
-    virtual QString unitText() = 0;
-    virtual QString metricText() = 0;
+    virtual QTest::QBenchmarkMetric metricType() = 0;
 };
 
@@ -85 +85 @@
     int adjustIterationCount(int sugestion);
     int adjustMedianCount(int suggestion);
-    QString unitText();
-    QString metricText();
+    ();
+    Q();
 private:
-    QTime time;
+    Q time;
 };
 
@@ -103 +103 @@
     int adjustMedianCount(int suggestion);
     bool needsWarmupIteration();
-    QString unitText();
-    QString metricText();
+    QTest::QBenchmarkMetric metricType();
 private:
     CycleCounterTicks startTicks;