Skip to content
Permalink
Browse files
No more old style connects in providers
  • Loading branch information
nyalldawson committed Apr 3, 2017
1 parent c8e4e68 commit 620a8394c9029ebc306271a33b238f55717171a5
Showing with 284 additions and 282 deletions.
  1. +1 −1 src/gui/qgscolorbutton.cpp
  2. +4 −4 src/providers/arcgisrest/qgsafsdataitems.cpp
  3. +4 −4 src/providers/arcgisrest/qgsamsdataitems.cpp
  4. +5 −5 src/providers/arcgisrest/qgsamsprovider.cpp
  5. +5 −5 src/providers/arcgisrest/qgsarcgisrestutils.cpp
  6. +4 −4 src/providers/db2/qgsdb2dataitems.cpp
  7. +9 −9 src/providers/db2/qgsdb2sourceselect.cpp
  8. +1 −1 src/providers/delimitedtext/qgsdelimitedtextfile.cpp
  9. +1 −1 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  10. +35 −35 src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp
  11. +2 −2 src/providers/grass/qgsgrass.cpp
  12. +2 −2 src/providers/grass/qgsgrassfeatureiterator.cpp
  13. +3 −3 src/providers/grass/qgsgrassimport.cpp
  14. +6 −6 src/providers/grass/qgsgrassoptions.cpp
  15. +15 −14 src/providers/grass/qgsgrassprovider.cpp
  16. +5 −5 src/providers/grass/qgsgrassprovidermodule.cpp
  17. +10 −10 src/providers/mssql/qgsmssqldataitems.cpp
  18. +9 −9 src/providers/mssql/qgsmssqlsourceselect.cpp
  19. +2 −2 src/providers/ows/qgsowsdataitems.cpp
  20. +11 −11 src/providers/postgres/qgspgsourceselect.cpp
  21. +12 −12 src/providers/postgres/qgspostgresdataitems.cpp
  22. +5 −5 src/providers/spatialite/qgsspatialitedataitems.cpp
  23. +4 −4 src/providers/spatialite/qgsspatialitesourceselect.cpp
  24. +1 −1 src/providers/virtual/qgsslottofunction.h
  25. +3 −3 src/providers/virtual/qgsvirtuallayerprovider.cpp
  26. +7 −7 src/providers/virtual/qgsvirtuallayersourceselect.cpp
  27. +1 −1 src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
  28. +7 −7 src/providers/wcs/qgswcscapabilities.cpp
  29. +4 −4 src/providers/wcs/qgswcsdataitems.cpp
  30. +7 −7 src/providers/wcs/qgswcsprovider.cpp
  31. +1 −1 src/providers/wfs/qgswfscapabilities.cpp
  32. +4 −4 src/providers/wfs/qgswfsdataitems.cpp
  33. +22 −22 src/providers/wfs/qgswfsfeatureiterator.cpp
  34. +1 −1 src/providers/wfs/qgswfsfeatureiterator.h
  35. +4 −4 src/providers/wfs/qgswfsprovider.cpp
  36. +9 −9 src/providers/wfs/qgswfsrequest.cpp
  37. +1 −1 src/providers/wfs/qgswfsshareddata.cpp
  38. +19 −19 src/providers/wfs/qgswfssourceselect.cpp
  39. +1 −1 src/providers/wfs/qgswfsutils.cpp
  40. +6 −5 src/providers/wms/qgstilescalewidget.cpp
  41. +5 −5 src/providers/wms/qgswmscapabilities.cpp
  42. +6 −6 src/providers/wms/qgswmsdataitems.cpp
  43. +17 −17 src/providers/wms/qgswmsprovider.cpp
  44. +3 −3 src/providers/wms/qgswmssourceselect.cpp
