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

Make some more capturelists friendlier for C++20

Browse Source 
Change-Id: Ic00f75e1f59f5eb0430d24e4448a3bb7f8bfbd8d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-12-18 16:26:23 +01:00
parent 164a6e7447
commit f5d4d331c4
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/3rdparty/syntax-highlighting/src/lib/definitiondownloader.cpp vendored
View File

@@ -174,7 +174,7 @@ void DefinitionDownloader::start()
auto req = QNetworkRequest(QUrl(url)); auto req = QNetworkRequest(QUrl(url));
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy); req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
auto reply = d->nam->get(req); auto reply = d->nam->get(req);
QObject::connect(reply, &QNetworkReply::finished, this, [=]() { QObject::connect(reply, &QNetworkReply::finished, this, [this, reply]() {
d->definitionListDownloadFinished(reply); d->definitionListDownloadFinished(reply);
}); });
} }

2
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
View File

@@ -1420,7 +1420,7 @@ void ModelManagerInterface::maybeQueueCppQmlTypeUpdate(const CPlusPlus::Document
QMutexLocker locker(&g_instanceMutex); QMutexLocker locker(&g_instanceMutex);
if (g_instance) // delegate actual queuing to the gui thread if (g_instance) // delegate actual queuing to the gui thread
QMetaObject::invokeMethod(g_instance, [=] { queueCppQmlTypeUpdate(doc, scan); }); QMetaObject::invokeMethod(g_instance, [this, doc, scan] { queueCppQmlTypeUpdate(doc, scan); });
} }
void ModelManagerInterface::queueCppQmlTypeUpdate(const CPlusPlus::Document::Ptr &doc, bool scan) void ModelManagerInterface::queueCppQmlTypeUpdate(const CPlusPlus::Document::Ptr &doc, bool scan)

15
src/libs/qmljs/qmljsplugindumper.cpp
View File

@@ -46,7 +46,7 @@ Utils::FileSystemWatcher *PluginDumper::pluginWatcher()
void PluginDumper::loadBuiltinTypes(const QmlJS::ModelManagerInterface::ProjectInfo &info) void PluginDumper::loadBuiltinTypes(const QmlJS::ModelManagerInterface::ProjectInfo &info)
{ {
// move to the owning thread // move to the owning thread
metaObject()->invokeMethod(this, [=] { onLoadBuiltinTypes(info); }); metaObject()->invokeMethod(this, [this, info] { onLoadBuiltinTypes(info); });
} }
void PluginDumper::loadPluginTypes(const Utils::FilePath &libraryPath, void PluginDumper::loadPluginTypes(const Utils::FilePath &libraryPath,
@@ -55,8 +55,9 @@ void PluginDumper::loadPluginTypes(const Utils::FilePath &libraryPath,
const QString &importVersion) const QString &importVersion)
{ {
// move to the owning thread // move to the owning thread
metaObject()->invokeMethod(this, [=] { onLoadPluginTypes(libraryPath, importPath, metaObject()->invokeMethod(this, [this, libraryPath, importPath, importUri, importVersion] {
importUri, importVersion); }); onLoadPluginTypes(libraryPath, importPath, importUri, importVersion);
});
} }
void PluginDumper::scheduleRedumpPlugins() void PluginDumper::scheduleRedumpPlugins()
@@ -424,7 +425,8 @@ QFuture<PluginDumper::DependencyInfo> PluginDumper::loadDependencies(const FileP
visited->insert(name); visited->insert(name);
} }
Utils::onFinished(loadQmlTypeDescription(dependenciesPaths), const_cast<PluginDumper*>(this), [=] (const QFuture<PluginDumper::QmlTypeDescription> &typesFuture) { Utils::onFinished(loadQmlTypeDescription(dependenciesPaths), const_cast<PluginDumper*>(this),
[this, iface, visited](const QFuture<PluginDumper::QmlTypeDescription> &typesFuture) {
PluginDumper::QmlTypeDescription typesResult = typesFuture.result(); PluginDumper::QmlTypeDescription typesResult = typesFuture.result();
FilePaths newDependencies = FileUtils::toFilePathList(typesResult.dependencies); FilePaths newDependencies = FileUtils::toFilePathList(typesResult.dependencies);
@@ -560,8 +562,9 @@ void PluginDumper::loadQmltypesFile(const FilePaths &qmltypesFilePaths,
const FilePath &libraryPath, const FilePath &libraryPath,
QmlJS::LibraryInfo libraryInfo) QmlJS::LibraryInfo libraryInfo)
{ {
Utils::onFinished(loadQmlTypeDescription(qmltypesFilePaths), this, [=](const QFuture<PluginDumper::QmlTypeDescription> &typesFuture) Utils::onFinished(loadQmlTypeDescription(qmltypesFilePaths), this,
{ [this, qmltypesFilePaths, libraryPath, libraryInfo]
(const QFuture<PluginDumper::QmlTypeDescription> &typesFuture) {
PluginDumper::QmlTypeDescription typesResult = typesFuture.result(); PluginDumper::QmlTypeDescription typesResult = typesFuture.result();
if (!typesResult.dependencies.isEmpty()) if (!typesResult.dependencies.isEmpty())
{ {