From 7d858ad28cfe9df7266c81fd1c29a6fa152d5a93 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 19 Sep 2024 17:03:13 -0700 Subject: [PATCH] Benchlib: remove unused init() virtual function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 051f68c2d3a069543dce4d560facff6aa22284bd (Qt 5.2) made it empty by moving the content to QBenchmarkPerfEventsMeasurer::start(). Change-Id: I65f48d72a9d079f0aee5fffd6abeae9cf7fcdcf5 Reviewed-by: Tor Arne Vestbø (cherry picked from commit d44b3ad1c8f1e6615e47c4d62b236c57f051b709) Reviewed-by: Qt Cherry-pick Bot --- src/testlib/qbenchmark.cpp | 1 - src/testlib/qbenchmarkmeasurement_p.h | 1 - src/testlib/qbenchmarkperfevents.cpp | 4 ---- src/testlib/qbenchmarkperfevents_p.h | 1 - 4 files changed, 7 deletions(-) diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp index af6ee5f7c66..11bb28b9d55 100644 --- a/src/testlib/qbenchmark.cpp +++ b/src/testlib/qbenchmark.cpp @@ -55,7 +55,6 @@ QBenchmarkMeasurerBase * QBenchmarkGlobalData::createMeasurer() } else { measurer = new QBenchmarkTimeMeasurer; } - measurer->init(); return measurer; } diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h index 56b978228bf..70079ae48a3 100644 --- a/src/testlib/qbenchmarkmeasurement_p.h +++ b/src/testlib/qbenchmarkmeasurement_p.h @@ -30,7 +30,6 @@ public: QTest::QBenchmarkMetric metric; }; virtual ~QBenchmarkMeasurerBase() = default; - virtual void init() {} virtual void start() = 0; virtual QList stop() = 0; virtual bool isMeasurementAccepted(Measurement m) = 0; diff --git a/src/testlib/qbenchmarkperfevents.cpp b/src/testlib/qbenchmarkperfevents.cpp index b42789ce590..02f8e7af414 100644 --- a/src/testlib/qbenchmarkperfevents.cpp +++ b/src/testlib/qbenchmarkperfevents.cpp @@ -448,10 +448,6 @@ QBenchmarkPerfEventsMeasurer::~QBenchmarkPerfEventsMeasurer() qt_safe_close(fd); } -void QBenchmarkPerfEventsMeasurer::init() -{ -} - void QBenchmarkPerfEventsMeasurer::start() { QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers") diff --git a/src/testlib/qbenchmarkperfevents_p.h b/src/testlib/qbenchmarkperfevents_p.h index 5f94ea77948..753bb510a4d 100644 --- a/src/testlib/qbenchmarkperfevents_p.h +++ b/src/testlib/qbenchmarkperfevents_p.h @@ -24,7 +24,6 @@ class QBenchmarkPerfEventsMeasurer : public QBenchmarkMeasurerBase public: QBenchmarkPerfEventsMeasurer(); ~QBenchmarkPerfEventsMeasurer(); - void init() override; void start() override; QList stop() override; bool isMeasurementAccepted(Measurement measurement) override;