Fix clazy skipped-base-method warnings

qgis · Feb 2, 2018 · 0799835 · 0799835
1 parent 2dbda4f
commit 0799835
Show file tree

Hide file tree

Showing 19 changed files with 23 additions and 23 deletions.
diff --git a/src/app/layout/qgslayoutattributeselectiondialog.cpp b/src/app/layout/qgslayoutattributeselectiondialog.cpp
@@ -261,7 +261,7 @@ bool QgsLayoutAttributeTableColumnModel::setData( const QModelIndex &index, cons
 
 Qt::ItemFlags QgsLayoutAttributeTableColumnModel::flags( const QModelIndex &index ) const
 {
-  Qt::ItemFlags flags = QAbstractItemModel::flags( index );
+  Qt::ItemFlags flags = QAbstractTableModel::flags( index );
 
   if ( index.isValid() )
   {
@@ -594,7 +594,7 @@ QVariant QgsLayoutTableSortColumnsProxyModel::headerData( int section, Qt::Orien
 
 Qt::ItemFlags QgsLayoutTableSortColumnsProxyModel::flags( const QModelIndex &index ) const
 {
-  Qt::ItemFlags flags = QAbstractItemModel::flags( index );
+  Qt::ItemFlags flags = QSortFilterProxyModel::flags( index );
 
   if ( index.column() == 1 )
   {

diff --git a/src/app/pluginmanager/qgspluginmanager.cpp b/src/app/pluginmanager/qgspluginmanager.cpp
@@ -1605,7 +1605,7 @@ void QgsPluginManager::showEvent( QShowEvent *e )
     QTimer::singleShot( 0, this, SLOT( warnAboutMissingObjects() ) );
   }
 
-  QDialog::showEvent( e );
+  QgsOptionsDialogBase::showEvent( e );
 }
 
 

diff --git a/src/app/qgsmaptoolidentifyaction.cpp b/src/app/qgsmaptoolidentifyaction.cpp
@@ -173,13 +173,13 @@ void QgsMapToolIdentifyAction::handleChangedRasterResults( QList<IdentifyResult>
 void QgsMapToolIdentifyAction::activate()
 {
   resultsDialog()->activate();
-  QgsMapTool::activate();
+  QgsMapToolIdentify::activate();
 }
 
 void QgsMapToolIdentifyAction::deactivate()
 {
   resultsDialog()->deactivate();
-  QgsMapTool::deactivate();
+  QgsMapToolIdentify::deactivate();
 }
 
 QgsUnitTypes::DistanceUnit QgsMapToolIdentifyAction::displayDistanceUnits() const

diff --git a/src/app/qgswelcomepageitemsmodel.cpp b/src/app/qgswelcomepageitemsmodel.cpp
@@ -201,7 +201,7 @@ QVariant QgsWelcomePageItemsModel::data( const QModelIndex &index, int role ) co
 
 Qt::ItemFlags QgsWelcomePageItemsModel::flags( const QModelIndex &index ) const
 {
-  Qt::ItemFlags flags = QAbstractItemModel::flags( index );
+  Qt::ItemFlags flags = QAbstractListModel::flags( index );
 
   const RecentProjectData &projectData = mRecentProjects.at( index.row() );
 

diff --git a/src/app/vertextool/qgsvertexeditor.cpp b/src/app/vertextool/qgsvertexeditor.cpp
@@ -236,7 +236,7 @@ bool QgsVertexEditorModel::setData( const QModelIndex &index, const QVariant &va
 
 Qt::ItemFlags QgsVertexEditorModel::flags( const QModelIndex &index ) const
 {
-  Qt::ItemFlags flags = QAbstractItemModel::flags( index );
+  Qt::ItemFlags flags = QAbstractTableModel::flags( index );
 
   if ( index.isValid() )
   {

diff --git a/src/core/geometry/qgsmultilinestring.cpp b/src/core/geometry/qgsmultilinestring.cpp
@@ -46,7 +46,7 @@ QgsMultiLineString *QgsMultiLineString::clone() const
 
 void QgsMultiLineString::clear()
 {
-  QgsGeometryCollection::clear();
+  QgsMultiCurve::clear();
   mWkbType = QgsWkbTypes::MultiLineString;
 }
 
@@ -136,7 +136,7 @@ bool QgsMultiLineString::addGeometry( QgsAbstractGeometry *g )
     g->addMValue();
   else if ( !isMeasure() && g->isMeasure() )
     g->dropMValue();
-  return QgsGeometryCollection::addGeometry( g );
+  return QgsGeometryCollection::addGeometry( g ); // clazy:exclude=skipped-base-method
 }
 
 bool QgsMultiLineString::insertGeometry( QgsAbstractGeometry *g, int index )
@@ -147,7 +147,7 @@ bool QgsMultiLineString::insertGeometry( QgsAbstractGeometry *g, int index )
     return false;
   }
 
-  return QgsGeometryCollection::insertGeometry( g, index );
+  return QgsMultiCurve::insertGeometry( g, index ); // clazy:exclude=skipped-base-method
 }
 
 QgsMultiCurve *QgsMultiLineString::toCurveType() const

diff --git a/src/core/geometry/qgsmultipolygon.cpp b/src/core/geometry/qgsmultipolygon.cpp
@@ -158,7 +158,7 @@ bool QgsMultiPolygon::addGeometry( QgsAbstractGeometry *g )
   else if ( !isMeasure() && g->isMeasure() )
     g->dropMValue();
 
-  return QgsGeometryCollection::addGeometry( g );
+  return QgsGeometryCollection::addGeometry( g ); // clazy:exclude=skipped-base-method
 }
 
 bool QgsMultiPolygon::insertGeometry( QgsAbstractGeometry *g, int index )

diff --git a/src/core/geometry/qgstriangle.cpp b/src/core/geometry/qgstriangle.cpp
@@ -98,7 +98,7 @@ QgsTriangle *QgsTriangle::createEmptyWithSameType() const
 
 void QgsTriangle::clear()
 {
-  QgsCurvePolygon::clear();
+  QgsPolygon::clear();
   mWkbType = QgsWkbTypes::Triangle;
 }
 

diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -745,7 +745,7 @@ Qt::ItemFlags QgsAttributeTableModel::flags( const QModelIndex &index ) const
   if ( index.column() >= mFieldCount )
     return Qt::NoItemFlags;
 
-  Qt::ItemFlags flags = QAbstractItemModel::flags( index );
+  Qt::ItemFlags flags = QAbstractTableModel::flags( index );
 
   bool editable = false;
   const int fieldIndex = mAttributes[index.column()];

diff --git a/src/gui/auth/qgsauthtrustedcasdialog.cpp b/src/gui/auth/qgsauthtrustedcasdialog.cpp
@@ -316,7 +316,7 @@ void QgsAuthTrustedCAsDialog::showEvent( QShowEvent *e )
   {
     treeTrustedCAs->setFocus();
   }
-  QWidget::showEvent( e );
+  QDialog::showEvent( e );
 }
 
 QgsMessageBar *QgsAuthTrustedCAsDialog::messageBar()

diff --git a/src/gui/editorwidgets/qgsdatetimeedit.cpp b/src/gui/editorwidgets/qgsdatetimeedit.cpp
@@ -127,7 +127,7 @@ void QgsDateTimeEdit::focusOutEvent( QFocusEvent *event )
     {
       displayNull();
     }
-    QWidget::focusOutEvent( event );
+    QAbstractSpinBox::focusOutEvent( event );
     emit editingFinished();
   }
   else

diff --git a/src/gui/qgscodeeditor.cpp b/src/gui/qgscodeeditor.cpp
@@ -76,7 +76,7 @@ void QgsCodeEditor::keyPressEvent( QKeyEvent *event )
   if ( event->key() == Qt::Key_Escape && !isListActive() )
   {
     // Shortcut QScintilla and redirect the event to the QWidget handler
-    QWidget::keyPressEvent( event );
+    QWidget::keyPressEvent( event ); // clazy:exclude=skipped-base-method
   }
   else
   {

diff --git a/src/gui/qgscompoundcolorwidget.cpp b/src/gui/qgscompoundcolorwidget.cpp
@@ -756,7 +756,7 @@ void QgsCompoundColorWidget::keyPressEvent( QKeyEvent *e )
   if ( !mPickingColor )
   {
     //if not picking a color, use default tool button behavior
-    QWidget::keyPressEvent( e );
+    QgsPanelWidget::keyPressEvent( e );
     return;
   }
 

diff --git a/src/gui/qgsdatasourcemanagerdialog.cpp b/src/gui/qgsdatasourcemanagerdialog.cpp
@@ -173,5 +173,5 @@ void QgsDataSourceManagerDialog::makeConnections( QgsAbstractDataSourceWidget *d
 void QgsDataSourceManagerDialog::showEvent( QShowEvent *e )
 {
   ui->mOptionsStackedWidget->currentWidget()->show();
-  QDialog::showEvent( e );
+  QgsOptionsDialogBase::showEvent( e );
 }
diff --git a/src/gui/qgsnewnamedialog.cpp b/src/gui/qgsnewnamedialog.cpp
@@ -34,7 +34,7 @@ QgsNewNameDialog::QgsNewNameDialog( const QString &source, const QString &initia
   , mRegexp( regexp )
 {
   setWindowTitle( tr( "New Name" ) );
-  QDialog::layout()->setSizeConstraint( QLayout::SetMinimumSize );
+  QgsDialog::layout()->setSizeConstraint( QLayout::SetMinimumSize );
   layout()->setSizeConstraint( QLayout::SetMinimumSize );
   layout()->setSpacing( 6 );
   mOkString = buttonBox()->button( QDialogButtonBox::Ok )->text();

diff --git a/src/gui/qgssqlcomposerdialog.cpp b/src/gui/qgssqlcomposerdialog.cpp
@@ -180,7 +180,7 @@ bool QgsSQLComposerDialog::eventFilter( QObject *obj, QEvent *event )
     }
   }
 
-  return QObject::eventFilter( obj, event );
+  return QDialog::eventFilter( obj, event );
 }
 
 void QgsSQLComposerDialog::setTableSelectedCallback( TableSelectedCallback *tableSelectedCallback )

diff --git a/src/gui/symbology/qgscptcitycolorrampdialog.cpp b/src/gui/symbology/qgscptcitycolorrampdialog.cpp
@@ -564,7 +564,7 @@ bool QgsCptCityColorRampDialog::eventFilter( QObject *obj, QEvent *event )
   else
   {
     // standard event processing
-    return QObject::eventFilter( obj, event );
+    return QDialog::eventFilter( obj, event );
   }
 }
 

diff --git a/src/providers/grass/qgsgrassprovidermodule.cpp b/src/providers/grass/qgsgrassprovidermodule.cpp
@@ -412,7 +412,7 @@ QIcon QgsGrassMapsetItem::icon()
       return QgsApplication::getThemeIcon( "/grass_mapset_search.png" );
     }
   }
-  return QgsDataItem::icon();
+  return QgsDirectoryItem::icon();
 }
 
 void QgsGrassMapsetItem::setState( State state )

diff --git a/src/providers/grass/qgsgrassprovidermodule.h b/src/providers/grass/qgsgrassprovidermodule.h
@@ -82,7 +82,7 @@ class QgsGrassLocationItem : public QgsDirectoryItem, public QgsGrassObjectItemB
   public:
     QgsGrassLocationItem( QgsDataItem *parent, QString dirPath, QString path );
 
-    QIcon icon() override { return QgsDataItem::icon(); }
+    QIcon icon() override { return QgsDirectoryItem::icon(); }
 
     QVector<QgsDataItem *> createChildren() override;
 #ifdef HAVE_GUI