diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index e35407038b..335a70a76c 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -7082,7 +7082,7 @@ DisplayPluginPointer Application::getActiveDisplayPlugin() const { return _displayPlugin; } -static const char* exclusionGroupKey = "exclusionGroup"; +static const char* EXCLUSION_GROUP_KEY = "exclusionGroup"; static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool active = false) { auto menu = Menu::getInstance(); @@ -7119,7 +7119,7 @@ static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool acti action->setChecked(active); displayPluginGroup->addAction(action); - action->setProperty(exclusionGroupKey, QVariant::fromValue(displayPluginGroup)); + action->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(displayPluginGroup)); Q_ASSERT(menu->menuItemExists(MenuOption::OutputMenu, name)); } diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 9df22ab08e..9ec5cc6034 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -56,7 +56,7 @@ Menu* Menu::getInstance() { return dynamic_cast(qApp->getWindow()->menuBar()); } -const char* exclusionGroupKey = "exclusionGroup"; +const char* EXCLUSION_GROUP_KEY = "exclusionGroup"; Menu::Menu() { auto dialogsManager = DependencyManager::get(); @@ -228,21 +228,21 @@ Menu::Menu() { viewMenu, MenuOption::FirstPerson, Qt::CTRL | Qt::Key_F, true, qApp, SLOT(cameraMenuChanged()))); - firstPersonAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup)); + firstPersonAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup)); // View > Third Person auto thirdPersonAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash( viewMenu, MenuOption::ThirdPerson, Qt::CTRL | Qt::Key_G, false, qApp, SLOT(cameraMenuChanged()))); - thirdPersonAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup)); + thirdPersonAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup)); // View > Mirror auto viewMirrorAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash( viewMenu, MenuOption::FullscreenMirror, Qt::CTRL | Qt::Key_H, false, qApp, SLOT(cameraMenuChanged()))); - viewMirrorAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup)); + viewMirrorAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup)); // View > Independent [advanced] auto viewIndependentAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu, @@ -250,7 +250,7 @@ Menu::Menu() { false, qApp, SLOT(cameraMenuChanged()), UNSPECIFIED_POSITION, "Advanced")); - viewIndependentAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup)); + viewIndependentAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup)); // View > Entity Camera [advanced] auto viewEntityCameraAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu, @@ -258,7 +258,7 @@ Menu::Menu() { false, qApp, SLOT(cameraMenuChanged()), UNSPECIFIED_POSITION, "Advanced")); - viewEntityCameraAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup)); + viewEntityCameraAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup)); viewMenu->addSeparator();