Android: Make workflow item names consistent

Otherwise it's a nightmare to track it.

Change-Id: I6d9ddc1d5e7046307b0aa66ded05023cf884f37b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

src/plugins/android/androidsdkmanager.cpp

@@ -169,9 +169,9 @@ public:
 
     void parseCommonArguments(QPromise<QString> &promise);
     void updateInstalled(SdkCmdPromise &fi);
-    void update(SdkCmdPromise &fi, const InstallationChange &change);
+    void updatePackages(SdkCmdPromise &fi, const InstallationChange &change);
-    void checkPendingLicense(SdkCmdPromise &fi);
+    void licenseCheck(SdkCmdPromise &fi);
-    void getPendingLicense(SdkCmdPromise &fi);
+    void licenseWorkflow(SdkCmdPromise &fi);
 
     void addWatcher(const QFuture<AndroidSdkManager::OperationOutput> &future);
     void setLicenseInput(bool acceptLicense);
@@ -336,7 +336,7 @@ QFuture<QString> AndroidSdkManager::availableArguments() const
     return Utils::asyncRun(&AndroidSdkManagerPrivate::parseCommonArguments, m_d.get());
 }
 
-QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::updateAll()
+QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::updateInstalled()
 {
     if (isBusy()) {
         return QFuture<AndroidSdkManager::OperationOutput>();
@@ -346,29 +346,29 @@ QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::updateAll()
     return future;
 }
 
-QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::update(const InstallationChange &change)
+QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::updatePackages(const InstallationChange &change)
 {
     if (isBusy())
         return QFuture<AndroidSdkManager::OperationOutput>();
-    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::update, m_d.get(), change);
+    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::updatePackages, m_d.get(), change);
     m_d->addWatcher(future);
     return future;
 }
 
-QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::checkPendingLicenses()
+QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::licenseCheck()
 {
     if (isBusy())
         return QFuture<AndroidSdkManager::OperationOutput>();
-    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::checkPendingLicense, m_d.get());
+    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::licenseCheck, m_d.get());
     m_d->addWatcher(future);
     return future;
 }
 
-QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::runLicenseCommand()
+QFuture<AndroidSdkManager::OperationOutput> AndroidSdkManager::licenseWorkflow()
 {
     if (isBusy())
         return QFuture<AndroidSdkManager::OperationOutput>();
-    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::getPendingLicense, m_d.get());
+    auto future = Utils::asyncRun(&AndroidSdkManagerPrivate::licenseWorkflow, m_d.get());
     m_d->addWatcher(future);
     return future;
 }
@@ -433,7 +433,7 @@ void AndroidSdkManagerPrivate::updateInstalled(SdkCmdPromise &promise)
     promise.setProgressRange(0, 100);
     promise.setProgressValue(0);
     AndroidSdkManager::OperationOutput result;
-    result.type = AndroidSdkManager::UpdateAll;
+    result.type = AndroidSdkManager::UpdateInstalled;
     result.stdOutput = Tr::tr("Updating installed packages.");
     promise.addResult(result);
     QStringList args("--update");
@@ -450,7 +450,7 @@ void AndroidSdkManagerPrivate::updateInstalled(SdkCmdPromise &promise)
     promise.setProgressValue(100);
 }
 
