Skip to content

Commit

Permalink
add macros to Doxyfile.in
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Mar 25, 2019
1 parent 9a6ddbd commit 50f87c1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion cmake_templates/Doxyfile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmrasterlogicalop.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgslabelinggui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 50f87c1

Please sign in to comment.