napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Apply coding style to geoip/

Browse Source
This commit is contained in:
Adriaan de Groot 2019-09-04 09:19:00 -04:00
parent 01c4383178
commit 88fc6685ba
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamares/geoip/GeoIPTests.cpp
View File

@ -197,7 +197,8 @@ GeoIPTests::testSplitTZ()
#define CHECK_GET( t, selector, url ) \
{ \
auto tz = GeoIP##t( selector ).processReply( CalamaresUtils::Network::Manager::instance().synchronousGet( QUrl( url ) ) ); \
auto tz = GeoIP##t( selector ) \
.processReply( CalamaresUtils::Network::Manager::instance().synchronousGet( QUrl( url ) ) ); \
qDebug() << tz; \
QCOMPARE( default_tz, tz ); \
auto tz2 = CalamaresUtils::GeoIP::Handler( "" #t, url, selector ).get(); \
@ -216,7 +217,8 @@ GeoIPTests::testGet()
GeoIPJSON default_handler;
// Call the KDE service the definitive source.
auto default_tz = default_handler.processReply( CalamaresUtils::Network::Manager::instance().synchronousGet( QUrl( "https://geoip.kde.org/v1/calamares" ) ) );
auto default_tz = default_handler.processReply(
CalamaresUtils::Network::Manager::instance().synchronousGet( QUrl( "https://geoip.kde.org/v1/calamares" ) ) );
// This is bogus, because the test isn't always run by me
// QCOMPARE( default_tz.first, QStringLiteral("Europe") );

2
src/libcalamares/geoip/GeoIPXML.cpp
View File

@ -73,10 +73,12 @@ QString
GeoIPXML::rawReply( const QByteArray& data )
{
for ( const auto& e : getElementTexts( data, m_element ) )
{
if ( !e.isEmpty() )
{
return e;
}
}
return QString();
}