add macros to Doxyfile.in

3nids · 3nids · commit 50f87c196dda · 2019-03-25T09:18:32.000-05:00
diff --git a/cmake_templates/Doxyfile.in b/cmake_templates/Doxyfile.in
@@ -2066,7 +2066,9 @@ EXPAND_AS_DEFINED      = "SIP_ABSTRACT" \
                          "SIP_TRANSFERTHIS" \
                          "SIP_VIRTUAL_CATCHER_CODE" \
                          "SIP_VIRTUALERRORHANDLER" \
-                         "SIP_WHEN_FEATURE"
+                         "SIP_WHEN_FEATURE" \
+                         "SIP_MONKEYPATCH_SCOPEENUM" \
+                         "SIP_MONKEYPATCH_SCOPEENUM_UNNEST"
 
 # If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
 # remove all references to function-like macros that are alone on a line, have
diff --git a/src/analysis/processing/qgsalgorithmrasterlogicalop.cpp b/src/analysis/processing/qgsalgorithmrasterlogicalop.cpp
@@ -90,7 +90,7 @@ bool QgsRasterBooleanLogicAlgorithmBase::prepareAlgorithm( const QVariantMap &pa
   rasterLayers.reserve( layers.count() );
   for ( QgsMapLayer *l : layers )
   {
-    if ( l->type() == QgsMapLayer::RasterLayer )
+    if ( l->type() == QgsMapLayerType::RasterLayer )
     {
       QgsRasterLayer *layer = qobject_cast< QgsRasterLayer * >( l );
       QgsRasterAnalysisUtils::RasterLogicInput input;
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
@@ -108,7 +108,7 @@ void QgsLabelingGui::setLayer( QgsMapLayer *mapLayer )
 {
   mPreviewFeature = QgsFeature();
 
-  if ( !mapLayer || mapLayer->type() != QgsMapLayer::VectorLayer )
+  if ( !mapLayer || mapLayer->type() != QgsMapLayerType::VectorLayer )
   {
     setEnabled( false );
     return;

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ bool QgsRasterBooleanLogicAlgorithmBase::prepareAlgorithm( const QVariantMap &pa`
`90`	`90`	`rasterLayers.reserve( layers.count() );`
`91`	`91`	`for ( QgsMapLayer *l : layers )`
`92`	`92`	`{`
`93`		`- if ( l->type() == QgsMapLayer::RasterLayer )`
	`93`	`+ if ( l->type() == QgsMapLayerType::RasterLayer )`
`94`	`94`	`{`
`95`	`95`	`QgsRasterLayer layer = qobject_cast< QgsRasterLayer >( l );`
`96`	`96`	`QgsRasterAnalysisUtils::RasterLogicInput input;`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ void QgsLabelingGui::setLayer( QgsMapLayer *mapLayer )`
`108`	`108`	`{`
`109`	`109`	`mPreviewFeature = QgsFeature();`
`110`	`110`
`111`		`- if ( !mapLayer \|\| mapLayer->type() != QgsMapLayer::VectorLayer )`
	`111`	`+ if ( !mapLayer \|\| mapLayer->type() != QgsMapLayerType::VectorLayer )`
`112`	`112`	`{`
`113`	`113`	`setEnabled( false );`
`114`	`114`	`return;`