AxioDL
/
PrimeWorldEditor
mirror of https://github.com/AxioDL/PrimeWorldEditor.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CPropertyView: Make use of Qt 5 signals and slots

This commit is contained in:
Lioncash 2020-06-28 23:08:52 -04:00
parent c242c49a99
commit 22372fe33e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Editor/PropertyEdit/CPropertyView.cpp
View File

@ -21,12 +21,12 @@ CPropertyView::CPropertyView(QWidget *pParent)
mpShowNameValidityAction = new QAction(tr("Show whether property name is correct"), this); mpShowNameValidityAction = new QAction(tr("Show whether property name is correct"), this);
mpShowNameValidityAction->setCheckable(true); mpShowNameValidityAction->setCheckable(true);
mpShowNameValidityAction->setChecked(false); mpShowNameValidityAction->setChecked(false);
connect(mpShowNameValidityAction, SIGNAL(triggered(bool)), this, SLOT(ToggleShowNameValidity(bool))); connect(mpShowNameValidityAction, &QAction::triggered, this, &CPropertyView::ToggleShowNameValidity);
if (gTemplatesWritable) if (gTemplatesWritable)
{ {
mpEditTemplateAction = new QAction(tr("Edit template"), this); mpEditTemplateAction = new QAction(tr("Edit template"), this);
connect(mpEditTemplateAction, SIGNAL(triggered()), this, SLOT(EditPropertyTemplate())); connect(mpEditTemplateAction, &QAction::triggered, this, &CPropertyView::EditPropertyTemplate);
} }
else else
{ {
@ -37,15 +37,15 @@ CPropertyView::CPropertyView(QWidget *pParent)
mpGenNamesForPropertyAction = new QAction(tr("Generate names for this property"), this); mpGenNamesForPropertyAction = new QAction(tr("Generate names for this property"), this);
mpGenNamesForSiblingsAction = new QAction(this); // Text set in CreateContextMenu() mpGenNamesForSiblingsAction = new QAction(this); // Text set in CreateContextMenu()
mpGenNamesForChildrenAction = new QAction(this); // Text set in CreateContextMenu() mpGenNamesForChildrenAction = new QAction(this); // Text set in CreateContextMenu()
connect(mpGenNamesForPropertyAction, SIGNAL(triggered(bool)), this, SLOT(GenerateNamesForProperty())); connect(mpGenNamesForPropertyAction, &QAction::triggered, this, &CPropertyView::GenerateNamesForProperty);
connect(mpGenNamesForSiblingsAction, SIGNAL(triggered(bool)), this, SLOT(GenerateNamesForSiblings())); connect(mpGenNamesForSiblingsAction, &QAction::triggered, this, &CPropertyView::GenerateNamesForSiblings);
connect(mpGenNamesForChildrenAction, SIGNAL(triggered(bool)), this, SLOT(GenerateNamesForChildren())); connect(mpGenNamesForChildrenAction, &QAction::triggered, this, &CPropertyView::GenerateNamesForChildren);
connect(this, SIGNAL(expanded(QModelIndex)), this, SLOT(SetPersistentEditors(QModelIndex))); connect(this, &CPropertyView::expanded, this, &CPropertyView::SetPersistentEditors);
connect(this, SIGNAL(clicked(QModelIndex)), this, SLOT(edit(QModelIndex))); connect(this, &CPropertyView::clicked, [this](const QModelIndex& index) { edit(index); });
connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(CreateContextMenu(QPoint))); connect(this, &CPropertyView::customContextMenuRequested, this, &CPropertyView::CreateContextMenu);
connect(mpModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(SetPersistentEditors(QModelIndex))); connect(mpModel, &CPropertyModel::rowsInserted, [this](const QModelIndex& index, int, int) { SetPersistentEditors(index); });
connect(mpModel, SIGNAL(PropertyModified(const QModelIndex&)), this, SLOT(OnPropertyModified(const QModelIndex&))); connect(mpModel, &CPropertyModel::PropertyModified, this, &CPropertyView::OnPropertyModified);
} }
void CPropertyView::setModel(QAbstractItemModel *pModel) void CPropertyView::setModel(QAbstractItemModel *pModel)