From 44a1f858913d4911a5e214e2274fe28ce63169a8 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 6 Sep 2015 12:37:49 +0200 Subject: [PATCH] Refactor CRobotMain::DeleteObject -> DestroySelectedObject --- src/level/robotmain.cpp | 4 ++-- src/level/robotmain.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index 29acd7c0..367623de 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -991,7 +991,7 @@ bool CRobotMain::ProcessEvent(Event &event) case EVENT_OBJECT_DELETE: m_ui->GetDialog()->StartQuestion(RT_DIALOG_DELOBJ, true, false, false, [&]() { - DeleteObject(); + DestroySelectedObject(); }); break; @@ -1983,7 +1983,7 @@ bool CRobotMain::IsSelectable(CObject* obj) //! Deletes the selected object -bool CRobotMain::DeleteObject() +bool CRobotMain::DestroySelectedObject() { CObject* obj = GetSelect(); if (obj == nullptr) return false; diff --git a/src/level/robotmain.h b/src/level/robotmain.h index 622c18b5..14fa77d5 100644 --- a/src/level/robotmain.h +++ b/src/level/robotmain.h @@ -198,7 +198,6 @@ public: bool SelectObject(CObject* pObj, bool displayError=true); CObject* GetSelectObject(); CObject* DeselectAll(); - bool DeleteObject(); void ResetObject(); void UpdateAudio(bool frame); @@ -413,6 +412,7 @@ protected: int AutosaveRotate(bool freeOne); void Autosave(); + bool DestroySelectedObject(); void PushToSelectionHistory(CObject* obj); CObject* PopFromSelectionHistory();