diff --git a/src/base/net/geoipdatabase.cpp b/src/base/net/geoipdatabase.cpp index c548e7c0b..7d7d8d7f2 100644 --- a/src/base/net/geoipdatabase.cpp +++ b/src/base/net/geoipdatabase.cpp @@ -83,7 +83,6 @@ GeoIPDatabase::GeoIPDatabase(const quint32 size) GeoIPDatabase *GeoIPDatabase::load(const Path &filename, QString &error) { - GeoIPDatabase *db = nullptr; QFile file {filename.data()}; if (file.size() > MAX_FILE_SIZE) { @@ -97,7 +96,7 @@ GeoIPDatabase *GeoIPDatabase::load(const Path &filename, QString &error) return nullptr; } - db = new GeoIPDatabase(file.size()); + auto *db = new GeoIPDatabase(file.size()); if (file.read(reinterpret_cast(db->m_data), db->m_size) != db->m_size) { @@ -118,14 +117,13 @@ GeoIPDatabase *GeoIPDatabase::load(const Path &filename, QString &error) GeoIPDatabase *GeoIPDatabase::load(const QByteArray &data, QString &error) { - GeoIPDatabase *db = nullptr; if (data.size() > MAX_FILE_SIZE) { error = tr("Unsupported database file size."); return nullptr; } - db = new GeoIPDatabase(data.size()); + auto *db = new GeoIPDatabase(data.size()); memcpy(reinterpret_cast(db->m_data), data.constData(), db->m_size); diff --git a/src/base/net/geoipdatabase.h b/src/base/net/geoipdatabase.h index 9e02fda7e..06b6a209f 100644 --- a/src/base/net/geoipdatabase.h +++ b/src/base/net/geoipdatabase.h @@ -44,6 +44,7 @@ struct DataFieldDescriptor; class GeoIPDatabase { + Q_DISABLE_COPY_MOVE(GeoIPDatabase) Q_DECLARE_TR_FUNCTIONS(GeoIPDatabase) public: