From 3db5ea3ed101a9f85b86e21b093e322767d625bc Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Mon, 29 Jul 2019 16:08:48 +0300
Subject: Remove duplicate nested isValid() condition

The if condition is duplicated in
QNetworkSettingsServiceFilter::filterAcceptsRow()

Change-Id: Ie93044cc11421c4a6247cc2e511c04036b2f625b
Reviewed-by: Jani Launonen <jani.launonen@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 src/networksettings/qnetworksettingsservicemodel.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'src/networksettings')

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;
-- 
cgit v1.2.3