From dd003dab3b3d3e5856bafaa20be013de9b88bcfd Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Sun, 10 Mar 2019 17:26:32 +0100 Subject: [PATCH] Remove leftover code --- src/core/qgspallabeling.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp index a0d7b4cadd8..baecd069499 100644 --- a/src/core/qgspallabeling.cpp +++ b/src/core/qgspallabeling.cpp @@ -894,14 +894,6 @@ void QgsPalLayerSettings::readXml( QDomElement &elem, const QgsReadWriteContext geometryGeneratorEnabled = placementElem.attribute( QStringLiteral( "geometryGeneratorEnabled" ) ).toInt(); geometryGeneratorType = enumValueToKey( placementElem.attribute( QStringLiteral( "geometryGeneratorType" ) ), QgsWkbTypes::PointGeometry ); -#if 0 - const QMetaEnum metaEnum( QMetaEnum::fromType() ); - bool ok; - geometryGeneratorType = static_cast( metaEnum.keyToValue( placementElem.attribute( QStringLiteral( "geometryGeneratorType" ) ).toUtf8().constData(), &ok ) ); - if ( !ok ) - geometryGeneratorType = QgsWkbTypes::GeometryType::PointGeometry; -#endif - // rendering QDomElement renderingElem = elem.firstChildElement( QStringLiteral( "rendering" ) );