Skip to content

Commit f814ba0

Browse files
jef-njef-n
committedJul 19, 2017
fix oracle provider build (followup c4e26d7)
·
ltr-3_44final-3_0_0
1 parent e7700db commit f814ba0

File tree

10 files changed

+56
-64
lines changed

10 files changed

+56
-64
lines changed
 

‎src/gui/qgsowssourceselect.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
#include <QNetworkRequest>
5555
#include <QNetworkReply>
5656

57-
QgsOWSSourceSelect::QgsOWSSourceSelect( const QString &service, QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode )
58-
: QgsAbstractDataSourceWidget( parent, fl, widgetMode )
57+
QgsOWSSourceSelect::QgsOWSSourceSelect( const QString &service, QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode )
58+
: QgsAbstractDataSourceWidget( parent, fl, theWidgetMode )
5959
, mService( service )
6060
, mCurrentTileset( nullptr )
6161
{
6262
setupUi( this );
6363

64-
if ( QgsAbstractDataSourceWidget::widgetMode( ) != QgsProviderRegistry::WidgetMode::None )
64+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::None )
6565
{
6666
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
6767
}
@@ -88,7 +88,7 @@ QgsOWSSourceSelect::QgsOWSSourceSelect( const QString &service, QWidget *parent,
8888
// 'Prefer network' is the default noted in the combobox's tool tip
8989
mCacheComboBox->setCurrentIndex( mCacheComboBox->findData( QNetworkRequest::PreferNetwork ) );
9090

91-
if ( QgsAbstractDataSourceWidget::widgetMode( ) != QgsProviderRegistry::WidgetMode::Manager )
91+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::Manager )
9292
{
9393
connect( mAddButton, &QAbstractButton::clicked, this, &QgsOWSSourceSelect::addClicked );
9494
//set the current project CRS if available

‎src/providers/db2/qgsdb2sourceselect.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,16 @@ void QgsDb2SourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemMod
116116
model->setData( index, le->text() );
117117
}
118118

119-
QgsDb2SourceSelect::QgsDb2SourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode )
120-
: QgsAbstractDataSourceWidget( parent, fl, widgetMode )
119+
QgsDb2SourceSelect::QgsDb2SourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode )
120+
: QgsAbstractDataSourceWidget( parent, fl, theWidgetMode )
121121
, mColumnTypeThread( NULL )
122122
, mUseEstimatedMetadata( false )
123123
{
124124
setupUi( this );
125125

126126
setWindowTitle( tr( "Add Db2 Table(s)" ) );
127127

128-
if ( QgsAbstractDataSourceWidget::widgetMode() != QgsProviderRegistry::WidgetMode::None )
128+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::None )
129129
{
130130
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
131131
mHoldDialogOpen->hide();
@@ -138,7 +138,7 @@ QgsDb2SourceSelect::QgsDb2SourceSelect( QWidget *parent, Qt::WindowFlags fl, Qgs
138138
mBuildQueryButton->setToolTip( tr( "Set Filter" ) );
139139
mBuildQueryButton->setDisabled( true );
140140

141-
if ( QgsAbstractDataSourceWidget::widgetMode( ) != QgsProviderRegistry::WidgetMode::Manager )
141+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::Manager )
142142
{
143143
buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
144144
connect( mAddButton, &QAbstractButton::clicked, this, &QgsDb2SourceSelect::addTables );
@@ -458,7 +458,7 @@ void QgsDb2SourceSelect::addTables()
458458
else
459459
{
460460
emit addDatabaseLayers( mSelectedTables, QStringLiteral( "DB2" ) );
461-
if ( !mHoldDialogOpen->isChecked() && QgsAbstractDataSourceWidget::widgetMode() == QgsProviderRegistry::WidgetMode::None )
461+
if ( !mHoldDialogOpen->isChecked() && widgetMode() == QgsProviderRegistry::WidgetMode::None )
462462
{
463463
accept();
464464
}

‎src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434

3535
const int MAX_SAMPLE_LENGTH = 200;
3636

37-
QgsDelimitedTextSourceSelect::QgsDelimitedTextSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode )
38-
: QgsAbstractDataSourceWidget( parent, fl, widgetMode )
37+
QgsDelimitedTextSourceSelect::QgsDelimitedTextSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode )
38+
: QgsAbstractDataSourceWidget( parent, fl, theWidgetMode )
3939
, mFile( new QgsDelimitedTextFile() )
4040
, mExampleRowCount( 20 )
4141
, mBadRowCount( 0 )
@@ -48,7 +48,7 @@ QgsDelimitedTextSourceSelect::QgsDelimitedTextSourceSelect( QWidget *parent, Qt:
4848
QgsSettings settings;
4949
restoreGeometry( settings.value( mPluginKey + "/geometry" ).toByteArray() );
5050

51-
if ( QgsAbstractDataSourceWidget::widgetMode() != QgsProviderRegistry::WidgetMode::None )
51+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::None )
5252
{
5353
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Cancel ) );
5454
buttonBox->button( QDialogButtonBox::Ok )->setText( tr( "Add" ) );
@@ -199,7 +199,7 @@ void QgsDelimitedTextSourceSelect::on_buttonBox_accepted()
199199

