root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00
Code Issues Projects Releases Activity

Cosmetics

Browse Source
This commit is contained in:
Martin Tůma 2019-07-10 21:37:03 +02:00
parent 6bea3b7ebf
commit c1fdb21fad
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gpxsee.pro
View File

@ -323,7 +323,6 @@ DEFINES += APP_VERSION=\\\"$$VERSION\\\" \
QT_NO_DEPRECATED_WARNINGS QT_NO_DEPRECATED_WARNINGS
DEFINES *= QT_USE_QSTRINGBUILDER DEFINES *= QT_USE_QSTRINGBUILDER
RESOURCES += gpxsee.qrc RESOURCES += gpxsee.qrc
TRANSLATIONS = lang/gpxsee_en.ts \ TRANSLATIONS = lang/gpxsee_en.ts \
lang/gpxsee_cs.ts \ lang/gpxsee_cs.ts \

5
src/map/IMG/lblfile.cpp
View File

@ -102,7 +102,8 @@ Label LBLFile::label6b(Handle &hdl, quint32 offset) const
else if (c[cpt] == 0x1b) else if (c[cpt] == 0x1b)
curCharSet = Special; curCharSet = Special;
else if (c[cpt] >= 0x2a && c[cpt] <= 0x2f) { else if (c[cpt] >= 0x2a && c[cpt] <= 0x2f) {
shieldType = (Label::Shield::Type)(c[cpt] - 0x29); shieldType = static_cast<Label::Shield::Type>
(c[cpt] - 0x29);
bap = &shieldLabel; bap = &shieldLabel;
} else if (bap == &shieldLabel } else if (bap == &shieldLabel
&& NORMAL_CHARS[c[cpt]] == ' ') && NORMAL_CHARS[c[cpt]] == ' ')
@ -145,7 +146,7 @@ Label LBLFile::label8b(Handle &hdl, quint32 offset) const
else else
bap->append(' '); bap->append(' ');
} else if (c <= 0x07) { } else if (c <= 0x07) {
shieldType = (Label::Shield::Type)c; shieldType = static_cast<Label::Shield::Type>(c);
bap = &shieldLabel; bap = &shieldLabel;
} else if (bap == &shieldLabel && QChar(c).isSpace()) { } else if (bap == &shieldLabel && QChar(c).isSpace()) {
bap = &label; bap = &label;

5
src/map/imgmap.cpp
View File

@ -381,8 +381,9 @@ void IMGMap::processLines(QList<IMG::Poly> &lines, const QPoint &tile,
} }
for (int type = 1; type < 7; type++) { for (int type = Label::Shield::USInterstate; type <= Label::Shield::Oval;
if (minShieldZoom((Label::Shield::Type)type) > _zoom) type++) {
if (minShieldZoom(static_cast<Label::Shield::Type>(type)) > _zoom)
continue; continue;
QSet<Label::Shield> shields; QSet<Label::Shield> shields;