ac769d1de8
- In many cases, using QLatin1String is a de-optimization, when applied to a C string literal. Kevin Kofler pointed out that those should basically all be QStringLiteral, instead. (Compile tests with -O3 show that in the optimized object file, the code size difference is negligible). - Drop the explicit constructor entirely in cases where we're calling QProcess::execute(), for consistency. - Do a little less messing around in the mapping of keyboard locales to keyboard map names.
61 lines
1.9 KiB
C++
61 lines
1.9 KiB
C++
/* === This file is part of Calamares - <http://github.com/calamares> ===
|
|
*
|
|
* Copyright 2018, Adriaan de Groot <groot@kde.org>
|
|
*
|
|
* Calamares is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Calamares is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "GeoIPXML.h"
|
|
|
|
#include "utils/Logger.h"
|
|
|
|
#include <QNetworkReply>
|
|
#include <QtXml/QDomDocument>
|
|
|
|
GeoIPXML::GeoIPXML( const QString& element )
|
|
: GeoIP( element.isEmpty() ? QStringLiteral( "TimeZone" ) : element )
|
|
{
|
|
}
|
|
|
|
GeoIP::RegionZonePair
|
|
GeoIPXML::processReply( const QByteArray& data )
|
|
{
|
|
QString domError;
|
|
int errorLine, errorColumn;
|
|
|
|
QDomDocument doc;
|
|
if ( doc.setContent( data, false, &domError, &errorLine, &errorColumn ) )
|
|
{
|
|
const auto tzElements = doc.elementsByTagName( m_element );
|
|
cDebug() << "GeoIP found" << tzElements.length() << "elements";
|
|
for ( int it = 0; it < tzElements.length(); ++it )
|
|
{
|
|
auto e = tzElements.at(it).toElement();
|
|
auto tz = splitTZString( e.text() );
|
|
if ( !tz.first.isEmpty() )
|
|
return tz;
|
|
}
|
|
|
|
// None of them valid
|
|
cWarning() << "GeopIP XML had no recognizable timezone";
|
|
return qMakePair( QString(), QString() );
|
|
}
|
|
else
|
|
{
|
|
cWarning() << "GeoIP XML data error:" << domError << "(line" << errorLine << errorColumn << ')';
|
|
}
|
|
|
|
return qMakePair( QString(), QString() );
|
|
}
|