Skip to content

Commit 8463ddb

Browse files
committed
Source select signals: remove duplicate code and rely to the base class
1 parent b0c29da commit 8463ddb

File tree

6 files changed

+16
-21
lines changed

6 files changed

+16
-21
lines changed

src/gui/qgsdatasourcemanagerdialog.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,7 @@ QgsDataSourceManagerDialog::QgsDataSourceManagerDialog( QWidget *parent, QgsMapC
7676
// Add data provider dialogs
7777
QWidget *dlg = nullptr;
7878

79-
dlg = providerDialog( QStringLiteral( "delimitedtext" ), tr( "Delimited Text" ), QStringLiteral( "/mActionAddDelimitedTextLayer.svg" ) );
80-
81-
if ( dlg )
82-
{
83-
connect( dlg, SIGNAL( addVectorLayer( QString, QString, QString ) ), this, SLOT( vectorLayerAdded( QString, QString, QString ) ) );
84-
}
79+
addVectorProviderDialog( QStringLiteral( "delimitedtext" ), tr( "Delimited Text" ), QStringLiteral( "/mActionAddDelimitedTextLayer.svg" ) );
8580

8681
#ifdef HAVE_POSTGRESQL
8782
addDbProviderDialog( QStringLiteral( "postgres" ), tr( "PostgreSQL" ), QStringLiteral( "/mActionAddPostgisLayer.svg" ) );
@@ -97,11 +92,13 @@ QgsDataSourceManagerDialog::QgsDataSourceManagerDialog( QWidget *parent, QgsMapC
9792
addDbProviderDialog( QStringLiteral( "oracle" ), tr( "Oracle" ), QStringLiteral( "/mActionAddOracleLayer.svg" ) );
9893
#endif
9994

100-
dlg = providerDialog( QStringLiteral( "virtual" ), tr( "Virtual Layer" ), QStringLiteral( "/mActionAddVirtualLayer.svg" ) );
95+
dlg = addVectorProviderDialog( QStringLiteral( "virtual" ), tr( "Virtual Layer" ), QStringLiteral( "/mActionAddVirtualLayer.svg" ) );
10196

97+
// Apparently this is the only provider using replaceVectorLayer, we should
98+
// move this in to the base abstract class when it is used by at least one
99+
// additional provider.
102100
if ( dlg )
103101
{
104-
connect( dlg, SIGNAL( addVectorLayer( QString, QString, QString ) ), this, SLOT( vectorLayerAdded( QString, QString, QString ) ) );
105102
connect( dlg, SIGNAL( replaceVectorLayer( QString, QString, QString, QString ) ), this, SIGNAL( replaceSelectedVectorLayer( QString, QString, QString, QString ) ) );
106103
}
107104

@@ -197,7 +194,7 @@ QgsAbstractDataSourceWidget *QgsDataSourceManagerDialog::providerDialog( const Q
197194
}
198195
}
199196

200-
void QgsDataSourceManagerDialog::addDbProviderDialog( const QString providerKey, const QString providerName, const QString icon, QString title )
197+
QgsAbstractDataSourceWidget *QgsDataSourceManagerDialog::addDbProviderDialog( const QString providerKey, const QString providerName, const QString icon, QString title )
201198
{
202199
QgsAbstractDataSourceWidget *dlg = providerDialog( providerKey, providerName, icon, title );
203200
if ( dlg )
@@ -211,9 +208,10 @@ void QgsDataSourceManagerDialog::addDbProviderDialog( const QString providerKey,
211208
connect( dlg, SIGNAL( connectionsChanged() ), this, SIGNAL( connectionsChanged() ) );
212209
connect( this, SIGNAL( providerDialogsRefreshRequested() ), dlg, SLOT( refresh() ) );
213210
}
211+
return dlg;
214212
}
215213

216-
void QgsDataSourceManagerDialog::addRasterProviderDialog( const QString providerKey, const QString providerName, const QString icon, QString title )
214+
QgsAbstractDataSourceWidget *QgsDataSourceManagerDialog::addRasterProviderDialog( const QString providerKey, const QString providerName, const QString icon, QString title )
217215
{
218216
QgsAbstractDataSourceWidget *dlg = providerDialog( providerKey, providerName, icon, title );
219217
if ( dlg )
@@ -223,9 +221,10 @@ void QgsDataSourceManagerDialog::addRasterProviderDialog( const QString provider
223221
connect( dlg, SIGNAL( connectionsChanged() ), this, SIGNAL( connectionsChanged() ) );
224222
connect( this, SIGNAL( providerDialogsRefreshRequested() ), dlg, SLOT( refresh() ) );
225223
}
224+
return dlg;
226225
}
227226

228-
void QgsDataSourceManagerDialog::addVectorProviderDialog( const QString providerKey, const QString providerName, const QString icon, QString title )
227+
QgsAbstractDataSourceWidget *QgsDataSourceManagerDialog::addVectorProviderDialog( const QString providerKey, const QString providerName, const QString icon, QString title )
229228
{
230229
QgsAbstractDataSourceWidget *dlg = providerDialog( providerKey, providerName, icon, title );
231230
if ( dlg )
@@ -234,6 +233,7 @@ void QgsDataSourceManagerDialog::addVectorProviderDialog( const QString provider
234233
{ this->vectorLayerAdded( vectorLayerPath, baseName, providerKey ); } );
235234
connect( this, SIGNAL( providerDialogsRefreshRequested() ), dlg, SLOT( refresh() ) );
236235
}
236+
return dlg;
237237
}
238238