@@ -59,7 +59,7 @@ QgsColorButton::QgsColorButton( QWidget *parent, const QString &cdt, QgsColorSch

setAcceptDrops( true );
setMinimumSize( QSize( 24, 16 ) );
connect( this, SIGNAL( clicked() ), this, SLOT( buttonClicked() ) );
connect( this, &QAbstractButton::clicked, this, &QgsColorButton::buttonClicked );

//setup dropdown menu
mMenu = new QMenu( this );
@@ -49,14 +49,14 @@ QVector<QgsDataItem *> QgsAfsRootItem::createChildren()
QList<QAction *> QgsAfsRootItem::actions()
{
QAction *actionNew = new QAction( tr( "New Connection..." ), this );
connect( actionNew, SIGNAL( triggered() ), this, SLOT( newConnection() ) );
connect( actionNew, &QAction::triggered, this, &QgsAfsRootItem::newConnection );
return QList<QAction *>() << actionNew;
}

QWidget *QgsAfsRootItem::paramWidget()
{
QgsAfsSourceSelect *select = new QgsAfsSourceSelect( 0, 0, true );
connect( select, SIGNAL( connectionsChanged() ), this, SLOT( connectionsChanged() ) );
connect( select, &QgsSourceSelectDialog::connectionsChanged, this, &QgsAfsRootItem::connectionsChanged );
return select;
}

@@ -118,11 +118,11 @@ QList<QAction *> QgsAfsConnectionItem::actions()
QList<QAction *> lst;

QAction *actionEdit = new QAction( tr( "Edit..." ), this );
connect( actionEdit, SIGNAL( triggered() ), this, SLOT( editConnection() ) );
connect( actionEdit, &QAction::triggered, this, &QgsAfsConnectionItem::editConnection );
lst.append( actionEdit );

QAction *actionDelete = new QAction( tr( "Delete" ), this );
connect( actionDelete, SIGNAL( triggered() ), this, SLOT( deleteConnection() ) );
connect( actionDelete, &QAction::triggered, this, &QgsAfsConnectionItem::deleteConnection );
lst.append( actionDelete );

return lst;
@@ -46,15 +46,15 @@ QVector<QgsDataItem *> QgsAmsRootItem::createChildren()
QList<QAction *> QgsAmsRootItem::actions()
{
QAction *actionNew = new QAction( tr( "New Connection..." ), this );
connect( actionNew, SIGNAL( triggered() ), this, SLOT( newConnection() ) );
connect( actionNew, &QAction::triggered, this, &QgsAmsRootItem::newConnection );
return QList<QAction *>() << actionNew;
}


QWidget *QgsAmsRootItem::paramWidget()
{
QgsAmsSourceSelect *select = new QgsAmsSourceSelect( 0, 0, true );
connect( select, SIGNAL( connectionsChanged() ), this, SLOT( connectionsChanged() ) );
connect( select, &QgsSourceSelectDialog::connectionsChanged, this, &QgsAmsRootItem::connectionsChanged );
return select;
}

@@ -134,11 +134,11 @@ QList<QAction *> QgsAmsConnectionItem::actions()
QList<QAction *> lst;

QAction *actionEdit = new QAction( tr( "Edit..." ), this );
connect( actionEdit, SIGNAL( triggered() ), this, SLOT( editConnection() ) );
connect( actionEdit, &QAction::triggered, this, &QgsAmsConnectionItem::editConnection );
lst.append( actionEdit );

QAction *actionDelete = new QAction( tr( "Delete" ), this );
connect( actionDelete, SIGNAL( triggered() ), this, SLOT( deleteConnection() ) );
connect( actionDelete, &QAction::triggered, this, &QgsAmsConnectionItem::deleteConnection );
lst.append( actionDelete );

return lst;
@@ -36,8 +36,8 @@ QgsAmsLegendFetcher::QgsAmsLegendFetcher( QgsAmsProvider *provider )
: QgsImageFetcher( provider ), mProvider( provider )
{
mQuery = new QgsArcGisAsyncQuery( this );
connect( mQuery, SIGNAL( finished() ), this, SLOT( handleFinished() ) );
connect( mQuery, SIGNAL( failed( QString, QString ) ), this, SLOT( handleError( QString, QString ) ) );
connect( mQuery, &QgsArcGisAsyncQuery::finished, this, &QgsAmsLegendFetcher::handleFinished );
connect( mQuery, &QgsArcGisAsyncQuery::failed, this, &QgsAmsLegendFetcher::handleError );
}

void QgsAmsLegendFetcher::start()
@@ -307,7 +307,7 @@ void QgsAmsProvider::draw( const QgsRectangle &viewExtent, int pixelWidth, int p
}
QgsArcGisAsyncParallelQuery query;
QEventLoop evLoop;
connect( &query, SIGNAL( finished( QStringList ) ), &evLoop, SLOT( quit() ) );
connect( &query, &QgsArcGisAsyncParallelQuery::finished, &evLoop, &QEventLoop::quit );
query.start( queries, &results, true );
evLoop.exec( QEventLoop::ExcludeUserInputEvents );

@@ -353,8 +353,8 @@ QImage QgsAmsProvider::getLegendGraphic( double /*scale*/, bool forceRefresh, co
return mLegendFetcher->getImage();
}
QEventLoop evLoop;
connect( mLegendFetcher, SIGNAL( finish( QImage ) ), &evLoop, SLOT( quit() ) );
connect( mLegendFetcher, SIGNAL( error( QString ) ), &evLoop, SLOT( quit() ) );
connect( mLegendFetcher, &QgsImageFetcher::finish, &evLoop, &QEventLoop::quit );
connect( mLegendFetcher, &QgsImageFetcher::error, &evLoop, &QEventLoop::quit );
mLegendFetcher->start();
evLoop.exec( QEventLoop::ExcludeUserInputEvents );
if ( !mLegendFetcher->errorTitle().isEmpty() )
@@ -427,7 +427,7 @@ QByteArray QgsArcGisRestUtils::queryService( const QUrl &url, QString &errorTitl
while ( true )
{
reply = nam->get( request );
QObject::connect( reply, SIGNAL( finished() ), &loop, SLOT( quit() ) );
QObject::connect( reply, &QNetworkReply::finished, &loop, &QEventLoop::quit );

loop.exec( QEventLoop::ExcludeUserInputEvents );

@@ -502,7 +502,7 @@ void QgsArcGisAsyncQuery::start( const QUrl &url, QByteArray *result, bool allow
request.setAttribute( QNetworkRequest::CacheSaveControlAttribute, true );
}
mReply = QgsNetworkAccessManager::instance()->get( request );
connect( mReply, SIGNAL( finished() ), this, SLOT( handleReply() ) );
connect( mReply, &QNetworkReply::finished, this, &QgsArcGisAsyncQuery::handleReply );
}

void QgsArcGisAsyncQuery::handleReply()
@@ -524,7 +524,7 @@ void QgsArcGisAsyncQuery::handleReply()
QgsDebugMsg( "redirecting to " + redirect.toUrl().toString() );
request.setUrl( redirect.toUrl() );
mReply = QgsNetworkAccessManager::instance()->get( request );
connect( mReply, SIGNAL( finished() ), this, SLOT( handleReply() ) );
connect( mReply, &QNetworkReply::finished, this, &QgsArcGisAsyncQuery::handleReply );
return;
}

@@ -559,7 +559,7 @@ void QgsArcGisAsyncParallelQuery::start( const QVector<QUrl> &urls, QVector<QByt
}
QNetworkReply *reply = QgsNetworkAccessManager::instance()->get( request );
reply->setProperty( "idx", i );
connect( reply, SIGNAL( finished() ), this, SLOT( handleReply() ) );
connect( reply, &QNetworkReply::finished, this, &QgsArcGisAsyncParallelQuery::handleReply );
}
}

