From 2a17185cc0345fb3b8a577fdc751f8c04d993302 Mon Sep 17 00:00:00 2001 From: KeyboardCombination Date: Sun, 21 May 2023 17:29:11 -0400 Subject: [PATCH] Fixed name inconsistencies --- src/source/DataModelV2/GuiRootInstance.cpp | 10 ++--- src/source/Listener/GUDButtonListener.cpp | 44 +++++++++++----------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/source/DataModelV2/GuiRootInstance.cpp b/src/source/DataModelV2/GuiRootInstance.cpp index 6e2f46c..a135de9 100644 --- a/src/source/DataModelV2/GuiRootInstance.cpp +++ b/src/source/DataModelV2/GuiRootInstance.cpp @@ -504,7 +504,7 @@ void GuiRootInstance::update() Instance * obj4 = this->findFirstChild("Rotate"); Instance * obj5 = this->findFirstChild("Tilt"); - SelectionService* SelectionSvc = g_dataModel->getSelectionService(); + SelectionService* getSelectionService = g_dataModel->getSelectionService(); if(obj != NULL && obj2 != NULL && obj3 != NULL && obj4 !=NULL && obj5 != NULL && obj6 != NULL) { @@ -520,8 +520,8 @@ void GuiRootInstance::update() button4->disabled = true; button5->disabled = true; button6->disabled = true; - for(size_t i = 0; i < SelectionSvc->getSelection().size(); i++) - if(SelectionSvc->getSelection()[i]->canDelete) + for(size_t i = 0; i < getSelectionService->getSelection().size(); i++) + if(getSelectionService->getSelection()[i]->canDelete) { button->disabled = false; button4->disabled = false; @@ -529,11 +529,11 @@ void GuiRootInstance::update() button6->disabled = false; - if (SelectionSvc->getSelection().size() > 1){ + if (getSelectionService->getSelection().size() > 1){ button2->disabled = false; } - if (dynamic_cast(SelectionSvc->getSelection()[i])){ + if (dynamic_cast(getSelectionService->getSelection()[i])){ button3->disabled = false; } diff --git a/src/source/Listener/GUDButtonListener.cpp b/src/source/Listener/GUDButtonListener.cpp index b6032ff..31df167 100644 --- a/src/source/Listener/GUDButtonListener.cpp +++ b/src/source/Listener/GUDButtonListener.cpp @@ -7,12 +7,12 @@ void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button) { - SelectionService* SelectionSvc = g_dataModel->getSelectionService(); - SoundService* SoundSvc = g_dataModel->getSoundService(); + SelectionService* getSelectionService = g_dataModel->getSelectionService(); + SoundService* getSoundService = g_dataModel->getSoundService(); bool cont = false; - for(size_t i = 0; i < SelectionSvc->getSelection().size(); i++) - if(SelectionSvc->getSelection()[i]->canDelete) + for(size_t i = 0; i < getSelectionService->getSelection().size(); i++) + if(getSelectionService->getSelection()[i]->canDelete) { cont = true; break; @@ -21,19 +21,19 @@ void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button) if (cont) { if(button->disabled == false){ - SoundSvc->playSound(SoundSvc->findFirstChild("Ping")); + getSoundService->playSound(getSoundService->findFirstChild("Ping")); } if(button->name == "Duplicate") { std::vector newinst; - for(size_t i = 0; i < SelectionSvc->getSelection().size(); i++) + for(size_t i = 0; i < getSelectionService->getSelection().size(); i++) { - if(SelectionSvc->getSelection()[i]->canDelete) + if(getSelectionService->getSelection()[i]->canDelete) { - Instance* tempinst = SelectionSvc->getSelection()[i]; + Instance* tempinst = getSelectionService->getSelection()[i]; - Instance* clonedInstance = SelectionSvc->getSelection()[i]->clone(); + Instance* clonedInstance = getSelectionService->getSelection()[i]->clone(); if (clonedInstance->getClassName() == "PVInstance"){ PartInstance* Part = dynamic_cast(clonedInstance); @@ -43,35 +43,35 @@ void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button) newinst.push_back(clonedInstance); } } - SelectionSvc->clearSelection(); - SelectionSvc->addSelected(newinst); + getSelectionService->clearSelection(); + getSelectionService->addSelected(newinst); } else if(button->name == "Group") { - if (SelectionSvc->getSelection().size() > 1){ + if (getSelectionService->getSelection().size() > 1){ GroupInstance * inst = new GroupInstance(); inst->setParent(g_dataModel->getWorkspace()); - for(size_t i = 0; i < SelectionSvc->getSelection().size(); i++) + for(size_t i = 0; i < getSelectionService->getSelection().size(); i++) { - if(SelectionSvc->getSelection()[i]->canDelete) + if(getSelectionService->getSelection()[i]->canDelete) { - SelectionSvc->getSelection()[i]->setParent(inst); - if(PartInstance* part = dynamic_cast(SelectionSvc->getSelection()[i])) + getSelectionService->getSelection()[i]->setParent(inst); + if(PartInstance* part = dynamic_cast(getSelectionService->getSelection()[i])) { inst->primaryPart = part; } } } - SelectionSvc->clearSelection(); - SelectionSvc->addSelected(inst); + getSelectionService->clearSelection(); + getSelectionService->addSelected(inst); } } else if(button->name == "UnGroup") { std::vector newinst; - for(size_t i = 0; i < SelectionSvc->getSelection().size(); i++) + for(size_t i = 0; i < getSelectionService->getSelection().size(); i++) { - Instance* selection = SelectionSvc->getSelection()[i]; + Instance* selection = getSelectionService->getSelection()[i]; if(GroupInstance* model = dynamic_cast(selection)) { @@ -81,8 +81,8 @@ void GUDButtonListener::onButton1MouseClick(BaseButtonInstance* button) model = NULL; } } - SelectionSvc->clearSelection(); - SelectionSvc->addSelected(newinst); + getSelectionService->clearSelection(); + getSelectionService->addSelected(newinst); } } } \ No newline at end of file