Silenced some more clazy warnings

src/data/dem.cpp

@@ -148,9 +148,9 @@ qreal DEM::elevation(const Coordinates &c)
 
 QList<Area> DEM::tiles()
 {
+	static const QRegularExpression re("([NS])([0-9]{2})([EW])([0-9]{3})");
 	QDir dir(_dir);
 	QFileInfoList files(dir.entryInfoList(QDir::Files | QDir::Readable));
-	QRegularExpression re("([NS])([0-9]{2})([EW])([0-9]{3})");
 	QLocale l(QLocale::system());
 	QList<Area> list;
 

src/data/gpsdumpparser.cpp

@@ -88,6 +88,7 @@ static Coordinates parseUTM(const QString &zone, const QString &easting,
 bool GPSDumpParser::parse(QFile *file, QList<TrackData> &tracks,
   QList<RouteData> &routes, QList<Area> &polygons, QVector<Waypoint> &waypoints)
 {
+	static const QRegularExpression dm("[ ]{2,}");
 	Q_UNUSED(tracks);
 	Q_UNUSED(routes);
 	Q_UNUSED(polygons);
@@ -95,7 +96,6 @@ bool GPSDumpParser::parse(QFile *file, QList<TrackData> &tracks,
 	_errorLine = 1;
 	_errorString.clear();
 	Type type = Unknown;
-	QRegularExpression dm("[ ]{2,}");
 
 	while (!file->atEnd()) {
 		QByteArray ba(file->readLine(4096).trimmed());

src/map/ozimap.cpp

@@ -62,7 +62,7 @@ OziMap::OziMap(const QString &fileName, CalibrationType type,
 	if (type == Unknown) {
 		_tar = new Tar(fileName);
 		if (!_tar->open()) {
-			_errorString = "Error reading tar file: " + _tar->errorString();
+			_errorString = _tar->errorString();
 			return;
 		}
 		QStringList files(_tar->files());
@@ -262,27 +262,30 @@ bool OziMap::setImageInfo(const QString &path)
 
 bool OziMap::setTileInfo(const QStringList &tiles, const QString &path)
 {
+	static const QRegularExpression rx("_[0-9]+_[0-9]+\\.");
+
 	if (!_map.size.isValid()) {
 		_errorString = "Missing total image size (IWH)";
 		return false;
 	}
 
-	QRegularExpression rx("_[0-9]+_[0-9]+\\.");
 	for (int i = 0; i < tiles.size(); i++) {
-		if (tiles.at(i).contains(rx)) {
-			_tile.path = QString(tiles.at(i)).replace(rx, "_%1_%2.");
+		const QString &tile = tiles.at(i);
+
+		if (tile.startsWith("set/") && tile.contains(rx)) {
+			_tile.path = QString(tile).replace(rx, "_%1_%2.");
 
 			if (_tar) {
-				QByteArray ba = _tar->file(tiles.at(i));
+				QByteArray ba(_tar->file(tile));
 				QBuffer buffer(&ba);
 				_tile.size = QImageReader(&buffer).size();
 			} else {
 				_tile.path = path + "/" + _tile.path;
-				_tile.size = QImageReader(path + "/" + tiles.at(i)).size();
+				_tile.size = QImageReader(path + "/" + tile).size();
 			}
 			if (!_tile.size.isValid()) {
 				_errorString = QString("Error retrieving tile size: "
-				  "%1: Invalid image").arg(QFileInfo(tiles.at(i)).fileName());
+				  "%1: Invalid image").arg(QFileInfo(tile).fileName());
 				return false;
 			}
 
@@ -393,8 +396,9 @@ void OziMap::drawOZF(QPainter *painter, const QRectF &rect) const
 			int y = round(tl.y() * _mapRatio + j * _ozf->tileSize().height());
 
 			QPixmap pixmap;
-			QString key = _ozf->fileName() + "/" + QString::number(_zoom) + "_"
-			  + QString::number(x) + "_" + QString::number(y);
+			QString key(_ozf->fileName() + "/" + QString::number(_zoom) + "_"
+			  + QString::number(x) + "_" + QString::number(y));
+
 			if (!QPixmapCache::find(key, &pixmap)) {
 				pixmap = _ozf->tile(_zoom, x, y);
 				if (!pixmap.isNull())

src/map/rmap.cpp

@@ -97,10 +97,10 @@ static Projection parseProjection(const QString &str, const GCS &gcs)
 
 bool RMap::parseIMP(const QByteArray &data)
 {
-	QStringList lines = QString(data).split("\r\n");
+	static const QRegularExpression re("^P[0-9]+=");
+	QStringList lines(QString(data).split("\r\n"));
 	QVector<CalibrationPoint> calibrationPoints;
 	QString projection, datum;
-	QRegularExpression re("^P[0-9]+=");
 
 	for (int i = 0; i < lines.count(); i++) {
 		const QString &line = lines.at(i);

src/map/tar.cpp

@@ -70,11 +70,11 @@ bool Tar::loadTar()
 	quint64 size;
 	qint64 ret;
 
-	while ((ret = _file.read(buffer, BLOCKSIZE)) > 0) {
+	while ((ret = _file.read(buffer, BLOCKSIZE))) {
 		if (ret < BLOCKSIZE) {
 			_file.close();
 			_index.clear();
-			_errorString = "Error reading header block";
+			_errorString = "Error reading TAR header block";
 			return false;
 		}
 		size = number(hdr->size, sizeof(hdr->size));
@@ -100,7 +100,7 @@ bool Tar::loadTmi(const QString &path)
 		return false;
 
 	while (!file.atEnd()) {
-		QByteArray line = file.readLine(4096);
+		QByteArray line(file.readLine(4096));
 		int pos = line.indexOf(':');
 		if (line.size() < 10 || pos < 7 || !line.startsWith("block")) {
 			qWarning("%s:%d: syntax error", qPrintable(path), ln);