root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-17 04:14:24 +02:00
Code Issues Projects Releases Activity

Code cleanup

Browse Source
This commit is contained in:
Martin Tůma
2023-12-26 14:14:08 +01:00
parent 9380f31022
commit 14dc2af877
18 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/map/ENC/iso8211.cpp
View File

@ -323,7 +323,7 @@ bool ISO8211::readRecord(Record &record)
const FieldDefinition &def = fields.at(i);
Data data;
FieldsMap::const_iterator it = _map.find(def.tag);
FieldsMap::const_iterator it(_map.find(def.tag));
if (it == _map.constEnd()) {
_errorString = QString("%1: unknown record").arg(QString(def.tag));
return false;

2
src/map/ENC/mapdata.cpp
View File

@ -86,7 +86,7 @@ static QMap<uint,uint> orderMap = orderMapInit();
static uint order(uint type)
{
uint st = ((type>>16) == BUAARE) ? type : (type & 0xFFFF0000);
QMap<uint, uint>::const_iterator it = orderMap.find(st);
QMap<uint, uint>::const_iterator it(orderMap.find(st));
return (it == orderMap.constEnd()) ? (type>>16) + 512 : it.value();
}

7
src/map/ENC/rastertile.cpp
View File

@ -15,7 +15,8 @@ using namespace ENC;
typedef QSet<Coordinates> PointSet;
static const float C1 = 0.866025f; /* sqrt(3)/2 */
static const QColor haloColor(Qt::white);
static const QColor tsslptPen = QColor("#eb49eb");
static const QColor tsslptBrush = QColor("#80eb49eb");
static const Style *style()
{
@ -174,8 +175,8 @@ void RasterTile::drawArrows(QPainter *painter,
QPolygonF polygon(tsslptArrow(centroid(poly.path().first()),
deg2rad(180 - poly.param().toDouble())));
painter->setPen(QPen(QColor("#eb49eb"), 1));
painter->setBrush(QBrush("#80eb49eb"));
painter->setPen(QPen(tsslptPen, 1));
painter->setBrush(QBrush(tsslptBrush));
painter->drawPolygon(polygon);
}
}

6
src/map/ENC/style.cpp
View File

@ -344,7 +344,7 @@ const Style::Line &Style::line(uint type) const
{
static Line null;
QMap<uint, Line>::const_iterator it = _lines.find(type);
QMap<uint, Line>::const_iterator it(_lines.find(type));
return (it == _lines.constEnd()) ? null : *it;
}
@ -352,7 +352,7 @@ const Style::Polygon &Style::polygon(uint type) const
{
static Polygon null;
QMap<uint, Polygon>::const_iterator it = _polygons.find(type);
QMap<uint, Polygon>::const_iterator it(_polygons.find(type));
return (it == _polygons.constEnd()) ? null : *it;
}
@ -360,7 +360,7 @@ const Style::Point &Style::point(uint type) const
{
static Point null;
QMap<uint, Point>::const_iterator it = _points.find(type);
QMap<uint, Point>::const_iterator it(_points.find(type));
return (it == _points.constEnd()) ? null : *it;
}

1
src/map/ENC/style.h
View File

@ -111,6 +111,7 @@ private:
QMap<uint, Point> _points;
QVector<uint> _drawOrder;
/* Fonts and images must be initialized after QGuiApplication! */
QFont _small, _normal, _large;
QImage _light, _signal;
};