@@ -330,13 +330,13 @@ GPSData* GPSData::getData(const QString& filename) {
330
330
while (!file.atEnd ()) {
331
331
long int readBytes = file.readBlock (buffer, bufsize);
332
332
if (file.atEnd ())
333
- atEnd = 1 ;
333
+ atEnd = 1 ;
334
334
if (!XML_Parse (p, buffer, readBytes, atEnd)) {
335
- std::cerr<<" Parse error at line "
336
- <<XML_GetCurrentLineNumber (p)<<" : "
337
- <<XML_ErrorString (XML_GetErrorCode (p))<<std::endl;
338
- failed = true ;
339
- break ;
335
+ std::cerr<<" Parse error at line "
336
+ <<XML_GetCurrentLineNumber (p)<<" : "
337
+ <<XML_ErrorString (XML_GetErrorCode (p))<<std::endl;
338
+ failed = true ;
339
+ break ;
340
340
}
341
341
}
342
342
delete [] buffer;
@@ -391,9 +391,9 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
391
391
mWpt = Waypoint ();
392
392
for (int i = 0 ; attr[2 *i] != NULL ; ++i) {
393
393
if (!std::strcmp (attr[2 *i], " lat" ))
394
- mWpt .lat = QString (attr[2 *i+1 ]).toDouble ();
394
+ mWpt .lat = QString (attr[2 *i+1 ]).toDouble ();
395
395
else if (!std::strcmp (attr[2 *i], " lon" ))
396
- mWpt .lon = QString (attr[2 *i+1 ]).toDouble ();
396
+ mWpt .lon = QString (attr[2 *i+1 ]).toDouble ();
397
397
}
398
398
mObj = &mWpt ;
399
399
}
@@ -411,8 +411,8 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
411
411
// common properties
412
412
else if (!std::strcmp (qName, " name" )) {
413
413
if (parseModes.top () == ParsingWaypoint ||
414
- parseModes.top () == ParsingRoute ||
415
- parseModes.top () == ParsingTrack) {
414
+ parseModes.top () == ParsingRoute ||
415
+ parseModes.top () == ParsingTrack) {
416
416
mString = &mObj ->name ;
417
417
mCharBuffer = " " ;
418
418
parseModes.push (ParsingString);
@@ -422,8 +422,8 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
422
422
}
423
423
else if (!std::strcmp (qName, " cmt" )) {
424
424
if (parseModes.top () == ParsingWaypoint ||
425
- parseModes.top () == ParsingRoute ||
426
- parseModes.top () == ParsingTrack) {
425
+ parseModes.top () == ParsingRoute ||
426
+ parseModes.top () == ParsingTrack) {
427
427
mString = &mObj ->cmt ;
428
428
mCharBuffer = " " ;
429
429
parseModes.push (ParsingString);
@@ -433,8 +433,8 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
433
433
}
434
434
else if (!std::strcmp (qName, " desc" )) {
435
435
if (parseModes.top () == ParsingWaypoint ||
436
- parseModes.top () == ParsingRoute ||
437
- parseModes.top () == ParsingTrack) {
436
+ parseModes.top () == ParsingRoute ||
437
+ parseModes.top () == ParsingTrack) {
438
438
mString = &mObj ->desc ;
439
439
mCharBuffer = " " ;
440
440
parseModes.push (ParsingString);
@@ -444,8 +444,8 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
444
444
}
445
445
else if (!std::strcmp (qName, " src" )) {
446
446
if (parseModes.top () == ParsingWaypoint ||
447
- parseModes.top () == ParsingRoute ||
448
- parseModes.top () == ParsingTrack) {
447
+ parseModes.top () == ParsingRoute ||
448
+ parseModes.top () == ParsingTrack) {
449
449
mString = &mObj ->src ;
450
450
mCharBuffer = " " ;
451
451
parseModes.push (ParsingString);
@@ -455,8 +455,8 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
455
455
}
456
456
else if (!std::strcmp (qName, " url" )) {
457
457
if (parseModes.top () == ParsingWaypoint ||
458
- parseModes.top () == ParsingRoute ||
459
- parseModes.top () == ParsingTrack) {
458
+ parseModes.top () == ParsingRoute ||
459
+ parseModes.top () == ParsingTrack) {
460
460
mString = &mObj ->url ;
461
461
mCharBuffer = " " ;
462
462
parseModes.push (ParsingString);
@@ -466,8 +466,8 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
466
466
}
467
467
else if (!std::strcmp (qName, " urlname" )) {
468
468
if (parseModes.top () == ParsingWaypoint ||
469
- parseModes.top () == ParsingRoute ||
470
- parseModes.top () == ParsingTrack) {
469
+ parseModes.top () == ParsingRoute ||
470
+ parseModes.top () == ParsingTrack) {
471
471
mString = &mObj ->urlname ;
472
472
mCharBuffer = " " ;
473
473
parseModes.push (ParsingString);
@@ -516,10 +516,10 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
516
516
if (parseModes.top () == ParsingRoute) {
517
517
mRtept = Routepoint ();
518
518
for (int i = 0 ; attr[2 *i] != NULL ; ++i) {
519
- if (!std::strcmp (attr[2 *i], " lat" ))
520
- mRtept .lat = QString (attr[2 *i+1 ]).toDouble ();
521
- else if (!std::strcmp (attr[2 *i], " lon" ))
522
- mRtept .lon = QString (attr[2 *i+1 ]).toDouble ();
519
+ if (!std::strcmp (attr[2 *i], " lat" ))
520
+ mRtept .lat = QString (attr[2 *i+1 ]).toDouble ();
521
+ else if (!std::strcmp (attr[2 *i], " lon" ))
522
+ mRtept .lon = QString (attr[2 *i+1 ]).toDouble ();
523
523
}
524
524
parseModes.push (ParsingRoutepoint);
525
525
}
@@ -540,10 +540,10 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
540
540
if (parseModes.top () == ParsingTrackSegment) {
541
541
mTrkpt = Trackpoint ();
542
542
for (int i = 0 ; attr[2 *i] != NULL ; ++i) {
543
- if (!std::strcmp (attr[2 *i], " lat" ))
544
- mTrkpt .lat = QString (attr[2 *i+1 ]).toDouble ();
545
- else if (!std::strcmp (attr[2 *i], " lon" ))
546
- mTrkpt .lon = QString (attr[2 *i+1 ]).toDouble ();
543
+ if (!std::strcmp (attr[2 *i], " lat" ))
544
+ mTrkpt .lat = QString (attr[2 *i+1 ]).toDouble ();
545
+ else if (!std::strcmp (attr[2 *i], " lon" ))
546
+ mTrkpt .lon = QString (attr[2 *i+1 ]).toDouble ();
547
547
}
548
548
parseModes.push (ParsingTrackpoint);
549
549
}
0 commit comments