From a9ef587705bbf5074a15d2df0645944876a31bf0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 10 Sep 2023 22:32:49 +0200 Subject: [PATCH] libcalamares: use namespace Calamares::Network consistently --- src/libcalamares/geoip/GeoIPTests.cpp | 4 ++-- src/libcalamares/geoip/Handler.cpp | 8 ++++---- src/libcalamares/network/Manager.cpp | 11 ++++------- src/libcalamares/network/Manager.h | 4 ++-- src/libcalamares/network/Tests.cpp | 8 ++++---- src/libcalamaresui/utils/Qml.cpp | 4 ++-- src/libcalamaresui/utils/TestPaste.cpp | 2 +- src/modules/locale/Config.cpp | 2 +- src/modules/netinstall/LoaderQueue.cpp | 2 +- src/modules/tracking/TrackingJobs.cpp | 6 +++--- src/modules/welcome/Tests.cpp | 12 ++++++------ src/modules/welcome/checker/GeneralRequirements.cpp | 8 ++++---- 12 files changed, 34 insertions(+), 37 deletions(-) diff --git a/src/libcalamares/geoip/GeoIPTests.cpp b/src/libcalamares/geoip/GeoIPTests.cpp index 4f3311db9..d54d417b3 100644 --- a/src/libcalamares/geoip/GeoIPTests.cpp +++ b/src/libcalamares/geoip/GeoIPTests.cpp @@ -187,7 +187,7 @@ GeoIPTests::testSplitTZ() #define CHECK_GET( t, selector, url ) \ { \ auto tz = GeoIP##t( selector ) \ - .processReply( CalamaresUtils::Network::Manager::instance().synchronousGet( QUrl( url ) ) ); \ + .processReply( Calamares::Network::Manager::instance().synchronousGet( QUrl( url ) ) ); \ qDebug() << tz; \ QCOMPARE( default_tz, tz ); \ auto tz2 = Calamares::GeoIP::Handler( "" #t, url, selector ).get(); \ @@ -207,7 +207,7 @@ 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" ) ) ); + Calamares::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") ); diff --git a/src/libcalamares/geoip/Handler.cpp b/src/libcalamares/geoip/Handler.cpp index a6838c018..d9db94848 100644 --- a/src/libcalamares/geoip/Handler.cpp +++ b/src/libcalamares/geoip/Handler.cpp @@ -113,9 +113,9 @@ do_query( Handler::Type type, const QString& url, const QString& selector ) return RegionZonePair(); } - using namespace CalamaresUtils::Network; + using namespace Calamares::Network; return interface->processReply( - CalamaresUtils::Network::Manager::instance().synchronousGet( url, { RequestOptions::FakeUserAgent } ) ); + Calamares::Network::Manager::instance().synchronousGet( url, { RequestOptions::FakeUserAgent } ) ); } static QString @@ -127,9 +127,9 @@ do_raw_query( Handler::Type type, const QString& url, const QString& selector ) return QString(); } - using namespace CalamaresUtils::Network; + using namespace Calamares::Network; return interface->rawReply( - CalamaresUtils::Network::Manager::instance().synchronousGet( url, { RequestOptions::FakeUserAgent } ) ); + Calamares::Network::Manager::instance().synchronousGet( url, { RequestOptions::FakeUserAgent } ) ); } RegionZonePair diff --git a/src/libcalamares/network/Manager.cpp b/src/libcalamares/network/Manager.cpp index 66c009222..275a7f523 100644 --- a/src/libcalamares/network/Manager.cpp +++ b/src/libcalamares/network/Manager.cpp @@ -22,7 +22,7 @@ #include -namespace CalamaresUtils +namespace Calamares { namespace Network { @@ -127,7 +127,6 @@ Manager::Private::cleanupNam() } } - Manager::Manager() : d( std::make_unique< Private >() ) { @@ -187,7 +186,6 @@ Manager::checkHasInternet() attempts++; } while ( !d->m_hasInternet && ( attempts < d->m_hasInternetUrls.size() ) ); - // For earlier Qt versions (< 5.15.0), set the accessibility flag to // NotAccessible if synchronous ping has failed, so that any module // using Qt's networkAccessible method to determine whether or not @@ -348,13 +346,13 @@ Manager::synchronousGet( const QUrl& url, const RequestOptions& options ) } QNetworkReply* -Manager::asynchronousGet( const QUrl& url, const CalamaresUtils::Network::RequestOptions& options ) +Manager::asynchronousGet( const QUrl& url, const Calamares::Network::RequestOptions& options ) { return asynchronousRun( d->nam(), url, options ); } QDebug& -operator<<( QDebug& s, const CalamaresUtils::Network::RequestStatus& e ) +operator<<( QDebug& s, const Calamares::Network::RequestStatus& e ) { s << int( e.status ) << bool( e ); switch ( e.status ) @@ -377,9 +375,8 @@ operator<<( QDebug& s, const CalamaresUtils::Network::RequestStatus& e ) return s; } - } // namespace Network -} // namespace CalamaresUtils +} // namespace Calamares #include "utils/moc-warnings.h" diff --git a/src/libcalamares/network/Manager.h b/src/libcalamares/network/Manager.h index 6a906c883..2538b35c5 100644 --- a/src/libcalamares/network/Manager.h +++ b/src/libcalamares/network/Manager.h @@ -24,7 +24,7 @@ class QNetworkReply; class QNetworkRequest; -namespace CalamaresUtils +namespace Calamares { namespace Network { @@ -170,5 +170,5 @@ private: std::unique_ptr< Private > d; }; } // namespace Network -} // namespace CalamaresUtils +} // namespace Calamares #endif // LIBCALAMARES_NETWORK_MANAGER_H diff --git a/src/libcalamares/network/Tests.cpp b/src/libcalamares/network/Tests.cpp index e5bd34c23..284fcba75 100644 --- a/src/libcalamares/network/Tests.cpp +++ b/src/libcalamares/network/Tests.cpp @@ -28,7 +28,7 @@ NetworkTests::initTestCase() void NetworkTests::testInstance() { - auto& nam = CalamaresUtils::Network::Manager::instance(); + auto& nam = Calamares::Network::Manager::instance(); QVERIFY( !nam.hasInternet() ); QCOMPARE( nam.getCheckInternetUrls().count(), 0 ); } @@ -36,7 +36,7 @@ NetworkTests::testInstance() void NetworkTests::testPing() { - using namespace CalamaresUtils::Network; + using namespace Calamares::Network; Logger::setupLogLevel( Logger::LOGVERBOSE ); auto& nam = Manager::instance(); @@ -65,7 +65,7 @@ NetworkTests::testPing() void NetworkTests::testCheckUrl() { - using namespace CalamaresUtils::Network; + using namespace Calamares::Network; Logger::setupLogLevel( Logger::LOGVERBOSE ); auto& nam = Manager::instance(); @@ -95,7 +95,7 @@ NetworkTests::testCheckUrl() void NetworkTests::testCheckMultiUrl() { - using namespace CalamaresUtils::Network; + using namespace Calamares::Network; Logger::setupLogLevel( Logger::LOGVERBOSE ); auto& nam = Manager::instance(); diff --git a/src/libcalamaresui/utils/Qml.cpp b/src/libcalamaresui/utils/Qml.cpp index b73bf7172..7f3df6ee8 100644 --- a/src/libcalamaresui/utils/Qml.cpp +++ b/src/libcalamaresui/utils/Qml.cpp @@ -240,12 +240,12 @@ registerQmlModels() 0, "Global", []( QQmlEngine*, QJSEngine* ) -> QObject* { return Calamares::JobQueue::instance()->globalStorage(); } ); - qmlRegisterSingletonType< CalamaresUtils::Network::Manager >( + qmlRegisterSingletonType< Calamares::Network::Manager >( "io.calamares.core", 1, 0, "Network", - []( QQmlEngine*, QJSEngine* ) -> QObject* { return &CalamaresUtils::Network::Manager::instance(); } ); + []( QQmlEngine*, QJSEngine* ) -> QObject* { return &Calamares::Network::Manager::instance(); } ); } } diff --git a/src/libcalamaresui/utils/TestPaste.cpp b/src/libcalamaresui/utils/TestPaste.cpp index 2245c76c4..95259298f 100644 --- a/src/libcalamaresui/utils/TestPaste.cpp +++ b/src/libcalamaresui/utils/TestPaste.cpp @@ -75,7 +75,7 @@ TestPaste::testUploadSize() QVERIFY( !s.isEmpty() ); QUrl url( s ); - QByteArray returnedData = CalamaresUtils::Network::Manager::instance().synchronousGet( url ); + QByteArray returnedData = Calamares::Network::Manager::instance().synchronousGet( url ); QCOMPARE( returnedData.size(), 100 ); } diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp index 7b9f9f24a..2a0ea79c5 100644 --- a/src/modules/locale/Config.cpp +++ b/src/modules/locale/Config.cpp @@ -549,7 +549,7 @@ Config::startGeoIP() { if ( m_geoip && m_geoip->isValid() ) { - auto& network = CalamaresUtils::Network::Manager::instance(); + auto& network = Calamares::Network::Manager::instance(); if ( network.hasInternet() || network.synchronousPing( m_geoip->url() ) ) { using Watcher = QFutureWatcher< Calamares::GeoIP::RegionZonePair >; diff --git a/src/modules/netinstall/LoaderQueue.cpp b/src/modules/netinstall/LoaderQueue.cpp index 50b3354ba..97ddd11b8 100644 --- a/src/modules/netinstall/LoaderQueue.cpp +++ b/src/modules/netinstall/LoaderQueue.cpp @@ -126,7 +126,7 @@ LoaderQueue::fetch( const QUrl& url ) return; } - using namespace CalamaresUtils::Network; + using namespace Calamares::Network; cDebug() << "NetInstall loading groups from" << url; QNetworkReply* reply = Manager::instance().asynchronousGet( diff --git a/src/modules/tracking/TrackingJobs.cpp b/src/modules/tracking/TrackingJobs.cpp index 7430bd57b..70b68de45 100644 --- a/src/modules/tracking/TrackingJobs.cpp +++ b/src/modules/tracking/TrackingJobs.cpp @@ -110,9 +110,9 @@ TrackingInstallJob::prettyStatusMessage() const Calamares::JobResult TrackingInstallJob::exec() { - using CalamaresUtils::Network::Manager; - using CalamaresUtils::Network::RequestOptions; - using CalamaresUtils::Network::RequestStatus; + using Calamares::Network::Manager; + using Calamares::Network::RequestOptions; + using Calamares::Network::RequestStatus; auto result = Manager::instance().synchronousPing( QUrl( m_url ), diff --git a/src/modules/welcome/Tests.cpp b/src/modules/welcome/Tests.cpp index 70e18b88f..51495830d 100644 --- a/src/modules/welcome/Tests.cpp +++ b/src/modules/welcome/Tests.cpp @@ -72,7 +72,7 @@ WelcomeTests::testOneUrl() QVERIFY( map.contains( "requirements" ) ); c.setConfigurationMap( map ); - QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), 1 ); + QCOMPARE( Calamares::Network::Manager::instance().getCheckInternetUrls().count(), 1 ); } void @@ -107,17 +107,17 @@ WelcomeTests::testUrls() const auto map = CalamaresUtils::loadYaml( fi, &ok ); QVERIFY( ok ); - CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} ); - QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), 0 ); + Calamares::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} ); + QCOMPARE( Calamares::Network::Manager::instance().getCheckInternetUrls().count(), 0 ); c.setConfigurationMap( map ); - QCOMPARE( CalamaresUtils::Network::Manager::instance().getCheckInternetUrls().count(), result ); + QCOMPARE( Calamares::Network::Manager::instance().getCheckInternetUrls().count(), result ); } void WelcomeTests::testBadConfigDoesNotResetUrls() { - auto& nam = CalamaresUtils::Network::Manager::instance(); - CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} ); + auto& nam = Calamares::Network::Manager::instance(); + Calamares::Network::Manager::instance().setCheckHasInternetUrl( QVector< QUrl > {} ); QCOMPARE( nam.getCheckInternetUrls().count(), 0 ); nam.setCheckHasInternetUrl( QVector< QUrl > { QUrl( "http://example.com" ), QUrl( "https://www.kde.org" ) } ); QCOMPARE( nam.getCheckInternetUrls().count(), 2 ); diff --git a/src/modules/welcome/checker/GeneralRequirements.cpp b/src/modules/welcome/checker/GeneralRequirements.cpp index 330288965..ca9e0f6d7 100644 --- a/src/modules/welcome/checker/GeneralRequirements.cpp +++ b/src/modules/welcome/checker/GeneralRequirements.cpp @@ -306,12 +306,12 @@ getCheckInternetUrls( const QVariantMap& configurationMap ) { cWarning() << "GeneralRequirements entry 'internetCheckUrl' contains no valid URLs, " << "reverting to default (" << exampleUrl << ")."; - CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) ); + Calamares::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) ); incomplete = true; } else { - CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( urls ); + Calamares::Network::Manager::instance().setCheckHasInternetUrl( urls ); } } else @@ -319,7 +319,7 @@ getCheckInternetUrls( const QVariantMap& configurationMap ) cWarning() << "GeneralRequirements entry 'internetCheckUrl' is undefined in welcome.conf, " "reverting to default (" << exampleUrl << ")."; - CalamaresUtils::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) ); + Calamares::Network::Manager::instance().setCheckHasInternetUrl( QUrl( exampleUrl ) ); incomplete = true; } return incomplete; @@ -508,7 +508,7 @@ GeneralRequirements::checkHasPower() bool GeneralRequirements::checkHasInternet() { - auto& nam = CalamaresUtils::Network::Manager::instance(); + auto& nam = Calamares::Network::Manager::instance(); bool hasInternet = nam.checkHasInternet(); Calamares::JobQueue::instance()->globalStorage()->insert( "hasInternet", hasInternet ); return hasInternet;