200200
// add the layer to the map
201201
emit addVectorLayer( QString::fromAscii( url.toEncoded() ), txtLayerName->text(), QStringLiteral( "delimitedtext" ) );
202-
if ( QgsAbstractDataSourceWidget::widgetMode() == QgsProviderRegistry::WidgetMode::None )
202+
if ( widgetMode() == QgsProviderRegistry::WidgetMode::None )
203203
{
204204
accept();
205205
}

‎src/providers/mssql/qgsmssqlsourceselect.cpp‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -118,20 +118,22 @@ void QgsMssqlSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemM
118118
model->setData( index, le->text() );
119119
}
120120

121-
QgsMssqlSourceSelect::QgsMssqlSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode )
122-
: QgsAbstractDataSourceWidget( parent, fl, widgetMode )
121+
QgsMssqlSourceSelect::QgsMssqlSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode )
122+
: QgsAbstractDataSourceWidget( parent, fl, theWidgetMode )
123123
, mColumnTypeThread( nullptr )
124124
, mUseEstimatedMetadata( false )
125125
{
126126
setupUi( this );
127127

128-
setWindowTitle( tr( "Add MSSQL Table(s)" ) );
129-
130-
if ( QgsAbstractDataSourceWidget::widgetMode( ) != QgsProviderRegistry::WidgetMode::None )
128+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::None )
131129
{
132130
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
133131
mHoldDialogOpen->hide();
134132
}
133+
else
134+
{
135+
setWindowTitle( tr( "Add MSSQL Table(s)" ) );
136+
}
135137

136138
mAddButton = new QPushButton( tr( "&Add" ) );
137139
mAddButton->setEnabled( false );
@@ -140,7 +142,7 @@ QgsMssqlSourceSelect::QgsMssqlSourceSelect( QWidget *parent, Qt::WindowFlags fl,
140142
mBuildQueryButton->setToolTip( tr( "Set Filter" ) );
141143
mBuildQueryButton->setDisabled( true );
142144

143-
if ( QgsAbstractDataSourceWidget::widgetMode( ) != QgsProviderRegistry::WidgetMode::Manager )
145+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::Manager )
144146
{
145147
buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
146148
connect( mAddButton, &QAbstractButton::clicked, this, &QgsMssqlSourceSelect::addTables );
@@ -453,7 +455,7 @@ void QgsMssqlSourceSelect::addTables()
453455
else
454456
{
455457
emit addDatabaseLayers( mSelectedTables, QStringLiteral( "mssql" ) );
456-
if ( !mHoldDialogOpen->isChecked() && QgsAbstractDataSourceWidget::widgetMode() == QgsProviderRegistry::WidgetMode::None )
458+
if ( !mHoldDialogOpen->isChecked() && widgetMode() == QgsProviderRegistry::WidgetMode::None )
457459
{
458460
accept();
459461
}

‎src/providers/oracle/qgsoraclesourceselect.cpp‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,14 @@ void QgsOracleSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItem
166166
}
167167
}
168168

