Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bad outdated code style #1849

Merged
merged 2 commits into from
Dec 11, 2024
Merged

Fix bad outdated code style #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac40d80
Fix bad outdated code style
iakov Dec 10, 2024
f54b9d2
Fix linter/formatter issue (CodeFactor.io)
iakov Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions qrgui/mainWindow/shapeEdit/visibilityConditionsDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,10 @@ VisibilityConditionsDialog::VisibilityConditionsDialog(QMap<QString, PropertyInf

setWidgetValues();

connect(ui->propertyComboBox, SIGNAL(activated(const QString &)), this, SLOT(changeProperty(const QString &)));
connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), this, SLOT(okClicked()));
connect(ui->propertyComboBox, QOverload<const QString&>::of(&QComboBox::activated)
, this, &VisibilityConditionsDialog::changeProperty);
auto *btnOk = ui->buttonBox->button(QDialogButtonBox::Ok);
connect( btnOk, &QPushButton::clicked, this, &VisibilityConditionsDialog::okClicked);
}

VisibilityConditionsDialog::~VisibilityConditionsDialog()
Expand All @@ -42,9 +44,11 @@ VisibilityConditionsDialog::~VisibilityConditionsDialog()

void VisibilityConditionsDialog::changeProperty(const QString &propertyName)
{
PropertyInfo propertyInfo = mProperties[propertyName];
ui->valueWidget->setPropertyInfo(propertyInfo);
changeOperators(propertyInfo.type);
auto i = mProperties.find(propertyName);
if (i != mProperties.end()) {
ui->valueWidget->setPropertyInfo(*i);
changeOperators(i->type);
}
}

void VisibilityConditionsDialog::changeOperators(Type type)
Expand All @@ -64,7 +68,7 @@ void VisibilityConditionsDialog::changeOperators(Type type)

void VisibilityConditionsDialog::okClicked()
{
for (auto item : mItems) {
for (auto &&item : mItems) {
item->setVisibilityCondition(ui->propertyComboBox->currentText()
, ui->operatorComboBox->currentText(), ui->valueWidget->value());
}
Expand All @@ -85,14 +89,10 @@ void VisibilityConditionsDialog::setWidgetValues()
bool VisibilityConditionsDialog::areValuesEqual() const
{
Item::VisibilityCondition value = mItems.first()->visibilityCondition();
for (auto item : mItems) {
for (auto &&item : mItems) {
if (item->visibilityCondition() != value) {
return false;
}
}
return true;
}

VisibilityConditionsDialog::PropertyInfo::PropertyInfo(VisibilityConditionsDialog::Type t, const QStringList &v)
: type(t), values(v)
{}
10 changes: 6 additions & 4 deletions qrgui/mainWindow/shapeEdit/visibilityConditionsDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,17 @@ class VisibilityConditionsDialog : public QDialog
Type type;
QStringList values;

PropertyInfo() {}
PropertyInfo(Type t, const QStringList &v);
//PropertyInfo() = default;
PropertyInfo(Type t, const QStringList &v)
: type(t), values(v)
{}
};

explicit VisibilityConditionsDialog(QMap<QString, PropertyInfo> const &enumValues
, QList<QSharedPointer<Item>> const &items, QWidget *parent = nullptr);
~VisibilityConditionsDialog();
~VisibilityConditionsDialog() override;

private slots:
private Q_SLOTS:
void changeProperty(const QString &propertyName);
void okClicked();

Expand Down
Loading