-void AndroidSdkManagerPrivate::update(SdkCmdPromise &fi, const InstallationChange &change)
+void AndroidSdkManagerPrivate::updatePackages(SdkCmdPromise &fi, const InstallationChange &change)
 {
     fi.setProgressRange(0, 100);
     fi.setProgressValue(0);
@@ -463,7 +463,7 @@ void AndroidSdkManagerPrivate::update(SdkCmdPromise &fi, const InstallationChang
     auto doOperation = [&](const QString& packagePath, const QStringList& args,
             bool isInstall) {
         AndroidSdkManager::OperationOutput result;
-        result.type = AndroidSdkManager::UpdatePackage;
+        result.type = AndroidSdkManager::UpdatePackages;
         result.stdOutput = QString("%1 %2").arg(isInstall ? installTag : uninstallTag)
                 .arg(packagePath);
         fi.addResult(result);
@@ -500,7 +500,7 @@ void AndroidSdkManagerPrivate::update(SdkCmdPromise &fi, const InstallationChang
     fi.setProgressValue(100);
 }
 
-void AndroidSdkManagerPrivate::checkPendingLicense(SdkCmdPromise &fi)
+void AndroidSdkManagerPrivate::licenseCheck(SdkCmdPromise &fi)
 {
     fi.setProgressRange(0, 100);
     fi.setProgressValue(0);
@@ -518,7 +518,7 @@ void AndroidSdkManagerPrivate::checkPendingLicense(SdkCmdPromise &fi)
     fi.setProgressValue(100);
 }
 
-void AndroidSdkManagerPrivate::getPendingLicense(SdkCmdPromise &fi)
+void AndroidSdkManagerPrivate::licenseWorkflow(SdkCmdPromise &fi)
 {
     fi.setProgressRange(0, 100);
     fi.setProgressValue(0);

src/plugins/android/androidsdkmanager.h

@@ -33,8 +33,8 @@ public:
     enum CommandType
     {
         None,
-        UpdateAll,
+        UpdateInstalled,
-        UpdatePackage,
+        UpdatePackages,
         LicenseCheck,
         LicenseWorkflow
     };
@@ -73,10 +73,10 @@ public:
     bool packageListingSuccessful() const;
 
     QFuture<QString> availableArguments() const;
-    QFuture<OperationOutput> updateAll();
+    QFuture<OperationOutput> updateInstalled();
-    QFuture<OperationOutput> update(const InstallationChange &change);
+    QFuture<OperationOutput> updatePackages(const InstallationChange &change);
-    QFuture<OperationOutput> checkPendingLicenses();
+    QFuture<OperationOutput> licenseCheck();
-    QFuture<OperationOutput> runLicenseCommand();
+    QFuture<OperationOutput> licenseWorkflow();
 
     void cancelOperatons();
     void acceptSdkLicense(bool accept);

src/plugins/android/androidsdkmanagerwidget.cpp

@@ -177,7 +177,7 @@ AndroidSdkManagerWidget::AndroidSdkManagerWidget(AndroidSdkManager *sdkManager,
             packagesView->collapseAll();
     });
     connect(updateInstalledButton, &QPushButton::clicked,
-            this, &AndroidSdkManagerWidget::onUpdatePackages);
+            this, &AndroidSdkManagerWidget::onUpdateInstalled);
     connect(showAllRadio, &QRadioButton::toggled, this, [this, proxyModel](bool checked) {
         if (checked) {
             proxyModel->setAcceptedPackageState(AndroidSdkPackage::AnyValidState);
@@ -288,14 +288,14 @@ void AndroidSdkManagerWidget::installMissingEssentials()
                                    "Do you want to install the missing packages?"));
 }
 
-void AndroidSdkManagerWidget::beginLicenseCheck()
+void AndroidSdkManagerWidget::licenseCheck()
 {
     m_formatter->appendMessage(Tr::tr("Checking pending licenses...") + "\n", NormalMessageFormat);
     m_formatter->appendMessage(Tr::tr("The installation of Android SDK packages may fail if the "
                                       "respective licenses are not accepted.")
                                    + "\n",
                                LogMessageFormat);
-    addPackageFuture(m_sdkManager->checkPendingLicenses());
+    addPackageFuture(m_sdkManager->licenseCheck());
 }
 
 void AndroidSdkManagerWidget::applyInstallationChange(const InstallationChange &change,
@@ -340,14 +340,14 @@ void AndroidSdkManagerWidget::applyInstallationChange(const InstallationChange &
     show();
 
     switchView(Operations);
-    m_pendingCommand = AndroidSdkManager::UpdatePackage;
+    m_pendingCommand = AndroidSdkManager::UpdatePackages;
     // User agreed with the selection. Check for licenses.
     if (!change.toInstall.isEmpty()) {
         // Pending license affects installtion only.
-        beginLicenseCheck();
+        licenseCheck();
     } else {
         // Uninstall only. Go Ahead.
-        beginExecution();
+        updatePackages();
     }
 }
 
@@ -357,15 +357,15 @@ void AndroidSdkManagerWidget::onApplyButton()
     applyInstallationChange(m_sdkModel->installationChange());
 }
 
-void AndroidSdkManagerWidget::onUpdatePackages()
+void AndroidSdkManagerWidget::onUpdateInstalled()
 {
     if (m_sdkManager->isBusy()) {
         m_formatter->appendMessage("\n" + Tr::tr("SDK Manager is busy."), StdErrFormat);
         return;
     }
     switchView(Operations);
-    m_pendingCommand = AndroidSdkManager::UpdateAll;
+    m_pendingCommand = AndroidSdkManager::UpdateInstalled;
-    beginLicenseCheck();
+    licenseCheck();
 }
 
 void AndroidSdkManagerWidget::onCancel()
@@ -400,7 +400,7 @@ void AndroidSdkManagerWidget::onLicenseCheckResult(const AndroidSdkManager::Oper
         runPendingCommand();
     } else {
         // Run license workflow.
-        beginLicenseWorkflow();
+        licenseWorkflow();
     }
 }
 
@@ -430,7 +430,7 @@ void AndroidSdkManagerWidget::addPackageFuture(const QFuture<AndroidSdkManager::
     }
 }
 
