Skip to content

Commit 1af4458

Browse files
author
g_j_m
committed
Adjust indenting only
git-svn-id: http://svn.osgeo.org/qgis/trunk@5796 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 56cfc7e commit 1af4458

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

src/providers/gpx/gpsdata.cpp

+28-28
Original file line numberDiff line numberDiff line change
@@ -330,13 +330,13 @@ GPSData* GPSData::getData(const QString& filename) {
330330
while (!file.atEnd()) {
331331
long int readBytes = file.readBlock(buffer, bufsize);
332332
if (file.atEnd())
333-
atEnd = 1;
333+
atEnd = 1;
334334
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;
340340
}
341341
}
342342
delete [] buffer;
@@ -391,9 +391,9 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
391391
mWpt = Waypoint();
392392
for (int i = 0; attr[2*i] != NULL; ++i) {
393393
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();
395395
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();
397397
}
398398
mObj = &mWpt;
399399
}
@@ -411,8 +411,8 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
411411
// common properties
412412
else if (!std::strcmp(qName, "name")) {
413413
if (parseModes.top() == ParsingWaypoint ||
414-
parseModes.top() == ParsingRoute ||
415-
parseModes.top() == ParsingTrack) {
414+
parseModes.top() == ParsingRoute ||
415+
parseModes.top() == ParsingTrack) {
416416
mString = &mObj->name;
417417
mCharBuffer = "";
418418
parseModes.push(ParsingString);
@@ -422,8 +422,8 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
422422
}
423423
else if (!std::strcmp(qName, "cmt")) {
424424
if (parseModes.top() == ParsingWaypoint ||
425-
parseModes.top() == ParsingRoute ||
426-
parseModes.top() == ParsingTrack) {
425+
parseModes.top() == ParsingRoute ||
426+
parseModes.top() == ParsingTrack) {
427427
mString = &mObj->cmt;
428428
mCharBuffer = "";
429429
parseModes.push(ParsingString);
@@ -433,8 +433,8 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
433433
}
434434
else if (!std::strcmp(qName, "desc")) {
435435
if (parseModes.top() == ParsingWaypoint ||
436-
parseModes.top() == ParsingRoute ||
437-
parseModes.top() == ParsingTrack) {
436+
parseModes.top() == ParsingRoute ||
437+
parseModes.top() == ParsingTrack) {
438438
mString = &mObj->desc;
439439
mCharBuffer = "";
440440
parseModes.push(ParsingString);
@@ -444,8 +444,8 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
444444
}
445445
else if (!std::strcmp(qName, "src")) {
446446
if (parseModes.top() == ParsingWaypoint ||
447-
parseModes.top() == ParsingRoute ||
448-
parseModes.top() == ParsingTrack) {
447+
parseModes.top() == ParsingRoute ||
448+
parseModes.top() == ParsingTrack) {
449449
mString = &mObj->src;
450450
mCharBuffer = "";
451451
parseModes.push(ParsingString);
@@ -455,8 +455,8 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
455455
}
456456
else if (!std::strcmp(qName, "url")) {
457457
if (parseModes.top() == ParsingWaypoint ||
458-
parseModes.top() == ParsingRoute ||
459-
parseModes.top() == ParsingTrack) {
458+
parseModes.top() == ParsingRoute ||
459+
parseModes.top() == ParsingTrack) {
460460
mString = &mObj->url;
461461
mCharBuffer = "";
462462
parseModes.push(ParsingString);
@@ -466,8 +466,8 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
466466
}
467467
else if (!std::strcmp(qName, "urlname")) {
468468
if (parseModes.top() == ParsingWaypoint ||
469-
parseModes.top() == ParsingRoute ||
470-
parseModes.top() == ParsingTrack) {
469+
parseModes.top() == ParsingRoute ||
470+
parseModes.top() == ParsingTrack) {
471471
mString = &mObj->urlname;
472472
mCharBuffer = "";
473473
parseModes.push(ParsingString);
@@ -516,10 +516,10 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
516516
if (parseModes.top() == ParsingRoute) {
517517
mRtept = Routepoint();
518518
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();
523523
}
524524
parseModes.push(ParsingRoutepoint);
525525
}
@@ -540,10 +540,10 @@ bool GPXHandler::startElement(const XML_Char* qName, const XML_Char** attr) {
540540
if (parseModes.top() == ParsingTrackSegment) {
541541
mTrkpt = Trackpoint();
542542
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();
547547
}
548548
parseModes.push(ParsingTrackpoint);
549549
}

0 commit comments

Comments
 (0)