History

fix implicit this

RTUnreal committed 1 year ago

Commit 86c5f2c1 parent 611faa942 files · +134 −135Browse files

Showing the changes to interface/src/Application_UI.cpp (1 of 42 files). Show all

Unified · Split

interface/src/Application_UI.cpp+9−9
@@ -339,7 +339,7 @@ void Application::confirmConnectWithoutAvatarEntities() { · 338 unmodified lines
339339 _confirmConnectWithoutAvatarEntitiesDialog = OffscreenUi::asyncQuestion("Continue Without Wearables", continueMessage,
340340 QMessageBox::Yes | QMessageBox::No);
341341 if (_confirmConnectWithoutAvatarEntitiesDialog->getDialogItem()) {
342− QObject::connect(_confirmConnectWithoutAvatarEntitiesDialog, &ModalDialogListener::response, this, [=](QVariant answer) {
342+ QObject::connect(_confirmConnectWithoutAvatarEntitiesDialog, &ModalDialogListener::response, this, [=, this](QVariant answer) {
343343 QObject::disconnect(_confirmConnectWithoutAvatarEntitiesDialog, &ModalDialogListener::response, this, nullptr);
344344 _confirmConnectWithoutAvatarEntitiesDialog = nullptr;
345345 bool shouldConnect = (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes);
@@ -490,7 +490,7 @@ void Application::loadDialog() { · 144 unmodified lines
490490 ModalDialogListener* dlg = OffscreenUi::getOpenFileNameAsync(_glWidget, tr("Open Script"),
491491 getPreviousScriptLocation(),
492492 tr("JavaScript Files (*.js)"));
493− connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
493+ connect(dlg, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
494494 disconnect(dlg, &ModalDialogListener::response, this, nullptr);
495495 const QString& response = answer.toString();
496496 if (!response.isEmpty() && QFile(response).exists()) {
@@ -502,7 +502,7 @@ void Application::loadDialog() { · 5 unmodified lines
502502
503503 void Application::loadScriptURLDialog() const {
504504 ModalDialogListener* dlg = OffscreenUi::getTextAsync(OffscreenUi::ICON_NONE, "Open and Run Script", "Script URL");
505− connect(dlg, &ModalDialogListener::response, this, [=] (QVariant response) {
505+ connect(dlg, &ModalDialogListener::response, this, [=, this] (QVariant response) {
506506 disconnect(dlg, &ModalDialogListener::response, this, nullptr);
507507 const QString& newScript = response.toString();
508508 if (QUrl(newScript).scheme() == "atp") {
@@ -574,7 +574,7 @@ void Application::showAssetServerWidget(QString filePath) { · 65 unmodified lines
574574 }
575575 static const QUrl url { "hifi/AssetServer.qml" };
576576
577− auto startUpload = [=](QQmlContext* context, QObject* newObject){
577+ auto startUpload = [=, this](QQmlContext* context, QObject* newObject){
578578 if (!filePath.isEmpty()) {
579579 emit uploadRequest(filePath);
580580 }
@@ -982,11 +982,11 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 401 unmodified lines
982982
983983 bool agreeToLicense = true; // assume true
984984 //create set avatar callback
985− auto setAvatar = [=] (QString url, QString modelName) {
985+ auto setAvatar = [=, this] (QString url, QString modelName) {
986986 ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Set Avatar",
987987 "Would you like to use '" + modelName + "' for your avatar?",
988988 QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok);
989− QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
989+ QObject::connect(dlg, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
990990 QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
991991
992992 bool ok = (QMessageBox::Ok == static_cast<QMessageBox::StandardButton>(answer.toInt()));
@@ -1007,7 +1007,7 @@ bool Application::askToSetAvatarUrl(const QString& url) { · 14 unmodified lines
10071007 ModalDialogListener* dlg = OffscreenUi::asyncQuestion("Avatar Usage License",
10081008 modelLicense + "\nDo you agree to these terms?",
10091009 QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes);
1010− QObject::connect(dlg, &ModalDialogListener::response, this, [=, &agreeToLicense] (QVariant answer) {
1010+ QObject::connect(dlg, &ModalDialogListener::response, this, [=, this, &agreeToLicense] (QVariant answer) {
10111011 QObject::disconnect(dlg, &ModalDialogListener::response, this, nullptr);
10121012
10131013 agreeToLicense = (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes);
@@ -1052,7 +1052,7 @@ bool Application::askToLoadScript(const QString& scriptFilenameOrURL) { · 38 unmodified lines
10521052 ModalDialogListener* dlg = OffscreenUi::asyncQuestion(getWindow(), "Run Script", message,
10531053 QMessageBox::Yes | QMessageBox::No);
10541054
1055− QObject::connect(dlg, &ModalDialogListener::response, this, [=] (QVariant answer) {
1055+ QObject::connect(dlg, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
10561056 const QString& fileName = scriptFilenameOrURL;
10571057 if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
10581058 qCDebug(interfaceapp) << "Chose to run the script: " << fileName;
@@ -1081,7 +1081,7 @@ bool Application::askToReplaceDomainContent(const QString& url) { · 22 unmodified lines
10811081 ModalDialogListener* dig = OffscreenUi::asyncQuestion("Are you sure you want to replace this domain's content set?",
10821082 infoText, QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
10831083
1084− QObject::connect(dig, &ModalDialogListener::response, this, [=] (QVariant answer) {
1084+ QObject::connect(dig, &ModalDialogListener::response, this, [=, this] (QVariant answer) {
10851085 QString details;
10861086 if (static_cast<QMessageBox::StandardButton>(answer.toInt()) == QMessageBox::Yes) {
10871087 // Given confirmation, send request to domain server to replace content