diff options
| -rw-r--r-- | desktop-widgets/diveplanner.cpp | 12 | ||||
| -rw-r--r-- | mobile-widgets/qmlmanager.cpp | 4 | ||||
| -rw-r--r-- | qt-models/divelistmodel.cpp | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp index 7b67b8527..f1c0582f9 100644 --- a/desktop-widgets/diveplanner.cpp +++ b/desktop-widgets/diveplanner.cpp @@ -455,9 +455,9 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) rebreather_modes.append(gettextFromC::tr(divemode_text_ui[i])); ui.rebreathermode->insertItems(0, rebreather_modes); - connect(ui.recreational_deco, &QAbstractButton::clicked, [=] { PlannerShared::set_planner_deco_mode(RECREATIONAL); }); - connect(ui.buehlmann_deco, &QAbstractButton::clicked, [=] { PlannerShared::set_planner_deco_mode(BUEHLMANN); }); - connect(ui.vpmb_deco, &QAbstractButton::clicked, [=] { PlannerShared::set_planner_deco_mode(VPMB); }); + connect(ui.recreational_deco, &QAbstractButton::clicked, [] { PlannerShared::set_planner_deco_mode(RECREATIONAL); }); + connect(ui.buehlmann_deco, &QAbstractButton::clicked, [] { PlannerShared::set_planner_deco_mode(BUEHLMANN); }); + connect(ui.vpmb_deco, &QAbstractButton::clicked, [] { PlannerShared::set_planner_deco_mode(VPMB); }); connect(ui.lastStop, &QAbstractButton::toggled, plannerModel, &DivePlannerPointsModel::setLastStop6m); connect(ui.lastStop, &QAbstractButton::toggled, this, &PlannerSettingsWidget::disableBackgasBreaks); @@ -485,9 +485,9 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f) connect(ui.rebreathermode, QOverload<int>::of(&QComboBox::currentIndexChanged), plannerModel, &DivePlannerPointsModel::setRebreatherMode); connect(ui.rebreathermode, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &PlannerSettingsWidget::setBailoutVisibility); - connect(ui.recreational_deco, &QAbstractButton::clicked, [=] { disableDecoElements(RECREATIONAL); }); - connect(ui.buehlmann_deco, &QAbstractButton::clicked, [=] { disableDecoElements(BUEHLMANN); }); - connect(ui.vpmb_deco, &QAbstractButton::clicked, [=] { disableDecoElements(VPMB); }); + connect(ui.recreational_deco, &QAbstractButton::clicked, [this] { disableDecoElements(RECREATIONAL); }); + connect(ui.buehlmann_deco, &QAbstractButton::clicked, [this] { disableDecoElements(BUEHLMANN); }); + connect(ui.vpmb_deco, &QAbstractButton::clicked, [this] { disableDecoElements(VPMB); }); connect(ui.sacfactor, QOverload<double>::of(&QDoubleSpinBox::valueChanged), &PlannerShared::set_sacfactor); connect(ui.problemsolvingtime, QOverload<int>::of(&QSpinBox::valueChanged), plannerModel, &DivePlannerPointsModel::setProblemSolvingTime); diff --git a/mobile-widgets/qmlmanager.cpp b/mobile-widgets/qmlmanager.cpp index a1e092289..456d9c603 100644 --- a/mobile-widgets/qmlmanager.cpp +++ b/mobile-widgets/qmlmanager.cpp @@ -1859,7 +1859,7 @@ void QMLManager::writeToAppLogFile(QString logText) void QMLManager::setStatusbarColor(QColor color) { - QtAndroid::runOnAndroidThread([=]() { + QtAndroid::runOnAndroidThread([color]() { QAndroidJniObject window = QtAndroid::androidActivity().callObjectMethod("getWindow", "()Landroid/view/Window;"); window.callMethod<void>("addFlags", "(I)V", FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); window.callMethod<void>("clearFlags", "(I)V", FLAG_TRANSLUCENT_STATUS); @@ -2094,7 +2094,7 @@ void QMLManager::setFilter(const QString filterText) // show that we are doing something, then do something in another thread in order not to block the UI QMetaObject::invokeMethod(qmlWindow, "showBusyAndDisconnectModel"); QtConcurrent::run(QThreadPool::globalInstance(), - [=]{ + [this,filterText]{ DiveListSortModel::instance()->setFilter(filterText); CollapsedDiveListSortModel::instance()->updateFilterState(); QMetaObject::invokeMethod(qmlWindow, "hideBusyAndConnectModel"); diff --git a/qt-models/divelistmodel.cpp b/qt-models/divelistmodel.cpp index d45072dd2..1335b2952 100644 --- a/qt-models/divelistmodel.cpp +++ b/qt-models/divelistmodel.cpp @@ -106,7 +106,7 @@ void CollapsedDiveListSortModel::setActiveTrip(const QString &trip) // to be destroyed before this function returns. // Instead do this asynchronously QtConcurrent::run(QThreadPool::globalInstance(), - [=]{ + []{ CollapsedDiveListSortModel::instance()->updateFilterState(); }); } |