-void AndroidSdkManagerWidget::beginExecution()
+void AndroidSdkManagerWidget::updatePackages()
 {
     if (m_installationChange.count() == 0) {
         switchView(PackageListing);
@@ -444,24 +444,24 @@ void AndroidSdkManagerWidget::beginExecution()
                                                            Tr::tr("preferences") : Tr::tr("options")),
                                LogMessageFormat);
 
-    addPackageFuture(m_sdkManager->update(m_installationChange));
+    addPackageFuture(m_sdkManager->updatePackages(m_installationChange));
     m_installationChange = {};
 }
 
-void AndroidSdkManagerWidget::beginUpdate()
+void AndroidSdkManagerWidget::updateInstalled()
 {
     m_formatter->appendMessage(Tr::tr("Updating installed packages...\n"), NormalMessageFormat);
     m_formatter->appendMessage(Tr::tr("Closing the %1 dialog will cancel the running and scheduled SDK "
                                   "operations.\n").arg(HostOsInfo::isMacHost() ?
                                                            Tr::tr("preferences") : Tr::tr("options")),
                                LogMessageFormat);
-    addPackageFuture(m_sdkManager->updateAll());
+    addPackageFuture(m_sdkManager->updateInstalled());
 }
 
-void AndroidSdkManagerWidget::beginLicenseWorkflow()
+void AndroidSdkManagerWidget::licenseWorkflow()
 {
     switchView(LicenseWorkflow);
-    addPackageFuture(m_sdkManager->runLicenseCommand());
+    addPackageFuture(m_sdkManager->licenseWorkflow());
 }
 
 void AndroidSdkManagerWidget::notifyOperationFinished()
@@ -500,8 +500,8 @@ void AndroidSdkManagerWidget::packageFutureFinished()
             m_sdkLicenseLabel->hide();
             runPendingCommand();
             break;
-        case AndroidSdkManager::UpdateAll:
+        case AndroidSdkManager::UpdateInstalled:
-        case AndroidSdkManager::UpdatePackage:
+        case AndroidSdkManager::UpdatePackages:
             notifyOperationFinished();
             switchView(PackageListing);
             m_sdkManager->reloadPackages();
@@ -544,10 +544,10 @@ void AndroidSdkManagerWidget::switchView(AndroidSdkManagerWidget::View view)
 
 void AndroidSdkManagerWidget::runPendingCommand()
 {
-    if (m_pendingCommand == AndroidSdkManager::UpdatePackage)
+    if (m_pendingCommand == AndroidSdkManager::UpdatePackages)
-        beginExecution(); // License workflow can only start when updating packages.
+        updatePackages(); // License workflow can only start when updating packages.
-    else if (m_pendingCommand == AndroidSdkManager::UpdateAll)
+    else if (m_pendingCommand == AndroidSdkManager::UpdateInstalled)
-        beginUpdate();
+        updateInstalled();
     else
         QTC_ASSERT(false, qCDebug(androidSdkMgrUiLog) << "Unexpected state: No pending command.");
 }

src/plugins/android/androidsdkmanagerwidget.h

@@ -75,16 +75,16 @@ public:
 private:
     void applyInstallationChange(const InstallationChange &change, const QString &extraMessage = {});
     void onApplyButton();
-    void onUpdatePackages();
+    void onUpdateInstalled();
     void onCancel();
     void onOperationResult(int index);
     void onLicenseCheckResult(const AndroidSdkManager::OperationOutput &output);
     void onSdkManagerOptions();
     void addPackageFuture(const QFuture<AndroidSdkManager::OperationOutput> &future);
-    void beginLicenseCheck();
+    void licenseCheck();
-    void beginExecution();
+    void updatePackages();
-    void beginUpdate();
+    void updateInstalled();
-    void beginLicenseWorkflow();
+    void licenseWorkflow();
     void notifyOperationFinished();
     void packageFutureFinished();
     void cancelPendingOperations();