Add and fix implicit this capture warning
This commit is contained in:
@@ -646,6 +646,14 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_COMPILER_FRONTEND_VARIANT
|
||||
add_compile_options("/wd${d}")
|
||||
endforeach(d)
|
||||
|
||||
set(WARNINGS_EXTRA
|
||||
4855 # implicit capture of 'this' via '[=]' is deprecated in 'version'
|
||||
)
|
||||
|
||||
foreach(d ${WARNINGS_EXTRA})
|
||||
add_compile_options("/w1${d}")
|
||||
endforeach(d)
|
||||
|
||||
if(OPENMW_MSVC_WERROR)
|
||||
add_compile_options("/WX")
|
||||
endif()
|
||||
|
||||
@@ -107,26 +107,26 @@ Launcher::SettingsPage::SettingsPage(
|
||||
connect(configsList, &QTreeWidget::itemActivated, this, &SettingsPage::slotOpenFile);
|
||||
|
||||
auto actionOpenDir = new QAction(tr("Open directory"), configsList);
|
||||
connect(actionOpenDir, &QAction::triggered, [=]() {
|
||||
connect(actionOpenDir, &QAction::triggered, [this]() {
|
||||
QUrl configFolderUrl = configsList->currentItem()->data(0, ConfigDirectory).toUrl();
|
||||
QDesktopServices::openUrl(configFolderUrl);
|
||||
});
|
||||
|
||||
auto actionOpenOpenmwCfg = new QAction(tr("Open openmw.cfg"), configsList);
|
||||
connect(actionOpenOpenmwCfg, &QAction::triggered, [=]() {
|
||||
connect(actionOpenOpenmwCfg, &QAction::triggered, [this]() {
|
||||
QVariant configFileUrl = configsList->currentItem()->data(0, OpenMWCfg);
|
||||
if (configFileUrl.isValid())
|
||||
QDesktopServices::openUrl(configFileUrl.toUrl());
|
||||
});
|
||||
|
||||
auto actionOpenSettingsCfg = new QAction(tr("Open settings.cfg"), configsList);
|
||||
connect(actionOpenSettingsCfg, &QAction::triggered, [=]() {
|
||||
connect(actionOpenSettingsCfg, &QAction::triggered, [this]() {
|
||||
QVariant configFileUrl = configsList->currentItem()->data(0, SettingsCfg);
|
||||
if (configFileUrl.isValid())
|
||||
QDesktopServices::openUrl(configFileUrl.toUrl());
|
||||
});
|
||||
|
||||
connect(configsList, &QTreeWidget::customContextMenuRequested, [=](const QPoint& pos) {
|
||||
connect(configsList, &QTreeWidget::customContextMenuRequested, [=, this](const QPoint& pos) {
|
||||
if (configsList->currentItem())
|
||||
{
|
||||
QMenu* contextMenu = new QMenu();
|
||||
|
||||
Reference in New Issue
Block a user