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

Android: Get rid of forceUpdates arg from filteredPackages()

Browse Source 
Inline this function.
Fix const correctness.

Change-Id: I4ff3f9c03e5bc23c0e71ca6635718c89b883308b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-04-17 17:11:43 +02:00
parent 77d7106b3a
commit 400088fa3c
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/android/androidsdkmanager.cpp
View File

@@ -160,8 +160,13 @@ public:
~AndroidSdkManagerPrivate(); ~AndroidSdkManagerPrivate();
AndroidSdkPackageList filteredPackages(AndroidSdkPackage::PackageState state, AndroidSdkPackageList filteredPackages(AndroidSdkPackage::PackageState state,
AndroidSdkPackage::PackageType type, AndroidSdkPackage::PackageType type)
bool forceUpdate = false); {
refreshSdkPackages();
return Utils::filtered(m_allPackages, [state, type](const AndroidSdkPackage *p) {
return p->state() & state && p->type() & type;
});
}
const AndroidSdkPackageList &allPackages(bool forceUpdate = false); const AndroidSdkPackageList &allPackages(bool forceUpdate = false);
void refreshSdkPackages(bool forceReload = false); void refreshSdkPackages(bool forceReload = false);
@@ -205,7 +210,7 @@ AndroidSdkManager::~AndroidSdkManager()
SdkPlatformList AndroidSdkManager::installedSdkPlatforms() SdkPlatformList AndroidSdkManager::installedSdkPlatforms()
{ {
AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed, const AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed,
AndroidSdkPackage::SdkPlatformPackage); AndroidSdkPackage::SdkPlatformPackage);
return Utils::static_container_cast<SdkPlatform *>(list); return Utils::static_container_cast<SdkPlatform *>(list);
} }
@@ -222,7 +227,7 @@ AndroidSdkPackageList AndroidSdkManager::installedSdkPackages()
SystemImageList AndroidSdkManager::installedSystemImages() SystemImageList AndroidSdkManager::installedSystemImages()
{ {
AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::AnyValidState, const AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::AnyValidState,
AndroidSdkPackage::SdkPlatformPackage); AndroidSdkPackage::SdkPlatformPackage);
QList<SdkPlatform *> platforms = Utils::static_container_cast<SdkPlatform *>(list); QList<SdkPlatform *> platforms = Utils::static_container_cast<SdkPlatform *>(list);
@@ -237,7 +242,7 @@ SystemImageList AndroidSdkManager::installedSystemImages()
NdkList AndroidSdkManager::installedNdkPackages() NdkList AndroidSdkManager::installedNdkPackages()
{ {
AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed, const AndroidSdkPackageList list = m_d->filteredPackages(AndroidSdkPackage::Installed,
AndroidSdkPackage::NDKPackage); AndroidSdkPackage::NDKPackage);
return Utils::static_container_cast<Ndk *>(list); return Utils::static_container_cast<Ndk *>(list);
} }
@@ -363,16 +368,6 @@ AndroidSdkManagerPrivate::~AndroidSdkManagerPrivate()
clearPackages(); clearPackages();
} }
AndroidSdkPackageList
AndroidSdkManagerPrivate::filteredPackages(AndroidSdkPackage::PackageState state,
AndroidSdkPackage::PackageType type, bool forceUpdate)
{
refreshSdkPackages(forceUpdate);
return Utils::filtered(m_allPackages, [state, type](const AndroidSdkPackage *p) {
return p->state() & state && p->type() & type;
});
}
const AndroidSdkPackageList &AndroidSdkManagerPrivate::allPackages(bool forceUpdate) const AndroidSdkPackageList &AndroidSdkManagerPrivate::allPackages(bool forceUpdate)
{ {
refreshSdkPackages(forceUpdate); refreshSdkPackages(forceUpdate);