adrido
/
MinetestMapperGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Geometry meta enum for static methods

master
adrido 2018-08-17 17:40:53 +02:00
parent 1b59cbc37c
commit d2fd74a8c4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
geometry.cpp
View File

@ -1,7 +1,6 @@
#include "geometry.h"
const QMetaEnum Geometry::metaEnumFormat = QMetaEnum::fromType<Geometry::Format>();
const QRegularExpression Geometry::corners = QRegularExpression("(-?\\d*),(-?\\d*):(-?\\d*),(-?\\d*)");
const QRegularExpression Geometry::centerDimension = QRegularExpression("(-?\\d*),(-?\\d*):(-?\\d*)x(-?\\d*)");
const QRegularExpression Geometry::cornerDimension = QRegularExpression("(-?\\d*)[,:](-?\\d*)[+-](-?\\d*)[+-](-?\\d*)");
@ -11,7 +10,7 @@ const char *Geometry::formatName(Geometry::Format id)
{
if (id < Geometry::FormatNone || id >= Geometry::FormatMax)
id = Geometry::FormatUnknown;
return metaEnumFormat.key(id);
return QMetaEnum::fromType<Geometry::Format>().key(id);
}
Geometry::Format Geometry::formatId(const QString &name)
@ -22,7 +21,7 @@ Geometry::Format Geometry::formatId(const QString &name)
Geometry::Format Geometry::formatId(const char *name)
{
// keyToValue returns -1 for not found, which equals FormatUnknown
return static_cast<Format>(metaEnumFormat.keyToValue(name));
return static_cast<Format>(QMetaEnum::fromType<Geometry::Format>().keyToValue(name));
}
Geometry::Format Geometry::set(const QString &str)

1
geometry.h
View File

@ -23,7 +23,6 @@ public:
FormatMax
};
Q_ENUM(Format)
static const QMetaEnum metaEnumFormat;
static const char *formatName(Geometry::Format id);
static Geometry::Format formatId(const QString &name);