forked from qt-creator/qt-creator
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. Task-number: QTBUG-99313 Change-Id: I88edd91395849574436299b8badda21bb93bea39 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -536,7 +536,7 @@ void SdkManagerOutputParser::compilePackageAssociations()
|
||||
deleteAlreadyInstalled(images);
|
||||
|
||||
// Associate the system images with sdk platforms.
|
||||
for (AndroidSdkPackage *image : qAsConst(images)) {
|
||||
for (AndroidSdkPackage *image : std::as_const(images)) {
|
||||
int imageApi = m_systemImages[image];
|
||||
auto itr = std::find_if(m_packages.begin(), m_packages.end(),
|
||||
[imageApi](const AndroidSdkPackage *p) {
|
||||
@@ -651,7 +651,7 @@ bool SdkManagerOutputParser::parseAbstractData(SdkManagerOutputParser::GenericPa
|
||||
keys << installLocationKey << revisionKey << descriptionKey;
|
||||
for (const QString &line : input) {
|
||||
QString value;
|
||||
for (const auto &key: qAsConst(keys)) {
|
||||
for (const auto &key: std::as_const(keys)) {
|
||||
if (valueForKey(key, line, &value)) {
|
||||
if (key == installLocationKey)
|
||||
output.installedLocation = Utils::FilePath::fromUserInput(value);
|
||||
@@ -1123,7 +1123,7 @@ void AndroidSdkManagerPrivate::parseCommonArguments(QFutureInterface<QString> &f
|
||||
|
||||
void AndroidSdkManagerPrivate::clearPackages()
|
||||
{
|
||||
for (AndroidSdkPackage *p : qAsConst(m_allPackages))
|
||||
for (AndroidSdkPackage *p : std::as_const(m_allPackages))
|
||||
delete p;
|
||||
m_allPackages.clear();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user