yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't qcompare with nullptr

Browse source 
use QVERIFY(!pointer) instead, clang likes it more apparently
This commit is contained in:
Marco Martin 2017-10-13 12:08:47 +02:00
parent 9feb359676
commit 7d53e7998c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/wayland/autotests/client/test_xdg_foreign.cpp
View file

@ -260,8 +260,8 @@ void TestForeign::testDeleteImported()
QVERIFY(transientSpy.wait());
QCOMPARE(transientSpy.first().first().value<KWayland::Server::SurfaceInterface *>(), m_childSurfaceInterface.data());
QCOMPARE(transientSpy.first().at(1).value<KWayland::Server::SurfaceInterface *>(), nullptr);
QCOMPARE(m_foreignInterface->transientFor(m_childSurfaceInterface), nullptr);
QVERIFY(!transientSpy.first().at(1).value<KWayland::Server::SurfaceInterface *>());
QVERIFY(!m_foreignInterface->transientFor(m_childSurfaceInterface));
}
void TestForeign::testDeleteChildSurface()
@ -279,7 +279,7 @@ void TestForeign::testDeleteChildSurface()
QSignalSpy surfaceDestroyedSpy(m_childSurfaceInterface, SIGNAL(destroyed()));
QVERIFY(surfaceDestroyedSpy.wait());
QCOMPARE(transientSpy.first().at(0).value<KWayland::Server::SurfaceInterface *>(), nullptr);
QVERIFY(!transientSpy.first().at(0).value<KWayland::Server::SurfaceInterface *>());
QCOMPARE(transientSpy.first().at(1).value<KWayland::Server::SurfaceInterface *>(), m_exportedSurfaceInterface.data());
}
@ -299,8 +299,8 @@ void TestForeign::testDeleteParentSurface()
QVERIFY(transientSpy.wait());
QCOMPARE(transientSpy.first().first().value<KWayland::Server::SurfaceInterface *>(), m_childSurfaceInterface.data());
QCOMPARE(transientSpy.first().at(1).value<KWayland::Server::SurfaceInterface *>(), nullptr);
QCOMPARE(m_foreignInterface->transientFor(m_childSurfaceInterface), nullptr);
QVERIFY(!transientSpy.first().at(1).value<KWayland::Server::SurfaceInterface *>());
QVERIFY(!m_foreignInterface->transientFor(m_childSurfaceInterface));
}
void TestForeign::testDeleteExported()
@ -318,8 +318,8 @@ void TestForeign::testDeleteExported()
QVERIFY(destroyedSpy.wait());
QCOMPARE(transientSpy.first().first().value<KWayland::Server::SurfaceInterface *>(), m_childSurfaceInterface.data());
QCOMPARE(transientSpy.first().at(1).value<KWayland::Server::SurfaceInterface *>(), nullptr);
QCOMPARE(m_foreignInterface->transientFor(m_childSurfaceInterface), nullptr);
QVERIFY(!transientSpy.first().at(1).value<KWayland::Server::SurfaceInterface *>());
QVERIFY(!m_foreignInterface->transientFor(m_childSurfaceInterface));
QVERIFY(!m_imported->isValid());
}