From 6aa662343778727d460f8657d3187e407492cdd3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 13 Jun 2019 11:23:26 +0200 Subject: QTestLib: Fix class declarations/structure - Remove virtual from functions declared as override - Use " = default" for trivial constructors/destructors - Remove all special functions from QTestLog Apply Fixits by Qt Creator with some amendments. Task-number: QTBUG-69413 Change-Id: I812b8116e5b4c927e4e5cee44e63bc705385d866 Reviewed-by: Frederik Gladhorn --- src/testlib/qbenchmarkevent.cpp | 4 +--- src/testlib/qbenchmarkmeasurement_p.h | 2 +- src/testlib/qbenchmarkperfevents_p.h | 20 ++++++++++---------- src/testlib/qcsvbenchmarklogger.cpp | 4 +--- src/testlib/qplaintestlogger.cpp | 4 +--- src/testlib/qtaptestlogger.cpp | 4 +--- src/testlib/qteamcitylogger.cpp | 4 +--- src/testlib/qtestlog_p.h | 7 ++++--- src/testlib/qtestxunitstreamer.cpp | 3 +-- src/testlib/qxmltestlogger.cpp | 4 +--- 10 files changed, 22 insertions(+), 34 deletions(-) (limited to 'src/testlib') diff --git a/src/testlib/qbenchmarkevent.cpp b/src/testlib/qbenchmarkevent.cpp index 41be9fa468..bcae9325cd 100644 --- a/src/testlib/qbenchmarkevent.cpp +++ b/src/testlib/qbenchmarkevent.cpp @@ -46,9 +46,7 @@ QT_BEGIN_NAMESPACE QBenchmarkEvent::QBenchmarkEvent() = default; -QBenchmarkEvent::~QBenchmarkEvent() -{ -} +QBenchmarkEvent::~QBenchmarkEvent() = default; void QBenchmarkEvent::start() { diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h index 8dbfd4b618..cecf97963b 100644 --- a/src/testlib/qbenchmarkmeasurement_p.h +++ b/src/testlib/qbenchmarkmeasurement_p.h @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE class QBenchmarkMeasurerBase { public: - virtual ~QBenchmarkMeasurerBase() {} + virtual ~QBenchmarkMeasurerBase() = default; virtual void init() {} virtual void start() = 0; virtual qint64 checkpoint() = 0; diff --git a/src/testlib/qbenchmarkperfevents_p.h b/src/testlib/qbenchmarkperfevents_p.h index 47af4db9f8..15b946ad26 100644 --- a/src/testlib/qbenchmarkperfevents_p.h +++ b/src/testlib/qbenchmarkperfevents_p.h @@ -60,16 +60,16 @@ class QBenchmarkPerfEventsMeasurer : public QBenchmarkMeasurerBase public: QBenchmarkPerfEventsMeasurer(); ~QBenchmarkPerfEventsMeasurer(); - virtual void init() override; - virtual void start() override; - virtual qint64 checkpoint() override; - virtual qint64 stop() override; - virtual bool isMeasurementAccepted(qint64 measurement) override; - virtual int adjustIterationCount(int suggestion) override; - virtual int adjustMedianCount(int suggestion) override; - virtual bool repeatCount() override { return 1; } - virtual bool needsWarmupIteration() override { return true; } - virtual QTest::QBenchmarkMetric metricType() override; + void init() override; + void start() override; + qint64 checkpoint() override; + qint64 stop() override; + bool isMeasurementAccepted(qint64 measurement) override; + int adjustIterationCount(int suggestion) override; + int adjustMedianCount(int suggestion) override; + bool repeatCount() override { return 1; } + bool needsWarmupIteration() override { return true; } + QTest::QBenchmarkMetric metricType() override; static bool isAvailable(); static QTest::QBenchmarkMetric metricForEvent(quint32 type, quint64 event_id); diff --git a/src/testlib/qcsvbenchmarklogger.cpp b/src/testlib/qcsvbenchmarklogger.cpp index ee7270b634..f410ec6e3d 100644 --- a/src/testlib/qcsvbenchmarklogger.cpp +++ b/src/testlib/qcsvbenchmarklogger.cpp @@ -46,9 +46,7 @@ QCsvBenchmarkLogger::QCsvBenchmarkLogger(const char *filename) { } -QCsvBenchmarkLogger::~QCsvBenchmarkLogger() -{ -} +QCsvBenchmarkLogger::~QCsvBenchmarkLogger() = default; void QCsvBenchmarkLogger::startLogging() { diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index ed53dcdde8..c2e0bebaa0 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -316,9 +316,7 @@ QPlainTestLogger::QPlainTestLogger(const char *filename) { } -QPlainTestLogger::~QPlainTestLogger() -{ -} +QPlainTestLogger::~QPlainTestLogger() = default; void QPlainTestLogger::startLogging() { diff --git a/src/testlib/qtaptestlogger.cpp b/src/testlib/qtaptestlogger.cpp index 476761e602..5b5a3c4875 100644 --- a/src/testlib/qtaptestlogger.cpp +++ b/src/testlib/qtaptestlogger.cpp @@ -55,9 +55,7 @@ QTapTestLogger::QTapTestLogger(const char *filename) { } -QTapTestLogger::~QTapTestLogger() -{ -} +QTapTestLogger::~QTapTestLogger() = default; void QTapTestLogger::startLogging() { diff --git a/src/testlib/qteamcitylogger.cpp b/src/testlib/qteamcitylogger.cpp index 88c83d1269..6c0605130b 100644 --- a/src/testlib/qteamcitylogger.cpp +++ b/src/testlib/qteamcitylogger.cpp @@ -103,9 +103,7 @@ QTeamCityLogger::QTeamCityLogger(const char *filename) { } -QTeamCityLogger::~QTeamCityLogger() -{ -} +QTeamCityLogger::~QTeamCityLogger() = default; void QTeamCityLogger::startLogging() { diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h index e63e89a78e..fff36f290d 100644 --- a/src/testlib/qtestlog_p.h +++ b/src/testlib/qtestlog_p.h @@ -66,6 +66,10 @@ class QTestData; class Q_TESTLIB_EXPORT QTestLog { public: + QTestLog() = delete; + ~QTestLog() = delete; + Q_DISABLE_COPY_MOVE(QTestLog) + enum LogMode { Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP #if defined(QT_USE_APPLE_UNIFIED_LOGGING) @@ -135,9 +139,6 @@ public: static qreal msecsFunctionTime() { return QTestLog::nsecsFunctionTime() / 1000000.; } private: - QTestLog(); - ~QTestLog(); - static bool printAvailableTags; }; diff --git a/src/testlib/qtestxunitstreamer.cpp b/src/testlib/qtestxunitstreamer.cpp index 6b0619d847..bdbdfa9610 100644 --- a/src/testlib/qtestxunitstreamer.cpp +++ b/src/testlib/qtestxunitstreamer.cpp @@ -54,8 +54,7 @@ QTestXunitStreamer::QTestXunitStreamer(QXunitTestLogger *logger) QTEST_ASSERT(testLogger); } -QTestXunitStreamer::~QTestXunitStreamer() -{} +QTestXunitStreamer::~QTestXunitStreamer() = default; void QTestXunitStreamer::indentForElement(const QTestElement* element, char* buf, int size) { diff --git a/src/testlib/qxmltestlogger.cpp b/src/testlib/qxmltestlogger.cpp index c47042c3a0..84126c10eb 100644 --- a/src/testlib/qxmltestlogger.cpp +++ b/src/testlib/qxmltestlogger.cpp @@ -107,9 +107,7 @@ QXmlTestLogger::QXmlTestLogger(XmlMode mode, const char *filename) { } -QXmlTestLogger::~QXmlTestLogger() -{ -} +QXmlTestLogger::~QXmlTestLogger() = default; void QXmlTestLogger::startLogging() { -- cgit v1.2.3