@@ -583,7 +583,7 @@ void QgsArcGisAsyncParallelQuery::handleReply()
request.setUrl( redirect.toUrl() );
reply = QgsNetworkAccessManager::instance()->get( request );
reply->setProperty( "idx", idx );
connect( reply, SIGNAL( finished() ), this, SLOT( handleReply() ) );
connect( reply, &QNetworkReply::finished, this, &QgsArcGisAsyncParallelQuery::handleReply );
}
else
{
@@ -248,15 +248,15 @@ QList<QAction *> QgsDb2ConnectionItem::actions()
QList<QAction *> lst;

QAction *actionRefresh = new QAction( tr( "Refresh connection" ), this );
connect( actionRefresh, SIGNAL( triggered() ), this, SLOT( refreshConnection() ) );
connect( actionRefresh, &QAction::triggered, this, &QgsDb2ConnectionItem::refreshConnection );
lst.append( actionRefresh );

QAction *actionEdit = new QAction( tr( "Edit connection..." ), this );
connect( actionEdit, SIGNAL( triggered() ), this, SLOT( editConnection() ) );
connect( actionEdit, &QAction::triggered, this, &QgsDb2ConnectionItem::editConnection );
lst.append( actionEdit );

QAction *actionDelete = new QAction( tr( "Delete connection" ), this );
connect( actionDelete, SIGNAL( triggered() ), this, SLOT( deleteConnection() ) );
connect( actionDelete, &QAction::triggered, this, &QgsDb2ConnectionItem::deleteConnection );
lst.append( actionDelete );

return lst;
@@ -443,7 +443,7 @@ QList<QAction *> QgsDb2RootItem::actions()
QList<QAction *> actionList;

QAction *action = new QAction( tr( "New Connection..." ), this );
connect( action, SIGNAL( triggered() ), this, SLOT( newConnection() ) );
connect( action, &QAction::triggered, this, &QgsDb2RootItem::newConnection );
actionList.append( action );
QgsDebugMsg( "DB2: Browser Panel; New Connection option added." );

@@ -142,10 +142,10 @@ QgsDb2SourceSelect::QgsDb2SourceSelect( QWidget *parent, Qt::WindowFlags fl, boo
if ( !mManagerMode )
{
buttonBox->addButton( mAddButton, QDialogButtonBox::ActionRole );
connect( mAddButton, SIGNAL( clicked() ), this, SLOT( addTables() ) );
connect( mAddButton, &QAbstractButton::clicked, this, &QgsDb2SourceSelect::addTables );

buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole );
connect( mBuildQueryButton, SIGNAL( clicked() ), this, SLOT( buildQuery() ) );
connect( mBuildQueryButton, &QAbstractButton::clicked, this, &QgsDb2SourceSelect::buildQuery );
}

populateConnectionList();
@@ -172,7 +172,7 @@ QgsDb2SourceSelect::QgsDb2SourceSelect( QWidget *parent, Qt::WindowFlags fl, boo
mTablesTreeView->setEditTriggers( QAbstractItemView::CurrentChanged );
mTablesTreeView->setItemDelegate( new QgsDb2SourceSelectDelegate( this ) );

connect( mTablesTreeView->selectionModel(), SIGNAL( selectionChanged( const QItemSelection &, const QItemSelection & ) ), this, SLOT( treeWidgetSelectionChanged( const QItemSelection &, const QItemSelection & ) ) );
connect( mTablesTreeView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &QgsDb2SourceSelect::treeWidgetSelectionChanged );

QgsSettings settings;
mTablesTreeView->setSelectionMode( settings.value( QStringLiteral( "qgis/addDb2DC" ), false ).toBool() ?
@@ -615,12 +615,12 @@ void QgsDb2SourceSelect::addSearchGeometryColumn( const QString &connectionName,
{
mColumnTypeThread = new QgsDb2GeomColumnTypeThread( connectionName, estimateMetadata );

connect( mColumnTypeThread, SIGNAL( setLayerType( QgsDb2LayerProperty ) ),
this, SLOT( setLayerType( QgsDb2LayerProperty ) ) );
connect( this, SIGNAL( addGeometryColumn( QgsDb2LayerProperty ) ),
mColumnTypeThread, SLOT( addGeometryColumn( QgsDb2LayerProperty ) ) );
connect( mColumnTypeThread, SIGNAL( finished() ),
this, SLOT( columnThreadFinished() ) );
connect( mColumnTypeThread, &QgsDb2GeomColumnTypeThread::setLayerType,
this, &QgsDb2SourceSelect::setLayerType );
connect( this, &QgsDb2SourceSelect::addGeometryColumn,
mColumnTypeThread, &QgsDb2GeomColumnTypeThread::addGeometryColumn );
connect( mColumnTypeThread, &QThread::finished,
this, &QgsDb2SourceSelect::columnThreadFinished );

}

@@ -114,7 +114,7 @@ bool QgsDelimitedTextFile::open()
{
mWatcher = new QFileSystemWatcher();
mWatcher->addPath( mFileName );
connect( mWatcher, SIGNAL( fileChanged( QString ) ), this, SLOT( updateFile() ) );
connect( mWatcher, &QFileSystemWatcher::fileChanged, this, &QgsDelimitedTextFile::updateFile );
}
}
}
@@ -703,7 +703,7 @@ void QgsDelimitedTextProvider::scanFile( bool buildIndexes )
mLayerValid = mValid;

// If it is valid, then watch for changes to the file
connect( mFile, SIGNAL( fileUpdated() ), this, SLOT( onFileUpdated() ) );
connect( mFile, &QgsDelimitedTextFile::fileUpdated, this, &QgsDelimitedTextProvider::onFileUpdated );


}
@@ -63,8 +63,8 @@ QgsDelimitedTextSourceSelect::QgsDelimitedTextSourceSelect( QWidget *parent, Qt:
bgGeomType->addButton( geomTypeWKT, swGeomType->indexOf( swpGeomWKT ) );
bgGeomType->addButton( geomTypeNone, swGeomType->indexOf( swpGeomNone ) );

connect( bgFileFormat, SIGNAL( buttonClicked( int ) ), swFileFormat, SLOT( setCurrentIndex( int ) ) );
connect( bgGeomType, SIGNAL( buttonClicked( int ) ), swGeomType, SLOT( setCurrentIndex( int ) ) );
connect( bgFileFormat, static_cast < void ( QButtonGroup::* )( int ) > ( &QButtonGroup::buttonClicked ), swFileFormat, &QStackedWidget::setCurrentIndex );
connect( bgGeomType, static_cast < void ( QButtonGroup::* )( int ) > ( &QButtonGroup::buttonClicked ), swGeomType, &QStackedWidget::setCurrentIndex );

cmbEncoding->clear();
cmbEncoding->addItems( QgsVectorDataProvider::availableEncodings() );
@@ -73,32 +73,32 @@ QgsDelimitedTextSourceSelect::QgsDelimitedTextSourceSelect( QWidget *parent, Qt:
loadSettings();
updateFieldsAndEnable();

connect( txtFilePath, SIGNAL( textChanged( QString ) ), this, SLOT( updateFileName() ) );
connect( txtLayerName, SIGNAL( textChanged( QString ) ), this, SLOT( enableAccept() ) );
connect( cmbEncoding, SIGNAL( currentIndexChanged( int ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( txtFilePath, &QLineEdit::textChanged, this, &QgsDelimitedTextSourceSelect::updateFileName );
connect( txtLayerName, &QLineEdit::textChanged, this, &QgsDelimitedTextSourceSelect::enableAccept );
connect( cmbEncoding, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );

connect( delimiterCSV, SIGNAL( toggled( bool ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( delimiterChars, SIGNAL( toggled( bool ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( delimiterRegexp, SIGNAL( toggled( bool ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( delimiterCSV, &QAbstractButton::toggled, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( delimiterChars, &QAbstractButton::toggled, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( delimiterRegexp, &QAbstractButton::toggled, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );

connect( cbxDelimComma, SIGNAL( stateChanged( int ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( cbxDelimSpace, SIGNAL( stateChanged( int ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( cbxDelimTab, SIGNAL( stateChanged( int ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( cbxDelimSemicolon, SIGNAL( stateChanged( int ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( cbxDelimColon, SIGNAL( stateChanged( int ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( cbxDelimComma, &QCheckBox::stateChanged, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( cbxDelimSpace, &QCheckBox::stateChanged, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( cbxDelimTab, &QCheckBox::stateChanged, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( cbxDelimSemicolon, &QCheckBox::stateChanged, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( cbxDelimColon, &QCheckBox::stateChanged, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );

connect( txtDelimiterOther, SIGNAL( textChanged( QString ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( txtQuoteChars, SIGNAL( textChanged( QString ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( txtEscapeChars, SIGNAL( textChanged( QString ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( txtDelimiterRegexp, SIGNAL( textChanged( QString ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( txtDelimiterOther, &QLineEdit::textChanged, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( txtQuoteChars, &QLineEdit::textChanged, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( txtEscapeChars, &QLineEdit::textChanged, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( txtDelimiterRegexp, &QLineEdit::textChanged, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );

connect( rowCounter, SIGNAL( valueChanged( int ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( cbxUseHeader, SIGNAL( stateChanged( int ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( cbxSkipEmptyFields, SIGNAL( stateChanged( int ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( cbxTrimFields, SIGNAL( stateChanged( int ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( rowCounter, static_cast < void ( QSpinBox::* )( int ) > ( &QSpinBox::valueChanged ), this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( cbxUseHeader, &QCheckBox::stateChanged, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( cbxSkipEmptyFields, &QCheckBox::stateChanged, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( cbxTrimFields, &QCheckBox::stateChanged, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );

connect( cbxPointIsComma, SIGNAL( toggled( bool ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( cbxXyDms, SIGNAL( toggled( bool ) ), this, SLOT( updateFieldsAndEnable() ) );
connect( cbxPointIsComma, &QAbstractButton::toggled, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
connect( cbxXyDms, &QAbstractButton::toggled, this, &QgsDelimitedTextSourceSelect::updateFieldsAndEnable );
}

QgsDelimitedTextSourceSelect::~QgsDelimitedTextSourceSelect()
@@ -378,12 +378,12 @@ void QgsDelimitedTextSourceSelect::updateFieldLists()
// Update the x and y field dropdown boxes
QgsDebugMsg( "Updating field lists" );

disconnect( cmbXField, SIGNAL( currentIndexChanged( int ) ), this, SLOT( enableAccept() ) );
disconnect( cmbYField, SIGNAL( currentIndexChanged( int ) ), this, SLOT( enableAccept() ) );
disconnect( cmbWktField, SIGNAL( currentIndexChanged( int ) ), this, SLOT( enableAccept() ) );
disconnect( geomTypeXY, SIGNAL( toggled( bool ) ), this, SLOT( enableAccept() ) );
disconnect( geomTypeWKT, SIGNAL( toggled( bool ) ), this, SLOT( enableAccept() ) );
disconnect( geomTypeNone, SIGNAL( toggled( bool ) ), this, SLOT( enableAccept() ) );
disconnect( cmbXField, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsDelimitedTextSourceSelect::enableAccept );
disconnect( cmbYField, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsDelimitedTextSourceSelect::enableAccept );
disconnect( cmbWktField, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsDelimitedTextSourceSelect::enableAccept );
disconnect( geomTypeXY, &QAbstractButton::toggled, this, &QgsDelimitedTextSourceSelect::enableAccept );
disconnect( geomTypeWKT, &QAbstractButton::toggled, this, &QgsDelimitedTextSourceSelect::enableAccept );
disconnect( geomTypeNone, &QAbstractButton::toggled, this, &QgsDelimitedTextSourceSelect::enableAccept );

QString columnX = cmbXField->currentText();
QString columnY = cmbYField->currentText();
@@ -557,12 +557,12 @@ void QgsDelimitedTextSourceSelect::updateFieldLists()

if ( haveFields )
{
connect( cmbXField, SIGNAL( currentIndexChanged( int ) ), this, SLOT( enableAccept() ) );
connect( cmbYField, SIGNAL( currentIndexChanged( int ) ), this, SLOT( enableAccept() ) );
connect( cmbWktField, SIGNAL( currentIndexChanged( int ) ), this, SLOT( enableAccept() ) );
connect( geomTypeXY, SIGNAL( toggled( bool ) ), this, SLOT( enableAccept() ) );
connect( geomTypeWKT, SIGNAL( toggled( bool ) ), this, SLOT( enableAccept() ) );
connect( geomTypeNone, SIGNAL( toggled( bool ) ), this, SLOT( enableAccept() ) );
connect( cmbXField, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsDelimitedTextSourceSelect::enableAccept );
connect( cmbYField, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsDelimitedTextSourceSelect::enableAccept );
connect( cmbWktField, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsDelimitedTextSourceSelect::enableAccept );
connect( geomTypeXY, &QAbstractButton::toggled, this, &QgsDelimitedTextSourceSelect::enableAccept );
connect( geomTypeWKT, &QAbstractButton::toggled, this, &QgsDelimitedTextSourceSelect::enableAccept );
connect( geomTypeNone, &QAbstractButton::toggled, this, &QgsDelimitedTextSourceSelect::enableAccept );
}

}
Loading

0 comments on commit 620a839

Please sign in to comment.