Flip Q_ENUMS to Q_ENUM

See https://woboq.com/blog/q_enum.html for rationale

Author: nyalldawson

python/core/qgsdataitem.sip

@@ -52,6 +52,7 @@ class QgsDataItem : QObject
       Project
     };
 
+
     QgsDataItem( QgsDataItem::Type type, QgsDataItem *parent /TransferThis/, const QString &name, const QString &path );
 %Docstring
 Create new data item.

python/core/qgsdataprovider.sip

@@ -46,7 +46,6 @@ class QgsDataProvider : QObject
 %End
   public:
 
-
     enum DataCapability
     {
       NoDataCapabilities,

python/gui/attributetable/qgsdualview.sip

@@ -34,6 +34,7 @@ class QgsDualView : QStackedWidget
       AttributeEditor
     };
 
+
     explicit QgsDualView( QWidget *parent /TransferThis/ = 0 );
 %Docstring
  Constructor

python/gui/qgsfontbutton.sip

@@ -31,13 +31,13 @@ class QgsFontButton : QToolButton
 %End
   public:
 
-
     enum Mode
     {
       ModeTextRenderer,
       ModeQFont,
     };
 
+
     QgsFontButton( QWidget *parent /TransferThis/ = 0, const QString &dialogTitle = QString() );
 %Docstring
  Construct a new font button.

scripts/sipify.pl

@@ -464,7 +464,7 @@ sub detect_comment_block{
         next;
     }
     # Skip Q_OBJECT, Q_PROPERTY, Q_ENUM, Q_GADGET etc.
-    if ($LINE =~ m/^\s*Q_(OBJECT|ENUMS|PROPERTY|GADGET|DECLARE_METATYPE|DECLARE_TYPEINFO|DECL_DEPRECATED|NOWARN_DEPRECATED_(PUSH|POP)).*?$/){
+    if ($LINE =~ m/^\s*Q_(OBJECT|ENUMS|ENUM|PROPERTY|GADGET|DECLARE_METATYPE|DECLARE_TYPEINFO|DECL_DEPRECATED|NOWARN_DEPRECATED_(PUSH|POP)).*?$/){
         next;
     }
 

src/core/auth/qgsauthmanager.h

@@ -60,7 +60,6 @@ class QTimer;
 class CORE_EXPORT QgsAuthManager : public QObject
 {
     Q_OBJECT
-    Q_ENUMS( MessageLevel )
 
   public:
 
@@ -71,6 +70,7 @@ class CORE_EXPORT QgsAuthManager : public QObject
       WARNING = 1,
       CRITICAL = 2
     };
+    Q_ENUM( MessageLevel );
 
     /** Enforce singleton pattern
      * \note To set up the manager instance and initialize everything use QgsAuthManager::instance()->init()

src/core/qgsapplication.cpp

@@ -146,7 +146,6 @@ void QgsApplication::init( QString profileFolder )
   qRegisterMetaType<QgsGeometry::Error>( "QgsGeometry::Error" );
   qRegisterMetaType<QgsProcessingFeatureSourceDefinition>( "QgsProcessingFeatureSourceDefinition" );
   qRegisterMetaType<QgsProcessingOutputLayerDefinition>( "QgsProcessingOutputLayerDefinition" );
-  qRegisterMetaType<QgsUnitTypes::LayoutUnit>( "QgsUnitTypes::LayoutUnit" );
   qRegisterMetaType<QgsFeatureIds>( "QgsFeatureIds" );
 
   QString prefixPath( getenv( "QGIS_PREFIX_PATH" ) ? getenv( "QGIS_PREFIX_PATH" ) : applicationDirPath() );

src/core/qgsdataitem.h

@@ -69,8 +69,7 @@ class CORE_EXPORT QgsDataItem : public QObject
 #endif
 
     Q_OBJECT
-    Q_ENUMS( Type )
-    Q_ENUMS( State )
+
   public:
     enum Type
     {
@@ -82,6 +81,8 @@ class CORE_EXPORT QgsDataItem : public QObject
       Project //!< Represents a QGIS project
     };
 
+    Q_ENUM( Type );
+
     //! Create new data item.
     QgsDataItem( QgsDataItem::Type type, QgsDataItem *parent SIP_TRANSFERTHIS, const QString &name, const QString &path );
     virtual ~QgsDataItem();
@@ -100,6 +101,7 @@ class CORE_EXPORT QgsDataItem : public QObject
       Populating,   //!< Creating children in separate thread (populating or refreshing)
       Populated     //!< Children created
     };
+    Q_ENUM( State );
 
     //! \since QGIS 2.8
     State state() const;
@@ -328,7 +330,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( QgsDataItem::Capabilities )
 class CORE_EXPORT QgsLayerItem : public QgsDataItem
 {
     Q_OBJECT
-    Q_ENUMS( LayerType )
+
   public:
     enum LayerType
     {
@@ -344,7 +346,7 @@ class CORE_EXPORT QgsLayerItem : public QgsDataItem
       Plugin     //!< Added in 2.10
     };
 
-    Q_ENUMS( LayerType )
+    Q_ENUM( LayerType );
 
     QgsLayerItem( QgsDataItem *parent, const QString &name, const QString &path, const QString &uri, LayerType layerType, const QString &providerKey );
 

src/core/qgsdataprovider.h

@@ -67,8 +67,6 @@ class CORE_EXPORT QgsDataProvider : public QObject
 
   public:
 
-    Q_ENUMS( DataCapability )
-
     enum DataCapability
     {
       NoDataCapabilities  = 0,
@@ -77,6 +75,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
       Database            = 1 << 2,
       Net                 = 1 << 3  // Internet source
     };
+    Q_ENUM( DataCapability );
 
     /**
      * Properties are used to pass custom configuration options into data providers.

src/core/qgsmessagelog.cpp

@@ -25,7 +25,6 @@ class QgsMessageLogConsole;
 QgsMessageLog::QgsMessageLog()
   : QObject()
 {
-  qRegisterMetaType< QgsMessageLog::MessageLevel >( "QgsMessageLog::MessageLevel" );
 }
 
 void QgsMessageLog::logMessage( const QString &message, const QString &tag, QgsMessageLog::MessageLevel level )