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

[libcalamares] Refactor timezone loading

Browse Source 
- load from a TextStream. This is prep-work for alternate TZ data
  sources.
This commit is contained in:
Adriaan de Groot 2020-08-08 22:12:22 +10:00
parent 0948963d86
commit 00626fd96c
1 changed files with 75 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libcalamares/locale/TimeZone.cpp
View File

@ -110,12 +110,8 @@ RegionData::tr() const
}
static void
loadTZData( RegionVector& regions, ZoneVector& zones )
loadTZData( RegionVector& regions, ZoneVector& zones, QTextStream& in )
{
QFile file( TZ_DATA_FILE );
if ( file.open( QIODevice::ReadOnly | QIODevice::Text ) )
{
QTextStream in( &file );
while ( !in.atEnd() )
{
QString line = in.readLine().trimmed().split( '#', SplitKeepEmptyParts ).first().trimmed();
@ -185,6 +181,16 @@ loadTZData( RegionVector& regions, ZoneVector& zones )
}
zones.append( new TimeZoneData( region, zone, countryCode, latitude, longitude ) );
}
}
static void
loadTZData( RegionVector& regions, ZoneVector& zones )
{
QFile file( TZ_DATA_FILE );
if ( file.open( QIODevice::ReadOnly | QIODevice::Text ) )
{
QTextStream in( &file );
loadTZData( regions, zones, in );
}
}