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

Port from qAsConst() to std::as_const()

Browse Source 
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:
Marc Mutz
2022-10-07 14:46:06 +02:00
parent 90de29d530
commit 8eb4d52342
498 changed files with 1270 additions and 1270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -875,7 +875,7 @@ static ConsoleItem *constructLogItemTree(const QVariant &result,
std::sort(children.begin(), children.end(), compareConsoleItems);
item = new ConsoleItem(ConsoleItem::DefaultType, text);
for (ConsoleItem *child : qAsConst(children)) {
for (ConsoleItem *child : std::as_const(children)) {
if (child)
item->appendChild(child);
}
@@ -895,7 +895,7 @@ static ConsoleItem *constructLogItemTree(const QVariant &result,
std::sort(children.begin(), children.end(), compareConsoleItems);
item = new ConsoleItem(ConsoleItem::DefaultType, text);
for (ConsoleItem *child : qAsConst(children)) {
for (ConsoleItem *child : std::as_const(children)) {
if (child)
item->appendChild(child);
}
@@ -1804,7 +1804,7 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data)
}
QMap<QString,QString> files;
for (const QString &file : qAsConst(sourceFiles)) {
for (const QString &file : std::as_const(sourceFiles)) {
QString shortName = file;
QString fullName = engine->toFileInProject(file);
files.insert(shortName, fullName);
@@ -1856,7 +1856,7 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data)
int newColumn = sourceLineText.indexOf('(') + 1;
for (const Breakpoint &bp : qAsConst(v8Breakpoints)) {
for (const Breakpoint &bp : std::as_const(v8Breakpoints)) {
QTC_ASSERT(bp, continue);
const BreakpointParameters &params = bp->requestedParameters();
@@ -1882,7 +1882,7 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data)
if (inferiorStop) {
//Update breakpoint data
for (const Breakpoint &bp : qAsConst(v8Breakpoints)) {
for (const Breakpoint &bp : std::as_const(v8Breakpoints)) {
QTC_ASSERT(bp, continue);
if (bp->functionName().isEmpty()) {
bp->setFunctionName(invocationText);
@@ -1895,7 +1895,7 @@ void QmlEnginePrivate::messageReceived(const QByteArray &data)
}
if (engine->state() == InferiorRunOk) {
for (const Breakpoint &bp : qAsConst(v8Breakpoints)) {
for (const Breakpoint &bp : std::as_const(v8Breakpoints)) {
QTC_ASSERT(bp, continue);
if (breakpointsTemp.contains(bp->responseId()))
clearBreakpoint(bp);
@@ -2238,7 +2238,7 @@ void QmlEnginePrivate::constructChildLogItems(ConsoleItem *item, const QmlV8Obje
if (debuggerSettings()->sortStructMembers.value())
std::sort(children.begin(), children.end(), compareConsoleItems);
for (ConsoleItem *child : qAsConst(children))
for (ConsoleItem *child : std::as_const(children))
item->appendChild(child);
}
@@ -2364,7 +2364,7 @@ void QmlEnginePrivate::handleExecuteDebuggerCommand(const QVariantMap &response)
debuggerConsole()->printItem(constructLogItemTree(extractData(response.value(BODY))));
// Update the locals
for (int index : qAsConst(currentFrameScopes))
for (int index : std::as_const(currentFrameScopes))
scope(index);
} else {
debuggerConsole()->printItem(new ConsoleItem(ConsoleItem::ErrorType,
@@ -2439,7 +2439,7 @@ void QmlEnginePrivate::handleVersion(const QVariantMap &response)
void QmlEnginePrivate::flushSendBuffer()
{
QTC_ASSERT(state() == Enabled, return);
for (const QByteArray &msg : qAsConst(sendBuffer))
for (const QByteArray &msg : std::as_const(sendBuffer))
sendMessage(msg);
sendBuffer.clear();
}

8
src/plugins/debugger/qml/qmlinspectoragent.cpp
View File

@@ -247,7 +247,7 @@ void QmlInspectorAgent::onResult(quint32 queryId, const QVariant &value,
m_rootContexts.insert(engineId, qvariant_cast<ContextReference>(value));
if (m_rootContexts.size() == m_engines.size()) {
clearObjectTree();
for (const auto &engine : qAsConst(m_engines)) {
for (const auto &engine : std::as_const(m_engines)) {
QString name = engine.name();
if (name.isEmpty())
name = QString::fromLatin1("Engine %1").arg(engine.debugId());
@@ -270,7 +270,7 @@ void QmlInspectorAgent::newObject(int engineId, int /*objectId*/, int /*parentId
log(LogReceive, "OBJECT_CREATED");
for (const auto &engine : qAsConst(m_engines)) {
for (const auto &engine : std::as_const(m_engines)) {
if (engine.debugId() == engineId) {
m_delayQueryTimer.start();
break;
@@ -361,7 +361,7 @@ void QmlInspectorAgent::queryEngineContext()
m_rootContexts.clear();
m_rootContextQueryIds.clear();
for (const auto &engine : qAsConst(m_engines))
for (const auto &engine : std::as_const(m_engines))
m_rootContextQueryIds.append(m_engineClient->queryRootContexts(engine));
}
@@ -424,7 +424,7 @@ void QmlInspectorAgent::verifyAndInsertObjectInTree(const ObjectReference &objec
// Still not found? Maybe we're loading the engine itself.
if (engineId == -1) {
for (const auto &engine : qAsConst(m_engines)) {
for (const auto &engine : std::as_const(m_engines)) {
if (engine.debugId() == objectDebugId) {
engineId = engine.debugId();
break;