move XML flag reading to Xml utils

python/core/auto_generated/qgsxmlutils.sip.in

@@ -9,6 +9,9 @@
 
 
 
+
+
+
 class QgsXmlUtils
 {
 %Docstring
@@ -67,6 +70,7 @@ Supported types are
 %Docstring
 Read a QVariant from a QDomElement.
 %End
+
 };
 
 

src/core/qgsmaplayer.cpp

@@ -554,7 +554,7 @@ void QgsMapLayer::writeCommonStyle( QDomElement &layerElement, QDomDocument &doc
   // save categories
   QMetaEnum metaEnum = QMetaEnum::fromType<QgsMapLayer::StyleCategories>();
   QString categoriesKeys( metaEnum.valueToKeys( static_cast<int>( categories ) ) );
-  layerElement.setAttribute( QStringLiteral( "style_categories" ), categoriesKeys );
+  layerElement.setAttribute( QStringLiteral( "styleCategories" ), categoriesKeys );
 
   if ( categories.testFlag( Rendering ) )
   {
@@ -1060,17 +1060,7 @@ bool QgsMapLayer::importNamedStyle( QDomDocument &myDocument, QString &myErrorMe
   }
 
   // Get source categories
-  QgsMapLayer::StyleCategories sourceCategories = QgsMapLayer::AllStyleCategories;
-  QMetaEnum metaEnum = QMetaEnum::fromType<QgsMapLayer::StyleCategories>();
-  QString sourceCategoriesStr( myRoot.attribute( "style_categories", metaEnum.valueToKeys( static_cast<int>( QgsMapLayer::AllStyleCategories ) ) ) );
-  if ( metaEnum.isValid() )
-  {
-    bool ok = false;
-    const char *vs = sourceCategoriesStr.toUtf8().data();
-    int newValue = metaEnum.keysToValue( vs, &ok );
-    if ( ok )
-      sourceCategories = static_cast<QgsMapLayer::StyleCategories>( newValue );
-  }
+  QgsMapLayer::StyleCategories sourceCategories = QgsXmlUtils::readFlagAttribute( myRoot, QStringLiteral( "styleCategories" ), QgsMapLayer::AllStyleCategories );
 
   //Test for matching geometry type on vector layers when applying, if geometry type is given in the style
   if ( ( sourceCategories.testFlag( QgsMapLayer::Symbology ) || sourceCategories.testFlag( QgsMapLayer::Symbology3D ) ) &&

src/core/qgsxmlutils.h

@@ -16,14 +16,17 @@
 #define QGSXMLUTILS_H
 
 class QDomDocument;
-class QDomElement;
 
 class QgsRectangle;
 
+#include <QDomElement>
+
 #include "qgis_core.h"
 #include "qgis.h"
 #include "qgsunittypes.h"
 
+
+
 /**
  * \ingroup core
  * Assorted helper methods for reading and writing chunks of XML
@@ -75,6 +78,23 @@ class CORE_EXPORT QgsXmlUtils
      * Read a QVariant from a QDomElement.
      */
     static QVariant readVariant( const QDomElement &element );
+
+    template<class T> static T readFlagAttribute( const QDomElement &element, const QString &attributeName, T defaultValue ) SIP_SKIP
+    {
+      T value = defaultValue;
+      // Get source categories
+      QMetaEnum metaEnum = QMetaEnum::fromType<T>();
+      QString sourceCategoriesStr( element.attribute( attributeName, metaEnum.valueToKeys( static_cast<int>( defaultValue ) ) ) );
+      if ( metaEnum.isValid() )
+      {
+        bool ok = false;
+        const char *vs = sourceCategoriesStr.toUtf8().data();
+        int newValue = metaEnum.keysToValue( vs, &ok );
+        if ( ok )
+          value = static_cast<T>( newValue );
+      }
+      return value;
+    }
 };