qInstallMsgHandler got deprecated in Qt 5.
Change-Id: Ib36983e66b3a8090b99f14e3fd4e210602a3f018
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
MessageHandlerType(const int typeId)
: MessageHandler(typeId, handler)
{}
- static void handler(QtMsgType, const char *txt)
+ static void handler(QtMsgType, const QMessageLogContext &, const QString &msg)
{
- QString msg = QString::fromLatin1(txt);
// Format itself is not important, but basic data as a type name should be included in the output
ok = msg.startsWith("QVariant::");
QVERIFY2(ok, (QString::fromLatin1("Message is not started correctly: '") + msg + '\'').toLatin1().constData());
static bool success;
-void porterDuff_warningChecker(QtMsgType type, const char *msg)
+void porterDuff_warningChecker(QtMsgType type, const QMessageLogContext &, const QString &msg)
{
if (type == QtWarningMsg && msg == QLatin1String("QPainter::setCompositionMode: PorterDuff modes not supported on device"))
success = false;
void tst_QPainter::porterDuff_warning()
{
- QtMsgHandler old = qInstallMsgHandler(porterDuff_warningChecker);
+ QtMessageHandler old = qInstallMessageHandler(porterDuff_warningChecker);
DummyPaintEngine dummy;
QPainter p(&dummy);
p.setCompositionMode(QPainter::CompositionMode_DestinationOver);
QVERIFY(!success);
- QVERIFY(qInstallMsgHandler(old) == porterDuff_warningChecker);
+ QVERIFY(qInstallMessageHandler(old) == porterDuff_warningChecker);
}
class quint24
void linkedList();
private:
- static QtMsgHandler testMessageHandler;
- static void safeMessageHandler(QtMsgType, const char *);
+ static QtMessageHandler testMessageHandler;
+ static void safeMessageHandler(QtMsgType, const QMessageLogContext&, const QString&);
#endif
};
}
};
-QtMsgHandler tst_ExceptionSafety_Objects::testMessageHandler;
+QtMessageHandler tst_ExceptionSafety_Objects::testMessageHandler;
-void tst_ExceptionSafety_Objects::safeMessageHandler(QtMsgType type, const char *msg)
+void tst_ExceptionSafety_Objects::safeMessageHandler(QtMsgType type, const QMessageLogContext &ctxt,
+ const QString &msg)
{
// this temporarily suspends OOM testing while handling a message
int currentIndex = mallocFailIndex;
AllocFailer allocFailer(0);
allocFailer.deactivate();
- (*testMessageHandler)(type, msg);
+ (*testMessageHandler)(type, ctxt, msg);
allocFailer.reactivateAt(currentIndex);
}
// set handlers for bad exception cases, you might want to step in and breakpoint the default handlers too
defaultTerminate = std::set_terminate(&debugTerminate);
defaultUnexpected = std::set_unexpected(&debugUnexpected);
- testMessageHandler = qInstallMsgHandler(safeMessageHandler);
+ testMessageHandler = qInstallMessageHandler(safeMessageHandler);
QVERIFY(AllocFailer::initialize());
void tst_ExceptionSafety_Objects::cleanupTestCase()
{
- qInstallMsgHandler(testMessageHandler);
+ qInstallMessageHandler(testMessageHandler);
}
void tst_ExceptionSafety_Objects::objects()
struct MessageHandlerInvalidType
{
MessageHandlerInvalidType()
- : oldMsgHandler(qInstallMsgHandler(handler))
+ : oldMsgHandler(qInstallMessageHandler(handler))
{
ok = false;
}
~MessageHandlerInvalidType()
{
- qInstallMsgHandler(oldMsgHandler);
+ qInstallMessageHandler(oldMsgHandler);
}
- QtMsgHandler oldMsgHandler;
+ QtMessageHandler oldMsgHandler;
- static void handler(QtMsgType type, const char *txt)
+ static void handler(QtMsgType type, const QMessageLogContext & /*ctxt*/, const QString &msg)
{
Q_UNUSED(type);
- QString msg = QString::fromLatin1(txt);
// uint(-1) can be platform dependent so we check only beginning of the message.
ok = msg.startsWith("Trying to construct an instance of an invalid type, type id:");
QVERIFY2(ok, (QString::fromLatin1("Message is not started correctly: '") + msg + '\'').toLatin1().constData());
class MessageHandler {
public:
- MessageHandler(const int typeId, QtMsgHandler msgHandler = handler)
- : oldMsgHandler(qInstallMsgHandler(msgHandler))
+ MessageHandler(const int typeId, QtMessageHandler msgHandler = handler)
+ : oldMsgHandler(qInstallMessageHandler(msgHandler))
{
currentId = typeId;
}
~MessageHandler()
{
- qInstallMsgHandler(oldMsgHandler);
+ qInstallMessageHandler(oldMsgHandler);
}
bool testPassed() const
return ok;
}
protected:
- static void handler(QtMsgType, const char *txt)
+ static void handler(QtMsgType, const QMessageLogContext &, const QString &msg)
{
- QString msg = QString::fromLatin1(txt);
// Format itself is not important, but basic data as a type name should be included in the output
ok = msg.startsWith("QVariant(");
QVERIFY2(ok, (QString::fromLatin1("Message is not started correctly: '") + msg + '\'').toLatin1().constData());
}
- QtMsgHandler oldMsgHandler;
+ QtMessageHandler oldMsgHandler;
static int currentId;
static bool ok;
};
QCOMPARE(val.canConvert(QVariant::ULongLong), ULongLongCast);
-#endif
\ No newline at end of file
+#endif