From d4469ed46905956273207bc81f40814be3920257 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 18 Aug 2020 23:08:03 +0300 Subject: [PATCH] remove unused QTestLogger methods and members Signed-off-by: Ivailo Monev --- src/test/qtestlogger.cpp | 77 ++---------------------------------------------- src/test/qtestlogger_p.h | 26 +++------------- 2 files changed, 7 insertions(+), 96 deletions(-) diff --git a/src/test/qtestlogger.cpp b/src/test/qtestlogger.cpp index 73e8b505b..ded6a9f7d 100644 --- a/src/test/qtestlogger.cpp +++ b/src/test/qtestlogger.cpp @@ -46,16 +46,11 @@ QT_BEGIN_NAMESPACE -QTestLogger::QTestLogger(int fm) +QTestLogger::QTestLogger(TestLoggerFormat fm) :listOfTestcases(0), currentLogElement(0), errorLogElement(0), logFormatter(0), format( (TestLoggerFormat)fm ), filelogger(new QTestFileLogger), - testCounter(0), passCounter(0), - failureCounter(0), errorCounter(0), - warningCounter(0), skipCounter(0), - qcriticalCounter(0), qdebugCounter(0), - qwarnCounter(0), qfatalCounter(0), - infoCounter(0), randomSeed_(0), - hasRandomSeed_(false) + testCounter(0), passCounter(0), failureCounter(0), errorCounter(0), + skipCounter(0), randomSeed_(0), hasRandomSeed_(false) { } @@ -305,23 +300,18 @@ void QTestLogger::addMessage(MessageTypes type, const char *message, const char switch (type) { case QAbstractTestLogger::Warn: - ++warningCounter; typeBuf = "warn"; break; case QAbstractTestLogger::QDebug: - ++qdebugCounter; typeBuf = "qdebug"; break; case QAbstractTestLogger::QWarning: - ++qwarnCounter; typeBuf = "qwarn"; break; case QAbstractTestLogger::QCritical: - ++qcriticalCounter; typeBuf = "qcritical"; break; case QAbstractTestLogger::QFatal: - ++qfatalCounter; typeBuf = "qfatal"; break; case QAbstractTestLogger::Skip: @@ -329,7 +319,6 @@ void QTestLogger::addMessage(MessageTypes type, const char *message, const char typeBuf = "skip"; break; case QAbstractTestLogger::Info: - ++infoCounter; typeBuf = "info"; break; default: @@ -361,66 +350,6 @@ void QTestLogger::addMessage(MessageTypes type, const char *message, const char } } -void QTestLogger::setLogFormat(TestLoggerFormat fm) -{ - format = fm; -} - -QTestLogger::TestLoggerFormat QTestLogger::logFormat() -{ - return format; -} - -int QTestLogger::passCount() const -{ - return passCounter; -} - -int QTestLogger::failureCount() const -{ - return failureCounter; -} - -int QTestLogger::errorCount() const -{ - return errorCounter; -} - -int QTestLogger::warningCount() const -{ - return warningCounter; -} - -int QTestLogger::skipCount() const -{ - return skipCounter; -} - -int QTestLogger::qcriticalCount() const -{ - return qcriticalCounter; -} - -int QTestLogger::qdebugCount() const -{ - return qdebugCounter; -} - -int QTestLogger::qwarnCount() const -{ - return qwarnCounter; -} - -int QTestLogger::qfatalCount() const -{ - return qfatalCounter; -} - -int QTestLogger::infoCount() const -{ - return infoCounter; -} - void QTestLogger::registerRandomSeed(unsigned int seed) { randomSeed_ = seed; diff --git a/src/test/qtestlogger_p.h b/src/test/qtestlogger_p.h index ef96e6ac2..c68ed064e 100644 --- a/src/test/qtestlogger_p.h +++ b/src/test/qtestlogger_p.h @@ -56,9 +56,6 @@ class QTestFileLogger; class QTestLogger : public QAbstractTestLogger { public: - QTestLogger(int fm = 0); - ~QTestLogger(); - enum TestLoggerFormat { TLF_XML = 0, @@ -66,6 +63,10 @@ class QTestLogger : public QAbstractTestLogger TLF_XunitXml = 2 }; + + QTestLogger(TestLoggerFormat fm = TestLoggerFormat::TLF_XML); + ~QTestLogger(); + void startLogging(); void stopLogging(); @@ -80,19 +81,6 @@ class QTestLogger : public QAbstractTestLogger void addMessage(MessageTypes type, const char *message, const char *file = 0, int line = 0); - void setLogFormat(TestLoggerFormat fm); - TestLoggerFormat logFormat(); - - int passCount() const; - int failureCount() const; - int errorCount() const; - int warningCount() const; - int skipCount() const; - int qdebugCount() const; - int qwarnCount() const; - int qcriticalCount() const; - int qfatalCount() const; - int infoCount() const; void registerRandomSeed(unsigned int seed); unsigned int randomSeed() const; bool hasRandomSeed() const; @@ -109,13 +97,7 @@ class QTestLogger : public QAbstractTestLogger int passCounter; int failureCounter; int errorCounter; - int warningCounter; int skipCounter; - int qdebugCounter; - int qwarnCounter; - int qcriticalCounter; - int qfatalCounter; - int infoCounter; unsigned int randomSeed_; bool hasRandomSeed_; }; -- 2.11.0