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

libcalamares*: adapt consumers of network manager

Browse Source
This commit is contained in:
Adriaan de Groot 2023-10-24 01:59:54 +02:00
parent 35998066c2
commit 8ebba4fcff
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
src/libcalamares/geoip/Handler.cpp
View File

@ -115,7 +115,7 @@ do_query( Handler::Type type, const QString& url, const QString& selector )
using namespace Calamares::Network; using namespace Calamares::Network;
return interface->processReply( return interface->processReply(
Calamares::Network::Manager::instance().synchronousGet( url, { RequestOptions::FakeUserAgent } ) ); Calamares::Network::Manager().synchronousGet( url, { RequestOptions::FakeUserAgent } ) );
} }
static QString static QString
@ -129,7 +129,7 @@ do_raw_query( Handler::Type type, const QString& url, const QString& selector )
using namespace Calamares::Network; using namespace Calamares::Network;
return interface->rawReply( return interface->rawReply(
Calamares::Network::Manager::instance().synchronousGet( url, { RequestOptions::FakeUserAgent } ) ); Calamares::Network::Manager().synchronousGet( url, { RequestOptions::FakeUserAgent } ) );
} }
RegionZonePair RegionZonePair

2
src/libcalamaresui/utils/Qml.cpp
View File

@ -247,7 +247,7 @@ registerQmlModels()
0, 0,
"Network", "Network",
[]( QQmlEngine*, QJSEngine* ) -> QObject* []( QQmlEngine*, QJSEngine* ) -> QObject*
{ return &Calamares::Network::Manager::instance(); } ); { return new Calamares::Network::Manager; } );
} }
} }

2
src/libcalamaresui/utils/TestPaste.cpp
View File

@ -75,7 +75,7 @@ TestPaste::testUploadSize()
QVERIFY( !s.isEmpty() ); QVERIFY( !s.isEmpty() );
QUrl url( s ); QUrl url( s );
QByteArray returnedData = Calamares::Network::Manager::instance().synchronousGet( url ); QByteArray returnedData = Calamares::Network::Manager().synchronousGet( url );
QCOMPARE( returnedData.size(), 100 ); QCOMPARE( returnedData.size(), 100 );
} }