diff --git a/src/core/qgsauxiliarystorage.cpp b/src/core/qgsauxiliarystorage.cpp index cfdce938e7f..249cddea107 100644 --- a/src/core/qgsauxiliarystorage.cpp +++ b/src/core/qgsauxiliarystorage.cpp @@ -30,7 +30,10 @@ #define AS_JOINFIELD QStringLiteral( "ASPK" ) #define AS_EXTENSION QStringLiteral( "qgd" ) #define AS_JOINPREFIX QStringLiteral( "auxiliary_storage_" ) + typedef QVector PalPropertyList; +typedef QVector SymbolPropertyList; + Q_GLOBAL_STATIC_WITH_ARGS( PalPropertyList, palHiddenProperties, ( { QgsPalLayerSettings::PositionX, @@ -59,7 +62,6 @@ Q_GLOBAL_STATIC_WITH_ARGS( PalPropertyList, palHiddenProperties, ( QgsPalLayerSettings::CalloutDraw, QgsPalLayerSettings::LabelAllParts } ) ) -typedef QVector SymbolPropertyList; Q_GLOBAL_STATIC_WITH_ARGS( SymbolPropertyList, symbolHiddenProperties, ( { QgsSymbolLayer::PropertyAngle, @@ -365,12 +367,9 @@ int QgsAuxiliaryLayer::createProperty( QgsCallout::Property property, QgsVectorL bool QgsAuxiliaryLayer::isHiddenProperty( int index ) const { - std::cout << "QgsAuxiliaryLayer::isHiddenProperty 0: " << index << std::endl; bool hidden = false; const QgsPropertyDefinition def = propertyDefinitionFromIndex( index ); - std::cout << def.origin().toStdString() << std::endl; - if ( def.origin().compare( QLatin1String( "labeling" ) ) == 0 ) { const PalPropertyList &palProps = *palHiddenProperties();