From 16a64ed84d0598adcbdf2206777a14cf3b12bcd4 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 20 Mar 2019 07:28:32 +1000 Subject: [PATCH] Deprecate some methods, dox++ --- .../expression/qgsexpression.sip.in | 4 +- .../qgslayertreemodellegendnode.sip.in | 2 +- .../qgsmapthemecollection.sip.in | 2 +- .../auto_generated/qgssqlstatement.sip.in | 3 +- .../qgsvectorlayerjoininfo.sip.in | 6 +-- .../symbology/qgsrulebasedrenderer.sip.in | 4 +- .../auto_generated/symbology/qgssymbol.sip.in | 46 +++++++++++++++---- .../layertree/qgslayertreeview.sip.in | 2 +- src/3d/chunks/qgschunknode_p.h | 10 ++-- src/3d/qgs3dmapscene.h | 2 +- src/app/3d/qgs3dmapcanvas.h | 2 +- src/app/3d/qgsvectorlayer3drendererwidget.h | 2 +- src/core/expression/qgsexpression.h | 6 ++- src/core/layertree/qgslayertreemodel.h | 2 +- .../layertree/qgslayertreemodellegendnode.h | 2 +- src/core/layertree/qgslayertreenode.h | 2 +- src/core/qgsmapthemecollection.h | 2 +- src/core/qgspointlocator.h | 2 +- src/core/qgssqlstatement.h | 5 +- src/core/qgsvectorlayerjoininfo.h | 8 ++-- src/core/symbology/qgsrulebasedrenderer.h | 4 +- src/core/symbology/qgssymbol.h | 45 ++++++++++++++---- src/gui/layertree/qgslayertreeview.h | 2 +- src/gui/qgsconfigureshortcutsdialog.h | 4 +- 24 files changed, 119 insertions(+), 50 deletions(-) diff --git a/python/core/auto_generated/expression/qgsexpression.sip.in b/python/core/auto_generated/expression/qgsexpression.sip.in index e8e6f679e05..11f5e171771 100644 --- a/python/core/auto_generated/expression/qgsexpression.sip.in +++ b/python/core/auto_generated/expression/qgsexpression.sip.in @@ -144,7 +144,9 @@ Returns parser error details including location of error. const QgsExpressionNode *rootNode() const; %Docstring -Returns root node of the expression. Root node is null is parsing has failed +Returns the root node of the expression. + +The root node is ``None`` if parsing has failed. %End bool prepare( const QgsExpressionContext *context ); diff --git a/python/core/auto_generated/layertree/qgslayertreemodellegendnode.sip.in b/python/core/auto_generated/layertree/qgslayertreemodellegendnode.sip.in index bfc6fc18375..dabaa89f18a 100644 --- a/python/core/auto_generated/layertree/qgslayertreemodellegendnode.sip.in +++ b/python/core/auto_generated/layertree/qgslayertreemodellegendnode.sip.in @@ -165,7 +165,7 @@ Construct the node with pointer to its parent layer node QgsRenderContext *createTemporaryRenderContext() const /Factory/; %Docstring -Returns a temporary context or null if legendMapViewData are not valid +Returns a temporary context or ``None`` if legendMapViewData are not valid %End protected: diff --git a/python/core/auto_generated/qgsmapthemecollection.sip.in b/python/core/auto_generated/qgsmapthemecollection.sip.in index e118eb23555..7520b2f47e4 100644 --- a/python/core/auto_generated/qgsmapthemecollection.sip.in +++ b/python/core/auto_generated/qgsmapthemecollection.sip.in @@ -47,7 +47,7 @@ Initialize layer record with a map layer - it will be stored as a weak pointer QgsMapLayer *layer() const; %Docstring -Returns map layer or null if the layer does not exist anymore +Returns map layer or ``None`` if the layer does not exist anymore %End void setLayer( QgsMapLayer *layer ); diff --git a/python/core/auto_generated/qgssqlstatement.sip.in b/python/core/auto_generated/qgssqlstatement.sip.in index 1c6b5bc5d34..3d11a2b3582 100644 --- a/python/core/auto_generated/qgssqlstatement.sip.in +++ b/python/core/auto_generated/qgssqlstatement.sip.in @@ -54,7 +54,8 @@ successful const QgsSQLStatement::Node *rootNode() const; %Docstring -Returns root node of the statement. Root node is null is parsing has failed +Returns the root node of the statement. +The root node is ``None`` if parsing has failed. %End QString statement() const; diff --git a/python/core/auto_generated/qgsvectorlayerjoininfo.sip.in b/python/core/auto_generated/qgsvectorlayerjoininfo.sip.in index 2f7715ccb19..c19b53d0865 100644 --- a/python/core/auto_generated/qgsvectorlayerjoininfo.sip.in +++ b/python/core/auto_generated/qgsvectorlayerjoininfo.sip.in @@ -34,7 +34,7 @@ Sets weak reference to the joined layer %End QgsVectorLayer *joinLayer() const; %Docstring -Returns joined layer (may be null if the reference was set by layer ID and not resolved yet) +Returns joined layer (may be ``None`` if the reference was set by layer ID and not resolved yet) %End void setJoinLayerId( const QString &layerId ); @@ -66,11 +66,11 @@ Returns name of the field of joined layer that will be used for join void setPrefix( const QString &prefix ); %Docstring -Sets prefix of fields from the joined layer. If null, joined layer's name will be used. +Sets prefix of fields from the joined layer. If ``None``, joined layer's name will be used. %End QString prefix() const; %Docstring -Returns prefix of fields from the joined layer. If null, joined layer's name will be used. +Returns prefix of fields from the joined layer. If ``None``, joined layer's name will be used. %End void setUsingMemoryCache( bool enabled ); diff --git a/python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in b/python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in index a6c4174dcc0..8bea46750c5 100644 --- a/python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in +++ b/python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in @@ -394,12 +394,12 @@ delete child rule QgsRuleBasedRenderer::Rule *takeChild( QgsRuleBasedRenderer::Rule *rule ) /TransferBack/; %Docstring -take child rule out, set parent as null +take child rule out, set parent as ``None`` %End QgsRuleBasedRenderer::Rule *takeChildAt( int i ) /TransferBack/; %Docstring -take child rule out, set parent as null +take child rule out, set parent as ``None`` %End QgsRuleBasedRenderer::Rule *findRuleByKey( const QString &key ); diff --git a/python/core/auto_generated/symbology/qgssymbol.sip.in b/python/core/auto_generated/symbology/qgssymbol.sip.in index abd6b835874..192fa69c0f5 100644 --- a/python/core/auto_generated/symbology/qgssymbol.sip.in +++ b/python/core/auto_generated/symbology/qgssymbol.sip.in @@ -545,18 +545,31 @@ Sets the original value variable value for data defined symbology .. versionadded:: 2.12 %End - QgsUnitTypes::RenderUnit outputUnit() const; + QgsUnitTypes::RenderUnit outputUnit() const /Deprecated/; %Docstring -Returns the output unit for the context +Returns the output unit for the context. + +.. deprecated:: No longer used and will be removed in QGIS 4.0 %End - void setOutputUnit( QgsUnitTypes::RenderUnit u ); + void setOutputUnit( QgsUnitTypes::RenderUnit u ) /Deprecated/; %Docstring -Sets the output unit for the context +Sets the output unit for the context. + +.. deprecated:: No longer used and will be removed in QGIS 4.0 %End - QgsMapUnitScale mapUnitScale() const; - void setMapUnitScale( const QgsMapUnitScale &scale ); + QgsMapUnitScale mapUnitScale() const /Deprecated/; +%Docstring + +.. deprecated:: Will be removed in QGIS 4.0 +%End + + void setMapUnitScale( const QgsMapUnitScale &scale ) /Deprecated/; +%Docstring + +.. deprecated:: Will be removed in QGIS 4.0 +%End qreal opacity() const; %Docstring @@ -577,7 +590,18 @@ Sets the ``opacity`` for the symbol. %End bool selected() const; +%Docstring +Returns ``True`` if symbols should be rendered using the selected symbol coloring and style. + +.. seealso:: :py:func:`setSelected` +%End + void setSelected( bool selected ); +%Docstring +Sets whether symbols should be rendered using the selected symbol coloring and style. + +.. seealso:: :py:func:`selected` +%End QgsSymbol::RenderHints renderHints() const; %Docstring @@ -594,9 +618,10 @@ Sets rendering hint flags for the symbol. %End void setFeature( const QgsFeature *f ); + const QgsFeature *feature() const; %Docstring -Current feature being rendered - may be null +Returns the current feature being rendered. This may be ``None``. %End void setOriginalGeometryType( QgsWkbTypes::GeometryType type ); @@ -658,7 +683,12 @@ Sets the part number of current geometry %End double outputLineWidth( double width ) const; - double outputPixelSize( double size ) const; + + double outputPixelSize( double size ) const /Deprecated/; +%Docstring + +.. deprecated:: Use the size conversion methods in QgsRenderContext instead. +%End QgsExpressionContextScope *expressionContextScope(); diff --git a/python/gui/auto_generated/layertree/qgslayertreeview.sip.in b/python/gui/auto_generated/layertree/qgslayertreeview.sip.in index 8455f20889a..fde8e5877a0 100644 --- a/python/gui/auto_generated/layertree/qgslayertreeview.sip.in +++ b/python/gui/auto_generated/layertree/qgslayertreeview.sip.in @@ -243,7 +243,7 @@ instance to provide custom context menus (opened upon right-click). virtual QMenu *createContextMenu() = 0 /Factory/; %Docstring -Returns a newly created menu instance (or null pointer on error) +Returns a newly created menu instance (or ``None`` on error) %End }; diff --git a/src/3d/chunks/qgschunknode_p.h b/src/3d/chunks/qgschunknode_p.h index 7e5944695ee..69ecabe1d93 100644 --- a/src/3d/chunks/qgschunknode_p.h +++ b/src/3d/chunks/qgschunknode_p.h @@ -109,15 +109,15 @@ class QgsChunkNode //! Returns current state of the node State state() const { return mState; } - //! Returns node's entry in the loader queue. Not null only when in QueuedForLoad / QueuedForUpdate state + //! Returns node's entry in the loader queue. Not NULLPTR only when in QueuedForLoad / QueuedForUpdate state QgsChunkListEntry *loaderQueueEntry() const { return mLoaderQueueEntry; } - //! Returns node's entry in the replacement queue. Not null only when in Loaded / QueuedForUpdate / Updating state + //! Returns node's entry in the replacement queue. Not NULLPTR only when in Loaded / QueuedForUpdate / Updating state QgsChunkListEntry *replacementQueueEntry() const { return mReplacementQueueEntry; } - //! Returns loader of the node. Not null only when in Loading state + //! Returns loader of the node. Not NULLPTR only when in Loading state QgsChunkLoader *loader() const { return mLoader; } - //! Returns associated entity (3D object). Not null only when Loaded / QueuedForUpdate / Updating state + //! Returns associated entity (3D object). Not NULLPTR only when Loaded / QueuedForUpdate / Updating state Qt3DCore::QEntity *entity() const { return mEntity; } - //! Returns updater job. Not null only when in Updating state + //! Returns updater job. Not NULLPTR only when in Updating state QgsChunkQueueJob *updater() const { return mUpdater; } //! Returns TRUE if all child chunks are available and thus this node could be swapped to the child nodes diff --git a/src/3d/qgs3dmapscene.h b/src/3d/qgs3dmapscene.h index 5ebe8efc5e7..d98f1c7083c 100644 --- a/src/3d/qgs3dmapscene.h +++ b/src/3d/qgs3dmapscene.h @@ -59,7 +59,7 @@ class _3D_EXPORT Qgs3DMapScene : public Qt3DCore::QEntity //! Returns camera controller QgsCameraController *cameraController() { return mCameraController; } - //! Returns terrain entity (may be temporarily null) + //! Returns terrain entity (may be temporarily NULLPTR) QgsTerrainEntity *terrainEntity() { return mTerrain; } //! Resets camera view to show the whole scene (top view) diff --git a/src/app/3d/qgs3dmapcanvas.h b/src/app/3d/qgs3dmapcanvas.h index dfb06f20abc..37cd1f87f6b 100644 --- a/src/app/3d/qgs3dmapcanvas.h +++ b/src/app/3d/qgs3dmapcanvas.h @@ -93,7 +93,7 @@ class Qgs3DMapCanvas : public QWidget //! Root entity of the 3D scene Qgs3DMapScene *mScene = nullptr; - //! Active map tool that receives events (if null then mouse/keyboard events are used for camera manipulation) + //! Active map tool that receives events (if NULLPTR then mouse/keyboard events are used for camera manipulation) Qgs3DMapTool *mMapTool = nullptr; }; diff --git a/src/app/3d/qgsvectorlayer3drendererwidget.h b/src/app/3d/qgsvectorlayer3drendererwidget.h index 018ec982d20..908222e0c23 100644 --- a/src/app/3d/qgsvectorlayer3drendererwidget.h +++ b/src/app/3d/qgsvectorlayer3drendererwidget.h @@ -42,7 +42,7 @@ class QgsSingleSymbol3DRendererWidget : public QWidget //! no transfer of ownership void setLayer( QgsVectorLayer *layer ); - //! cloned symbol or null + //! Returns the cloned symbol or NULLPTR. QgsAbstract3DSymbol *symbol(); signals: diff --git a/src/core/expression/qgsexpression.h b/src/core/expression/qgsexpression.h index 6934b955000..118829e8005 100644 --- a/src/core/expression/qgsexpression.h +++ b/src/core/expression/qgsexpression.h @@ -228,7 +228,11 @@ class CORE_EXPORT QgsExpression */ QList parserErrors() const; - //! Returns root node of the expression. Root node is null is parsing has failed + /** + * Returns the root node of the expression. + * + * The root node is NULLPTR if parsing has failed. + */ const QgsExpressionNode *rootNode() const; /** diff --git a/src/core/layertree/qgslayertreemodel.h b/src/core/layertree/qgslayertreemodel.h index beaa40142b5..77233c590ca 100644 --- a/src/core/layertree/qgslayertreemodel.h +++ b/src/core/layertree/qgslayertreemodel.h @@ -373,7 +373,7 @@ class CORE_EXPORT QgsLayerTreeModel : public QAbstractItemModel #ifndef SIP_RUN struct LayerLegendTree { - //! Pointer to parent for each active node. Top-level nodes have null parent. Pointers are not owned. + //! Pointer to parent for each active node. Top-level nodes have NULLPTR parent. Pointers are not owned. QMap parents; //! List of children for each active node. Top-level nodes are under NULLPTR key. Pointers are not owned. QMap > children; diff --git a/src/core/layertree/qgslayertreemodellegendnode.h b/src/core/layertree/qgslayertreemodellegendnode.h index bdacb19f5dc..3b703a1f1cc 100644 --- a/src/core/layertree/qgslayertreemodellegendnode.h +++ b/src/core/layertree/qgslayertreemodellegendnode.h @@ -163,7 +163,7 @@ class CORE_EXPORT QgsLayerTreeModelLegendNode : public QObject //! Construct the node with pointer to its parent layer node explicit QgsLayerTreeModelLegendNode( QgsLayerTreeLayer *nodeL, QObject *parent SIP_TRANSFERTHIS = nullptr ); - //! Returns a temporary context or null if legendMapViewData are not valid + //! Returns a temporary context or NULLPTR if legendMapViewData are not valid QgsRenderContext *createTemporaryRenderContext() const SIP_FACTORY; protected: diff --git a/src/core/layertree/qgslayertreenode.h b/src/core/layertree/qgslayertreenode.h index 3d980e53e63..ce758078481 100644 --- a/src/core/layertree/qgslayertreenode.h +++ b/src/core/layertree/qgslayertreenode.h @@ -266,7 +266,7 @@ class CORE_EXPORT QgsLayerTreeNode : public QObject //! type of the node - determines which subclass is used NodeType mNodeType; bool mChecked; - //! pointer to the parent node - null in case of root node + //! pointer to the parent node - NULLPTR in case of root node QgsLayerTreeNode *mParent = nullptr; //! list of children - node is responsible for their deletion QList mChildren; diff --git a/src/core/qgsmapthemecollection.h b/src/core/qgsmapthemecollection.h index dcf43af55cf..a733ab03623 100644 --- a/src/core/qgsmapthemecollection.h +++ b/src/core/qgsmapthemecollection.h @@ -73,7 +73,7 @@ class CORE_EXPORT QgsMapThemeCollection : public QObject return !( *this == other ); } - //! Returns map layer or null if the layer does not exist anymore + //! Returns map layer or NULLPTR if the layer does not exist anymore QgsMapLayer *layer() const { return mLayer; } //! Sets the map layer for this record diff --git a/src/core/qgspointlocator.h b/src/core/qgspointlocator.h index 13cf85b07aa..615b8cbc631 100644 --- a/src/core/qgspointlocator.h +++ b/src/core/qgspointlocator.h @@ -299,7 +299,7 @@ class CORE_EXPORT QgsPointLocator : public QObject QHash mGeoms; std::unique_ptr< SpatialIndex::ISpatialIndex > mRTree; - //! flag whether the layer is currently empty (i.e. mRTree is null but it is not necessary to rebuild it) + //! flag whether the layer is currently empty (i.e. mRTree is NULLPTR but it is not necessary to rebuild it) bool mIsEmptyLayer = false; diff --git a/src/core/qgssqlstatement.h b/src/core/qgssqlstatement.h index 41827e0a38f..bb6c747c2bf 100644 --- a/src/core/qgssqlstatement.h +++ b/src/core/qgssqlstatement.h @@ -68,7 +68,10 @@ class CORE_EXPORT QgsSQLStatement class Node; - //! Returns root node of the statement. Root node is null is parsing has failed + /** + * Returns the root node of the statement. + * The root node is NULLPTR if parsing has failed. + */ const QgsSQLStatement::Node *rootNode() const; /** diff --git a/src/core/qgsvectorlayerjoininfo.h b/src/core/qgsvectorlayerjoininfo.h index 1078d4dacf5..6b508d72354 100644 --- a/src/core/qgsvectorlayerjoininfo.h +++ b/src/core/qgsvectorlayerjoininfo.h @@ -41,7 +41,7 @@ class CORE_EXPORT QgsVectorLayerJoinInfo //! Sets weak reference to the joined layer void setJoinLayer( QgsVectorLayer *layer ) { mJoinLayerRef = QgsVectorLayerRef( layer ); } - //! Returns joined layer (may be null if the reference was set by layer ID and not resolved yet) + //! Returns joined layer (may be NULLPTR if the reference was set by layer ID and not resolved yet) QgsVectorLayer *joinLayer() const { return mJoinLayerRef.get(); } //! Sets ID of the joined layer. It will need to be overwritten by setJoinLayer() to a reference to real layer @@ -59,9 +59,9 @@ class CORE_EXPORT QgsVectorLayerJoinInfo //! Returns name of the field of joined layer that will be used for join QString joinFieldName() const { return mJoinFieldName; } - //! Sets prefix of fields from the joined layer. If null, joined layer's name will be used. + //! Sets prefix of fields from the joined layer. If NULLPTR, joined layer's name will be used. void setPrefix( const QString &prefix ) { mPrefix = prefix; } - //! Returns prefix of fields from the joined layer. If null, joined layer's name will be used. + //! Returns prefix of fields from the joined layer. If NULLPTR, joined layer's name will be used. QString prefix() const { return mPrefix; } //! Sets whether values from the joined layer should be cached in memory to speed up lookups @@ -219,7 +219,7 @@ class CORE_EXPORT QgsVectorLayerJoinInfo //! True if the join is cached in virtual memory bool mMemoryCache = false; - //! Subset of fields to use from joined layer. null = use all fields + //! Subset of fields to use from joined layer. NULLPTR = use all fields std::shared_ptr mJoinFieldsSubset; // caching support diff --git a/src/core/symbology/qgsrulebasedrenderer.h b/src/core/symbology/qgsrulebasedrenderer.h index de202749735..9c0ef12d5d9 100644 --- a/src/core/symbology/qgsrulebasedrenderer.h +++ b/src/core/symbology/qgsrulebasedrenderer.h @@ -402,10 +402,10 @@ class CORE_EXPORT QgsRuleBasedRenderer : public QgsFeatureRenderer //! delete child rule void removeChildAt( int i ); - //! take child rule out, set parent as null + //! take child rule out, set parent as NULLPTR QgsRuleBasedRenderer::Rule *takeChild( QgsRuleBasedRenderer::Rule *rule ) SIP_TRANSFERBACK; - //! take child rule out, set parent as null + //! take child rule out, set parent as NULLPTR QgsRuleBasedRenderer::Rule *takeChildAt( int i ) SIP_TRANSFERBACK; /** diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h index 0448f3e80df..f7f26a2bc5d 100644 --- a/src/core/symbology/qgssymbol.h +++ b/src/core/symbology/qgssymbol.h @@ -585,14 +585,27 @@ class CORE_EXPORT QgsSymbolRenderContext */ void setOriginalValueVariable( const QVariant &value ); - //! Returns the output unit for the context - QgsUnitTypes::RenderUnit outputUnit() const { return mOutputUnit; } + /** + * Returns the output unit for the context. + * \deprecated No longer used and will be removed in QGIS 4.0 + */ + Q_DECL_DEPRECATED QgsUnitTypes::RenderUnit outputUnit() const SIP_DEPRECATED { return mOutputUnit; } - //! Sets the output unit for the context - void setOutputUnit( QgsUnitTypes::RenderUnit u ) { mOutputUnit = u; } + /** + * Sets the output unit for the context. + * \deprecated No longer used and will be removed in QGIS 4.0 + */ + Q_DECL_DEPRECATED void setOutputUnit( QgsUnitTypes::RenderUnit u ) SIP_DEPRECATED { mOutputUnit = u; } - QgsMapUnitScale mapUnitScale() const { return mMapUnitScale; } - void setMapUnitScale( const QgsMapUnitScale &scale ) { mMapUnitScale = scale; } + /** + * \deprecated Will be removed in QGIS 4.0 + */ + Q_DECL_DEPRECATED QgsMapUnitScale mapUnitScale() const SIP_DEPRECATED { return mMapUnitScale; } + + /** + * \deprecated Will be removed in QGIS 4.0 + */ + Q_DECL_DEPRECATED void setMapUnitScale( const QgsMapUnitScale &scale ) SIP_DEPRECATED { mMapUnitScale = scale; } /** * Returns the opacity for the symbol. @@ -608,7 +621,16 @@ class CORE_EXPORT QgsSymbolRenderContext */ void setOpacity( qreal opacity ) { mOpacity = opacity; } + /** + * Returns TRUE if symbols should be rendered using the selected symbol coloring and style. + * \see setSelected() + */ bool selected() const { return mSelected; } + + /** + * Sets whether symbols should be rendered using the selected symbol coloring and style. + * \see selected() + */ void setSelected( bool selected ) { mSelected = selected; } /** @@ -624,7 +646,10 @@ class CORE_EXPORT QgsSymbolRenderContext void setRenderHints( QgsSymbol::RenderHints hints ) { mRenderHints = hints; } void setFeature( const QgsFeature *f ) { mFeature = f; } - //! Current feature being rendered - may be null + + /** + * Returns the current feature being rendered. This may be NULLPTR. + */ const QgsFeature *feature() const { return mFeature; } /** @@ -677,7 +702,11 @@ class CORE_EXPORT QgsSymbolRenderContext void setGeometryPartNum( int num ) { mGeometryPartNum = num; } double outputLineWidth( double width ) const; - double outputPixelSize( double size ) const; + + /** + * \deprecated Use the size conversion methods in QgsRenderContext instead. + */ + Q_DECL_DEPRECATED double outputPixelSize( double size ) const SIP_DEPRECATED; // workaround for sip 4.7. Don't use assignment - will fail with assertion error QgsSymbolRenderContext &operator=( const QgsSymbolRenderContext & ); diff --git a/src/gui/layertree/qgslayertreeview.h b/src/gui/layertree/qgslayertreeview.h index 8df9b8c5bad..27e4e1a1f2b 100644 --- a/src/gui/layertree/qgslayertreeview.h +++ b/src/gui/layertree/qgslayertreeview.h @@ -244,7 +244,7 @@ class GUI_EXPORT QgsLayerTreeViewMenuProvider public: virtual ~QgsLayerTreeViewMenuProvider() = default; - //! Returns a newly created menu instance (or null pointer on error) + //! Returns a newly created menu instance (or NULLPTR on error) virtual QMenu *createContextMenu() = 0 SIP_FACTORY; }; diff --git a/src/gui/qgsconfigureshortcutsdialog.h b/src/gui/qgsconfigureshortcutsdialog.h index 224006e101c..2aef3c0f380 100644 --- a/src/gui/qgsconfigureshortcutsdialog.h +++ b/src/gui/qgsconfigureshortcutsdialog.h @@ -72,10 +72,10 @@ class GUI_EXPORT QgsConfigureShortcutsDialog : public QDialog, private Ui::QgsCo //! Returns the currently selected shortcut object (QAction or QShortcut) QObject *currentObject(); - //! Returns the currently selected action, or null if no action selected + //! Returns the currently selected action, or NULLPTR if no action selected QAction *currentAction(); - //! Returns the currently selected QShortcut, or null if no shortcut selected + //! Returns the currently selected QShortcut, or NULLPTR if no shortcut selected QShortcut *currentShortcut(); void setGettingShortcut( bool getting );