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 <frederik.gladhorn@qt.io>
bb10
Friedemann Kleint 2019-06-13 11:23:26 +02:00
parent 225dd568af
commit 6aa6623437
10 changed files with 22 additions and 34 deletions

View File

@ -46,9 +46,7 @@ QT_BEGIN_NAMESPACE
QBenchmarkEvent::QBenchmarkEvent() = default;
QBenchmarkEvent::~QBenchmarkEvent()
{
}
QBenchmarkEvent::~QBenchmarkEvent() = default;
void QBenchmarkEvent::start()
{

View File

@ -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;

View File

@ -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);

View File

@ -46,9 +46,7 @@ QCsvBenchmarkLogger::QCsvBenchmarkLogger(const char *filename)
{
}
QCsvBenchmarkLogger::~QCsvBenchmarkLogger()
{
}
QCsvBenchmarkLogger::~QCsvBenchmarkLogger() = default;
void QCsvBenchmarkLogger::startLogging()
{

View File

@ -316,9 +316,7 @@ QPlainTestLogger::QPlainTestLogger(const char *filename)
{
}
QPlainTestLogger::~QPlainTestLogger()
{
}
QPlainTestLogger::~QPlainTestLogger() = default;
void QPlainTestLogger::startLogging()
{

View File

@ -55,9 +55,7 @@ QTapTestLogger::QTapTestLogger(const char *filename)
{
}
QTapTestLogger::~QTapTestLogger()
{
}
QTapTestLogger::~QTapTestLogger() = default;
void QTapTestLogger::startLogging()
{

View File

@ -103,9 +103,7 @@ QTeamCityLogger::QTeamCityLogger(const char *filename)
{
}
QTeamCityLogger::~QTeamCityLogger()
{
}
QTeamCityLogger::~QTeamCityLogger() = default;
void QTeamCityLogger::startLogging()
{

View File

@ -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;
};

View File

@ -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)
{

View File

@ -107,9 +107,7 @@ QXmlTestLogger::QXmlTestLogger(XmlMode mode, const char *filename)
{
}
QXmlTestLogger::~QXmlTestLogger()
{
}
QXmlTestLogger::~QXmlTestLogger() = default;
void QXmlTestLogger::startLogging()
{