From 9c8dbdcb41651efe594a4a34d862576896e88062 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Tue, 14 Feb 2017 05:11:00 +0300 Subject: [PATCH] fix kwin definition again --- sources/awesomewidgets/yahooweatherprovider.cpp | 4 ++-- sources/test/awtestlibrary.cpp | 6 +++--- sources/test/testplayersource.cpp | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sources/awesomewidgets/yahooweatherprovider.cpp b/sources/awesomewidgets/yahooweatherprovider.cpp index 6635179..8d4c7e2 100644 --- a/sources/awesomewidgets/yahooweatherprovider.cpp +++ b/sources/awesomewidgets/yahooweatherprovider.cpp @@ -94,8 +94,8 @@ YahooWeatherProvider::parseCurrent(const QVariantMap &json, values[QString("humidity%1").arg(number())] = atmosphere[QString("humidity")].toInt(); // HACK temporary fix of invalid values on Yahoo! side - values[QString("pressure%1").arg(number())] - = static_cast(atmosphere[QString("pressure")].toFloat() / 33.863753); + values[QString("pressure%1").arg(number())] = static_cast( + atmosphere[QString("pressure")].toFloat() / 33.863753); return values; } diff --git a/sources/test/awtestlibrary.cpp b/sources/test/awtestlibrary.cpp index e41f0c8..d699c30 100644 --- a/sources/test/awtestlibrary.cpp +++ b/sources/test/awtestlibrary.cpp @@ -22,14 +22,14 @@ #include #include #include +#include bool AWTestLibrary::isKWinActive() { - QEventLoop loop; - loop.connect(KWindowSystem::self(), SIGNAL(showingDesktopChanged(bool)), SLOT(quit())); + QSignalSpy spy(KWindowSystem::self(), SIGNAL(showingDesktopChanged(bool))); KWindowSystem::setShowingDesktop(true); - loop.exec(); + spy.wait(5000); bool state = KWindowSystem::showingDesktop(); KWindowSystem::setShowingDesktop(false); diff --git a/sources/test/testplayersource.cpp b/sources/test/testplayersource.cpp index 440bd38..e4b41cf 100644 --- a/sources/test/testplayersource.cpp +++ b/sources/test/testplayersource.cpp @@ -106,7 +106,8 @@ void TestPlayerSource::test_mpd() if (secondValue[QString("player/title")].toString() == QString("unknown")) QSKIP("No mpd found"); - QVERIFY(secondValue[QString("player/progress")].toInt() < secondValue[QString("player/duration")].toInt()); + QVERIFY(secondValue[QString("player/progress")].toInt() + < secondValue[QString("player/duration")].toInt()); }