From 7899ab83f91d377ded8a1d52676029228e9a07f5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 3 May 2019 11:35:13 -0400 Subject: [PATCH] [libcalamares] Remove convenience API --- src/libcalamares/geoip/Handler.cpp | 7 ------- src/libcalamares/geoip/Handler.h | 10 ---------- 2 files changed, 17 deletions(-) diff --git a/src/libcalamares/geoip/Handler.cpp b/src/libcalamares/geoip/Handler.cpp index a803889b2..f98ac897d 100644 --- a/src/libcalamares/geoip/Handler.cpp +++ b/src/libcalamares/geoip/Handler.cpp @@ -74,13 +74,6 @@ Handler::Handler( const QString& implementation, const QString& url, const QStri } } -Handler::Handler( const QVariantMap& config ) - : Handler( CalamaresUtils::getString( config, QStringLiteral( "style" ) ), - CalamaresUtils::getString( config, QStringLiteral( "url" ) ), - CalamaresUtils::getString( config, QStringLiteral( "selector" ) ) ) -{ -} - Handler::~Handler() { } diff --git a/src/libcalamares/geoip/Handler.h b/src/libcalamares/geoip/Handler.h index 0a5ec1e12..533188a0d 100644 --- a/src/libcalamares/geoip/Handler.h +++ b/src/libcalamares/geoip/Handler.h @@ -56,16 +56,6 @@ public: * is used to select something from the data returned by the @url. */ Handler( const QString& implementation, const QString& url, const QString& selector ); - /** @brief A handler for a specific GeoIP source. - * - * This is like the 3-QString Handler constructor, except the strings - * are extracted from the map, which is typically part of the configuration - * of a Calamares module. The strings are fetched from these keys: - * - implementation from "style" - * - url from "url" - * - selector from "selector" - */ - Handler( const QVariantMap& config ); ~Handler();