diff options
Diffstat (limited to 'src/testlib/qabstracttestlogger_p.h')
-rw-r--r-- | src/testlib/qabstracttestlogger_p.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/testlib/qabstracttestlogger_p.h b/src/testlib/qabstracttestlogger_p.h index 018361b81e..9bb1d1e80c 100644 --- a/src/testlib/qabstracttestlogger_p.h +++ b/src/testlib/qabstracttestlogger_p.h @@ -69,7 +69,9 @@ public: Fail, XPass, BlacklistedPass, - BlacklistedFail + BlacklistedFail, + BlacklistedXPass, + BlacklistedXFail }; enum MessageTypes { @@ -95,14 +97,14 @@ public: virtual void enterTestData(QTestData *) {} virtual void addIncident(IncidentTypes type, const char *description, - const char *file = 0, int line = 0) = 0; + const char *file = nullptr, int line = 0) = 0; virtual void addBenchmarkResult(const QBenchmarkResult &result) = 0; virtual void addMessage(QtMsgType, const QMessageLogContext &, const QString &); virtual void addMessage(MessageTypes type, const QString &message, - const char *file = 0, int line = 0) = 0; + const char *file = nullptr, int line = 0) = 0; void outputString(const char *msg); @@ -149,7 +151,7 @@ struct QTestCharBuffer inline bool reset(int newSize) { - char *newBuf = 0; + char *newBuf = nullptr; if (buf == staticBuf) { // if we point to our internal buffer, we need to malloc first newBuf = reinterpret_cast<char *>(malloc(newSize)); |