blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 17:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

emit keyword is incompatible with oneTBB

Browse source
This commit is contained in:
Dan Paulat 2023-06-05 21:53:24 -05:00
parent b9f55fbb4d
commit ea6134acea
24 changed files with 81 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scwx-qt/source/scwx/qt/ui/alert_dialog.cpp
View file

@ -87,7 +87,7 @@ void AlertDialogImpl::ConnectSignals()
this,
[this]()
{
emit self_->MoveMap(centroid_.latitude_, centroid_.longitude_);
Q_EMIT self_->MoveMap(centroid_.latitude_, centroid_.longitude_);
self_->close();
});
}

8
scwx-qt/source/scwx/qt/ui/alert_dock_widget.cpp
View file

@ -184,8 +184,8 @@ void AlertDockWidgetImpl::ConnectSignals()
{
case types::AlertAction::Go:
// Move map
emit self_->MoveMap(selectedAlertCentroid_.latitude_,
selectedAlertCentroid_.longitude_);
Q_EMIT self_->MoveMap(selectedAlertCentroid_.latitude_,
selectedAlertCentroid_.longitude_);
break;
case types::AlertAction::View:
@ -214,8 +214,8 @@ void AlertDockWidgetImpl::ConnectSignals()
this,
[this]()
{
emit self_->MoveMap(selectedAlertCentroid_.latitude_,
selectedAlertCentroid_.longitude_);
Q_EMIT self_->MoveMap(selectedAlertCentroid_.latitude_,
selectedAlertCentroid_.longitude_);
});
connect(
alertDialog_, &AlertDialog::MoveMap, self_, &AlertDockWidget::MoveMap);

26
scwx-qt/source/scwx/qt/ui/animation_dock_widget.cpp
View file

@ -108,7 +108,7 @@ void AnimationDockWidgetImpl::ConnectSignals()
{
if (checked)
{
emit self_->ViewTypeChanged(types::MapTime::Live);
Q_EMIT self_->ViewTypeChanged(types::MapTime::Live);
}
});
QObject::connect(self_->ui->archiveViewRadioButton,
@ -118,7 +118,8 @@ void AnimationDockWidgetImpl::ConnectSignals()
{
if (checked)
{
emit self_->ViewTypeChanged(types::MapTime::Archive);
Q_EMIT self_->ViewTypeChanged(
types::MapTime::Archive);
}
});
@ -132,7 +133,7 @@ void AnimationDockWidgetImpl::ConnectSignals()
if (date.isValid())
{
selectedDate_ = util::SysDays(date);
emit self_->DateTimeChanged(selectedDate_ + selectedTime_);
Q_EMIT self_->DateTimeChanged(selectedDate_ + selectedTime_);
}
});
QObject::connect(
@ -145,7 +146,7 @@ void AnimationDockWidgetImpl::ConnectSignals()
{
selectedTime_ =
std::chrono::seconds(time.msecsSinceStartOfDay() / 1000);
emit self_->DateTimeChanged(selectedDate_ + selectedTime_);
Q_EMIT self_->DateTimeChanged(selectedDate_ + selectedTime_);
}
});
@ -153,34 +154,35 @@ void AnimationDockWidgetImpl::ConnectSignals()
QObject::connect(self_->ui->loopTimeSpinBox,
&QSpinBox::valueChanged,
self_,
[this](int i)
{ emit self_->LoopTimeChanged(std::chrono::minutes(i)); });
[this](int i) {
Q_EMIT self_->LoopTimeChanged(std::chrono::minutes(i));
});
QObject::connect(self_->ui->loopSpeedSpinBox,
&QDoubleSpinBox::valueChanged,
self_,
[this](double d) { emit self_->LoopSpeedChanged(d); });
[this](double d) { Q_EMIT self_->LoopSpeedChanged(d); });
// Animation controls
QObject::connect(self_->ui->beginButton,
&QAbstractButton::clicked,
self_,
[this]() { emit self_->AnimationStepBeginSelected(); });
[this]() { Q_EMIT self_->AnimationStepBeginSelected(); });
QObject::connect(self_->ui->stepBackButton,
&QAbstractButton::clicked,
self_,
[this]() { emit self_->AnimationStepBackSelected(); });
[this]() { Q_EMIT self_->AnimationStepBackSelected(); });
QObject::connect(self_->ui->playButton,
&QAbstractButton::clicked,
self_,
[this]() { emit self_->AnimationPlaySelected(); });
[this]() { Q_EMIT self_->AnimationPlaySelected(); });
QObject::connect(self_->ui->stepNextButton,
&QAbstractButton::clicked,
self_,
[this]() { emit self_->AnimationStepNextSelected(); });
[this]() { Q_EMIT self_->AnimationStepNextSelected(); });
QObject::connect(self_->ui->endButton,
&QAbstractButton::clicked,
self_,
[this]() { emit self_->AnimationStepEndSelected(); });
[this]() { Q_EMIT self_->AnimationStepEndSelected(); });
}
void AnimationDockWidget::UpdateAnimationState(types::AnimationState state)

