Changeset 561 for trunk/src/testlib/qbenchmark.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/testlib/qbenchmark.cpp (modified) (8 diffs)

trunk/src/testlib/qbenchmark.cpp

@@ -1 @@
-
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtTest module of the Qt Toolkit.
@@ -22 +22 @@
 ** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** 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.
 **
 ** GNU General Public License Usage
@@ -35 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -118 +117 @@
 
 QBenchmarkTestMethodData::QBenchmarkTestMethodData()
-:resultAccepted(false), iterationCount(-1)
+:resultAccepted(false), iterationCount(-1)
 {
    
@@ -159 +158 @@
         accepted = true;
 
+
+
+
+
+
     // Test the result directly without calling the measurer if the minimum time 
     // has been specifed on the command line with -minimumvalue.
@@ -176 +180 @@
 }
 
-/*! \internal
+/*!
+    \class QTest::QBenchmarkIterationController
+    \internal
+
     The QBenchmarkIterationController class is used by the QBENCHMARK macro to
     drive the benchmarking loop. It is repsonsible for starting and stopping
     the timing measurements as well as calling the result reporting functions.
 */
+
+
+
+
+
+
+
+
+
+
+
 QTest::QBenchmarkIterationController::QBenchmarkIterationController()
 {
+
     QTest::beginBenchmarkMeasurement();
-    i = 0;
-}
+}
+
 /*! \internal
 */
@@ -197 +216 @@
 bool QTest::QBenchmarkIterationController::isDone()
 {
+
+
     return i >= QTest::iterationCount();
 }
@@ -220 +241 @@
     QBenchmarkTestMethodData::current->adjustIterationCount(count);
 }
+
 /*! \internal
 */