Add support for scoped enums to QMetaObjectBuilder

Change-Id: I7b3c3973ff4396a854014f5b2b671b71007e80da
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>

3 files changed, 46 insertions, 3 deletions

diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp
index 56f187a59d..e3b70638c6 100644
--- a/src/corelib/kernel/qmetaobjectbuilder.cpp
+++ b/src/corelib/kernel/qmetaobjectbuilder.cpp
@@ -190,12 +190,13 @@ class QMetaEnumBuilderPrivate
 {
 public:
     QMetaEnumBuilderPrivate(const QByteArray& _name)
-        : name(_name), isFlag(false)
+        : name(_name), isFlag(false), isScoped(false)
     {
     }
 
     QByteArray name;
     bool isFlag;
+    bool isScoped;
     QList<QByteArray> keys;
     QVector<int> values;
 };
@@ -637,6 +638,7 @@ QMetaEnumBuilder QMetaObjectBuilder::addEnumerator(const QMetaEnum& prototype)
 {
     QMetaEnumBuilder en = addEnumerator(prototype.name());
     en.setIsFlag(prototype.isFlag());
+    en.setIsScoped(prototype.isScoped());
     int count = prototype.keyCount();
     for (int index = 0; index < count; ++index)
         en.addKey(prototype.key(index), prototype.value(index));
@@ -1408,12 +1410,13 @@ static int buildMetaObject(QMetaObjectBuilderPrivate *d, char *buf,
     Q_ASSERT(!buf || dataIndex == pmeta->enumeratorData);
     for (const auto &enumerator : d->enumerators) {
         int name = strings.enter(enumerator.name);
-        int isFlag = (int)(enumerator.isFlag);
+        int isFlag = enumerator.isFlag ? EnumIsFlag : 0;
+        int isScoped = enumerator.isScoped ? EnumIsScoped : 0;
         int count = enumerator.keys.size();
         int enumOffset = enumIndex;
         if (buf) {
             data[dataIndex]     = name;
-            data[dataIndex + 1] = isFlag;
+            data[dataIndex + 1] = isFlag | isScoped;
             data[dataIndex + 2] = count;
             data[dataIndex + 3] = enumOffset;
         }
@@ -1641,6 +1644,7 @@ void QMetaObjectBuilder::serialize(QDataStream& stream) const
     for (const auto &enumerator : d->enumerators) {
         stream << enumerator.name;
         stream << enumerator.isFlag;
+        stream << enumerator.isScoped;
         stream << enumerator.keys;
         stream << enumerator.values;
     }
@@ -1807,6 +1811,7 @@ void QMetaObjectBuilder::deserialize
         addEnumerator(name);
         QMetaEnumBuilderPrivate &enumerator = d->enumerators[index];
         stream >> enumerator.isFlag;
+        stream >> enumerator.isScoped;
         stream >> enumerator.keys;
         stream >> enumerator.values;
         if (enumerator.keys.size() != enumerator.values.size()) {
@@ -2633,6 +2638,31 @@ void QMetaEnumBuilder::setIsFlag(bool value)
 }
 
 /*!
+    Return \c true if this enumerator should be considered scoped (C++11 enum class).
+
+    \sa setIsScoped()
+*/
+bool QMetaEnumBuilder::isScoped() const
+{
+    QMetaEnumBuilderPrivate *d = d_func();
+    if (d)
+        return d->isScoped;
+    return false;
+}
+
+/*!
+    Sets this enumerator to be a scoped enum if \value is true
+
+    \sa isScoped()
+*/
+void QMetaEnumBuilder::setIsScoped(bool value)
+{
+    QMetaEnumBuilderPrivate *d = d_func();
+    if (d)
+        d->isScoped = value;
+}
+
+/*!
     Returns the number of keys.
 
     \sa key(), addKey()
diff --git a/src/corelib/kernel/qmetaobjectbuilder_p.h b/src/corelib/kernel/qmetaobjectbuilder_p.h
index 144595330d..03b2afaebc 100644
--- a/src/corelib/kernel/qmetaobjectbuilder_p.h
+++ b/src/corelib/kernel/qmetaobjectbuilder_p.h
@@ -300,6 +300,9 @@ public:
     bool isFlag() const;
     void setIsFlag(bool value);
 
+    bool isScoped() const;
+    void setIsScoped(bool value);
+
     int keyCount() const;
     QByteArray key(int index) const;
     int value(int index) const;
diff --git a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index 9ae39449f8..6bb031e357 100644
--- a/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -806,6 +806,7 @@ void tst_QMetaObjectBuilder::enumerator()
     QMetaEnumBuilder enum1 = builder.addEnumerator("foo");
     QCOMPARE(enum1.name(), QByteArray("foo"));
     QVERIFY(!enum1.isFlag());
+    QVERIFY(!enum1.isScoped());
     QCOMPARE(enum1.keyCount(), 0);
     QCOMPARE(enum1.index(), 0);
     QCOMPARE(builder.enumeratorCount(), 1);
@@ -814,6 +815,7 @@ void tst_QMetaObjectBuilder::enumerator()
     QMetaEnumBuilder enum2 = builder.addEnumerator("bar");
     QCOMPARE(enum2.name(), QByteArray("bar"));
     QVERIFY(!enum2.isFlag());
+    QVERIFY(!enum2.isScoped());
     QCOMPARE(enum2.keyCount(), 0);
     QCOMPARE(enum2.index(), 1);
     QCOMPARE(builder.enumeratorCount(), 2);
@@ -827,6 +829,7 @@ void tst_QMetaObjectBuilder::enumerator()
 
     // Modify the attributes on enum1.
     enum1.setIsFlag(true);
+    enum1.setIsScoped(true);
     QCOMPARE(enum1.addKey("ABC", 0), 0);
     QCOMPARE(enum1.addKey("DEF", 1), 1);
     QCOMPARE(enum1.addKey("GHI", -1), 2);
@@ -834,6 +837,7 @@ void tst_QMetaObjectBuilder::enumerator()
     // Check that enum1 is changed, but enum2 is not.
     QCOMPARE(enum1.name(), QByteArray("foo"));
     QVERIFY(enum1.isFlag());
+    QVERIFY(enum1.isScoped());
     QCOMPARE(enum1.keyCount(), 3);
     QCOMPARE(enum1.index(), 0);
     QCOMPARE(enum1.key(0), QByteArray("ABC"));
@@ -845,6 +849,7 @@ void tst_QMetaObjectBuilder::enumerator()
     QCOMPARE(enum1.value(2), -1);
     QCOMPARE(enum2.name(), QByteArray("bar"));
     QVERIFY(!enum2.isFlag());
+    QVERIFY(!enum2.isScoped());
     QCOMPARE(enum2.keyCount(), 0);
     QCOMPARE(enum2.index(), 1);
 
@@ -856,6 +861,7 @@ void tst_QMetaObjectBuilder::enumerator()
     // This time check that only method2 changed.
     QCOMPARE(enum1.name(), QByteArray("foo"));
     QVERIFY(enum1.isFlag());
+    QVERIFY(enum1.isScoped());
     QCOMPARE(enum1.keyCount(), 3);
     QCOMPARE(enum1.index(), 0);
     QCOMPARE(enum1.key(0), QByteArray("ABC"));
@@ -867,6 +873,7 @@ void tst_QMetaObjectBuilder::enumerator()
     QCOMPARE(enum1.value(2), -1);
     QCOMPARE(enum2.name(), QByteArray("bar"));
     QVERIFY(enum2.isFlag());
+    QVERIFY(!enum2.isScoped());
     QCOMPARE(enum2.keyCount(), 2);
     QCOMPARE(enum2.index(), 1);
     QCOMPARE(enum2.key(0), QByteArray("XYZ"));
@@ -879,6 +886,7 @@ void tst_QMetaObjectBuilder::enumerator()
     enum1.removeKey(2);
     QCOMPARE(enum1.name(), QByteArray("foo"));
     QVERIFY(enum1.isFlag());
+    QVERIFY(enum1.isScoped());
     QCOMPARE(enum1.keyCount(), 2);
     QCOMPARE(enum1.index(), 0);
     QCOMPARE(enum1.key(0), QByteArray("ABC"));
@@ -889,6 +897,7 @@ void tst_QMetaObjectBuilder::enumerator()
     QCOMPARE(enum1.value(2), -1);
     QCOMPARE(enum2.name(), QByteArray("bar"));
     QVERIFY(enum2.isFlag());
+    QVERIFY(!enum2.isScoped());
     QCOMPARE(enum2.keyCount(), 2);
     QCOMPARE(enum2.index(), 1);
     QCOMPARE(enum2.key(0), QByteArray("XYZ"));
@@ -903,6 +912,7 @@ void tst_QMetaObjectBuilder::enumerator()
     enum2 = builder.enumerator(0);
     QCOMPARE(enum2.name(), QByteArray("bar"));
     QVERIFY(enum2.isFlag());
+    QVERIFY(!enum2.isScoped());
     QCOMPARE(enum2.keyCount(), 2);
     QCOMPARE(enum2.index(), 0);
     QCOMPARE(enum2.key(0), QByteArray("XYZ"));