diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2014-08-10 19:31:57 +0200 |
|---|---|---|
| committer | Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> | 2015-02-04 14:59:35 +0000 |
| commit | 7d6c6bc082dc4c93078c5803f0b6cc536474b9b1 (patch) | |
| tree | c47951a8607dbc059ee1bab69f82344be1096805 /src/corelib/tools/qlocale.h | |
| parent | d446b1a5ef1f58d26b226dc185259cc2ab168db2 (diff) | |
Use Q_ENUM and Q_FLAG for types in QtCore
Change-Id: I33590a9c4c6d87c5bbba1d201e32c6bf1bd3e00b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/corelib/tools/qlocale.h')
| -rw-r--r-- | src/corelib/tools/qlocale.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index f965ae6562..145b67f9f1 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -55,9 +55,6 @@ class QLocalePrivate; class Q_CORE_EXPORT QLocale { Q_GADGET - Q_ENUMS(Language) - Q_ENUMS(Country) - Q_ENUMS(MeasurementSystem) friend class QString; friend class QStringRef; friend class QByteArray; @@ -781,12 +778,16 @@ public: }; // GENERATED PART ENDS HERE + Q_ENUM(Language) + Q_ENUM(Country) + enum MeasurementSystem { MetricSystem, ImperialUSSystem, ImperialUKSystem, ImperialSystem = ImperialUSSystem // Qt 4 compatibility }; + Q_ENUM(MeasurementSystem) enum FormatType { LongFormat, ShortFormat, NarrowFormat }; enum NumberOption { |