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

[locale] Adjust to Calamares 3.2 idiom

Browse Source
This commit is contained in:
Adriaan de Groot 2018-04-13 09:24:59 -04:00
parent 3ea5a06157
commit 47b7040897
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/locale/GeoIPXML.cpp
View File

@ -42,7 +42,7 @@ XMLGeoIP::processReply( const QByteArray& data )
} }
else else
{ {
cDebug() << "GeoIP XML data error:" << domError << "(line" << errorLine << errorColumn << ')'; cWarning() << "GeoIP XML data error:" << domError << "(line" << errorLine << errorColumn << ')';
} }
return qMakePair( QString(), QString() ); return qMakePair( QString(), QString() );

17
src/modules/locale/LocaleViewStep.cpp
View File

@ -31,6 +31,7 @@
#include "timezonewidget/localeglobal.h" #include "timezonewidget/localeglobal.h"
#include "widgets/WaitingWidget.h" #include "widgets/WaitingWidget.h"
#include "utils/CalamaresUtils.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/YamlUtils.h" #include "utils/YamlUtils.h"
@ -137,7 +138,7 @@ LocaleViewStep::fetchGeoIpTimezone()
#endif #endif
else else
{ {
cDebug() << "WARNING: GeoIP Style" << m_geoipStyle << "is not recognized."; cWarning() << "GeoIP Style" << m_geoipStyle << "is not recognized.";
setUpPage(); setUpPage();
return; return;
} }
@ -289,16 +290,6 @@ LocaleViewStep::setConfigurationMap( const QVariantMap& configurationMap )
} }
// Optional // Optional
if ( configurationMap.contains( "geoipUrl" ) && m_geoipUrl = CalamaresUtils::getString( configurationMap, "geoipUrl" );
configurationMap.value( "geoipUrl" ).type() == QVariant::String && m_geoipStyle = CalamaresUtils::getString( configurationMap, "geoipStyle" );
!configurationMap.value( "geoipUrl" ).toString().isEmpty() )
{
m_geoipUrl = configurationMap.value( "geoipUrl" ).toString();
}
if ( configurationMap.contains( "geoipStyle" ) &&
configurationMap.value( "geoipStyle" ).type() == QVariant::String &&
!configurationMap.value( "geoipStyle" ).toString().isEmpty() )
{
m_geoipStyle = configurationMap.value( "geoipStyle" ).toString();
}
} }