diff options
author | hjk <hjk121@nokiamail.com> | 2013-10-10 17:06:37 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 19:15:29 +0200 |
commit | 7a47aebe9ed41d6cd9c9bcd45758d4d553668e99 (patch) | |
tree | 4f1f9c59691c384a47aa6eadf2a719795f37e21f /tests/auto/corelib/io/qloggingcategory | |
parent | f9889534d16290262eced02bc9c9ed1a9afb8fac (diff) |
Let QLoggingCategory::defaultCategory return a pointer
The pointer can be null. Going trough the reference invokes undefined
behavior here.
Change-Id: Ia84e4e732cdcbbaee0f5f0679765d18069ea8b2d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'tests/auto/corelib/io/qloggingcategory')
-rw-r--r-- | tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp index df93262d93..a49793c3d4 100644 --- a/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp +++ b/tests/auto/corelib/io/qloggingcategory/tst_qloggingcategory.cpp @@ -226,7 +226,7 @@ private slots: void QLoggingCategory_categoryName() { logMessage.clear(); - QCOMPARE(QString::fromLatin1(QLoggingCategory::defaultCategory().categoryName()), + QCOMPARE(QString::fromLatin1(QLoggingCategory::defaultCategory()->categoryName()), QStringLiteral("default")); QLoggingCategory defaultCategory("default"); @@ -237,7 +237,7 @@ private slots: QCOMPARE(QByteArray(nullCategory.categoryName()), QByteArray("default")); // we rely on the same pointer for any "default" category - QCOMPARE(QLoggingCategory::defaultCategory().categoryName(), + QCOMPARE(QLoggingCategory::defaultCategory()->categoryName(), defaultCategory.categoryName()); QCOMPARE(defaultCategory.categoryName(), nullCategory.categoryName()); @@ -256,12 +256,12 @@ private slots: { logMessage.clear(); - QCOMPARE(QLoggingCategory::defaultCategory().isDebugEnabled(), true); - QCOMPARE(QLoggingCategory::defaultCategory().isEnabled(QtDebugMsg), true); - QCOMPARE(QLoggingCategory::defaultCategory().isWarningEnabled(), true); - QCOMPARE(QLoggingCategory::defaultCategory().isEnabled(QtWarningMsg), true); - QCOMPARE(QLoggingCategory::defaultCategory().isCriticalEnabled(), true); - QCOMPARE(QLoggingCategory::defaultCategory().isEnabled(QtCriticalMsg), true); + QCOMPARE(QLoggingCategory::defaultCategory()->isDebugEnabled(), true); + QCOMPARE(QLoggingCategory::defaultCategory()->isEnabled(QtDebugMsg), true); + QCOMPARE(QLoggingCategory::defaultCategory()->isWarningEnabled(), true); + QCOMPARE(QLoggingCategory::defaultCategory()->isEnabled(QtWarningMsg), true); + QCOMPARE(QLoggingCategory::defaultCategory()->isCriticalEnabled(), true); + QCOMPARE(QLoggingCategory::defaultCategory()->isEnabled(QtCriticalMsg), true); QLoggingCategory defaultCategory("default"); QCOMPARE(defaultCategory.isDebugEnabled(), true); @@ -287,11 +287,11 @@ private slots: { logMessage.clear(); - QCOMPARE(QLoggingCategory::defaultCategory().isDebugEnabled(), true); + QCOMPARE(QLoggingCategory::defaultCategory()->isDebugEnabled(), true); - QLoggingCategory::defaultCategory().setEnabled(QtDebugMsg, false); - QCOMPARE(QLoggingCategory::defaultCategory().isDebugEnabled(), false); - QLoggingCategory::defaultCategory().setEnabled(QtDebugMsg, true); + QLoggingCategory::defaultCategory()->setEnabled(QtDebugMsg, false); + QCOMPARE(QLoggingCategory::defaultCategory()->isDebugEnabled(), false); + QLoggingCategory::defaultCategory()->setEnabled(QtDebugMsg, true); // make sure nothing has printed warnings QVERIFY(logMessage.isEmpty()); @@ -300,13 +300,13 @@ private slots: void QLoggingCategory_installFilter() { - QVERIFY(QLoggingCategory::defaultCategory().isDebugEnabled()); + QVERIFY(QLoggingCategory::defaultCategory()->isDebugEnabled()); QLoggingCategory::CategoryFilter defaultFilter = QLoggingCategory::installFilter(customCategoryFilter); QVERIFY(defaultFilter); customCategoryFilterArgs.clear(); - QVERIFY(!QLoggingCategory::defaultCategory().isDebugEnabled()); + QVERIFY(!QLoggingCategory::defaultCategory()->isDebugEnabled()); QLoggingCategory cat("custom"); QCOMPARE(customCategoryFilterArgs, QStringList() << "custom"); @@ -319,7 +319,7 @@ private slots: QCOMPARE((void*)currentFilter, (void*)customCategoryFilter); QCOMPARE(customCategoryFilterArgs.size(), 0); - QVERIFY(QLoggingCategory::defaultCategory().isDebugEnabled()); + QVERIFY(QLoggingCategory::defaultCategory()->isDebugEnabled()); QVERIFY(!cat.isDebugEnabled()); // install default filter @@ -328,7 +328,7 @@ private slots: QCOMPARE((void*)defaultFilter, (void*)currentFilter); QCOMPARE(customCategoryFilterArgs.size(), 0); - QVERIFY(QLoggingCategory::defaultCategory().isDebugEnabled()); + QVERIFY(QLoggingCategory::defaultCategory()->isDebugEnabled()); QVERIFY(!cat.isDebugEnabled()); } |