History

Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist

Zach Fox committed 8 years ago

Commit b2bafed2 parents d31578a 4f8a2ea325 files · +8307 −6585Browse files

Showing the changes to interface/src/Menu.cpp (1 of 325 files). Show all

Unified · Split

interface/src/Menu.cpp+6−6
@@ -56,7 +56,7 @@ Menu* Menu::getInstance() { · 55 unmodified lines
5656 return dynamic_cast<Menu*>(qApp->getWindow()->menuBar());
5757 }
5858
59−const char* exclusionGroupKey = "exclusionGroup";
59+const char* EXCLUSION_GROUP_KEY = "exclusionGroup";
6060
6161 Menu::Menu() {
6262 auto dialogsManager = DependencyManager::get<DialogsManager>();
@@ -228,21 +228,21 @@ Menu::Menu() { · 165 unmodified lines
228228 viewMenu, MenuOption::FirstPerson, Qt::CTRL | Qt::Key_F,
229229 true, qApp, SLOT(cameraMenuChanged())));
230230
231− firstPersonAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup));
231+ firstPersonAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup));
232232
233233 // View > Third Person
234234 auto thirdPersonAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(
235235 viewMenu, MenuOption::ThirdPerson, Qt::CTRL | Qt::Key_G,
236236 false, qApp, SLOT(cameraMenuChanged())));
237237
238− thirdPersonAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup));
238+ thirdPersonAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup));
239239
240240 // View > Mirror
241241 auto viewMirrorAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(
242242 viewMenu, MenuOption::FullscreenMirror, Qt::CTRL | Qt::Key_H,
243243 false, qApp, SLOT(cameraMenuChanged())));
244244
245− viewMirrorAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup));
245+ viewMirrorAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup));
246246
247247 // View > Independent [advanced]
248248 auto viewIndependentAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu,
@@ -250,7 +250,7 @@ Menu::Menu() { · 1 unmodified line
250250 false, qApp, SLOT(cameraMenuChanged()),
251251 UNSPECIFIED_POSITION, "Advanced"));
252252
253− viewIndependentAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup));
253+ viewIndependentAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup));
254254
255255 // View > Entity Camera [advanced]
256256 auto viewEntityCameraAction = cameraModeGroup->addAction(addCheckableActionToQMenuAndActionHash(viewMenu,
@@ -258,7 +258,7 @@ Menu::Menu() { · 1 unmodified line
258258 false, qApp, SLOT(cameraMenuChanged()),
259259 UNSPECIFIED_POSITION, "Advanced"));
260260
261− viewEntityCameraAction->setProperty(exclusionGroupKey, QVariant::fromValue(cameraModeGroup));
261+ viewEntityCameraAction->setProperty(EXCLUSION_GROUP_KEY, QVariant::fromValue(cameraModeGroup));
262262
263263 viewMenu->addSeparator();
264264