Skip to content

Commit 0799835

Browse files
committed
Fix clazy skipped-base-method warnings
1 parent 2dbda4f commit 0799835

19 files changed

+23
-23
lines changed

src/app/layout/qgslayoutattributeselectiondialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ bool QgsLayoutAttributeTableColumnModel::setData( const QModelIndex &index, cons
261261

262262
Qt::ItemFlags QgsLayoutAttributeTableColumnModel::flags( const QModelIndex &index ) const
263263
{
264-
Qt::ItemFlags flags = QAbstractItemModel::flags( index );
264+
Qt::ItemFlags flags = QAbstractTableModel::flags( index );
265265

266266
if ( index.isValid() )
267267
{
@@ -594,7 +594,7 @@ QVariant QgsLayoutTableSortColumnsProxyModel::headerData( int section, Qt::Orien
594594

595595
Qt::ItemFlags QgsLayoutTableSortColumnsProxyModel::flags( const QModelIndex &index ) const
596596
{
597-
Qt::ItemFlags flags = QAbstractItemModel::flags( index );
597+
Qt::ItemFlags flags = QSortFilterProxyModel::flags( index );
598598

599599
if ( index.column() == 1 )
600600
{

src/app/pluginmanager/qgspluginmanager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ void QgsPluginManager::showEvent( QShowEvent *e )
16051605
QTimer::singleShot( 0, this, SLOT( warnAboutMissingObjects() ) );
16061606
}
16071607

1608-
QDialog::showEvent( e );
1608+
QgsOptionsDialogBase::showEvent( e );
16091609
}
16101610

16111611

src/app/qgsmaptoolidentifyaction.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,13 @@ void QgsMapToolIdentifyAction::handleChangedRasterResults( QList<IdentifyResult>
173173
void QgsMapToolIdentifyAction::activate()
174174
{
175175
resultsDialog()->activate();
176-
QgsMapTool::activate();
176+
QgsMapToolIdentify::activate();
177177
}
178178

179179
void QgsMapToolIdentifyAction::deactivate()
180180
{
181181
resultsDialog()->deactivate();
182-
QgsMapTool::deactivate();
182+
QgsMapToolIdentify::deactivate();
183183
}
184184

185185
QgsUnitTypes::DistanceUnit QgsMapToolIdentifyAction::displayDistanceUnits() const

src/app/qgswelcomepageitemsmodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ QVariant QgsWelcomePageItemsModel::data( const QModelIndex &index, int role ) co
201201

202202
Qt::ItemFlags QgsWelcomePageItemsModel::flags( const QModelIndex &index ) const
203203
{
204-
Qt::ItemFlags flags = QAbstractItemModel::flags( index );
204+
Qt::ItemFlags flags = QAbstractListModel::flags( index );
205205

206206
const RecentProjectData &projectData = mRecentProjects.at( index.row() );
207207

src/app/vertextool/qgsvertexeditor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ bool QgsVertexEditorModel::setData( const QModelIndex &index, const QVariant &va
236236

237237
Qt::ItemFlags QgsVertexEditorModel::flags( const QModelIndex &index ) const
238238
{
239-
Qt::ItemFlags flags = QAbstractItemModel::flags( index );
239+
Qt::ItemFlags flags = QAbstractTableModel::flags( index );
240240

241241
if ( index.isValid() )
242242
{

src/core/geometry/qgsmultilinestring.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ QgsMultiLineString *QgsMultiLineString::clone() const
4646

4747
void QgsMultiLineString::clear()
4848
{
49-
QgsGeometryCollection::clear();
49+
QgsMultiCurve::clear();
5050
mWkbType = QgsWkbTypes::MultiLineString;
5151
}
5252

@@ -136,7 +136,7 @@ bool QgsMultiLineString::addGeometry( QgsAbstractGeometry *g )
136136
g->addMValue();
137137
else if ( !isMeasure() && g->isMeasure() )
138138
g->dropMValue();
139-
return QgsGeometryCollection::addGeometry( g );
139+
return QgsGeometryCollection::addGeometry( g ); // clazy:exclude=skipped-base-method
140140
}
141141

142142
bool QgsMultiLineString::insertGeometry( QgsAbstractGeometry *g, int index )
@@ -147,7 +147,7 @@ bool QgsMultiLineString::insertGeometry( QgsAbstractGeometry *g, int index )
147147
return false;
148148
}
149149

150-
return QgsGeometryCollection::insertGeometry( g, index );
150+
return QgsMultiCurve::insertGeometry( g, index ); // clazy:exclude=skipped-base-method
151151
}
152152

153153
QgsMultiCurve *QgsMultiLineString::toCurveType() const

src/core/geometry/qgsmultipolygon.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ bool QgsMultiPolygon::addGeometry( QgsAbstractGeometry *g )
158158
else if ( !isMeasure() && g->isMeasure() )
159159
g->dropMValue();
160160

161-
return QgsGeometryCollection::addGeometry( g );
161+
return QgsGeometryCollection::addGeometry( g ); // clazy:exclude=skipped-base-method
162162
}
163163

164164
bool QgsMultiPolygon::insertGeometry( QgsAbstractGeometry *g, int index )

src/core/geometry/qgstriangle.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ QgsTriangle *QgsTriangle::createEmptyWithSameType() const
9898

9999
void QgsTriangle::clear()
100100
{
101-
QgsCurvePolygon::clear();
101+
QgsPolygon::clear();
102102
mWkbType = QgsWkbTypes::Triangle;
103103
}
104104

src/gui/attributetable/qgsattributetablemodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ Qt::ItemFlags QgsAttributeTableModel::flags( const QModelIndex &index ) const
745745
if ( index.column() >= mFieldCount )
746746
return Qt::NoItemFlags;
747747

748-
Qt::ItemFlags flags = QAbstractItemModel::flags( index );
748+
Qt::ItemFlags flags = QAbstractTableModel::flags( index );
749749

750750
bool editable = false;
751751
const int fieldIndex = mAttributes[index.column()];

src/gui/auth/qgsauthtrustedcasdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ void QgsAuthTrustedCAsDialog::showEvent( QShowEvent *e )
316316
{
317317
treeTrustedCAs->setFocus();
318318
}
319-
QWidget::showEvent( e );
319+
QDialog::showEvent( e );
320320
}
321321

322322
QgsMessageBar *QgsAuthTrustedCAsDialog::messageBar()

src/gui/editorwidgets/qgsdatetimeedit.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ void QgsDateTimeEdit::focusOutEvent( QFocusEvent *event )
127127
{
128128
displayNull();
129129
}
130-
QWidget::focusOutEvent( event );
130+
QAbstractSpinBox::focusOutEvent( event );
131131
emit editingFinished();
132132
}
133133
else

src/gui/qgscodeeditor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ void QgsCodeEditor::keyPressEvent( QKeyEvent *event )
7676
if ( event->key() == Qt::Key_Escape && !isListActive() )
7777
{
7878
// Shortcut QScintilla and redirect the event to the QWidget handler
79-
QWidget::keyPressEvent( event );
79+
QWidget::keyPressEvent( event ); // clazy:exclude=skipped-base-method
8080
}
8181
else
8282
{

src/gui/qgscompoundcolorwidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ void QgsCompoundColorWidget::keyPressEvent( QKeyEvent *e )
756756
if ( !mPickingColor )
757757
{
758758
//if not picking a color, use default tool button behavior
759-
QWidget::keyPressEvent( e );
759+
QgsPanelWidget::keyPressEvent( e );
760760
return;
761761
}
762762

src/gui/qgsdatasourcemanagerdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,5 +173,5 @@ void QgsDataSourceManagerDialog::makeConnections( QgsAbstractDataSourceWidget *d
173173
void QgsDataSourceManagerDialog::showEvent( QShowEvent *e )
174174
{
175175
ui->mOptionsStackedWidget->currentWidget()->show();
176-
QDialog::showEvent( e );
176+
QgsOptionsDialogBase::showEvent( e );
177177
}

src/gui/qgsnewnamedialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ QgsNewNameDialog::QgsNewNameDialog( const QString &source, const QString &initia
3434
, mRegexp( regexp )
3535
{
3636
setWindowTitle( tr( "New Name" ) );
37-
QDialog::layout()->setSizeConstraint( QLayout::SetMinimumSize );
37+
QgsDialog::layout()->setSizeConstraint( QLayout::SetMinimumSize );
3838
layout()->setSizeConstraint( QLayout::SetMinimumSize );
3939
layout()->setSpacing( 6 );
4040
mOkString = buttonBox()->button( QDialogButtonBox::Ok )->text();

src/gui/qgssqlcomposerdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ bool QgsSQLComposerDialog::eventFilter( QObject *obj, QEvent *event )
180180
}
181181
}
182182

183-
return QObject::eventFilter( obj, event );
183+
return QDialog::eventFilter( obj, event );
184184
}
185185

186186
void QgsSQLComposerDialog::setTableSelectedCallback( TableSelectedCallback *tableSelectedCallback )

src/gui/symbology/qgscptcitycolorrampdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ bool QgsCptCityColorRampDialog::eventFilter( QObject *obj, QEvent *event )
564564
else
565565
{
566566
// standard event processing
567-
return QObject::eventFilter( obj, event );
567+
return QDialog::eventFilter( obj, event );
568568
}
569569
}
570570

src/providers/grass/qgsgrassprovidermodule.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ QIcon QgsGrassMapsetItem::icon()
412412
return QgsApplication::getThemeIcon( "/grass_mapset_search.png" );
413413
}
414414
}
415-
return QgsDataItem::icon();
415+
return QgsDirectoryItem::icon();
416416
}
417417

418418
void QgsGrassMapsetItem::setState( State state )

src/providers/grass/qgsgrassprovidermodule.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ class QgsGrassLocationItem : public QgsDirectoryItem, public QgsGrassObjectItemB
8282
public:
8383
QgsGrassLocationItem( QgsDataItem *parent, QString dirPath, QString path );
8484

85-
QIcon icon() override { return QgsDataItem::icon(); }
85+
QIcon icon() override { return QgsDirectoryItem::icon(); }
8686

8787
QVector<QgsDataItem *> createChildren() override;
8888
#ifdef HAVE_GUI

0 commit comments

Comments
 (0)