2
scwx-qt/source/scwx/qt/ui/level2_products_widget.cpp
View file

@ -96,7 +96,7 @@ void Level2ProductsWidgetImpl::SelectProduct(common::Level2Product product)
{
UpdateProductSelection(product);
emit self_->RadarProductSelected(
Q_EMIT self_->RadarProductSelected(
common::RadarProductGroup::Level2, common::GetLevel2Name(product), 0);
}

2
scwx-qt/source/scwx/qt/ui/level2_settings_widget.cpp
View file

@ -126,7 +126,7 @@ void Level2SettingsWidgetImpl::SelectElevation(float elevation)
{
self_->UpdateElevationSelection(elevation);
emit self_->ElevationSelected(elevation);
Q_EMIT self_->ElevationSelected(elevation);
}
void Level2SettingsWidget::UpdateElevationSelection(float elevation)

4
scwx-qt/source/scwx/qt/ui/level3_products_widget.cpp
View file

@ -87,7 +87,7 @@ public:
self_->UpdateProductSelection(
common::RadarProductGroup::Level3, awipsProductName);
emit self_->RadarProductSelected(
Q_EMIT self_->RadarProductSelected(
common::RadarProductGroup::Level3, awipsProductName, 0);
});
}
@ -164,7 +164,7 @@ void Level3ProductsWidgetImpl::SelectProductCategory(
{
UpdateCategorySelection(category);
emit self_->RadarProductSelected(
Q_EMIT self_->RadarProductSelected(
common::RadarProductGroup::Level3,
common::GetLevel3CategoryDefaultProduct(category),
0);

2
scwx-qt/source/scwx/qt/ui/radar_site_dialog.cpp
View file

@ -72,7 +72,7 @@ RadarSiteDialog::RadarSiteDialog(QWidget* parent) :
connect(ui->radarSiteView,
&QTreeView::doubleClicked,
this,
[this]() { emit accept(); });
[this]() { Q_EMIT accept(); });
connect(
ui->radarSiteView->selectionModel(),
&QItemSelectionModel::selectionChanged,

4
scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
View file

@ -494,7 +494,7 @@ void SettingsDialogImpl::SetupPalettesColorTablesTab()
lineEdit->setText(path);
// setText does not emit the textEdited signal
emit lineEdit->textEdited(path);
Q_EMIT lineEdit->textEdited(path);
});
dialog->open();
@ -707,7 +707,7 @@ void SettingsDialogImpl::ShowColorDialog(QLineEdit* lineEdit, QFrame* frame)
lineEdit->setText(colorName);
// setText does not emit the textEdited signal
emit lineEdit->textEdited(colorName);
Q_EMIT lineEdit->textEdited(colorName);
});
dialog->open();