StelLocationMgr.cpp   StelLocationMgr.cpp 
skipping to change at line 127 skipping to change at line 127
} }
// Read the data serialized from the file. // Read the data serialized from the file.
// Code below borrowed from Marble (http://edu.kde.org/marble/) // Code below borrowed from Marble (http://edu.kde.org/marble/)
QTextStream sourcestream(&sourcefile); QTextStream sourcestream(&sourcefile);
sourcestream.setCodec("UTF-8"); sourcestream.setCodec("UTF-8");
StelLocation loc; StelLocation loc;
while (!sourcestream.atEnd()) while (!sourcestream.atEnd())
{ {
const QString& rawline=sourcestream.readLine(); const QString& rawline=sourcestream.readLine();
if (rawline.isEmpty() || rawline.startsWith('#')) if (rawline.isEmpty() || rawline.startsWith('#') || (rawline .split("\t").count() < 8))
continue; continue;
loc = StelLocation::createFromLine(rawline); loc = StelLocation::createFromLine(rawline);
loc.isUserLocation = isUserLocation; loc.isUserLocation = isUserLocation;
const QString& locId = loc.getID(); const QString& locId = loc.getID();
if (locations.contains(locId)) if (locations.contains(locId))
{ {
// Add the state in the name of the existing one and the new one to differentiate // Add the state in the name of the existing one and the new one to differentiate
StelLocation loc2 = locations[locId]; StelLocation loc2 = locations[locId];
if (!loc2.state.isEmpty()) if (!loc2.state.isEmpty())
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/