169-
QgsOracleSourceSelect::QgsOracleSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode )
170-
: QgsAbstractDataSourceWidget( parent, fl, widgetMode )
169+
QgsOracleSourceSelect::QgsOracleSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode )
170+
: QgsAbstractDataSourceWidget( parent, fl, theWidgetMode )
171171
, mColumnTypeThread( 0 )
172172
, mIsConnected( false )
173173
{
174174
setupUi( this );
175175

176-
if ( QgsAbstractDataSourceWidget::widgetMode( ) == QgsProviderRegistry::WidgetMode::Embedded )
176+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::None )
177177
{
178178
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
179179
mHoldDialogOpen->hide();
@@ -190,7 +190,7 @@ QgsOracleSourceSelect::QgsOracleSourceSelect( QWidget *parent, Qt::WindowFlags f
190190
mBuildQueryButton->setToolTip( tr( "Set Filter" ) );
191191
mBuildQueryButton->setDisabled( true );
192192

193-
if ( mWidgetMode != QgsProviderRegistry::WidgetMode::Manager )
193+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::Manager )
194194
{
195195
buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
196196
connect( mAddButton, &QAbstractButton::clicked, this, &QgsOracleSourceSelect::addTables );
@@ -357,7 +357,7 @@ void QgsOracleSourceSelect::on_mTablesTreeView_clicked( const QModelIndex &index
357357
void QgsOracleSourceSelect::on_mTablesTreeView_doubleClicked( const QModelIndex &index )
358358
{
359359
QgsSettings settings;
360-
if ( settings.value( "qgis/addOracleDC", false ).toBool() )
360+
if ( settings.value( QStringLiteral( "qgis/addOracleDC" ), false ).toBool() )
361361
{
362362
addTables();
363363
}
@@ -443,12 +443,12 @@ QgsOracleSourceSelect::~QgsOracleSourceSelect()
443443
}
444444

445445
QgsSettings settings;
446-
settings.setValue( "/Windows/OracleSourceSelect/geometry", saveGeometry() );
447-
settings.setValue( "/Windows/OracleSourceSelect/HoldDialogOpen", mHoldDialogOpen->isChecked() );
446+
settings.setValue( QStringLiteral( "/Windows/OracleSourceSelect/geometry" ), saveGeometry() );
447+
settings.setValue( QStringLiteral( "/Windows/OracleSourceSelect/HoldDialogOpen" ), mHoldDialogOpen->isChecked() );
448448

449449
for ( int i = 0; i < mTableModel.columnCount(); i++ )
450450
{
451-
settings.setValue( QString( "/Windows/OracleSourceSelect/columnWidths/%1" ).arg( i ), mTablesTreeView->columnWidth( i ) );
451+
settings.setValue( QStringLiteral( "Windows/OracleSourceSelect/columnWidths/%1" ).arg( i ), mTablesTreeView->columnWidth( i ) );
452452
}
453453
}
454454

@@ -492,8 +492,8 @@ void QgsOracleSourceSelect::addTables()
492492
}
493493
else
494494
{
495-
emit addDatabaseLayers( mSelectedTables, "oracle" );
496-
if ( !mHoldDialogOpen->isChecked() && mWidgetMode == QgsProviderRegistry::WidgetMode::None )
495+
emit addDatabaseLayers( mSelectedTables, QStringLiteral( "oracle" ) );
496+
if ( !mHoldDialogOpen->isChecked() && widgetMode() == QgsProviderRegistry::WidgetMode::None )
497497
{
498498
accept();
499499
}
@@ -541,11 +541,6 @@ void QgsOracleSourceSelect::finishList()
541541
{
542542
QApplication::restoreOverrideCursor();
543543

544-
#if 0
545-
for ( int i = 0; i < QgsOracleTableModel::DbtmColumns; i++ )
546-
mTablesTreeView->resizeColumnToContents( i );
547-
#endif
548-
549544
mTablesTreeView->sortByColumn( QgsOracleTableModel::DbtmTable, Qt::AscendingOrder );
550545
mTablesTreeView->sortByColumn( QgsOracleTableModel::DbtmOwner, Qt::AscendingOrder );
551546
}

‎src/providers/postgres/qgspgsourceselect.cpp‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,14 @@ void QgsPgSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemMode
193193
}
194194
}
195195

