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

add .data() to qpointer access

Browse source 
fix build on old gcc versions
This commit is contained in:
Marco Martin 2016-06-30 16:45:29 +02:00
parent bd7d7c1936
commit cd77833c3b
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/wayland/autotests/client/test_shadow.cpp
View file

@ -290,7 +290,7 @@ void ShadowTest::testSurfaceDestroy()
// destroy the parent surface
QSignalSpy surfaceDestroyedSpy(serverSurface, &QObject::destroyed);
QVERIFY(surfaceDestroyedSpy.isValid());
QSignalSpy shadowDestroyedSpy(serverShadow, &QObject::destroyed);
QSignalSpy shadowDestroyedSpy(serverShadow.data(), &QObject::destroyed);
QVERIFY(shadowDestroyedSpy.isValid());
surface.reset();
QVERIFY(surfaceDestroyedSpy.wait());

2
src/wayland/autotests/client/test_wayland_blur.cpp
View file

@ -201,7 +201,7 @@ void TestBlur::testSurfaceDestroy()
// destroy the parent surface
QSignalSpy surfaceDestroyedSpy(serverSurface, &QObject::destroyed);
QVERIFY(surfaceDestroyedSpy.isValid());
QSignalSpy blurDestroyedSpy(serverSurface->blur(), &QObject::destroyed);
QSignalSpy blurDestroyedSpy(serverSurface->blur().data(), &QObject::destroyed);
QVERIFY(blurDestroyedSpy.isValid());
surface.reset();
QVERIFY(surfaceDestroyedSpy.wait());

4
src/wayland/autotests/client/test_wayland_contrast.cpp
View file

@ -182,7 +182,7 @@ void TestContrast::testCreate()
QCOMPARE(wl_fixed_from_double(serverSurface->contrast()->saturation()), wl_fixed_from_double(1.7));
// and destroy
QSignalSpy destroyedSpy(serverSurface->contrast(), &QObject::destroyed);
QSignalSpy destroyedSpy(serverSurface->contrast().data(), &QObject::destroyed);
QVERIFY(destroyedSpy.isValid());
delete contrast;
QVERIFY(destroyedSpy.wait());
@ -211,7 +211,7 @@ void TestContrast::testSurfaceDestroy()
// destroy the parent surface
QSignalSpy surfaceDestroyedSpy(serverSurface, &QObject::destroyed);
QVERIFY(surfaceDestroyedSpy.isValid());
QSignalSpy contrastDestroyedSpy(serverSurface->contrast(), &QObject::destroyed);
QSignalSpy contrastDestroyedSpy(serverSurface->contrast().data(), &QObject::destroyed);
QVERIFY(contrastDestroyedSpy.isValid());
surface.reset();
QVERIFY(surfaceDestroyedSpy.wait());

2
src/wayland/autotests/client/test_wayland_slide.cpp
View file

@ -173,7 +173,7 @@ void TestSlide::testCreate()
QCOMPARE(serverSurface->slideOnShowHide()->offset(), 15);
// and destroy
QSignalSpy destroyedSpy(serverSurface->slideOnShowHide(), &QObject::destroyed);
QSignalSpy destroyedSpy(serverSurface->slideOnShowHide().data(), &QObject::destroyed);
QVERIFY(destroyedSpy.isValid());
delete slide;
QVERIFY(destroyedSpy.wait());