Cosmetics

tumic0 · Dec 9, 2023 · eee4f31 · eee4f31
1 parent bac55e3
commit eee4f31
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/map/ozf.cpp b/src/map/ozf.cpp
@@ -180,21 +180,21 @@ bool OZF::readTileTable()
 bool OZF::open()
 {
 	if (!_file.open(QIODevice::ReadOnly)) {
-		_error = _file.errorString();
+		_errorString = _file.errorString();
 		return false;
 	}
 
 	if (!_zooms.isEmpty())
 		return true;
 
 	if (!readHeaders()) {
-		_error = "Invalid header";
+		_errorString = "Invalid header";
 		_file.close();
 		return false;
 	}
 
 	if (!readTileTable()) {
-		_error = "Invalid tile table";
+		_errorString = "Invalid tile table";
 		_file.close();
 		return false;
 	}

diff --git a/src/map/ozf.h b/src/map/ozf.h
@@ -17,7 +17,7 @@ class OZF
 
 	bool open();
 	void close() {_file.close();}
-	const QString &errorString() const {return _error;}
+	const QString &errorString() const {return _errorString;}
 
 	QString fileName() const {return _file.fileName();}
 	bool isOpen() const {return _file.isOpen();}
@@ -50,7 +50,7 @@ class OZF
 	quint8 _key;
 	QList<Zoom> _zooms;
 	QFile _file;
-	QString _error;
+	QString _errorString;
 };
 
 #endif // OZF_H
diff --git a/src/map/tar.cpp b/src/map/tar.cpp
@@ -47,7 +47,7 @@ static quint64 number(const char* data, size_t size, int base = 8)
 bool Tar::open()
 {
 	if (!_file.open(QIODevice::ReadOnly)) {
-		_error = _file.errorString();
+		_errorString = _file.errorString();
 		return false;
 	}
 
@@ -74,15 +74,15 @@ bool Tar::loadTar()
 		if (ret < BLOCKSIZE) {
 			_file.close();
 			_index.clear();
-			_error = "Error reading header block";
+			_errorString = "Error reading header block";
 			return false;
 		}
 		size = number(hdr->size, sizeof(hdr->size));
 		_index.insert(hdr->name, _file.pos() / BLOCKSIZE - 1);
 		if (!_file.seek(_file.pos() + BLOCKCOUNT(size) * BLOCKSIZE)) {
 			_file.close();
 			_index.clear();
-			_error = "Error skipping data blocks";
+			_errorString = "Error skipping data blocks";
 			return false;
 		}
 	}

diff --git a/src/map/tar.h b/src/map/tar.h
@@ -12,7 +12,7 @@ class Tar
 
 	bool open();
 	void close() {_file.close();}
-	const QString &errorString() const {return _error;}
+	const QString &errorString() const {return _errorString;}
 
 	QStringList files() const {return _index.keys();}
 	QByteArray file(const QString &name);
@@ -27,7 +27,7 @@ class Tar
 
 	QFile _file;
 	QMap<QString, quint64> _index;
-	QString _error;
+	QString _errorString;
 };
 
 #endif // TAR_H