Android: Get rid of packageReloadBegin() signal

Since the packageReloadBegin() signal is always followed by the
packageReloadFinished() signal, emitted synchronously to the former one,
there is no need to have 2 separate signals. Particularly,
showing the progress on packageReloadBegin() and hiding it on
packageReloadFinished() is no-op, since the gui won't have a chance to
paint it (because of synchronous emission of both signals).

Thus, remove the packageReloadBegin() signal and remove the progress
indicator.

Rename packageReloadFinished() to packagesReloaded().

Inline clearContainers().

Change-Id: I0ad65dd4d915a1d164c8d398a84a568c57545a6f
Reviewed-by: Assam Boudjelthia <[email protected]>

1 files changed, 4 insertions, 16 deletions

diff --git a/src/plugins/android/androidsdkmodel.cpp b/src/plugins/android/androidsdkmodel.cpp
index c2b3ffdba31..86dbc320135 100644
--- a/src/plugins/android/androidsdkmodel.cpp
+++ b/src/plugins/android/androidsdkmodel.cpp
@@ -22,17 +22,8 @@ AndroidSdkModel::AndroidSdkModel(AndroidSdkManager *sdkManager, QObject *parent)
       m_sdkManager(sdkManager)
 {
     QTC_CHECK(m_sdkManager);
-    connect(m_sdkManager, &AndroidSdkManager::packageReloadBegin, this, [this] {
-        clearContainers();
-        beginResetModel();
-    });
-    connect(m_sdkManager, &AndroidSdkManager::packageReloadFinished, this, [this] {
-        refreshData();
-        endResetModel();
-    });
-    beginResetModel();
+    connect(m_sdkManager, &AndroidSdkManager::packagesReloaded, this, &AndroidSdkModel::refreshData);
     refreshData();
-    endResetModel();
 }
 
 QVariant AndroidSdkModel::headerData(int section, Qt::Orientation orientation, int role) const
@@ -278,16 +269,12 @@ void AndroidSdkModel::resetSelection()
     endResetModel();
 }
 
-void AndroidSdkModel::clearContainers()
+void AndroidSdkModel::refreshData()
 {
     m_sdkPlatforms.clear();
     m_tools.clear();
     m_changeState.clear();
-}
-
-void AndroidSdkModel::refreshData()
-{
-    clearContainers();
+    beginResetModel();
     for (AndroidSdkPackage *p : m_sdkManager->allSdkPackages()) {
         if (p->type() == AndroidSdkPackage::SdkPlatformPackage)
             m_sdkPlatforms << static_cast<SdkPlatform *>(p);
@@ -304,6 +291,7 @@ void AndroidSdkModel::refreshData()
         else
             return p1->state() < p2->state();
     });
+    endResetModel();
 }
 
 } // namespace Internal