196-
QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode )
197-
: QgsAbstractDataSourceWidget( parent, fl, widgetMode )
196+
QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode )
197+
: QgsAbstractDataSourceWidget( parent, fl, theWidgetMode )
198198
, mColumnTypeThread( nullptr )
199199
, mUseEstimatedMetadata( false )
200200
{
201201
setupUi( this );
202202

203-
if ( QgsAbstractDataSourceWidget::widgetMode() != QgsProviderRegistry::WidgetMode::None )
203+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::None )
204204
{
205205
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
206206
mHoldDialogOpen->hide();
@@ -217,7 +217,7 @@ QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsPr
217217
mBuildQueryButton->setToolTip( tr( "Set Filter" ) );
218218
mBuildQueryButton->setDisabled( true );
219219

220-
if ( QgsAbstractDataSourceWidget::widgetMode() != QgsProviderRegistry::WidgetMode::Manager )
220+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::Manager )
221221
{
222222
buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
223223
connect( mAddButton, &QAbstractButton::clicked, this, &QgsPgSourceSelect::addTables );
@@ -508,7 +508,7 @@ void QgsPgSourceSelect::addTables()
508508
else
509509
{
510510
emit addDatabaseLayers( mSelectedTables, QStringLiteral( "postgres" ) );
511-
if ( ! mHoldDialogOpen->isChecked() && QgsAbstractDataSourceWidget::widgetMode( ) == QgsProviderRegistry::WidgetMode::None )
511+
if ( !mHoldDialogOpen->isChecked() && widgetMode() == QgsProviderRegistry::WidgetMode::None )
512512
{
513513
accept();
514514
}
@@ -557,11 +557,6 @@ void QgsPgSourceSelect::finishList()
557557
{
558558
QApplication::restoreOverrideCursor();
559559

560-
#if 0
561-
for ( int i = 0; i < QgsPgTableModel::DbtmColumns; i++ )
562-
mTablesTreeView->resizeColumnToContents( i );
563-
#endif
564-
565560
mTablesTreeView->sortByColumn( QgsPgTableModel::DbtmTable, Qt::AscendingOrder );
566561
mTablesTreeView->sortByColumn( QgsPgTableModel::DbtmSchema, Qt::AscendingOrder );
567562
}

‎src/providers/spatialite/qgsspatialitesourceselect.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ email : a.furieri@lqt.it
4040
#define strcasecmp(a,b) stricmp(a,b)
4141
#endif
4242

43-
QgsSpatiaLiteSourceSelect::QgsSpatiaLiteSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode ):
44-
QgsAbstractDataSourceWidget( parent, fl, widgetMode )
43+
QgsSpatiaLiteSourceSelect::QgsSpatiaLiteSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode ):
44+
QgsAbstractDataSourceWidget( parent, fl, theWidgetMode )
4545
{
4646
setupUi( this );
4747

@@ -66,7 +66,7 @@ QgsSpatiaLiteSourceSelect::QgsSpatiaLiteSourceSelect( QWidget *parent, Qt::Windo
6666
connect( mBuildQueryButton, &QAbstractButton::clicked, this, &QgsSpatiaLiteSourceSelect::buildQuery );
6767
mBuildQueryButton->setEnabled( false );
6868

69-
if ( QgsAbstractDataSourceWidget::widgetMode() != QgsProviderRegistry::WidgetMode::None )
69+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::None )
7070
{
7171
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Close ) );
7272
mHoldDialogOpen->hide();
@@ -417,7 +417,7 @@ void QgsSpatiaLiteSourceSelect::addTables()
417417
else
418418
{
419419
emit addDatabaseLayers( m_selectedTables, QStringLiteral( "spatialite" ) );
420-
if ( QgsAbstractDataSourceWidget::widgetMode( ) == QgsProviderRegistry::WidgetMode::None && ! mHoldDialogOpen->isChecked() )
420+
if ( widgetMode() == QgsProviderRegistry::WidgetMode::None && ! mHoldDialogOpen->isChecked() )
421421
{
422422
accept();
423423
}

‎src/providers/virtual/qgsvirtuallayersourceselect.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ QgsVirtualLayerSourceSelect::QgsVirtualLayerSourceSelect( QWidget *parent, Qt::W
4444
{
4545
setupUi( this );
4646

47-
if ( QgsAbstractDataSourceWidget::widgetMode( ) != QgsProviderRegistry::WidgetMode::None )
47+
if ( widgetMode != QgsProviderRegistry::WidgetMode::None )
4848
{
4949
buttonBox->removeButton( buttonBox->button( QDialogButtonBox::Cancel ) );
5050
buttonBox->button( QDialogButtonBox::Ok )->setText( tr( "Add" ) );
@@ -70,7 +70,7 @@ QgsVirtualLayerSourceSelect::QgsVirtualLayerSourceSelect( QWidget *parent, Qt::W
7070
}
7171
// It needs to find the layertree view without relying on the parent
7272
// being the main window
73-
for ( const QWidget *widget : qApp->allWidgets( ) )
73+
for ( const QWidget *widget : qApp->allWidgets() )
7474
{
7575
if ( ! mTreeView )
7676
{
@@ -137,7 +137,7 @@ void QgsVirtualLayerSourceSelect::onLayerComboChanged( int idx )
137137
}
138138

139139
// Clear embedded layers table
140-
mLayersTable->model()->removeRows( 0, mLayersTable->model()->rowCount( ) );
140+
mLayersTable->model()->removeRows( 0, mLayersTable->model()->rowCount() );
141141
// Add embedded layers
142142
Q_FOREACH ( const QgsVirtualLayerDefinition::SourceLayer &l, def.sourceLayers() )
143143
{
@@ -380,9 +380,9 @@ void QgsVirtualLayerSourceSelect::on_buttonBox_accepted()
380380
{
381381
emit addVectorLayer( def.toString(), layerName, QStringLiteral( "virtual" ) );
382382
}
383-
if ( QgsAbstractDataSourceWidget::widgetMode( ) == QgsProviderRegistry::WidgetMode::None )
383+
if ( widgetMode() == QgsProviderRegistry::WidgetMode::None )
384384
{
385-
accept( );
385+
accept();
386386
}
387387
}
388388

‎src/providers/wfs/qgswfssourceselect.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ enum
4848
MODEL_IDX_SQL
4949
};
5050

51-
QgsWFSSourceSelect::QgsWFSSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode )
52-
: QgsAbstractDataSourceWidget( parent, fl, widgetMode )
51+
QgsWFSSourceSelect::QgsWFSSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode )
52+
: QgsAbstractDataSourceWidget( parent, fl, theWidgetMode )
5353
, mCapabilities( nullptr )
5454
, mSQLComposerDialog( nullptr )
5555
{
5656
setupUi( this );
5757

58-
if ( QgsAbstractDataSourceWidget::widgetMode( ) != QgsProviderRegistry::WidgetMode::None )
58+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::None )
5959
{
6060
// For some obscure reason hiding does not work!
6161
// buttonBox->button( QDialogButtonBox::Close )->hide();
@@ -408,7 +408,7 @@ void QgsWFSSourceSelect::addLayer()
408408
emit addVectorLayer( mUri, layerName );
409409
}
410410

411-
if ( ! mHoldDialogOpen->isChecked() && QgsAbstractDataSourceWidget::widgetMode( ) == QgsProviderRegistry::WidgetMode::None )
411+
if ( ! mHoldDialogOpen->isChecked() && widgetMode() == QgsProviderRegistry::WidgetMode::None )
412412
{
413413
accept();
414414
}

‎src/providers/wms/qgswmssourceselect.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,14 @@
5454
#include <QNetworkRequest>
5555
#include <QNetworkReply>
5656

57-
QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode )
58-
: QgsAbstractDataSourceWidget( parent, fl, widgetMode )
57+
QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode )
58+
: QgsAbstractDataSourceWidget( parent, fl, theWidgetMode )
5959
, mDefaultCRS( GEO_EPSG_CRS_AUTHID )
6060
, mCurrentTileset( nullptr )
6161
{
6262
setupUi( this );
6363

64-
if ( QgsAbstractDataSourceWidget::widgetMode() != QgsProviderRegistry::WidgetMode::None )
64+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::None )
6565
{
6666
// For some obscure reason hiding does not work!
6767
// buttonBox->button( QDialogButtonBox::Close )->hide();
@@ -80,7 +80,7 @@ QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget *parent, Qt::WindowFlags fl, Qgs
8080

8181
mImageFormatGroup = new QButtonGroup;
8282

83-
if ( QgsAbstractDataSourceWidget::widgetMode( ) != QgsProviderRegistry::WidgetMode::Manager )
83+
if ( widgetMode() != QgsProviderRegistry::WidgetMode::Manager )
8484
{
8585
buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
8686
connect( mAddButton, &QAbstractButton::clicked, this, &QgsWMSSourceSelect::addClicked );
@@ -155,11 +155,11 @@ QgsWMSSourceSelect::~QgsWMSSourceSelect()
155155
settings.setValue( QStringLiteral( "Windows/WMSSourceSelect/geometry" ), saveGeometry() );
156156
}
157157

158-
void QgsWMSSourceSelect::refresh( )
158+
void QgsWMSSourceSelect::refresh()
159159
{
160160
// Reload WMS connections and update the GUI
161161
QgsDebugMsg( "Refreshing WMS connections ..." );
162-
populateConnectionList( );
162+
populateConnectionList();
163163
}
164164

165165

0 commit comments

Comments
 (0)
Please sign in to comment.