kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Fix backwards-compatible Qt6 warnings

Browse Source
This commit is contained in:
Johannes Wüller
2024-05-06 15:27:06 +02:00
committed by Chris Hennes
parent 5b4eeb29a9
commit 33e91421b5
22 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Mod/Sketcher/Gui/EditDatumDialog.cpp
View File

@@ -285,7 +285,8 @@ void EditDatumDialog::drivingToggled(bool state)
void EditDatumDialog::datumChanged()
{
if (ui_ins_datum->labelEdit->text() != qAsConst(ui_ins_datum->labelEdit)->getHistory()[0]) {
if (ui_ins_datum->labelEdit->text()
!= std::as_const(ui_ins_datum->labelEdit)->getHistory()[0]) {
ui_ins_datum->cbDriving->setChecked(false);
}
}

10
src/Mod/Sketcher/Gui/TaskSketcherConstraints.cpp
View File

@@ -833,7 +833,7 @@ TaskSketcherConstraints::TaskSketcherConstraints(ViewProviderSketch* sketchView)
QWidgetAction* action = new QWidgetAction(this);
filterList = new ConstraintFilterList(this);
action->setDefaultWidget(filterList);
qAsConst(ui->filterButton)->addAction(action);
std::as_const(ui->filterButton)->addAction(action);
// Create local settings menu
// FIXME there is probably a smarter way to handle this menu
@@ -862,7 +862,7 @@ TaskSketcherConstraints::TaskSketcherConstraints(ViewProviderSketch* sketchView)
}
hGrp->Attach(this);
auto settingsBut = qAsConst(ui->settingsButton);
auto settingsBut = std::as_const(ui->settingsButton);
settingsBut->addAction(action1);
settingsBut->addAction(action2);
@@ -1040,8 +1040,8 @@ void TaskSketcherConstraints::onChangedSketchView(const Gui::ViewProvider& vp,
{
if (sketchView == &vp) {
if (&sketchView->Autoconstraints == &prop) {
QSignalBlocker block(qAsConst(ui->settingsButton)->actions()[0]);
qAsConst(ui->settingsButton)
QSignalBlocker block(std::as_const(ui->settingsButton)->actions()[0]);
std::as_const(ui->settingsButton)
->actions()[0]
->setChecked(sketchView->Autoconstraints.getValue());
}
@@ -1425,7 +1425,7 @@ void TaskSketcherConstraints::OnChange(Base::Subject<const char*>& rCaller, cons
}
if (actNum >= 0) {
assert(actNum < static_cast<int>(ui->settingsButton->actions().size()));
qAsConst(ui->settingsButton)->actions()[actNum]->setChecked(hGrp->GetBool(rcReason, false));
std::as_const(ui->settingsButton)->actions()[actNum]->setChecked(hGrp->GetBool(rcReason, false));
}
}

6
src/Mod/Sketcher/Gui/TaskSketcherElements.cpp
View File

@@ -492,7 +492,7 @@ private:
{
int hue, sat, val, alp;
QIcon Normal = Gui::BitmapFactory().iconFromTheme(name);
QImage imgConstr(Normal.pixmap(qAsConst(Normal).availableSizes()[0]).toImage());
QImage imgConstr(Normal.pixmap(std::as_const(Normal).availableSizes()[0]).toImage());
QImage imgExt(imgConstr);
QImage imgInt(imgConstr);
@@ -1230,7 +1230,7 @@ void TaskSketcherElements::connectSignals()
&TaskSketcherElements::onFilterBoxStateChanged);
QObject::connect(
ui->settingsButton, &QToolButton::clicked, ui->settingsButton, &QToolButton::showMenu);
QObject::connect(qAsConst(ui->settingsButton)->actions()[0],
QObject::connect(std::as_const(ui->settingsButton)->actions()[0],
&QAction::changed,
this,
&TaskSketcherElements::onSettingsExtendedInformationChanged);
@@ -1250,7 +1250,7 @@ void TaskSketcherElements::createFilterButtonActions()
auto* action = new QWidgetAction(this);
filterList = new ElementFilterList(this);
action->setDefaultWidget(filterList);
qAsConst(ui->filterButton)->addAction(action);
std::as_const(ui->filterButton)->addAction(action);
}
void TaskSketcherElements::onFilterBoxStateChanged(int val)

4
src/Mod/Sketcher/Gui/TaskSketcherMessages.cpp
View File

@@ -102,7 +102,7 @@ TaskSketcherMessages::TaskSketcherMessages(ViewProviderSketch* sketchView)
action->setChecked(state);
ui->manualUpdate->addAction(action);
QObject::connect(qAsConst(ui->manualUpdate)->actions()[0],
QObject::connect(std::as_const(ui->manualUpdate)->actions()[0],
&QAction::changed,
this,
&TaskSketcherMessages::onAutoUpdateStateChanged);
@@ -175,7 +175,7 @@ void TaskSketcherMessages::onLabelConstrainStatusLinkClicked(const QString& str)
void TaskSketcherMessages::onAutoUpdateStateChanged()
{
bool state = qAsConst(ui->manualUpdate)->actions()[0]->isChecked();
bool state = std::as_const(ui->manualUpdate)->actions()[0]->isChecked();
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath(
"User parameter:BaseApp/Preferences/Mod/Sketcher");