a5eabac96d
C++11 added the new enum class key as well as enum struct. While the former is likely the most known and used, the later can be used in the same contexts and with the same effects. Currently moc doesn't parse enum struct while it does for enum class. This patch fixes this. [ChangeLog][moc] moc now parses enum struct the same way as enum class therefore that keyword can be used with the Q_ENUM macro as well as Q_FLAG and Q_DECLARE_FLAGS. Change-Id: Iaac3814ad63a15ee4d91b281d451e786b510449c Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
94 lines
2.9 KiB
C++
94 lines
2.9 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2011 Olivier Goffart.
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:GPL-EXCEPT$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef CXX11_ENUMS_H
|
|
#define CXX11_ENUMS_H
|
|
#include <QtCore/QObject>
|
|
|
|
#if defined(Q_COMPILER_CLASS_ENUM) || defined(Q_MOC_RUN)
|
|
class CXX11Enums
|
|
{
|
|
Q_GADGET
|
|
public:
|
|
enum class EnumClass { A0, A1, A2, A3 };
|
|
enum TypedEnum : char { B0, B1 , B2, B3 };
|
|
enum class TypedEnumClass : char { C0, C1, C2, C3 };
|
|
enum NormalEnum { D2 = 2, D3, D0 =0 , D1 };
|
|
enum class ClassFlag { F0 = 1, F1 = 2, F2 = 4, F3 = 8};
|
|
|
|
enum struct EnumStruct { G0, G1, G2, G3 };
|
|
enum struct TypedEnumStruct : char { H0, H1, H2, H3 };
|
|
enum struct StructFlag { I0 = 1, I1 = 2, I2 = 4, I3 = 8};
|
|
|
|
Q_DECLARE_FLAGS(ClassFlags, ClassFlag)
|
|
Q_DECLARE_FLAGS(StructFlags, StructFlag)
|
|
|
|
Q_ENUM(EnumClass)
|
|
Q_ENUM(TypedEnum)
|
|
Q_ENUM(TypedEnumClass)
|
|
Q_ENUM(NormalEnum)
|
|
Q_ENUM(EnumStruct)
|
|
Q_ENUM(TypedEnumStruct)
|
|
Q_FLAG(ClassFlags)
|
|
Q_FLAG(StructFlags)
|
|
};
|
|
|
|
// Also test the Q_ENUMS macro
|
|
class CXX11Enums2
|
|
{
|
|
Q_GADGET
|
|
public:
|
|
enum class EnumClass { A0, A1, A2, A3 };
|
|
enum TypedEnum : char { B0, B1 , B2, B3 };
|
|
enum class TypedEnumClass : char { C0, C1, C2, C3 };
|
|
enum NormalEnum { D2 = 2, D3, D0 =0 , D1 };
|
|
enum class ClassFlag { F0 = 1, F1 = 2, F2 = 4, F3 = 8 };
|
|
Q_DECLARE_FLAGS(ClassFlags, ClassFlag)
|
|
Q_ENUMS(EnumClass TypedEnum TypedEnumClass NormalEnum)
|
|
Q_FLAGS(ClassFlags)
|
|
};
|
|
|
|
#else
|
|
//workaround to get the moc compiled code to compile
|
|
class CXX11Enums
|
|
{
|
|
Q_GADGET
|
|
public:
|
|
struct EnumClass { enum { A0, A1, A2, A3 }; };
|
|
struct TypedEnumClass { enum { C0, C1, C2, C3 }; };
|
|
enum NormalEnum { D2 = 2, D3, D0 =0 , D1 };
|
|
enum TypedEnum { B0, B1 , B2, B3 };
|
|
};
|
|
|
|
class CXX11Enums2 : public CXX11Enums
|
|
{
|
|
Q_GADGET
|
|
};
|
|
#endif
|
|
#endif // CXX11_ENUMS_H
|