239239
void QgsDataSourceManagerDialog::showEvent( QShowEvent *e )

src/gui/qgsdatasourcemanagerdialog.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,9 @@ class GUI_EXPORT QgsDataSourceManagerDialog : public QgsOptionsDialogBase, priva
116116
private:
117117
// Return the dialog from the provider
118118
QgsAbstractDataSourceWidget *providerDialog( const QString providerKey, const QString providerName, const QString icon, QString title = QString() );
119-
void addDbProviderDialog( QString const providerKey, QString const providerName, QString const icon, QString title = QString() );
120-
void addRasterProviderDialog( QString const providerKey, QString const providerName, QString const icon, QString title = QString() );
121-
void addVectorProviderDialog( QString const providerKey, QString const providerName, QString const icon, QString title = QString() );
119+
QgsAbstractDataSourceWidget *addDbProviderDialog( QString const providerKey, QString const providerName, QString const icon, QString title = QString() );
120+
QgsAbstractDataSourceWidget *addRasterProviderDialog( QString const providerKey, QString const providerName, QString const icon, QString title = QString() );
121+
QgsAbstractDataSourceWidget *addVectorProviderDialog( QString const providerKey, QString const providerName, QString const icon, QString title = QString() );
122122
Ui::QgsDataSourceManagerDialog *ui;
123123
QgsBrowserDockWidget *mBrowserWidget = nullptr;
124124
int mPreviousRow;

src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ void QgsDelimitedTextSourceSelect::addButtonClicked()
193193

194194

195195
// add the layer to the map
196-
emit addVectorLayer( QString::fromAscii( url.toEncoded() ), txtLayerName->text(), QStringLiteral( "delimitedtext" ) );
196+
emit addVectorLayer( QString::fromAscii( url.toEncoded() ), txtLayerName->text() );
197197
if ( widgetMode() == QgsProviderRegistry::WidgetMode::None )
198198
{
199199
accept();

src/providers/delimitedtext/qgsdelimitedtextsourceselect.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ class QgsDelimitedTextSourceSelect : public QgsAbstractDataSourceWidget, private
7272
void updateFieldsAndEnable();
7373
void enableAccept();
7474
bool validate();
75-
76-
signals:
77-
void addVectorLayer( const QString &, const QString &, const QString & );
7875
};
7976

8077
#endif // QGSDELIMITEDTEXTSOURCESELECT_H

src/providers/virtual/qgsvirtuallayersourceselect.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ void QgsVirtualLayerSourceSelect::addButtonClicked()
376376
}
377377
else
378378
{
379-
emit addVectorLayer( def.toString(), layerName, QStringLiteral( "virtual" ) );
379+
emit addVectorLayer( def.toString(), layerName );
380380
}
381381
if ( widgetMode() == QgsProviderRegistry::WidgetMode::None )
382382
{

src/providers/virtual/qgsvirtuallayersourceselect.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ class QgsVirtualLayerSourceSelect : public QgsAbstractDataSourceWidget, private
5454
void updateLayersList();
5555

5656
signals:
57-
//! Source, name, provider
58-
void addVectorLayer( QString, QString, QString );
5957
//! Old_id, source, name, provider
6058
void replaceVectorLayer( QString, QString, QString, QString );
6159

0 commit comments

Comments
 (0)