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

Merge pull request #14004 from wwmayer/prop_item

Browse Source 
Gui: move to new-style connect() in createEditor()
This commit is contained in:
Chris Hennes
2024-05-20 10:45:54 -05:00
committed by GitHub
parent ed01d5cffa af3861aa79
commit 407a572d2f
12 changed files with 117 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Fem/Gui/PropertyFemMeshItem.cpp
View File

@@ -129,11 +129,9 @@ void PropertyFemMeshItem::setValue(const QVariant& value)
}
QWidget* PropertyFemMeshItem::createEditor(QWidget* parent,
const QObject* receiver,
const char* method) const
const std::function<void()>& method) const
{
Q_UNUSED(parent);
Q_UNUSED(receiver);
Q_UNUSED(method);
return nullptr;
}

3
src/Mod/Fem/Gui/PropertyFemMeshItem.h
View File

@@ -44,8 +44,7 @@ class PropertyFemMeshItem: public Gui::PropertyEditor::PropertyItem
Q_PROPERTY(int Groups READ countGroups CONSTANT)
PROPERTYITEM_HEADER
QWidget*
createEditor(QWidget* parent, const QObject* receiver, const char* method) const override;
QWidget* createEditor(QWidget* parent, const std::function<void()>& method) const override;
void setEditorData(QWidget* editor, const QVariant& data) const override;
QVariant editorData(QWidget* editor) const override;

4
src/Mod/Mesh/Gui/PropertyEditorMesh.cpp
View File

@@ -89,11 +89,9 @@ void PropertyMeshKernelItem::setValue(const QVariant& value)
}
QWidget* PropertyMeshKernelItem::createEditor(QWidget* parent,
const QObject* receiver,
const char* method) const
const std::function<void()>& method) const
{
Q_UNUSED(parent);
Q_UNUSED(receiver);
Q_UNUSED(method);
return nullptr;
}

4
src/Mod/Mesh/Gui/PropertyEditorMesh.h
View File

@@ -45,9 +45,7 @@ class MeshGuiExport PropertyMeshKernelItem: public Gui::PropertyEditor::Property
PROPERTYITEM_HEADER
// clang-format off
QWidget* createEditor(QWidget* parent,
const QObject* receiver,
const char* method) const override;
QWidget* createEditor(QWidget* parent, const std::function<void()>& method) const override;
// clang-format on
void setEditorData(QWidget* editor, const QVariant& data) const override;
QVariant editorData(QWidget* editor) const override;

5
src/Mod/Part/Gui/PropertyEnumAttacherItem.cpp
View File

@@ -42,10 +42,11 @@ PROPERTYITEM_SOURCE(PartGui::PropertyEnumAttacherItem)
PropertyEnumAttacherItem::PropertyEnumAttacherItem() = default;
QWidget* PropertyEnumAttacherItem::createEditor(QWidget* parent, const QObject* receiver, const char* method) const
QWidget* PropertyEnumAttacherItem::createEditor(QWidget* parent,
const std::function<void()>& method) const
{
Gui::LabelButton* modeEditor = new Gui::LabelButton(parent);
QObject::connect(modeEditor, SIGNAL(valueChanged(const QVariant &)), receiver, method);
QObject::connect(modeEditor, &Gui::LabelButton::valueChanged, method);
QObject::connect(modeEditor, &Gui::LabelButton::buttonClicked, this, &PropertyEnumAttacherItem::openTask);
modeEditor->setDisabled(isReadOnly());
return modeEditor;

2
src/Mod/Part/Gui/PropertyEnumAttacherItem.h
View File

@@ -40,7 +40,7 @@ class PartGuiExport PropertyEnumAttacherItem: public Gui::PropertyEditor::Proper
public:
PROPERTYITEM_HEADER
QWidget* createEditor(QWidget* parent, const QObject* receiver, const char* method) const override;
QWidget* createEditor(QWidget* parent, const std::function<void()>& method) const override;
void setEditorData(QWidget* editor, const QVariant& data) const override;
QVariant editorData(QWidget* editor) const override;

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

@@ -369,10 +369,8 @@ void PropertyConstraintListItem::setValue(const QVariant& value)
}
QWidget* PropertyConstraintListItem::createEditor(QWidget* parent,
const QObject* receiver,
const char* method) const
const std::function<void()>& method) const
{
Q_UNUSED(receiver);
Q_UNUSED(method);
QLineEdit* le = new QLineEdit(parent);
le->setFrame(false);

3
src/Mod/Sketcher/Gui/PropertyConstraintListItem.h
View File

@@ -38,8 +38,7 @@ class PropertyConstraintListItem: public Gui::PropertyEditor::PropertyItem
~PropertyConstraintListItem() override;
void assignProperty(const App::Property* prop) override;
QWidget*
createEditor(QWidget* parent, const QObject* receiver, const char* method) const override;
QWidget* createEditor(QWidget* parent, const std::function<void()>& method) const override;
void setEditorData(QWidget* editor, const QVariant& data) const override;
QVariant editorData(QWidget* editor) const override;