feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Remove FilePath::isWritablePath() uses

Browse Source 
And fix remaining users.

Change-Id: I41c27908f2e9f1e253d0b51830ba351b29a84ec5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-08-26 11:48:16 +02:00
parent 101fda5997
commit 3b75ca96d6
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/utils/filepath.h
View File

@@ -94,7 +94,6 @@ public:
bool needsDevice() const; bool needsDevice() const;
bool exists() const; bool exists() const;
bool isWritablePath() const { return isWritableDir(); } // Remove.
bool isWritableDir() const; bool isWritableDir() const;
bool isWritableFile() const; bool isWritableFile() const;
bool ensureWritableDir() const; bool ensureWritableDir() const;

2
src/plugins/android/androidconfigurations.cpp
View File

@@ -919,7 +919,7 @@ bool AndroidConfig::allEssentialsInstalled(AndroidSdkManager *sdkManager)
bool AndroidConfig::sdkToolsOk() const bool AndroidConfig::sdkToolsOk() const
{ {
bool exists = sdkLocation().exists(); bool exists = sdkLocation().exists();
bool writable = sdkLocation().isWritablePath(); bool writable = sdkLocation().isWritableDir();
bool sdkToolsExist = !sdkToolsVersion().isNull(); bool sdkToolsExist = !sdkToolsVersion().isNull();
return exists && writable && sdkToolsExist; return exists && writable && sdkToolsExist;
} }

2
src/plugins/android/androidsettingswidget.cpp
View File

@@ -612,7 +612,7 @@ void AndroidSettingsWidget::validateSdk()
m_androidConfig.setSdkLocation(sdkPath); m_androidConfig.setSdkLocation(sdkPath);
m_androidSummary->setPointValid(SdkPathExistsRow, m_androidConfig.sdkLocation().exists()); 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_androidSummary->setPointValid(SdkToolsInstalledRow,
!m_androidConfig.sdkToolsVersion().isNull()); !m_androidConfig.sdkToolsVersion().isNull());
m_androidSummary->setPointValid(PlatformToolsInstalledRow, m_androidSummary->setPointValid(PlatformToolsInstalledRow,

2
src/plugins/qtsupport/qtoptionspage.cpp
View File

@@ -830,7 +830,7 @@ static bool canLinkWithQt(QString *toolTip)
&installSettingsExist); &installSettingsExist);
QStringList tip; QStringList tip;
tip << linkingPurposeText(); tip << linkingPurposeText();
if (!Core::ICore::resourcePath().isWritablePath()) { if (!Core::ICore::resourcePath().isWritableDir()) {
canLink = false; canLink = false;
tip << QtOptionsPageWidget::tr("%1's resource directory is not writable.") tip << QtOptionsPageWidget::tr("%1's resource directory is not writable.")
.arg(Core::Constants::IDE_DISPLAY_NAME); .arg(Core::Constants::IDE_DISPLAY_NAME);