Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-05 18:28:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

interface+libraries+tools: Capture this explicitly in lambda copy capture.

Browse source 
Since C++20 it is deprecated to implicitly capture this with [=] lambda
copy expressions.

See: https://en.cppreference.com/w/cpp/language/lambda#Lambda_capture

This patch replaces these occurances with [this] where only this is
required and [=, this] where more scope is required.

In case only this and another variable is required in the scope I chose
to use that variable explicitly in favor of =.

This fixes the GCC14 warning: implicit capture of ‘this’ via ‘[=]’ is deprecated in C++20 [-Wdeprecated].
This commit is contained in:
Lubosz Sarnecki 2024-08-03 16:51:53 +02:00
parent c09ae79b70
commit 676de4b75b
41 changed files with 113 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/audio/AudioMixerSlavePool.cpp
View file

@ -76,7 +76,7 @@ void AudioMixerSlavePool::processPackets(ConstIter begin, ConstIter end) {
void AudioMixerSlavePool::mix(ConstIter begin, ConstIter end, unsigned int frame, int numToRetain) {
_function = &AudioMixerSlave::mix;
_configure = [=](AudioMixerSlave& slave) {
_configure = [=, this](AudioMixerSlave& slave) {
slave.configureMix(_begin, _end, frame, numToRetain);
};

2
assignment-client/src/avatars/AvatarMixerSlavePool.cpp
View file

@ -75,7 +75,7 @@ void AvatarMixerSlavePool::broadcastAvatarData(ConstIter begin, ConstIter end,
p_high_resolution_clock::time_point lastFrameTimestamp,
float maxKbpsPerNode, float throttlingRatio) {
_function = &AvatarMixerSlave::broadcastAvatarData;
_configure = [=](AvatarMixerSlave& slave) {
_configure = [=, this](AvatarMixerSlave& slave) {
slave.configureBroadcast(begin, end, lastFrameTimestamp, maxKbpsPerNode, throttlingRatio,
_priorityReservedFraction);
};

38
interface/src/Application.cpp
View file

@ -1418,7 +1418,7 @@ void Application::initialize(const QCommandLineParser &parser) {
if (parser.isSet("system-cursor")) {
_preferredCursor.set(Cursor::Manager::getIconName(Cursor::Icon::SYSTEM));
connect(this, &Application::activeDisplayPluginChanged, this, [=](){
connect(this, &Application::activeDisplayPluginChanged, this, [this](){
qApp->setProperty(hifi::properties::HMD, qApp->isHMDMode());
auto displayPlugin = qApp->getActiveDisplayPlugin();
@ -3378,7 +3378,7 @@ void Application::initializeUi() {
#if !defined(DISABLE_QML)
_glWidget->installEventFilter(offscreenUi.data());
offscreenUi->setMouseTranslator([=](const QPointF& pt) {
offscreenUi->setMouseTranslator([this](const QPointF& pt) {
QPointF result = pt;
auto displayPlugin = getActiveDisplayPlugin();
if (displayPlugin->isHmd()) {
@ -3422,7 +3422,7 @@ void Application::initializeUi() {
}
auto compositorHelper = DependencyManager::get<CompositorHelper>();
connect(compositorHelper.data(), &CompositorHelper::allowMouseCaptureChanged, this, [=] {
connect(compositorHelper.data(), &CompositorHelper::allowMouseCaptureChanged, this, [this] {
if (isHMDMode()) {
auto compositorHelper = DependencyManager::get<CompositorHelper>(); // don't capture outer smartpointer
showCursor(compositorHelper->getAllowMouseCapture() ?
@ -3609,7 +3609,7 @@ void Application::userKickConfirmation(const QUuid& nodeID, unsigned int banFlag
if (dlg->getDialogItem()) {
QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
QObject::connect(dlg, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
bool yes = (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes);
@ -4171,7 +4171,7 @@ void Application::loadServerlessDomain(QUrl domainURL) {
return;
}
connect(request, &ResourceRequest::finished, this, [=]() {
connect(request, &ResourceRequest::finished, this, [=, this]() {
if (request->getResult() == ResourceRequest::Success) {
auto namedPaths = prepareServerlessDomainContents(domainURL, request->getData());
auto nodeList = DependencyManager::get<NodeList>();
@ -7748,11 +7748,11 @@ bool Application::askToSetAvatarUrl(const QString& url) {
bool agreeToLicense = true; // assume true
//create set avatar callback
auto setAvatar = [=] (QString url, QString modelName) {
auto setAvatar = [this] (QString url, QString modelName) {
ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Set Avatar",
"Would you like to use '" + modelName + "' for your avatar?",
QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
QObject::connect(dlg, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
bool ok = (QMessageBox::Ok == static_cast<QMessageBox::StandardButton>(answer.toInt()));
@ -7773,7 +7773,7 @@ bool Application::askToSetAvatarUrl(const QString& url) {
ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Avatar Usage License",
modelLicense + "\nDo you agree to these terms?",
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
QObject::connect(dlg, &ModalDialogListener::response, this, [=, &agreeToLicense] (QVariant answer) {
QObject::connect(dlg, &ModalDialogListener::response, this, [=, this, &agreeToLicense] (QVariant answer) {
QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
agreeToLicense = (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes);
@ -7819,7 +7819,7 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) {
ModalDialogListener* dlg = OffscreenUi::asyncQuestion(getWindow(), "Run Script", message,
QMessageBox::Yes | QMessageBox::No);
QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
QObject::connect(dlg, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
const QString& fileName = scriptFilenameOrURL;
if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
qCDebug(interfaceapp) << "Chose to run the script: " << fileName;
@ -7871,7 +7871,7 @@ bool Application::askToWearAvatarAttachmentUrl(const QString& url) {
ModalDialogListener* dlg = OffscreenUi::asyncQuestion(avatarAttachmentConfirmationTitle,
avatarAttachmentConfirmationMessage,
QMessageBox::Ok | QMessageBox::Cancel);
QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
QObject::connect(dlg, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
// add attachment to avatar
@ -7939,7 +7939,7 @@ bool Application::askToReplaceDomainContent(const QString& url) {
ModalDialogListener* dig = OffscreenUi::asyncQuestion("Are you sure you want to replace this domain's content set?",
infoText, QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
QObject::connect(dig, &ModalDialogListener::response, this, [=] (QVariant answer) {
QObject::connect(dig, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
QString details;
if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
// Given confirmation, send request to domain server to replace content
@ -8013,7 +8013,7 @@ void Application::showAssetServerWidget(QString filePath) {
}
static const QUrl url { "hifi/AssetServer.qml" };
auto startUpload = [=](QQmlContext* context, QObject* newObject){
auto startUpload = [this, filePath](QQmlContext* context, QObject* newObject){
if (!filePath.isEmpty()) {
emit uploadRequest(filePath);
}
@ -8160,7 +8160,7 @@ void Application::addAssetToWorld(QString path, QString zipFile, bool isZip, boo
void Application::addAssetToWorldWithNewMapping(QString filePath, QString mapping, int copy, bool isZip, bool isBlocks) {
auto request = DependencyManager::get<AssetClient>()->createGetMappingRequest(mapping);
QObject::connect(request, &GetMappingRequest::finished, this, [=](GetMappingRequest* request) mutable {
QObject::connect(request, &GetMappingRequest::finished, this, [=, this](GetMappingRequest* request) mutable {
const int MAX_COPY_COUNT = 100; // Limit number of duplicate assets; recursion guard.
auto result = request->getError();
if (result == GetMappingRequest::NotFound) {
@ -8192,7 +8192,7 @@ void Application::addAssetToWorldWithNewMapping(QString filePath, QString mappin
void Application::addAssetToWorldUpload(QString filePath, QString mapping, bool isZip, bool isBlocks) {
qInfo(interfaceapp) << "Uploading" << filePath << "to Asset Server as" << mapping;
auto upload = DependencyManager::get<AssetClient>()->createUpload(filePath);
QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
QObject::connect(upload, &AssetUpload::finished, this, [=, this](AssetUpload* upload, const QString& hash) mutable {
if (upload->getError() != AssetUpload::NoError) {
QString errorInfo = "Could not upload model to the Asset Server.";
qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
@ -8217,7 +8217,7 @@ void Application::addAssetToWorldUpload(QString filePath, QString mapping, bool
void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, QString hash, bool isZip, bool isBlocks) {
auto request = DependencyManager::get<AssetClient>()->createSetMappingRequest(mapping, hash);
connect(request, &SetMappingRequest::finished, this, [=](SetMappingRequest* request) mutable {
connect(request, &SetMappingRequest::finished, this, [=, this](SetMappingRequest* request) mutable {
if (request->getError() != SetMappingRequest::NoError) {
QString errorInfo = "Could not set asset mapping.";
qWarning(interfaceapp) << "Error downloading model: " + errorInfo;
@ -8558,7 +8558,7 @@ void Application::loadDialog() {
ModalDialogListener* dlg = OffscreenUi::getOpenFileNameAsync(_glWidget, tr("Open Script"),
getPreviousScriptLocation(),
tr("JavaScript Files (*.js)"));
connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
connect(dlg, &ModalDialogListener::response, this, [this, dlg] (QVariant answer) {
disconnect(dlg, &ModalDialogListener::response, this, nullptr);
const QString& response = answer.toString();
if (!response.isEmpty() && QFile(response).exists()) {
@ -8579,7 +8579,7 @@ void Application::setPreviousScriptLocation(const QString& location) {
void Application::loadScriptURLDialog() const {
ModalDialogListener* dlg = OffscreenUi::getTextAsync(OffscreenUi::ICON_NONE, "Open and Run Script", "Script URL");
connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
connect(dlg, &ModalDialogListener::response, this, [this, dlg] (QVariant response) {
disconnect(dlg, &ModalDialogListener::response, this, nullptr);
const QString& newScript = response.toString();
if (QUrl(newScript).scheme() == "atp") {
@ -9206,7 +9206,7 @@ void Application::confirmConnectWithoutAvatarEntities() {
_confirmConnectWithoutAvatarEntitiesDialog = OffscreenUi::asyncQuestion("Continue Without Wearables", continueMessage,
QMessageBox::Yes | QMessageBox::No);
if (_confirmConnectWithoutAvatarEntitiesDialog->getDialogItem()) {
QObject::connect(_confirmConnectWithoutAvatarEntitiesDialog, &ModalDialogListener::response, this, [=](QVariant answer) {
QObject::connect(_confirmConnectWithoutAvatarEntitiesDialog, &ModalDialogListener::response, this, [this](QVariant answer) {
QObject::disconnect(_confirmConnectWithoutAvatarEntitiesDialog, &ModalDialogListener::response, this, nullptr);
_confirmConnectWithoutAvatarEntitiesDialog = nullptr;
bool shouldConnect = (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes);
@ -9598,7 +9598,7 @@ void Application::showUrlHandler(const QUrl& url) {
}
ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Confirm openUrl", "Do you recognize this path or code and want to open or execute it: " + url.toDisplayString());
QObject::connect(dlg, &ModalDialogListener::response, this, [=](QVariant answer) {
QObject::connect(dlg, &ModalDialogListener::response, this, [=, this](QVariant answer) {
QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
if (QMessageBox::Yes == static_cast<QMessageBox::StandardButton>(answer.toInt())) {
// Unset the handler, open the URL, and the reset the handler

2
interface/src/Bookmarks.cpp
View file

@ -65,7 +65,7 @@ void Bookmarks::addBookmarkToFile(const QString& bookmarkName, const QVariant& b
"The bookmark name you entered already exists in your list.",
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
dlg->setProperty("informativeText", "Would you like to overwrite it?");
QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
QObject::connect(dlg, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
if (QMessageBox::Yes == static_cast<QMessageBox::StandardButton>(answer.toInt())) {

2
interface/src/LocationBookmarks.cpp
View file

@ -83,7 +83,7 @@ void LocationBookmarks::teleportToBookmark() {
void LocationBookmarks::addBookmark() {
ModalDialogListener* dlg = OffscreenUi::getTextAsync(OffscreenUi::ICON_PLACEMARK, "Bookmark Location", "Name", QString());
connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
connect(dlg, &ModalDialogListener::response, this, [=, this] (QVariant response) {
disconnect(dlg, &ModalDialogListener::response, this, nullptr);
auto bookmarkName = response.toString();

14
interface/src/assets/ATPAssetMigrator.cpp
View file

@ -45,13 +45,13 @@ void ATPAssetMigrator::loadEntityServerFile() {
ModalDialogListener* dlg = OffscreenUi::getOpenFileNameAsync(_dialogParent, tr("Select an entity-server content file to migrate"),
QString(), tr("Entity-Server Content (*.gz)"));
connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
connect(dlg, &ModalDialogListener::response, this, [this, dlg] (QVariant response) {
const QString& filename = response.toString();
disconnect(dlg, &ModalDialogListener::response, this, nullptr);
if (!filename.isEmpty()) {
qCDebug(asset_migrator) << "Selected filename for ATP asset migration: " << filename;
auto migrateResources = [=](QUrl migrationURL, QJsonValueRef jsonValue, bool isModelURL) {
auto migrateResources = [this](QUrl migrationURL, QJsonValueRef jsonValue, bool isModelURL) {
auto request =
DependencyManager::get<ResourceManager>()->createResourceRequest(
this, migrationURL, true, -1, "ATPAssetMigrator::loadEntityServerFile");
@ -63,7 +63,7 @@ void ATPAssetMigrator::loadEntityServerFile() {
// to an ATP one once ready
_pendingReplacements.insert(migrationURL, { jsonValue, (isModelURL ? 0 : 1)});
connect(request, &ResourceRequest::finished, this, [=]() {
connect(request, &ResourceRequest::finished, this, [=, this]() {
if (request->getResult() == ResourceRequest::Success) {
migrateResource(request);
} else {
@ -90,7 +90,7 @@ void ATPAssetMigrator::loadEntityServerFile() {
};
ModalDialogListener* migrationConfirmDialog = OffscreenUi::asyncQuestion(_dialogParent, MESSAGE_BOX_TITLE, MIGRATION_CONFIRMATION_TEXT,
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
QObject::connect(migrationConfirmDialog, &ModalDialogListener::response, this, [=] (QVariant answer) {
QObject::connect(migrationConfirmDialog, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
QObject::disconnect(migrationConfirmDialog, &ModalDialogListener::response, this, nullptr);
if (QMessageBox::Yes == static_cast<QMessageBox::StandardButton>(answer.toInt())) {
@ -154,7 +154,7 @@ void ATPAssetMigrator::loadEntityServerFile() {
"Would you like to migrate the following resource?\n" + migrationURL.toString(),
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
QObject::connect(migrationConfirmDialog1, &ModalDialogListener::response, this, [=] (QVariant answer) {
QObject::connect(migrationConfirmDialog1, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
QObject::disconnect(migrationConfirmDialog1, &ModalDialogListener::response, this, nullptr);
if (static_cast<QMessageBox::StandardButton>(answer.toInt()) ==
QMessageBox::Yes) {
@ -164,7 +164,7 @@ void ATPAssetMigrator::loadEntityServerFile() {
ModalDialogListener* migrationConfirmDialog2 = OffscreenUi::asyncQuestion(_dialogParent, MESSAGE_BOX_TITLE, COMPLETE_MIGRATION_TEXT,
QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
QObject::connect(migrationConfirmDialog2, &ModalDialogListener::response, this, [=] (QVariant answer) {
QObject::connect(migrationConfirmDialog2, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
QObject::disconnect(migrationConfirmDialog2, &ModalDialogListener::response, this, nullptr);
if (static_cast<QMessageBox::StandardButton>(answer.toInt()) ==
QMessageBox::Yes) {
@ -331,7 +331,7 @@ bool ATPAssetMigrator::wantsToMigrateResource(const QUrl& url) {
void ATPAssetMigrator::saveEntityServerFile() {
// show a dialog to ask the user where they want to save the file
ModalDialogListener* dlg = OffscreenUi::getSaveFileNameAsync(_dialogParent, "Save Migrated Entities File");
connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
connect(dlg, &ModalDialogListener::response, this, [this] (QVariant response) {
const QString& saveName = response.toString();
QFile saveFile { saveName };

2
interface/src/avatar/AvatarPackager.cpp
View file

@ -53,7 +53,7 @@ AvatarPackager::AvatarPackager() {
}
bool AvatarPackager::open() {
const auto packageModelDialogCreated = [=](QQmlContext* context, QObject* newObject) {
const auto packageModelDialogCreated = [this](QQmlContext* context, QObject* newObject) {
context->setContextProperty("AvatarPackagerCore", this);
};

6
interface/src/avatar/MyAvatar.cpp
View file

@ -314,7 +314,7 @@ MyAvatar::MyAvatar(QThread* thread) :
auto player = DependencyManager::get<Deck>();
auto recorder = DependencyManager::get<Recorder>();
connect(player.data(), &Deck::playbackStateChanged, [=] {
connect(player.data(), &Deck::playbackStateChanged, [=, this] {
bool isPlaying = player->isPlaying();
if (isPlaying) {
auto recordingInterface = DependencyManager::get<RecordingScriptingInterface>();
@ -337,7 +337,7 @@ MyAvatar::MyAvatar(QThread* thread) :
_skeletonModel->getRig().setEnableAnimations(!isPlaying);
});
connect(recorder.data(), &Recorder::recordingStateChanged, [=] {
connect(recorder.data(), &Recorder::recordingStateChanged, [=, this] {
if (recorder->isRecording()) {
createRecordingIDs();
setRecordingBasis();
@ -347,7 +347,7 @@ MyAvatar::MyAvatar(QThread* thread) :
});
static const recording::FrameType AVATAR_FRAME_TYPE = recording::Frame::registerFrameType(AvatarData::FRAME_NAME);
Frame::registerFrameHandler(AVATAR_FRAME_TYPE, [=](Frame::ConstPointer frame) {
Frame::registerFrameHandler(AVATAR_FRAME_TYPE, [this](Frame::ConstPointer frame) {
static AvatarData dummyAvatar;
AvatarData::fromFrame(frame->data, dummyAvatar);
if (getRecordingBasis()) {

2
interface/src/scripting/AssetMappingsScriptingInterface.cpp
View file

@ -127,7 +127,7 @@ void AssetMappingsScriptingInterface::uploadFile(QString path, QString mapping,
});
auto upload = DependencyManager::get<AssetClient>()->createUpload(path);
QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
QObject::connect(upload, &AssetUpload::finished, this, [=, this](AssetUpload* upload, const QString& hash) mutable {
if (upload->getError() != AssetUpload::NoError) {
if (completedCallback.isCallable()) {
QJSValueList args { upload->getErrorString() };

2
interface/src/scripting/ScreenshareScriptingInterface.cpp
View file

@ -257,7 +257,7 @@ void ScreenshareScriptingInterface::handleSuccessfulScreenshareInfoGet(QNetworkR
arguments << "--sessionID=" + _sessionID << " ";
connect(_screenshareProcess.get(), QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
[=](int exitCode, QProcess::ExitStatus exitStatus) {
[this](int exitCode, QProcess::ExitStatus exitStatus) {
stopScreenshare();
emit screenshareProcessTerminated();
});

10
interface/src/scripting/WindowScriptingInterface.cpp
View file

@ -131,7 +131,7 @@ ScriptValue WindowScriptingInterface::prompt(const QString& message, const QStri
void WindowScriptingInterface::promptAsync(const QString& message, const QString& defaultText) {
bool ok = false;
ModalDialogListener* dlg = OffscreenUi::getTextAsync(nullptr, "", message, QLineEdit::Normal, defaultText, &ok);
connect(dlg, &ModalDialogListener::response, this, [=] (QVariant result) {
connect(dlg, &ModalDialogListener::response, this, [this, dlg] (QVariant result) {
disconnect(dlg, &ModalDialogListener::response, this, nullptr);
emit promptTextChanged(result.toString());
});
@ -252,7 +252,7 @@ void WindowScriptingInterface::browseDirAsync(const QString& title, const QStrin
path = fixupPathForMac(directory);
#endif
ModalDialogListener* dlg = OffscreenUi::getExistingDirectoryAsync(nullptr, title, path);
connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
connect(dlg, &ModalDialogListener::response, this, [this, dlg] (QVariant response) {
const QString& result = response.toString();
disconnect(dlg, &ModalDialogListener::response, this, nullptr);
if (!result.isEmpty()) {
@ -298,7 +298,7 @@ void WindowScriptingInterface::browseAsync(const QString& title, const QString&
path = fixupPathForMac(directory);
#endif
ModalDialogListener* dlg = OffscreenUi::getOpenFileNameAsync(nullptr, title, path, nameFilter);
connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
connect(dlg, &ModalDialogListener::response, this, [this, dlg] (QVariant response) {
const QString& result = response.toString();
disconnect(dlg, &ModalDialogListener::response, this, nullptr);
if (!result.isEmpty()) {
@ -346,7 +346,7 @@ void WindowScriptingInterface::saveAsync(const QString& title, const QString& di
path = fixupPathForMac(directory);
#endif
ModalDialogListener* dlg = OffscreenUi::getSaveFileNameAsync(nullptr, title, path, nameFilter);
connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
connect(dlg, &ModalDialogListener::response, this, [this, dlg] (QVariant response) {
const QString& result = response.toString();
disconnect(dlg, &ModalDialogListener::response, this, nullptr);
if (!result.isEmpty()) {
@ -401,7 +401,7 @@ void WindowScriptingInterface::browseAssetsAsync(const QString& title, const QSt
}
ModalDialogListener* dlg = OffscreenUi::getOpenAssetNameAsync(nullptr, title, path, nameFilter);
connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
connect(dlg, &ModalDialogListener::response, this, [this, dlg] (QVariant response) {
const QString& result = response.toString();
disconnect(dlg, &ModalDialogListener::response, this, nullptr);
if (!result.isEmpty()) {

2
interface/src/ui/Keyboard.cpp
View file

@ -743,7 +743,7 @@ void Keyboard::loadKeyboardFile(const QString& keyboardFile) {
}
connect(request, &ResourceRequest::finished, this, [=]() {
connect(request, &ResourceRequest::finished, this, [this, request]() {
if (request->getResult() != ResourceRequest::Success) {
qCWarning(interfaceapp) << "Keyboard file failed to download";
return;

2
interface/src/ui/overlays/QmlOverlay.cpp
View file

@ -34,7 +34,7 @@ void QmlOverlay::buildQmlElement(const QUrl& url) {
return;
}
offscreenUI->load(url, [=](QQmlContext* context, QObject* object) {
offscreenUI->load(url, [this](QQmlContext* context, QObject* object) {
_qmlElement = dynamic_cast<QQuickItem*>(object);
connect(_qmlElement, &QObject::destroyed, this, &QmlOverlay::qmlElementDestroyed);
});

6
libraries/audio-client/src/AudioClient.cpp
View file

@ -332,7 +332,7 @@ AudioClient::AudioClient() {
connect(&_receivedAudioStream, &MixedProcessedAudioStream::processSamples,
this, &AudioClient::processReceivedSamples, Qt::DirectConnection);
connect(this, &AudioClient::changeDevice, this, [=](const HifiAudioDeviceInfo& outputDeviceInfo) {
connect(this, &AudioClient::changeDevice, this, [this](const HifiAudioDeviceInfo& outputDeviceInfo) {
qCDebug(audioclient)<< "got AudioClient::changeDevice signal, about to call switchOutputToAudioDevice() outputDeviceInfo: ["<< outputDeviceInfo.deviceName() << "]";
switchOutputToAudioDevice(outputDeviceInfo);
});
@ -346,8 +346,8 @@ AudioClient::AudioClient() {
// start a thread to detect any device changes
_checkDevicesTimer = new QTimer(this);
const unsigned long DEVICE_CHECK_INTERVAL_MSECS = 2 * 1000;
connect(_checkDevicesTimer, &QTimer::timeout, this, [=] {
QtConcurrent::run(QThreadPool::globalInstance(), [=] {
connect(_checkDevicesTimer, &QTimer::timeout, this, [this] {
QtConcurrent::run(QThreadPool::globalInstance(), [this] {
checkDevices();
// On some systems (Ubuntu) checking all the audio devices can take more than 2 seconds. To
// avoid consuming all of the thread pool, don't start the check interval until the previous

2
libraries/controllers/src/controllers/ScriptingInterface.cpp
View file

@ -75,7 +75,7 @@ controller::ScriptingInterface::ScriptingInterface() {
connect(userInputMapper.data(), &UserInputMapper::inputEvent, this, &controller::ScriptingInterface::inputEvent);
// FIXME make this thread safe
connect(userInputMapper.data(), &UserInputMapper::hardwareChanged, this, [=] {
connect(userInputMapper.data(), &UserInputMapper::hardwareChanged, this, [this] {
updateMaps();
emit hardwareChanged();
});

2
libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
View file

@ -95,7 +95,7 @@ public:
Lock lock(_mutex);
if (isRunning()) {
_newPluginQueue.push(plugin);
_condition.wait(lock, [=]()->bool { return _newPluginQueue.empty(); });
_condition.wait(lock, [this]()->bool { return _newPluginQueue.empty(); });
}
}

2
libraries/display-plugins/src/display-plugins/stereo/StereoDisplayPlugin.cpp
View file

@ -67,7 +67,7 @@ bool StereoDisplayPlugin::internalActivate() {
}
const uint32_t screenIndex = i;
_container->addMenuItem(PluginType::DISPLAY_PLUGIN, MENU_PATH(), name,
[=](bool clicked) { updateScreen(screenIndex); }, true, checked, "Screens");
[this, screenIndex](bool clicked) { updateScreen(screenIndex); }, true, checked, "Screens");
}
_container->removeMenu(FRAMERATE);

6
libraries/entities-renderer/src/RenderableModelEntityItem.cpp
View file

@ -1256,13 +1256,13 @@ void ModelEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPoint
if (_hasModel && !model) {
model = std::make_shared<Model>(nullptr, entity.get(), _created);
connect(model.get(), &Model::requestRenderUpdate, this, &ModelEntityRenderer::requestRenderUpdate);
connect(model.get(), &Model::setURLFinished, this, [=](bool didVisualGeometryRequestSucceed) {
connect(model.get(), &Model::setURLFinished, this, [=, this](bool didVisualGeometryRequestSucceed) {
_didLastVisualGeometryRequestSucceed = didVisualGeometryRequestSucceed;
const render::ScenePointer& scene = AbstractViewStateInterface::instance()->getMain3DScene();
render::Transaction transaction;
transaction.updateItem<PayloadProxyInterface>(_renderItemID, [=](PayloadProxyInterface& self) {
transaction.updateItem<PayloadProxyInterface>(_renderItemID, [=, this](PayloadProxyInterface& self) {
const render::ScenePointer& scene = AbstractViewStateInterface::instance()->getMain3DScene();
withWriteLock([=] {
withWriteLock([=, this] {
setKey(didVisualGeometryRequestSucceed, _model);
_model->setVisibleInScene(_visible, scene);
_model->setCauterized(_cauterized, scene);

2
libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp
View file

@ -1028,7 +1028,7 @@ void RenderablePolyVoxEntityItem::uncompressVolumeData() {
voxelData = _voxelData;
});
QtConcurrent::run([=] {
QtConcurrent::run([=, this] {
QDataStream reader(voxelData);
quint16 voxelXSize, voxelYSize, voxelZSize;
reader >> voxelXSize;

4
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -1546,7 +1546,7 @@ bool EntityPropertyMetadataRequest::script(EntityItemID entityID, const ScriptVa
using LocalScriptStatusRequest = QFutureWatcher<QVariant>;
LocalScriptStatusRequest* request = new LocalScriptStatusRequest;
QObject::connect(request, &LocalScriptStatusRequest::finished, _scriptManager, [=]() mutable {
QObject::connect(request, &LocalScriptStatusRequest::finished, _scriptManager, [=, this]() mutable {
auto details = request->result().toMap();
ScriptValue err, result;
if (details.contains("isError")) {
@ -1581,7 +1581,7 @@ bool EntityPropertyMetadataRequest::serverScripts(EntityItemID entityID, const S
auto client = DependencyManager::get<EntityScriptClient>();
auto request = client->createScriptStatusRequest(entityID);
QPointer<ScriptManager> manager = _scriptManager;
QObject::connect(request, &GetScriptStatusRequest::finished, _scriptManager, [=](GetScriptStatusRequest* request) mutable {
QObject::connect(request, &GetScriptStatusRequest::finished, _scriptManager, [=, this](GetScriptStatusRequest* request) mutable {
auto manager = _scriptManager;
if (!manager) {
qCDebug(entities) << __FUNCTION__ << " -- engine destroyed while inflight" << entityID;

4
libraries/gpu-gl-common/src/gpu/gl/GLTexture.cpp
View file

@ -251,7 +251,7 @@ TransferJob::TransferJob(const Texture& texture,
}
// Buffering can invoke disk IO, so it should be off of the main and render threads
_bufferingLambda = [=](const TexturePointer& texture) {
_bufferingLambda = [=, this](const TexturePointer& texture) {
auto mipStorage = texture->accessStoredMipFace(sourceMip, face);
if (mipStorage) {
_mipData = mipStorage->createView(_transferSize, _transferOffset);
@ -261,7 +261,7 @@ TransferJob::TransferJob(const Texture& texture,
}
};
_transferLambda = [=](const TexturePointer& texture) {
_transferLambda = [=, this](const TexturePointer& texture) {
if (_mipData) {
auto gltexture = Backend::getGPUObject<GLTexture>(*texture);
gltexture->copyMipFaceLinesFromTexture(targetMip, face, transferDimensions, lineOffset, internalFormat, format,

2
libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp
View file

@ -620,7 +620,7 @@ void GL41VariableAllocationTexture::populateTransferQueue(TransferQueue& pending
}
// queue up the sampler and populated mip change for after the transfer has completed
pendingTransfers.emplace(new TransferJob(sourceMip, [=] {
pendingTransfers.emplace(new TransferJob(sourceMip, [this, sourceMip] {
_populatedMip = sourceMip;
incrementPopulatedSize(_gpuObject.evalMipSize(sourceMip));
sanityCheck();

2
libraries/gpu-gl/src/gpu/gl45/GL45BackendVariableTexture.cpp
View file

@ -281,7 +281,7 @@ void GL45ResourceTexture::populateTransferQueue(TransferQueue& pendingTransfers)
}
// queue up the sampler and populated mip change for after the transfer has completed
pendingTransfers.emplace(new TransferJob(sourceMip, [=] {
pendingTransfers.emplace(new TransferJob(sourceMip, [this, sourceMip] {
_populatedMip = sourceMip;
incrementPopulatedSize(_gpuObject.evalMipSize(sourceMip));
sanityCheck();

2
libraries/hfm/src/hfm/HFM.cpp
View file

@ -125,7 +125,7 @@ bool HFMModel::convexHullContains(const glm::vec3& point) const {
return false;
}
auto checkEachPrimitive = [=](HFMMesh& mesh, QVector<int> indices, int primitiveSize) -> bool {
auto checkEachPrimitive = [this, point](HFMMesh& mesh, QVector<int> indices, int primitiveSize) -> bool {
// Check whether the point is "behind" all the primitives.
// But first must transform from model-frame into mesh-frame
glm::vec3 transformedPoint = glm::vec3(glm::inverse(offset * mesh.modelTransform) * glm::vec4(point, 1.0f));

8
libraries/networking/src/BaseAssetScriptingInterface.cpp
View file

@ -96,7 +96,7 @@ Promise BaseAssetScriptingInterface::loadFromCache(const QUrl& url, bool decompr
downloaded->fail(fetched);
if (decompress) {
downloaded->then([=](QVariantMap result) {
downloaded->then([this, fetched](QVariantMap result) {
fetched->mixin(result);
Promise decompressed = decompressBytes(result.value("data").toByteArray());
decompressed->mixin(result);
@ -107,7 +107,7 @@ Promise BaseAssetScriptingInterface::loadFromCache(const QUrl& url, bool decompr
}
fetched->fail(completed);
fetched->then([=](QVariantMap result) {
fetched->then([=, this](QVariantMap result) {
Promise converted = convertBytes(result.value("data").toByteArray(), responseType);
converted->mixin(result);
converted->ready(completed);
@ -140,7 +140,7 @@ Promise BaseAssetScriptingInterface::loadAsset(QString asset, bool decompress, Q
downloaded->fail(fetched);
if (decompress) {
downloaded->then([=](QVariantMap result) {
downloaded->then([this, fetched](QVariantMap result) {
Q_ASSERT(thread() == QThread::currentThread());
fetched->mixin(result);
Promise decompressed = decompressBytes(result.value("data").toByteArray());
@ -152,7 +152,7 @@ Promise BaseAssetScriptingInterface::loadAsset(QString asset, bool decompress, Q
}
fetched->fail(completed);
fetched->then([=](QVariantMap result) {
fetched->then([=, this](QVariantMap result) {
Promise converted = convertBytes(result.value("data").toByteArray(), responseType);
converted->mixin(result);
converted->ready(completed);

2
libraries/qml/src/qml/OffscreenSurface.cpp
View file

@ -368,7 +368,7 @@ void OffscreenSurface::loadInternal(const QUrl& qmlSource,
}
if (qmlComponent->isLoading()) {
connect(qmlComponent, &QQmlComponent::statusChanged, this,
[=](QQmlComponent::Status) { finishQmlLoad(qmlComponent, targetContext, parent, callback); });
[=, this](QQmlComponent::Status) { finishQmlLoad(qmlComponent, targetContext, parent, callback); });
return;
}

6
libraries/render-utils/src/AmbientOcclusionEffect.cpp
View file

@ -662,7 +662,7 @@ void AmbientOcclusionEffect::run(const render::RenderContextPointer& renderConte
_frameId = (_frameId + 1) % (SSAO_RANDOM_SAMPLE_COUNT);
}
gpu::doInBatch("AmbientOcclusionEffect::run", args->_context, [=](gpu::Batch& batch) {
gpu::doInBatch("AmbientOcclusionEffect::run", args->_context, [=, this](gpu::Batch& batch) {
PROFILE_RANGE_BATCH(batch, "SSAO");
batch.enableStereo(false);
@ -895,8 +895,8 @@ void DebugAmbientOcclusion::run(const render::RenderContextPointer& renderContex
float tHeight = occlusionViewport.w / (float)framebufferSize.y;
auto debugPipeline = getDebugPipeline();
gpu::doInBatch("DebugAmbientOcclusion::run", args->_context, [=](gpu::Batch& batch) {
gpu::doInBatch("DebugAmbientOcclusion::run", args->_context, [=, this](gpu::Batch& batch) {
batch.enableStereo(false);
batch.setViewportTransform(sourceViewport);

2
libraries/render-utils/src/SubsurfaceScattering.cpp
View file

@ -488,7 +488,7 @@ void DebugSubsurfaceScattering::run(const render::RenderContextPointer& renderCo
_debugParams->setSubData(0, _debugCursorTexcoord);
}
gpu::doInBatch("DebugSubsurfaceScattering::run", args->_context, [=](gpu::Batch& batch) {
gpu::doInBatch("DebugSubsurfaceScattering::run", args->_context, [=, this](gpu::Batch& batch) {
batch.enableStereo(false);

4
libraries/render-utils/src/SurfaceGeometryPass.cpp
View file

@ -186,7 +186,7 @@ void LinearDepthPass::run(const render::RenderContextPointer& renderContext, con
auto halfViewport = depthViewport >> 1;
float clearLinearDepth = args->getViewFrustum().getFarClip() * 2.0f;
gpu::doInBatch("LinearDepthPass::run", args->_context, [=](gpu::Batch& batch) {
gpu::doInBatch("LinearDepthPass::run", args->_context, [=, this](gpu::Batch& batch) {
PROFILE_RANGE_BATCH(batch, "LinearDepthPass");
_gpuTimer->begin(batch);
@ -465,7 +465,7 @@ void SurfaceGeometryPass::run(const render::RenderContextPointer& renderContext,
_diffusePass.getParameters()->setLinearDepthPosFar(args->getViewFrustum().getFarClip());
gpu::doInBatch("SurfaceGeometryPass::run", args->_context, [=](gpu::Batch& batch) {
gpu::doInBatch("SurfaceGeometryPass::run", args->_context, [=, this](gpu::Batch& batch) {
_gpuTimer->begin(batch);
batch.enableStereo(false);

2
libraries/render-utils/src/VelocityBufferPass.cpp
View file

@ -118,7 +118,7 @@ void VelocityBufferPass::run(const render::RenderContextPointer& renderContext,
auto fullViewport = args->_viewport;
gpu::doInBatch("VelocityBufferPass::run", args->_context, [=](gpu::Batch& batch) {
gpu::doInBatch("VelocityBufferPass::run", args->_context, [=, this](gpu::Batch& batch) {
_gpuTimer->begin(batch);
batch.enableStereo(false);

2
libraries/render-utils/src/ZoneRenderer.cpp
View file

@ -150,7 +150,7 @@ void DebugZoneLighting::run(const render::RenderContextPointer& context, const I
}
}
gpu::doInBatch("DebugZoneLighting::run", args->_context, [=](gpu::Batch& batch) {
gpu::doInBatch("DebugZoneLighting::run", args->_context, [=, this](gpu::Batch& batch) {
batch.setViewportTransform(args->_viewport);
auto viewFrustum = args->getViewFrustum();

4
libraries/render/src/render/BlurTask.cpp
View file

@ -265,7 +265,7 @@ void BlurGaussian::run(const RenderContextPointer& renderContext, const Inputs&
_parameters->setWidthHeight(blurredFramebuffer->getWidth(), blurredFramebuffer->getHeight(), args->isStereo());
_parameters->setTexcoordTransform(gpu::Framebuffer::evalSubregionTexcoordTransformCoefficients(textureSize, viewport));
gpu::doInBatch("BlurGaussian::run", args->_context, [=](gpu::Batch& batch) {
gpu::doInBatch("BlurGaussian::run", args->_context, [=, this](gpu::Batch& batch) {
batch.enableStereo(false);
batch.setViewportTransform(viewport);
@ -362,7 +362,7 @@ void BlurGaussianDepthAware::run(const RenderContextPointer& renderContext, cons
_parameters->setDepthPerspective(args->getViewFrustum().getProjection()[1][1]);
_parameters->setLinearDepthPosFar(args->getViewFrustum().getFarClip());
gpu::doInBatch("BlurGaussianDepthAware::run", args->_context, [=](gpu::Batch& batch) {
gpu::doInBatch("BlurGaussianDepthAware::run", args->_context, [=, this](gpu::Batch& batch) {
batch.enableStereo(false);
batch.setViewportTransform(sourceViewport);

16
libraries/script-engine/src/AssetScriptingInterface.cpp
View file

@ -76,7 +76,7 @@ void AssetScriptingInterface::uploadData(QString data, const ScriptValue& callba
Promise deferred = makePromise(__FUNCTION__);
Q_ASSERT(engine());
auto scriptEngine = engine();
deferred->ready([=](QString error, QVariantMap result) {
deferred->ready([=, this](QString error, QVariantMap result) {
auto url = result.value("url").toString();
auto hash = result.value("hash").toString();
jsCallback(handler, scriptEngine->newValue(url), scriptEngine->newValue(hash));
@ -100,7 +100,7 @@ void AssetScriptingInterface::setMapping(QString path, QString hash, const Scrip
Promise deferred = makePromise(__FUNCTION__);
Q_ASSERT(engine());
auto scriptEngine = engine();
deferred->ready([=](QString error, QVariantMap result) {
deferred->ready([=, this](QString error, QVariantMap result) {
jsCallback(handler, scriptEngine->newValue(error), result);
});
@ -138,7 +138,7 @@ void AssetScriptingInterface::downloadData(QString urlString, const ScriptValue&
Promise deferred = makePromise(__FUNCTION__);
Q_ASSERT(engine());
auto scriptEngine = engine();
deferred->ready([=](QString error, QVariantMap result) {
deferred->ready([=, this](QString error, QVariantMap result) {
// FIXME: to remain backwards-compatible the signature here is "callback(data, n/a)"
jsCallback(handler, scriptEngine->newValue(result.value("data").toString()), { { "errorMessage", error } });
});
@ -202,7 +202,7 @@ void AssetScriptingInterface::getMapping(QString asset, const ScriptValue& callb
Promise promise = getAssetInfo(path);
Q_ASSERT(engine());
auto scriptEngine = engine();
promise->ready([=](QString error, QVariantMap result) {
promise->ready([=, this](QString error, QVariantMap result) {
jsCallback(handler, scriptEngine->newValue(error), scriptEngine->newValue(result.value("hash").toString()));
});
}
@ -317,7 +317,7 @@ void AssetScriptingInterface::getAsset(const ScriptValue& options, const ScriptV
Promise mapped = makePromise("mapped");
mapped->fail(fetched);
mapped->then([=](QVariantMap result) {
mapped->then([=, this](QVariantMap result) {
QString hash = result.value("hash").toString();
QString url = result.value("url").toString();
if (!AssetUtils::isValidHash(hash)) {
@ -397,7 +397,7 @@ void AssetScriptingInterface::decompressData(const ScriptValue& options, const S
if (responseType == "arraybuffer") {
decompressed->ready(completed);
} else {
decompressed->ready([=](QString error, QVariantMap result) {
decompressed->ready([=, this](QString error, QVariantMap result) {
Promise converted = convertBytes(result.value("data").toByteArray(), responseType);
converted->mixin(result);
converted->ready(completed);
@ -482,7 +482,7 @@ void AssetScriptingInterface::putAsset(const ScriptValue& options, const ScriptV
}
prepared->fail(completed);
prepared->then([=](QVariantMap result) {
prepared->then([this, uploaded](QVariantMap result) {
Promise upload = uploadBytes(result.value("data").toByteArray());
upload->mixin(result);
upload->ready(uploaded);
@ -492,7 +492,7 @@ void AssetScriptingInterface::putAsset(const ScriptValue& options, const ScriptV
if (path.isEmpty()) {
uploaded->then(completed);
} else {
uploaded->then([=](QVariantMap result) {
uploaded->then([=, this](QVariantMap result) {
QString hash = result.value("hash").toString();
if (!AssetUtils::isValidHash(hash)) {
completed->reject("path mapping requested, but did not receive valid hash", result);

4
libraries/script-engine/src/ScriptCache.cpp
View file

@ -125,7 +125,7 @@ void ScriptCache::getScriptContents(const QString& scriptOrURL, contentAvailable
nullptr, url, true, -1, "ScriptCache::getScriptContents");
Q_ASSERT(request);
request->setCacheEnabled(!forceDownload);
connect(request, &ResourceRequest::finished, this, [=]{ scriptContentAvailable(maxRetries); });
connect(request, &ResourceRequest::finished, this, [this, maxRetries]{ scriptContentAvailable(maxRetries); });
request->send();
}
}
@ -189,7 +189,7 @@ void ScriptCache::scriptContentAvailable(int maxRetries) {
// We've already made a request, so the cache must be disabled or it wasn't there, so enabling
// it will do nothing.
request->setCacheEnabled(false);
connect(request, &ResourceRequest::finished, this, [=]{ scriptContentAvailable(maxRetries); });
connect(request, &ResourceRequest::finished, this, [this, maxRetries]{ scriptContentAvailable(maxRetries); });
request->send();
});
} else {

8
libraries/script-engine/src/ScriptManager.cpp
View file

@ -707,7 +707,7 @@ bool externalResourceBucketFromScriptValue(const ScriptValue& object, ExternalRe
void ScriptManager::resetModuleCache(bool deleteScriptCache) {
if (QThread::currentThread() != thread()) {
executeOnScriptThread([=]() { resetModuleCache(deleteScriptCache); });
executeOnScriptThread([this, deleteScriptCache]() { resetModuleCache(deleteScriptCache); });
return;
}
auto jsRequire = _engine->globalObject().property("Script").property("require");
@ -1521,7 +1521,7 @@ QVariantMap ScriptManager::fetchModuleSource(const QString& modulePath, const bo
QVariantMap req;
qCDebug(scriptengine_module) << "require.fetchModuleSource: " << QUrl(modulePath).fileName() << QThread::currentThread();
auto onload = [=, &req](const UrlMap& data, const UrlMap& _status) {
auto onload = [=, this, &req](const UrlMap& data, const UrlMap& _status) {
auto url = modulePath;
auto status = _status[url];
auto contents = data[url];
@ -1773,7 +1773,7 @@ void ScriptManager::include(const QStringList& includeFiles, const ScriptValue&
EntityItemID capturedEntityIdentifier = currentEntityIdentifier;
QUrl capturedSandboxURL = currentSandboxURL;
auto evaluateScripts = [=](const QMap<QUrl, QString>& data, const QMap<QUrl, QString>& status) {
auto evaluateScripts = [=, this](const QMap<QUrl, QString>& data, const QMap<QUrl, QString>& status) {
auto parentURL = _parentURL;
for (QUrl url : urls) {
QString contents = data[url];
@ -2065,7 +2065,7 @@ void ScriptManager::loadEntityScript(const EntityItemID& entityID, const QString
#endif
return;
}
executeOnScriptThread([=]{
executeOnScriptThread([=, this]{
#ifdef DEBUG_ENTITY_STATES
qCDebug(scriptengine) << "loadEntityScript.contentAvailable" << status << entityID.toString();
#endif

6
libraries/ui/src/OffscreenUi.cpp
View file

@ -662,13 +662,13 @@ class KeyboardFocusHack : public QObject {
public:
KeyboardFocusHack() {
Q_ASSERT(_mainWindow);
QTimer::singleShot(200, [=] {
QTimer::singleShot(200, [this] {
_window = new QWindow();
_window->setFlags(Qt::FramelessWindowHint);
_window->setGeometry(_mainWindow->x(), _mainWindow->y(), 10, 10);
_window->show();
_window->requestActivate();
QTimer::singleShot(200, [=] {
QTimer::singleShot(200, [this] {
_window->hide();
_window->deleteLater();
_window = nullptr;
@ -693,7 +693,7 @@ void OffscreenUi::createDesktop(const QUrl& url) {
return;
}
load(url, [=](QQmlContext* context, QObject* newObject) {
load(url, [this](QQmlContext* context, QObject* newObject) {
Q_UNUSED(context)
_desktop = static_cast<QQuickItem*>(newObject);
getSurfaceContext()->setContextProperty("desktop", _desktop);

4
libraries/ui/src/VrMenu.cpp
View file

@ -29,10 +29,10 @@ MenuUserData::MenuUserData(QAction* action, QObject* qmlObject, QObject* qmlPare
qmlObject->setObjectName(uuid.toString());
// Make sure we can find it again in the future
updateQmlItemFromAction();
_changedConnection = QObject::connect(action, &QAction::changed, [=] {
_changedConnection = QObject::connect(action, &QAction::changed, [this] {
updateQmlItemFromAction();
});
_shutdownConnection = QObject::connect(qApp, &QCoreApplication::aboutToQuit, [=] {
_shutdownConnection = QObject::connect(qApp, &QCoreApplication::aboutToQuit, [this] {
QObject::disconnect(_changedConnection);
});

8
libraries/ui/src/ui/Menu.cpp
View file

@ -566,7 +566,7 @@ QAction* MenuWrapper::addSeparator() {
QAction* action = _realMenu->addSeparator();
auto offscreenUi = DependencyManager::get<OffscreenUi>();
if (offscreenUi) {
offscreenUi->addMenuInitializer([=](VrMenu* vrMenu) {
offscreenUi->addMenuInitializer([this](VrMenu* vrMenu) {
vrMenu->addSeparator(_realMenu);
});
}
@ -577,7 +577,7 @@ void MenuWrapper::addAction(QAction* action) {
_realMenu->addAction(action);
auto offscreenUi = DependencyManager::get<OffscreenUi>();
if (offscreenUi) {
offscreenUi->addMenuInitializer([=](VrMenu* vrMenu) {
offscreenUi->addMenuInitializer([this, action](VrMenu* vrMenu) {
vrMenu->addAction(_realMenu, action);
});
}
@ -587,7 +587,7 @@ QAction* MenuWrapper::addAction(const QString& menuName) {
QAction* action = _realMenu->addAction(menuName);
auto offscreenUi = DependencyManager::get<OffscreenUi>();
if (offscreenUi) {
offscreenUi->addMenuInitializer([=](VrMenu* vrMenu) {
offscreenUi->addMenuInitializer([this, action](VrMenu* vrMenu) {
vrMenu->addAction(_realMenu, action);
});
}
@ -598,7 +598,7 @@ QAction* MenuWrapper::addAction(const QString& menuName, const QObject* receiver
QAction* action = _realMenu->addAction(menuName, receiver, member, shortcut);
auto offscreenUi = DependencyManager::get<OffscreenUi>();
if (offscreenUi) {
offscreenUi->addMenuInitializer([=](VrMenu* vrMenu) {
offscreenUi->addMenuInitializer([this, action](VrMenu* vrMenu) {
vrMenu->addAction(_realMenu, action);
});
}

8
tools/atp-client/src/ATPClientApp.cpp
View file

@ -292,7 +292,7 @@ void ATPClientApp::uploadAsset() {
}
auto upload = DependencyManager::get<AssetClient>()->createUpload(_localUploadFile);
QObject::connect(upload, &AssetUpload::finished, this, [=](AssetUpload* upload, const QString& hash) mutable {
QObject::connect(upload, &AssetUpload::finished, this, [this](AssetUpload* upload, const QString& hash) mutable {
if (upload->getError() != AssetUpload::NoError) {
qDebug() << "upload failed: " << upload->getErrorString();
} else {
@ -310,7 +310,7 @@ void ATPClientApp::setMapping(QString hash) {
auto assetClient = DependencyManager::get<AssetClient>();
auto request = assetClient->createSetMappingRequest(path, hash);
connect(request, &SetMappingRequest::finished, this, [=](SetMappingRequest* request) mutable {
connect(request, &SetMappingRequest::finished, this, [this](SetMappingRequest* request) mutable {
if (request->getError() != SetMappingRequest::NoError) {
qDebug() << "upload succeeded, but couldn't set mapping: " << request->getErrorString();
} else if (_verbose) {
@ -325,7 +325,7 @@ void ATPClientApp::setMapping(QString hash) {
void ATPClientApp::listAssets() {
auto request = DependencyManager::get<AssetClient>()->createGetAllMappingsRequest();
QObject::connect(request, &GetAllMappingsRequest::finished, this, [=](GetAllMappingsRequest* request) mutable {
QObject::connect(request, &GetAllMappingsRequest::finished, this, [this](GetAllMappingsRequest* request) mutable {
auto result = request->getError();
if (result == GetAllMappingsRequest::NotFound) {
qDebug() << "not found: " << request->getErrorString();
@ -346,7 +346,7 @@ void ATPClientApp::listAssets() {
void ATPClientApp::lookupAsset() {
auto path = _url.path();
auto request = DependencyManager::get<AssetClient>()->createGetMappingRequest(path);
QObject::connect(request, &GetMappingRequest::finished, this, [=](GetMappingRequest* request) mutable {
QObject::connect(request, &GetMappingRequest::finished, this, [this](GetMappingRequest* request) mutable {
auto result = request->getError();
if (result == GetMappingRequest::NotFound) {
qDebug() << "not found: " << request->getErrorString();

4
tools/nitpick/src/AWSInterface.cpp
View file

@ -609,10 +609,10 @@ void AWSInterface::updateAWS() {
QProcess* process = new QProcess();
_busyWindow.setWindowTitle("Updating AWS");
connect(process, &QProcess::started, this, [=]() { _busyWindow.exec(); });
connect(process, &QProcess::started, this, [this]() { _busyWindow.exec(); });
connect(process, SIGNAL(finished(int)), process, SLOT(deleteLater()));
connect(process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this,
[=](int exitCode, QProcess::ExitStatus exitStatus) { _busyWindow.hide(); });
[this](int exitCode, QProcess::ExitStatus exitStatus) { _busyWindow.hide(); });
#ifdef Q_OS_WIN
QStringList parameters = QStringList() << filename;

18
tools/nitpick/src/TestRailInterface.cpp
View file

@ -353,10 +353,10 @@ void TestRailInterface::createAddTestCasesPythonScript(const QString& testDirect
QProcess* process = new QProcess();
_busyWindow.setWindowTitle("Updating TestRail");
connect(process, &QProcess::started, this, [=]() { _busyWindow.exec(); });
connect(process, &QProcess::started, this, [this]() { _busyWindow.exec(); });
connect(process, SIGNAL(finished(int)), process, SLOT(deleteLater()));
connect(process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this,
[=](int exitCode, QProcess::ExitStatus exitStatus) { _busyWindow.hide(); });
[this](int exitCode, QProcess::ExitStatus exitStatus) { _busyWindow.hide(); });
#ifdef Q_OS_WIN
QStringList parameters = QStringList() << _outputDirectory + "/addTestCases.py";
@ -484,10 +484,10 @@ void TestRailInterface::addRun() {
) {
QProcess* process = new QProcess();
_busyWindow.setWindowTitle("Updating TestRail");
connect(process, &QProcess::started, this, [=]() { _busyWindow.exec(); });
connect(process, &QProcess::started, this, [this]() { _busyWindow.exec(); });
connect(process, SIGNAL(finished(int)), process, SLOT(deleteLater()));
connect(process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this,
[=](int exitCode, QProcess::ExitStatus exitStatus) { _busyWindow.hide(); });
[this](int exitCode, QProcess::ExitStatus exitStatus) { _busyWindow.hide(); });
#ifdef Q_OS_WIN
QStringList parameters = QStringList() << _outputDirectory + "/addRun.py";
@ -594,10 +594,10 @@ void TestRailInterface::updateRunWithResults() {
) {
QProcess* process = new QProcess();
_busyWindow.setWindowTitle("Updating TestRail");
connect(process, &QProcess::started, this, [=]() { _busyWindow.exec(); });
connect(process, &QProcess::started, this, [this]() { _busyWindow.exec(); });
connect(process, SIGNAL(finished(int)), process, SLOT(deleteLater()));
connect(process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this,
[=](int exitCode, QProcess::ExitStatus exitStatus) { _busyWindow.hide(); });
[this](int exitCode, QProcess::ExitStatus exitStatus) { _busyWindow.hide(); });
#ifdef Q_OS_WIN
QStringList parameters = QStringList() << _outputDirectory + "/updateRunWithResults.py";
@ -774,7 +774,7 @@ void TestRailInterface::getReleasesFromTestRail() {
QProcess* process = new QProcess();
connect(process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this,
[=](int exitCode, QProcess::ExitStatus exitStatus) { updateReleasesComboData(exitCode, exitStatus); });
[this](int exitCode, QProcess::ExitStatus exitStatus) { updateReleasesComboData(exitCode, exitStatus); });
connect(process, SIGNAL(finished(int)), process, SLOT(deleteLater()));
#ifdef Q_OS_WIN
@ -1098,7 +1098,7 @@ void TestRailInterface::getTestSectionsFromTestRail() {
QProcess* process = new QProcess();
connect(process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this,
[=](int exitCode, QProcess::ExitStatus exitStatus) { updateSectionsComboData(exitCode, exitStatus); });
[this](int exitCode, QProcess::ExitStatus exitStatus) { updateSectionsComboData(exitCode, exitStatus); });
connect(process, SIGNAL(finished(int)), process, SLOT(deleteLater()));
#ifdef Q_OS_WIN
@ -1142,7 +1142,7 @@ void TestRailInterface::getRunsFromTestRail() {
QProcess* process = new QProcess();
connect(process, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this,
[=](int exitCode, QProcess::ExitStatus exitStatus) { updateRunsComboData(exitCode, exitStatus); });
[this](int exitCode, QProcess::ExitStatus exitStatus) { updateRunsComboData(exitCode, exitStatus); });
connect(process, SIGNAL(finished(int)), process, SLOT(deleteLater()));
#ifdef Q_OS_WIN