Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix various clazy warnings
  • Loading branch information
nyalldawson committed Jun 7, 2019
1 parent 1b5fb70 commit 861c511
Show file tree
Hide file tree
Showing 69 changed files with 96 additions and 115 deletions.
2 changes: 1 addition & 1 deletion python/3d/auto_generated/qgsrulebased3drenderer.sip.in
Expand Up @@ -60,7 +60,7 @@ Similar to rule-based 2D renderer and rule-based labeling, it allows specificati
public:

typedef QList<QgsRuleBased3DRenderer::Rule *> RuleList;
typedef QMap<const QgsRuleBased3DRenderer::Rule *, QgsFeature3DHandler *> RuleToHandlerMap;
typedef QHash<const QgsRuleBased3DRenderer::Rule *, QgsFeature3DHandler *> RuleToHandlerMap;

class Rule
{
Expand Down
2 changes: 1 addition & 1 deletion src/3d/qgsrulebased3drenderer.cpp
Expand Up @@ -442,7 +442,7 @@ Qt3DCore::QEntity *QgsRuleBased3DRenderer::createEntity( const Qgs3DMapSettings
for ( QgsFeature3DHandler *handler : handlers.values() )
handler->finalize( entity, context );

qDeleteAll( handlers.values() );
qDeleteAll( handlers );

return entity;

Expand Down
2 changes: 1 addition & 1 deletion src/3d/qgsrulebased3drenderer.h
Expand Up @@ -64,7 +64,7 @@ class _3D_EXPORT QgsRuleBased3DRenderer : public QgsAbstract3DRenderer

class Rule;
typedef QList<QgsRuleBased3DRenderer::Rule *> RuleList;
typedef QMap<const QgsRuleBased3DRenderer::Rule *, QgsFeature3DHandler *> RuleToHandlerMap;
typedef QHash<const QgsRuleBased3DRenderer::Rule *, QgsFeature3DHandler *> RuleToHandlerMap;

/**
* \ingroup 3d
Expand Down
1 change: 0 additions & 1 deletion src/analysis/mesh/qgsmeshcalcutils.cpp
Expand Up @@ -248,7 +248,6 @@ void QgsMeshCalcUtils::populateMaskFilter( QgsMeshMemoryDatasetGroup &filter, co
std::shared_ptr<QgsMeshMemoryDataset> output = create( filter );
output->time = mTimes[0];

const QVector<int> trianglesToNativeFaces = triangularMesh()->trianglesToNativeFaces();
const QVector<QgsMeshVertex> &vertices = triangularMesh()->vertices();

if ( mOutputType == QgsMeshDatasetGroupMetadata::DataOnVertices )
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/raster/qgsrastercalculator.cpp
Expand Up @@ -473,7 +473,7 @@ QgsRasterCalculator::Result QgsRasterCalculator::processCalculationGPU( std::uni
inputDesc.append( QStringLiteral( " // %1 = %2" ).arg( ref.varName ).arg( ref.name ) );
}
programTemplate = programTemplate.replace( QStringLiteral( "##INPUT_DESC##" ), inputDesc.join( '\n' ) );
programTemplate = programTemplate.replace( QStringLiteral( "##INPUT##" ), inputArgs.length() ? ( inputArgs.join( ',' ).append( ',' ) ) : QChar( ' ' ) );
programTemplate = programTemplate.replace( QStringLiteral( "##INPUT##" ), !inputArgs.isEmpty() ? ( inputArgs.join( ',' ).append( ',' ) ) : QChar( ' ' ) );
programTemplate = programTemplate.replace( QStringLiteral( "##EXPRESSION##" ), cExpression );
programTemplate = programTemplate.replace( QStringLiteral( "##EXPRESSION_ORIGINAL##" ), calcNode->toString( ) );

Expand Down
3 changes: 0 additions & 3 deletions src/app/3d/qgsrulebased3drendererwidget.h
Expand Up @@ -93,9 +93,6 @@ class QgsRuleBased3DRendererWidget : public QgsPanelWidget, private Ui::QgsRuleB
//! no transfer of ownership
QgsRuleBased3DRenderer::Rule *rootRule() { return mRootRule; }

signals:
void widgetChanged();

protected slots:
void addRule();
void editRule();
Expand Down
2 changes: 1 addition & 1 deletion src/app/decorations/qgsdecorationscalebar.cpp
Expand Up @@ -187,7 +187,7 @@ void QgsDecorationScaleBar::render( const QgsMapSettings &mapSettings, QgsRender
double scaleBarUnitsPerPixel = std::fabs( context.mapToPixel().mapUnitsPerPixel() );

// Exit if the canvas width is 0 or layercount is 0 or QGIS will freeze
if ( !mapSettings.layers().count() || !deviceWidth || !scaleBarUnitsPerPixel )
if ( mapSettings.layers().isEmpty() || !deviceWidth || !scaleBarUnitsPerPixel )
return;

double unitsPerSegment = mPreferredSize;
Expand Down
1 change: 0 additions & 1 deletion src/app/mesh/qgsmeshcalculatordialog.cpp
Expand Up @@ -409,7 +409,6 @@ void QgsMeshCalculatorDialog::getDatasetGroupNames()

bool QgsMeshCalculatorDialog::expressionValid() const
{
QString errorString;
QgsMeshCalculator::Result result = QgsMeshCalculator::expression_valid(
formulaString(),
meshLayer()
Expand Down
1 change: 1 addition & 0 deletions src/app/mesh/qgsmeshdatasetgrouptreeview.h
Expand Up @@ -133,6 +133,7 @@ class APP_NO_EXPORT QgsMeshDatasetGroupTreeModel : public QAbstractItemModel
*/
class APP_EXPORT QgsMeshDatasetGroupTreeItemDelagate: public QStyledItemDelegate
{
Q_OBJECT
public:
QgsMeshDatasetGroupTreeItemDelagate( QObject *parent = Q_NULLPTR );

Expand Down
3 changes: 2 additions & 1 deletion src/app/mesh/qgsmeshrendereractivedatasetwidget.cpp
Expand Up @@ -293,7 +293,8 @@ QString QgsMeshRendererActiveDatasetWidget::metadata( QgsMeshDatasetIndex datase
.arg( tr( "Is vector" ) )
.arg( gmeta.isVector() ? tr( "Yes" ) : tr( "No" ) );

for ( auto it = gmeta.extraOptions().constBegin(); it != gmeta.extraOptions().constEnd(); ++it )
const auto options = gmeta.extraOptions();
for ( auto it = options.constBegin(); it != options.constEnd(); ++it )
{
msg += QStringLiteral( "<tr><td>%1</td><td>%2</td></tr>" ).arg( it.key() ).arg( it.value() );
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
Expand Up @@ -14492,7 +14492,7 @@ void QgisApp::populateProjectStorageMenu( QMenu *menu, bool saving )
}
}
const QString filePath = templateDirName + QDir::separator() + templateName + QStringLiteral( ".qgz" );
if ( QFileInfo( filePath ).exists() )
if ( QFileInfo::exists( filePath ) )
{
QMessageBox msgBox( this );
msgBox.setWindowTitle( tr( "Overwrite template" ) );
Expand Down
2 changes: 2 additions & 0 deletions src/app/qgsappbrowserproviders.h
Expand Up @@ -200,6 +200,7 @@ class QgsStyleXmlDropHandler : public QgsCustomDropHandler
*/
class APP_EXPORT QgsProjectRootDataItem : public QgsProjectItem
{
Q_OBJECT
public:

/**
Expand All @@ -215,6 +216,7 @@ class APP_EXPORT QgsProjectRootDataItem : public QgsProjectItem
*/
class APP_EXPORT QgsProjectLayerTreeGroupItem : public QgsDataCollectionItem
{
Q_OBJECT
public:

/**
Expand Down
6 changes: 3 additions & 3 deletions src/app/qgsapplayertreeviewmenuprovider.cpp
Expand Up @@ -486,7 +486,7 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()
}
else if ( QgsLayerTreeModelLegendNode *node = mView->layerTreeModel()->index2legendNode( idx ) )
{
if ( QgsSymbolLegendNode *symbolNode = dynamic_cast< QgsSymbolLegendNode * >( node ) )
if ( QgsSymbolLegendNode *symbolNode = qobject_cast< QgsSymbolLegendNode * >( node ) )
{
// symbology item
if ( symbolNode->flags() & Qt::ItemIsUserCheckable )
Expand Down Expand Up @@ -774,7 +774,7 @@ void QgsAppLayerTreeViewMenuProvider::editSymbolLegendNodeSymbol()
QString layerId = action->property( "layerId" ).toString();
QString ruleKey = action->property( "ruleKey" ).toString();

QgsSymbolLegendNode *node = dynamic_cast<QgsSymbolLegendNode *>( mView->layerTreeModel()->findLegendNode( layerId, ruleKey ) );
QgsSymbolLegendNode *node = qobject_cast<QgsSymbolLegendNode *>( mView->layerTreeModel()->findLegendNode( layerId, ruleKey ) );
if ( !node )
return;

Expand Down Expand Up @@ -809,7 +809,7 @@ void QgsAppLayerTreeViewMenuProvider::setSymbolLegendNodeColor( const QColor &co
QString layerId = action->property( "layerId" ).toString();
QString ruleKey = action->property( "ruleKey" ).toString();

QgsSymbolLegendNode *node = dynamic_cast<QgsSymbolLegendNode *>( mView->layerTreeModel()->findLegendNode( layerId, ruleKey ) );
QgsSymbolLegendNode *node = qobject_cast<QgsSymbolLegendNode *>( mView->layerTreeModel()->findLegendNode( layerId, ruleKey ) );
if ( !node )
return;

Expand Down
3 changes: 1 addition & 2 deletions src/app/qgsappscreenshots.cpp
Expand Up @@ -129,7 +129,6 @@ QPixmap QgsAppScreenShots::takeScreenshot( QWidget *widget, GrabMode mode, QRect
linearGrad.setColorAt( 1, Qt::white );

// create image and fill it with gradient
QImage image( pixmap.width(), pixmap.height(), QImage::Format_ARGB32 );
QPainter painter( &img );
painter.fillRect( img.rect(), linearGrad );
pixmap = QPixmap::fromImage( img );
Expand Down Expand Up @@ -283,7 +282,7 @@ void QgsAppScreenShots::takeVectorLayerProperties25DSymbol()
Q_ASSERT( idx >= 0 );
dlg->mRendererDialog->cboRenderers->setCurrentIndex( idx );
QCoreApplication::processEvents();
Qgs25DRendererWidget *w = dynamic_cast<Qgs25DRendererWidget *>( dlg->mRendererDialog->mActiveWidget );
Qgs25DRendererWidget *w = qobject_cast<Qgs25DRendererWidget *>( dlg->mRendererDialog->mActiveWidget );
w->mHeightWidget->setField( QStringLiteral( "height" ) );
Q_ASSERT( w->mHeightWidget->expression() == QLatin1String( "\"height\"" ) );
QCoreApplication::processEvents();
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsbookmarks.cpp
Expand Up @@ -757,7 +757,7 @@ bool QgsMergedBookmarksTableModel::projectAvailable() const
void QgsMergedBookmarksTableModel::moveBookmark( QAbstractTableModel &modelFrom, QAbstractTableModel &modelTo, int row )
{
beginResetModel();
QSqlTableModel *qgisModel = dynamic_cast<QSqlTableModel *>( &modelTo );
QSqlTableModel *qgisModel = qobject_cast<QSqlTableModel *>( &modelTo );
if ( !qgisModel )
{
modelTo.insertRow( -1 );
Expand All @@ -768,7 +768,7 @@ void QgsMergedBookmarksTableModel::moveBookmark( QAbstractTableModel &modelFrom,
modelTo.index( modelTo.rowCount() - 1, column ),
modelFrom.data( modelFrom.index( row, column ) ) );
}
qgisModel = dynamic_cast<QSqlTableModel *>( &modelFrom );
qgisModel = qobject_cast<QSqlTableModel *>( &modelFrom );
Q_ASSERT( qgisModel );
qgisModel->removeRows( row, 1 );
qgisModel->select();
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsdxfexportdialog.cpp
Expand Up @@ -61,7 +61,7 @@ QWidget *FieldSelectorDelegate::createEditor( QWidget *parent, const QStyleOptio

void FieldSelectorDelegate::setEditorData( QWidget *editor, const QModelIndex &index ) const
{
const QgsVectorLayerAndAttributeModel *m = dynamic_cast< const QgsVectorLayerAndAttributeModel *>( index.model() );
const QgsVectorLayerAndAttributeModel *m = qobject_cast< const QgsVectorLayerAndAttributeModel *>( index.model() );
if ( !m )
return;

Expand Down Expand Up @@ -558,7 +558,7 @@ void QgsDxfExportDialog::deSelectAll()

QList< QgsDxfExport::DxfLayer > QgsDxfExportDialog::layers() const
{
const QgsVectorLayerAndAttributeModel *model = dynamic_cast< const QgsVectorLayerAndAttributeModel *>( mTreeView->model() );
const QgsVectorLayerAndAttributeModel *model = qobject_cast< const QgsVectorLayerAndAttributeModel *>( mTreeView->model() );
Q_ASSERT( model );
return model->layers();
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsgeometryvalidationservice.cpp
Expand Up @@ -422,7 +422,7 @@ void QgsGeometryValidationService::triggerTopologyChecks( QgsVectorLayer *layer

const QList<QgsGeometryCheck *> checks = mLayerChecks[layer].topologyChecks;

QMap<const QgsGeometryCheck *, QgsFeedback *> feedbacks;
QHash<const QgsGeometryCheck *, QgsFeedback *> feedbacks;
for ( QgsGeometryCheck *check : checks )
feedbacks.insert( check, new QgsFeedback() );

Expand Down Expand Up @@ -481,7 +481,7 @@ void QgsGeometryValidationService::triggerTopologyChecks( QgsVectorLayer *layer
QgsReadWriteLocker errorLocker( mTopologyCheckLock, QgsReadWriteLocker::Read );
layer->setAllowCommit( allErrors.empty() && mLayerChecks[layer].singleFeatureCheckErrors.empty() );
errorLocker.unlock();
qDeleteAll( feedbacks.values() );
qDeleteAll( feedbacks );
futureWatcher->deleteLater();
if ( mLayerChecks[layer].topologyCheckFutureWatcher == futureWatcher )
mLayerChecks[layer].topologyCheckFutureWatcher = nullptr;
Expand Down
3 changes: 1 addition & 2 deletions src/app/qgsidentifyresultsdialog.cpp
Expand Up @@ -1295,8 +1295,7 @@ void QgsIdentifyResultsDialog::contextMenuEvent( QContextMenuEvent *event )

int featIdx = featItem->data( 0, Qt::UserRole + 1 ).toInt();

QList<QgsMapLayerAction *>::const_iterator actionIt;
for ( actionIt = registeredActions.begin(); actionIt != registeredActions.end(); ++actionIt )
for ( auto actionIt = registeredActions.constBegin(); actionIt != registeredActions.constEnd(); ++actionIt )
{
if ( ( *actionIt )->isEnabledOnlyWhenEditable() )
continue;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgslayertreeviewbadlayerindicator.cpp
Expand Up @@ -42,7 +42,7 @@ void QgsLayerTreeViewBadLayerIndicatorProvider::onIndicatorClicked( const QModel
if ( !QgsLayerTree::isLayer( node ) )
return;

QgsMapLayer *layer = qobject_cast<QgsMapLayer *>( QgsLayerTree::toLayer( node )->layer() );
QgsMapLayer *layer = QgsLayerTree::toLayer( node )->layer();

if ( !layer )
return;
Expand Down
8 changes: 4 additions & 4 deletions src/app/qgslayertreeviewindicatorprovider.cpp
Expand Up @@ -50,7 +50,7 @@ void QgsLayerTreeViewIndicatorProvider::onAddedChildren( QgsLayerTreeNode *node,
}
else if ( QgsLayerTree::isLayer( childNode ) )
{
if ( QgsLayerTreeLayer *layerNode = dynamic_cast< QgsLayerTreeLayer * >( childNode ) )
if ( QgsLayerTreeLayer *layerNode = qobject_cast< QgsLayerTreeLayer * >( childNode ) )
{
if ( layerNode->layer() )
{
Expand Down Expand Up @@ -99,7 +99,7 @@ void QgsLayerTreeViewIndicatorProvider::onLayerLoaded()
if ( !( qobject_cast<QgsVectorLayer *>( layerNode->layer() ) || qobject_cast<QgsRasterLayer *>( layerNode->layer() ) ) )
return;

if ( QgsMapLayer *mapLayer = qobject_cast<QgsMapLayer *>( layerNode->layer() ) )
if ( QgsMapLayer *mapLayer = layerNode->layer() )
{
if ( mapLayer )
{
Expand Down Expand Up @@ -131,15 +131,15 @@ void QgsLayerTreeViewIndicatorProvider::connectSignals( QgsMapLayer *layer )
{
if ( !( qobject_cast<QgsVectorLayer *>( layer ) || qobject_cast<QgsRasterLayer *>( layer ) ) )
return;
QgsMapLayer *mapLayer = qobject_cast<QgsMapLayer *>( layer );
QgsMapLayer *mapLayer = layer;
connect( mapLayer, &QgsMapLayer::dataSourceChanged, this, &QgsLayerTreeViewIndicatorProvider::onLayerChanged );
}

void QgsLayerTreeViewIndicatorProvider::disconnectSignals( QgsMapLayer *layer )
{
if ( !( qobject_cast<QgsVectorLayer *>( layer ) || qobject_cast<QgsRasterLayer *>( layer ) ) )
return;
QgsMapLayer *mapLayer = qobject_cast<QgsMapLayer *>( layer );
QgsMapLayer *mapLayer = layer;
disconnect( mapLayer, &QgsMapLayer::dataSourceChanged, this, &QgsLayerTreeViewIndicatorProvider::onLayerChanged );
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolsimplify.h
Expand Up @@ -81,7 +81,7 @@ class APP_EXPORT QgsMapToolSimplify: public QgsMapToolEdit

void clearSelection();

void setMethod( Method method );
void setMethod( QgsMapToolSimplify::Method method );

private:

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsoptions.cpp
Expand Up @@ -1108,7 +1108,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti

// Setup OpenCL Acceleration widget

connect( mGPUEnableCheckBox, &QCheckBox::toggled, [ = ]( bool checked )
connect( mGPUEnableCheckBox, &QCheckBox::toggled, this, [ = ]( bool checked )
{
if ( checked )
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsrasterlayerproperties.cpp
Expand Up @@ -1427,7 +1427,7 @@ void QgsRasterLayerProperties::transparencyCellTextEdited( const QString &text )
int nBands = renderer->usesBands().size();
if ( nBands == 1 )
{
QLineEdit *lineEdit = dynamic_cast<QLineEdit *>( sender() );
QLineEdit *lineEdit = qobject_cast<QLineEdit *>( sender() );
if ( !lineEdit ) return;
int row = -1;
int column = -1;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsstatisticalsummarydockwidget.cpp
Expand Up @@ -389,7 +389,7 @@ void QgsStatisticalSummaryDockWidget::layerChanged( QgsMapLayer *layer )

void QgsStatisticalSummaryDockWidget::statActionTriggered( bool checked )
{
QAction *action = dynamic_cast<QAction *>( sender() );
QAction *action = qobject_cast<QAction *>( sender() );
int stat = action->data().toInt();

QString settingsKey;
Expand Down
2 changes: 0 additions & 2 deletions src/app/qgsvectorlayerproperties.cpp
Expand Up @@ -1246,9 +1246,7 @@ void QgsVectorLayerProperties::aboutToShowStyleMenu()

void QgsVectorLayerProperties::loadStyle()
{

QgsSettings settings; // where we keep last used filter in persistent state
QString myLastUsedDir = settings.value( QStringLiteral( "style/lastStyleDir" ), QDir::homePath() ).toString();

QString errorMsg;
QStringList ids, names, descriptions;
Expand Down
2 changes: 1 addition & 1 deletion src/app/vertextool/qgsvertexeditor.cpp
Expand Up @@ -41,7 +41,7 @@ QgsVertexEditorModel::QgsVertexEditorModel( QgsMapCanvas *canvas, QObject *paren
: QAbstractTableModel( parent )
, mCanvas( canvas )
{
QWidget *parentWidget = dynamic_cast< QWidget * >( parent );
QWidget *parentWidget = qobject_cast< QWidget * >( parent );
if ( parentWidget )
mWidgetFont = parentWidget->font();
}
Expand Down
1 change: 0 additions & 1 deletion src/app/vertextool/qgsvertextool.cpp
Expand Up @@ -521,7 +521,6 @@ void QgsVertexTool::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
// we give them precedence.

// for each editable layer, select vertices
const auto layers = canvas()->layers();
const auto editableLayers = editableVectorLayers();
for ( QgsVectorLayer *vlayer : editableLayers )
{
Expand Down
12 changes: 6 additions & 6 deletions src/auth/oauth2/qgsauthoauth2config.h
Expand Up @@ -258,9 +258,9 @@ class QgsAuthOAuth2Config : public QObject
//! Set version to \a value
void setVersion( int value );
//! Set config type to \a value
void setConfigType( ConfigType value );
void setConfigType( QgsAuthOAuth2Config::ConfigType value );
//! Set grant flow to \a value
void setGrantFlow( GrantFlow value );
void setGrantFlow( QgsAuthOAuth2Config::GrantFlow value );
//! Set name to \a value
void setName( const QString &value );
//! Set description to \a value
Expand Down Expand Up @@ -291,7 +291,7 @@ class QgsAuthOAuth2Config : public QObject
//! Set persistent token flag to \a persist
void setPersistToken( bool persist );
//! Set access method to \a value
void setAccessMethod( AccessMethod value );
void setAccessMethod( QgsAuthOAuth2Config::AccessMethod value );
//! Set request timeout to \a value
void setRequestTimeout( int value );
//! Set query pairs to \a pairs
Expand All @@ -309,9 +309,9 @@ class QgsAuthOAuth2Config : public QObject
//! Emitted when configuration version has changed
void versionChanged( int );
//! Emitted when configuration type has changed
void configTypeChanged( ConfigType );
void configTypeChanged( QgsAuthOAuth2Config::ConfigType );
//! Emitted when configuration grant flow has changed
void grantFlowChanged( GrantFlow );
void grantFlowChanged( QgsAuthOAuth2Config::GrantFlow );
//! Emitted when configuration grant flow has changed
void nameChanged( const QString & );
//! Emitted when configuration name has changed
Expand Down Expand Up @@ -343,7 +343,7 @@ class QgsAuthOAuth2Config : public QObject
//! Emitted when configuration persist token flag has changed
void persistTokenChanged( bool );
//! Emitted when configuration access method has changed
void accessMethodChanged( AccessMethod );
void accessMethodChanged( QgsAuthOAuth2Config::AccessMethod );
//! Emitted when configuration request timeout has changed
void requestTimeoutChanged( int );
//! Emitted when configuration query pair has changed
Expand Down
4 changes: 2 additions & 2 deletions src/auth/oauth2/qgsauthoauth2edit.cpp
Expand Up @@ -990,7 +990,7 @@ void QgsAuthOAuth2Edit::parseSoftwareStatement( const QString &path )
if ( jsonData.contains( QStringLiteral( "grant_types" ) ) && jsonData.contains( QStringLiteral( "redirect_uris" ) ) )
{
const QStringList grantTypes( jsonData[QStringLiteral( "grant_types" ) ].toStringList() );
if ( grantTypes.count( ) )
if ( !grantTypes.isEmpty( ) )
{
QString grantType = grantTypes[0];
if ( grantType == QLatin1Literal( "authorization_code" ) )
Expand All @@ -1004,7 +1004,7 @@ void QgsAuthOAuth2Edit::parseSoftwareStatement( const QString &path )
}
//Set redirect_uri
const QStringList redirectUris( jsonData[QStringLiteral( "redirect_uris" ) ].toStringList() );
if ( redirectUris.count( ) )
if ( !redirectUris.isEmpty( ) )
{
QString redirectUri = redirectUris[0];
leRedirectUrl->setText( redirectUri );
Expand Down
2 changes: 1 addition & 1 deletion src/auth/oauth2/qgsauthoauth2method.cpp
Expand Up @@ -378,7 +378,7 @@ void QgsAuthOAuth2Method::onCloseBrowser()
QgsMessageLog::logMessage( tr( "Close browser requested" ), AUTH_METHOD_KEY, Qgis::MessageLevel::Info );

// Bring focus back to QGIS app
if ( qobject_cast<QApplication *>( qApp ) )
if ( qApp )
{
const QList<QWidget *> widgets = QgsApplication::topLevelWidgets();
for ( QWidget *topwdgt : widgets )
Expand Down

0 comments on commit 861c511

Please sign in to comment.