Skip to content

Commit 174db61

Browse files
committed
Suppress more duplInheritedMember warnings
1 parent 614fa8a commit 174db61

9 files changed

+9
-9
lines changed

src/core/layout/qgslayoutitemmapgrid.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ QgsLayoutItemMapGrid *QgsLayoutItemMapGridStack::grid( const int index ) const
8686
return qobject_cast<QgsLayoutItemMapGrid *>( item );
8787
}
8888

89-
QList<QgsLayoutItemMapGrid *> QgsLayoutItemMapGridStack::asList() const
89+
QList<QgsLayoutItemMapGrid *> QgsLayoutItemMapGridStack::asList() const // cppcheck-suppress duplInheritedMember
9090
{
9191
QList< QgsLayoutItemMapGrid * > list;
9292
for ( QgsLayoutItemMapItem *item : mItems )

src/core/layout/qgslayoutitemmapgrid.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ class CORE_EXPORT QgsLayoutItemMapGridStack : public QgsLayoutItemMapItemStack
104104
/**
105105
* Returns a list of QgsLayoutItemMapGrids contained by the stack.
106106
*/
107-
QList< QgsLayoutItemMapGrid * > asList() const;
107+
QList< QgsLayoutItemMapGrid * > asList() const; // cppcheck-suppress duplInheritedMember
108108

109109
bool readXml( const QDomElement &elem, const QDomDocument &doc, const QgsReadWriteContext &context ) override;
110110

src/core/layout/qgslayoutitemmapoverview.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ QgsLayoutItemMapOverview &QgsLayoutItemMapOverviewStack::operator[]( int idx ) /
431431
return *overview;
432432
}
433433

434-
QList<QgsLayoutItemMapOverview *> QgsLayoutItemMapOverviewStack::asList() const
434+
QList<QgsLayoutItemMapOverview *> QgsLayoutItemMapOverviewStack::asList() const // cppcheck-suppress duplInheritedMember
435435
{
436436
QList< QgsLayoutItemMapOverview * > list;
437437
QList< QgsLayoutItemMapItem * >::const_iterator it = mItems.begin();

src/core/layout/qgslayoutitemmapoverview.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class CORE_EXPORT QgsLayoutItemMapOverviewStack : public QgsLayoutItemMapItemSta
101101
/**
102102
* Returns a list of QgsLayoutItemMapOverviews contained by the stack.
103103
*/
104-
QList< QgsLayoutItemMapOverview * > asList() const;
104+
QList< QgsLayoutItemMapOverview * > asList() const; // cppcheck-suppress duplInheritedMember
105105
bool readXml( const QDomElement &elem, const QDomDocument &doc, const QgsReadWriteContext &context ) override;
106106

107107
/**

src/core/qgsmaplayerserverproperties.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ void QgsMapLayerServerProperties::copyTo( QgsMapLayerServerProperties *propertie
228228
properties->setAttributionUrl( mAttributionUrl );
229229
}
230230

231-
void QgsMapLayerServerProperties::reset()
231+
void QgsMapLayerServerProperties::reset() // cppcheck-suppress duplInheritedMember
232232
{
233233
QgsServerMetadataUrlProperties::reset();
234234
QgsServerWmsDimensionProperties::reset();

src/core/qgsmaplayerserverproperties.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ class CORE_EXPORT QgsMapLayerServerProperties: public QgsServerMetadataUrlProper
305305
* Reset properties to default
306306
* \since QGIS 3.22
307307
*/
308-
void reset();
308+
void reset(); // cppcheck-suppress duplInheritedMember
309309

310310
/**
311311
* Sets the short \a name of the layer used by QGIS Server to identify the layer.

src/core/qgspropertytransformer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ QString QgsGenericNumericTransformer::toExpression( const QString &baseExpressio
224224
return QStringLiteral( "coalesce(scale_polynomial(%1, %2, %3, %4, %5, %6), %7)" ).arg( baseExpression, minValueString, maxValueString, minOutputString, maxOutputString, exponentString, nullOutputString );
225225
}
226226

227-
QgsGenericNumericTransformer *QgsGenericNumericTransformer::fromExpression( const QString &expression, QString &baseExpression, QString &fieldName )
227+
QgsGenericNumericTransformer *QgsGenericNumericTransformer::fromExpression( const QString &expression, QString &baseExpression, QString &fieldName ) // cppcheck-suppress duplInheritedMember
228228
{
229229
bool ok = false;
230230

src/core/qgspropertytransformer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ class CORE_EXPORT QgsGenericNumericTransformer : public QgsPropertyTransformer
365365
* \returns corresponding QgsSizeScaleTransformer, or NULLPTR if expression could not
366366
* be parsed to a size scale transformer.
367367
*/
368-
static QgsGenericNumericTransformer *fromExpression( const QString &expression, QString &baseExpression SIP_OUT, QString &fieldName SIP_OUT ) SIP_FACTORY;
368+
static QgsGenericNumericTransformer *fromExpression( const QString &expression, QString &baseExpression SIP_OUT, QString &fieldName SIP_OUT ) SIP_FACTORY; // cppcheck-suppress duplInheritedMember
369369

370370
/**
371371
* Calculates the size corresponding to a specific \a input value.

src/gui/editorwidgets/core/qgseditorwidgetwrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ class GUI_EXPORT QgsEditorWidgetWrapper : public QgsWidgetWrapper
130130
* \param widget The widget which was created by a wrapper
131131
* \returns The wrapper for the widget or NULLPTR
132132
*/
133-
static QgsEditorWidgetWrapper *fromWidget( QWidget *widget );
133+
static QgsEditorWidgetWrapper *fromWidget( QWidget *widget ); // cppcheck-suppress duplInheritedMember
134134

135135
/**
136136
* Check if the given widget or one of its parent is a QTableView.

0 commit comments

Comments
 (0)