Fix warning in GCC on C++20.

This commit is contained in:
John Preston 2021-11-14 11:26:24 +04:00
parent abfd578851
commit bd7c085bd0
2 changed files with 2 additions and 4 deletions

View file

@ -301,8 +301,6 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
, _family(family) {
if (other) {
memcpy(modified, other, sizeof(modified));
} else {
memset(modified, 0, sizeof(modified));
}
modified[_flags] = Font(this);

View file

@ -24,7 +24,7 @@ int registerFontFamily(const QString &family);
class FontData;
class Font {
public:
Font(Qt::Initialization = Qt::Uninitialized) : ptr(0) {
Font(Qt::Initialization = Qt::Uninitialized) {
}
Font(int size, uint32 flags, const QString &family);
Font(int size, uint32 flags, int family);
@ -43,7 +43,7 @@ public:
operator const QFont &() const;
private:
FontData *ptr;
FontData *ptr = nullptr;
void init(int size, uint32 flags, int family, Font *modified);
friend void startManager();