Mesh: modernize C++11

* remove redundant void-arg
* use nullptr
* replace deprecated headers
This commit is contained in:
wmayer
2022-01-26 18:05:02 +01:00
parent 213311524e
commit 59e605e6b8
88 changed files with 651 additions and 651 deletions

View File

@@ -207,7 +207,7 @@ ParametersDialog::ParametersDialog(std::vector<float>& val, FitParameter* fitPar
int index = 0;
QGridLayout *layout;
layout = new QGridLayout(groupBox);
for (auto it : parameter) {
for (const auto& it : parameter) {
QLabel* label = new QLabel(groupBox);
label->setText(it.first);
layout->addWidget(label, index, 0, 1, 1);
@@ -346,7 +346,7 @@ void SegmentationBestFit::on_planeParameters_clicked()
list.push_back(std::make_pair(axis + y, p[4]));
list.push_back(std::make_pair(axis + z, p[5]));
static QPointer<QDialog> dialog = 0;
static QPointer<QDialog> dialog = nullptr;
if (!dialog)
dialog = new ParametersDialog(planeParameter,
new PlaneFitParameter,
@@ -374,7 +374,7 @@ void SegmentationBestFit::on_cylinderParameters_clicked()
list.push_back(std::make_pair(axis + z, p[5]));
list.push_back(std::make_pair(radius, p[6]));
static QPointer<QDialog> dialog = 0;
static QPointer<QDialog> dialog = nullptr;
if (!dialog)
dialog = new ParametersDialog(cylinderParameter,
new CylinderFitParameter,
@@ -398,7 +398,7 @@ void SegmentationBestFit::on_sphereParameters_clicked()
list.push_back(std::make_pair(base + z, p[2]));
list.push_back(std::make_pair(radius, p[3]));
static QPointer<QDialog> dialog = 0;
static QPointer<QDialog> dialog = nullptr;
if (!dialog)
dialog = new ParametersDialog(sphereParameter,
new SphereFitParameter,
@@ -504,7 +504,7 @@ TaskSegmentationBestFit::TaskSegmentationBestFit(Mesh::Feature* mesh)
{
widget = new SegmentationBestFit(mesh);
taskbox = new Gui::TaskView::TaskBox(
QPixmap(), widget->windowTitle(), false, 0);
QPixmap(), widget->windowTitle(), false, nullptr);
taskbox->groupLayout()->addWidget(widget);
Content.push_back(taskbox);
}