AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-07-05 12:45:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

WEditorProperties: Make use of Qt 5 signals and slots

Browse Source
This commit is contained in:
Lioncash 2020-07-03 08:12:53 -04:00
parent 981d74e820
commit a72c338585
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Editor/WorldEditor/WEditorProperties.cpp
View File

@ -48,22 +48,22 @@ WEditorProperties::WEditorProperties(QWidget *pParent)
ComboFont.setPointSize(10); ComboFont.setPointSize(10);
mpLayersComboBox->setFont(ComboFont); mpLayersComboBox->setFont(ComboFont);
connect(mpActiveCheckBox, SIGNAL(clicked()), this, SLOT(OnActiveChanged())); connect(mpActiveCheckBox, &QCheckBox::clicked, this, &WEditorProperties::OnActiveChanged);
connect(mpInstanceNameLineEdit, SIGNAL(textEdited(QString)), this, SLOT(OnInstanceNameEdited())); connect(mpInstanceNameLineEdit, &QLineEdit::textEdited, this, &WEditorProperties::OnInstanceNameEdited);
connect(mpInstanceNameLineEdit, SIGNAL(editingFinished()), this, SLOT(OnInstanceNameEditFinished())); connect(mpInstanceNameLineEdit, &QLineEdit::editingFinished, this, &WEditorProperties::OnInstanceNameEditFinished);
connect(mpLayersComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnLayerChanged())); connect(mpLayersComboBox, qOverload<int>(&QComboBox::currentIndexChanged), this, &WEditorProperties::OnLayerChanged);
} }
void WEditorProperties::SyncToEditor(CWorldEditor *pEditor) void WEditorProperties::SyncToEditor(CWorldEditor *pEditor)
{ {
if (mpEditor) if (mpEditor)
disconnect(mpEditor, 0, this, 0); disconnect(mpEditor, nullptr, this, nullptr);
mpEditor = pEditor; mpEditor = pEditor;
connect(mpEditor, SIGNAL(SelectionModified()), this, SLOT(OnSelectionModified())); connect(mpEditor, &CWorldEditor::SelectionModified, this, &WEditorProperties::OnSelectionModified);
connect(mpEditor, SIGNAL(LayersModified()), this, SLOT(OnLayersModified())); connect(mpEditor, &CWorldEditor::LayersModified, this, &WEditorProperties::OnLayersModified);
connect(mpEditor, SIGNAL(InstancesLayerChanged(QList<CScriptNode*>)), this, SLOT(OnInstancesLayerChanged(QList<CScriptNode*>))); connect(mpEditor, &CWorldEditor::InstancesLayerChanged, this, &WEditorProperties::OnInstancesLayerChanged);
connect(mpEditor, SIGNAL(PropertyModified(IProperty*,CScriptObject*)), this, SLOT(OnPropertyModified(IProperty*,CScriptObject*))); connect(mpEditor, &CWorldEditor::PropertyModified, this, &WEditorProperties::OnPropertyModified);
OnLayersModified(); OnLayersModified();
} }