Skip to content

Commit f2c262b

Browse files
committed
Small refactoring to silence clang warnings plus changed name to GPKG source select dialog provider
... to make it different than the other OGR s.s. dialog
1 parent 7e3b5f4 commit f2c262b

File tree

1 file changed

+15
-8
lines changed

1 file changed

+15
-8
lines changed

src/providers/ogr/qgsogrprovider.cpp

+15-8
Original file line numberDiff line numberDiff line change
@@ -6323,10 +6323,7 @@ class QgsOgrVectorSourceSelectProvider : public QgsSourceSelectProvider
63236323
QString text() const override { return QObject::tr( "Vector" ); }
63246324
int ordering() const override { return QgsSourceSelectProvider::OrderLocalProvider + 10; }
63256325
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddOgrLayer.svg" ) ); }
6326-
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
6327-
{
6328-
return new QgsOgrSourceSelect( parent, fl, widgetMode );
6329-
}
6326+
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override;
63306327
};
63316328

63326329

@@ -6335,14 +6332,12 @@ class QgsGeoPackageSourceSelectProvider : public QgsSourceSelectProvider
63356332
{
63366333
public:
63376334

6335+
virtual QString name() const override;
63386336
QString providerKey() const override { return QStringLiteral( "ogr" ); }
63396337
QString text() const override { return QObject::tr( "GeoPackage" ); }
63406338
int ordering() const override { return QgsSourceSelectProvider::OrderLocalProvider + 45; }
63416339
QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddGeoPackageLayer.svg" ) ); }
6342-
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
6343-
{
6344-
return new QgsOgrDbSourceSelect( QStringLiteral( "GPKG" ), QObject::tr( "GeoPackage" ), QObject::tr( "GeoPackage Database (*.gpkg)" ), parent, fl, widgetMode );
6345-
}
6340+
QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override;
63466341
};
63476342

63486343

@@ -6395,3 +6390,15 @@ QGISEXTERN QgsTransaction *createTransaction( const QString &connString )
63956390

63966391
return new QgsOgrTransaction( connString, ds );
63976392
}
6393+
6394+
QString QgsGeoPackageSourceSelectProvider::name() const { return QStringLiteral( "GeoPackage" ); }
6395+
6396+
QgsAbstractDataSourceWidget *QgsGeoPackageSourceSelectProvider::createDataSourceWidget( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode ) const
6397+
{
6398+
return new QgsOgrDbSourceSelect( QStringLiteral( "GPKG" ), QObject::tr( "GeoPackage" ), QObject::tr( "GeoPackage Database (*.gpkg)" ), parent, fl, widgetMode );
6399+
}
6400+
6401+
QgsAbstractDataSourceWidget *QgsOgrVectorSourceSelectProvider::createDataSourceWidget( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode ) const
6402+
{
6403+
return new QgsOgrSourceSelect( parent, fl, widgetMode );
6404+
}

0 commit comments

Comments
 (0)