diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-03 03:00:03 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-03 03:00:08 +0200 |
commit | 12a115e06ac6cf24b79369cf435216ab0004e0c4 (patch) | |
tree | 20bf42ab2e0948122a8d4584748a2e78ba05bf10 /src/networksettings/qnetworksettingsservicemodel.cpp | |
parent | 321353b82fef7c675a5d62bb38c913fdc41e4f27 (diff) | |
parent | ca09bb69645cafe38e16c368c49b2864e75892ed (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/networksettings/qnetworksettingsservicemodel.cpp')
-rw-r--r-- | src/networksettings/qnetworksettingsservicemodel.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/networksettings/qnetworksettingsservicemodel.cpp b/src/networksettings/qnetworksettingsservicemodel.cpp index a62d415..115fe35 100644 --- a/src/networksettings/qnetworksettingsservicemodel.cpp +++ b/src/networksettings/qnetworksettingsservicemodel.cpp @@ -380,13 +380,10 @@ bool QNetworkSettingsServiceFilter::filterAcceptsRow( int source_row, const QMod QModelIndex index = this->sourceModel()->index( source_row, 0, source_parent ); if (index.isValid()) { - if (index.isValid()) - { - QObject * obj = qvariant_cast<QObject *>(index.data(Qt::UserRole)); - QNetworkSettingsService * service = qobject_cast<QNetworkSettingsService *>(obj); - if (service->type() == m_type || m_type == QNetworkSettingsType::Unknown) - return true; - } + QObject * obj = qvariant_cast<QObject *>(index.data(Qt::UserRole)); + QNetworkSettingsService * service = qobject_cast<QNetworkSettingsService *>(obj); + if (service->type() == m_type || m_type == QNetworkSettingsType::Unknown) + return true; } } return false; |