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

WModifyTab: Make use of Qt 5 signals and slots

This commit is contained in:
Lioncash 2020-07-03 08:00:50 -04:00
parent 2d811bfe94
commit 54a85f2fba
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/Editor/WorldEditor/WModifyTab.cpp
View File

@ -34,21 +34,21 @@ WModifyTab::WModifyTab(CWorldEditor *pEditor, QWidget *pParent)
ui->InLinksTableView->setModel(mpInLinkModel); ui->InLinksTableView->setModel(mpInLinkModel);
ui->OutLinksTableView->setModel(mpOutLinkModel); ui->OutLinksTableView->setModel(mpOutLinkModel);
connect(ui->InLinksTableView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnLinkTableDoubleClick(QModelIndex))); connect(ui->InLinksTableView, &QTableView::doubleClicked, this, &WModifyTab::OnLinkTableDoubleClick);
connect(ui->OutLinksTableView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnLinkTableDoubleClick(QModelIndex))); connect(ui->OutLinksTableView, &QTableView::doubleClicked, this, &WModifyTab::OnLinkTableDoubleClick);
connect(ui->InLinksTableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(OnLinksSelectionModified())); connect(ui->InLinksTableView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &WModifyTab::OnLinksSelectionModified);
connect(ui->OutLinksTableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)), this, SLOT(OnLinksSelectionModified())); connect(ui->OutLinksTableView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &WModifyTab::OnLinksSelectionModified);
connect(ui->AddOutgoingConnectionToolButton, SIGNAL(triggered(QAction*)), this, SLOT(OnAddLinkActionClicked(QAction*))); connect(ui->AddOutgoingConnectionToolButton, &QToolButton::triggered, this, &WModifyTab::OnAddLinkActionClicked);
connect(ui->AddIncomingConnectionToolButton, SIGNAL(triggered(QAction*)), this, SLOT(OnAddLinkActionClicked(QAction*))); connect(ui->AddIncomingConnectionToolButton, &QToolButton::triggered, this, &WModifyTab::OnAddLinkActionClicked);
connect(ui->DeleteOutgoingConnectionButton, SIGNAL(clicked()), this, SLOT(OnDeleteLinksClicked())); connect(ui->DeleteOutgoingConnectionButton, &QToolButton::clicked, this, &WModifyTab::OnDeleteLinksClicked);
connect(ui->DeleteIncomingConnectionButton, SIGNAL(clicked()), this, SLOT(OnDeleteLinksClicked())); connect(ui->DeleteIncomingConnectionButton, &QToolButton::clicked, this, &WModifyTab::OnDeleteLinksClicked);
connect(ui->EditOutgoingConnectionButton, SIGNAL(clicked()), this, SLOT(OnEditLinkClicked())); connect(ui->EditOutgoingConnectionButton, &QToolButton::clicked, this, &WModifyTab::OnEditLinkClicked);
connect(ui->EditIncomingConnectionButton, SIGNAL(clicked()), this, SLOT(OnEditLinkClicked())); connect(ui->EditIncomingConnectionButton, &QToolButton::clicked, this, &WModifyTab::OnEditLinkClicked);
connect(ui->PropertyView, SIGNAL(PropertyModified(IProperty*)), mpWorldEditor, SLOT(OnPropertyModified(IProperty*))); connect(ui->PropertyView, qOverload<IProperty*>(&CPropertyView::PropertyModified), mpWorldEditor, &CWorldEditor::OnPropertyModified);
connect(mpWorldEditor, SIGNAL(MapChanged(CWorld*,CGameArea*)), this, SLOT(OnMapChanged())); connect(mpWorldEditor, &CWorldEditor::MapChanged, this, &WModifyTab::OnMapChanged);
connect(mpWorldEditor, SIGNAL(SelectionTransformed()), this, SLOT(OnWorldSelectionTransformed())); connect(mpWorldEditor, &CWorldEditor::SelectionTransformed, this, &WModifyTab::OnWorldSelectionTransformed);
connect(mpWorldEditor, SIGNAL(InstanceLinksModified(const QList<CScriptObject*>&)), this, SLOT(OnInstanceLinksModified(const QList<CScriptObject*>&))); connect(mpWorldEditor, &CWorldEditor::InstanceLinksModified, this, &WModifyTab::OnInstanceLinksModified);
connect(mpWorldEditor->Selection(), SIGNAL(Modified()), this, SLOT(GenerateUI())); connect(mpWorldEditor->Selection(), &CNodeSelection::Modified, this, &WModifyTab::GenerateUI);
ClearUI(); ClearUI();
} }
@ -165,8 +165,8 @@ void WModifyTab::OnAddLinkActionClicked(QAction *pAction)
if (pAction == mpAddFromViewportAction) if (pAction == mpAddFromViewportAction)
{ {
mpWorldEditor->EnterPickMode(ENodeType::Script, true, false, false); mpWorldEditor->EnterPickMode(ENodeType::Script, true, false, false);
connect(mpWorldEditor, SIGNAL(PickModeClick(SRayIntersection,QMouseEvent*)), this, SLOT(OnPickModeClick(SRayIntersection))); connect(mpWorldEditor, &CWorldEditor::PickModeClick, this, &WModifyTab::OnPickModeClick);
connect(mpWorldEditor, SIGNAL(PickModeExited()), this, SLOT(OnPickModeExit())); connect(mpWorldEditor, &CWorldEditor::PickModeExited, this, &WModifyTab::OnPickModeExit);
mIsPicking = true; mIsPicking = true;
} }
@ -212,8 +212,8 @@ void WModifyTab::OnPickModeClick(const SRayIntersection& rkIntersect)
void WModifyTab::OnPickModeExit() void WModifyTab::OnPickModeExit()
{ {
disconnect(mpWorldEditor, SIGNAL(PickModeClick(SRayIntersection,QMouseEvent*)), this, 0); disconnect(mpWorldEditor, &CWorldEditor::PickModeClick, this, nullptr);
disconnect(mpWorldEditor, SIGNAL(PickModeExited()), this, 0); disconnect(mpWorldEditor, &CWorldEditor::PickModeExited, this, nullptr);
mIsPicking = false; mIsPicking = false;
} }