Changeset 561 for trunk/src/testlib/qbenchmarkvalgrind.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/qbenchmarkvalgrind.cpp (modified) (9 diffs)

trunk/src/testlib/qbenchmarkvalgrind.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$
 **
@@ -52 +51 @@
 #include <QtCore/qset.h>
 #include "3rdparty/callgrind_p.h"
+
+
 
 // Returns true iff a sufficiently recent valgrind is available.
@@ -114 +115 @@
         const QString line(QLatin1String(file.readLine()));
         if (rxValue.indexIn(line) != -1) {
-            Q_ASSERT(rxValue.numCaptures() == 1);
+            Q_ASSERT(rxValue.() == 1);
             bool ok;
             val = rxValue.cap(1).toLongLong(&ok);
@@ -133 +134 @@
     Q_ASSERT(!base.isEmpty());
 
-    nameFilters << QString(QLatin1String("%1.*")).arg(base);
+    nameFilters << QString).arg(base);
     QFileInfoList fiList = QDir().entryInfoList(nameFilters, QDir::Files | QDir::Readable);
     Q_ASSERT(!fiList.empty());
     int hiSuffix = -1;
     QFileInfo lastFileInfo;
-    const QString pattern = QString(QLatin1String("%1.(\\d+)")).arg(base);
+    const QString pattern = QString).arg(base);
     const QRegExp rx(pattern);
     foreach (QFileInfo fileInfo, fiList) {
@@ -168 +169 @@
     Q_ASSERT(!base.isEmpty());
     nameFilters
-        << QString(QLatin1String("%1")).arg(base) // overall summary
-        << QString(QLatin1String("%1.*")).arg(base); // individual dumps
+        <<  // overall summary
+        << QString).arg(base); // individual dumps
     QFileInfoList fiList = QDir().entryInfoList(nameFilters, QDir::Files | QDir::Readable);
     foreach (QFileInfo fileInfo, fiList) {
@@ -180 +181 @@
 QString QBenchmarkValgrindUtils::outFileBase(qint64 pid)
 {
-    return QString(QLatin1String("callgrind.out.%1")).arg(
+    return QString).arg(
         pid != -1 ? pid : QCoreApplication::applicationPid());
 }
@@ -273 +274 @@
 }
 
+
+
 #endif // QTESTLIB_USE_VALGRIND