From 3b75ca96d6f2aa541b2aa0a2c449dfa17eee04e6 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 26 Aug 2021 11:48:16 +0200 Subject: [PATCH] Utils: Remove FilePath::isWritablePath() uses And fix remaining users. Change-Id: I41c27908f2e9f1e253d0b51830ba351b29a84ec5 Reviewed-by: Qt CI Bot Reviewed-by: Christian Stenger --- src/libs/utils/filepath.h | 1 - src/plugins/android/androidconfigurations.cpp | 2 +- src/plugins/android/androidsettingswidget.cpp | 2 +- src/plugins/qtsupport/qtoptionspage.cpp | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libs/utils/filepath.h b/src/libs/utils/filepath.h index e3e91f0fbf5..97e9b9af470 100644 --- a/src/libs/utils/filepath.h +++ b/src/libs/utils/filepath.h @@ -94,7 +94,6 @@ public: bool needsDevice() const; bool exists() const; - bool isWritablePath() const { return isWritableDir(); } // Remove. bool isWritableDir() const; bool isWritableFile() const; bool ensureWritableDir() const; diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 8c57e3e7971..e47917a080a 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -919,7 +919,7 @@ bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager) bool AndroidConfig::sdkToolsOk() const { bool exists = sdkLocation().exists(); - bool writable = sdkLocation().isWritablePath(); + bool writable = sdkLocation().isWritableDir(); bool sdkToolsExist = !sdkToolsVersion().isNull(); return exists && writable && sdkToolsExist; } diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index f2329294c8d..1016ab98771 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -612,7 +612,7 @@ void AndroidSettingsWidget::validateSdk() m_androidConfig.setSdkLocation(sdkPath); m_androidSummary->setPointValid(SdkPathExistsRow, m_androidConfig.sdkLocation().exists()); - m_androidSummary->setPointValid(SdkPathWritableRow, m_androidConfig.sdkLocation().isWritablePath()); + m_androidSummary->setPointValid(SdkPathWritableRow, m_androidConfig.sdkLocation().isWritableDir()); m_androidSummary->setPointValid(SdkToolsInstalledRow, !m_androidConfig.sdkToolsVersion().isNull()); m_androidSummary->setPointValid(PlatformToolsInstalledRow, diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index c15f6703070..e09ead163bc 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -830,7 +830,7 @@ static bool canLinkWithQt(QString *toolTip) &installSettingsExist); QStringList tip; tip << linkingPurposeText(); - if (!Core::ICore::resourcePath().isWritablePath()) { + if (!Core::ICore::resourcePath().isWritableDir()) { canLink = false; tip << QtOptionsPageWidget::tr("%1's resource directory is not writable.") .arg(Core::Constants::IDE_DISPLAY_NAME);