Showing the changes to interface/src/Menu.cpp (1 of 11 files). Show all
Unified · Split
| @@ -690,10 +690,10 @@ void Menu::addDisabledActionAndSeparator(QMenu* destinationMenu, const QString& · 689 unmodified lines | ||
| 690 | 690 | |
| 691 | 691 | QAction* Menu::addActionToQMenuAndActionHash(QMenu* destinationMenu, |
| 692 | 692 | const QString actionName, |
| 693 | − const QKeySequence& shortcut, | |
| 693 | + const QKEYSEQUENCE& shortcut, | |
| 694 | 694 | const QObject* receiver, |
| 695 | 695 | const char* member, |
| 696 | − QAction::MenuRole role) { | |
| 696 | + QACTION_MENUROLE role) { | |
| 697 | 697 | QAction* action; |
| 698 | 698 | |
| 699 | 699 | if (receiver && member) { |
| @@ -702,7 +702,7 @@ QAction* Menu::addActionToQMenuAndActionHash(QMenu* destinationMenu, · 2 unmodified lines | ||
| 702 | 702 | action = destinationMenu->addAction(actionName); |
| 703 | 703 | action->setShortcut(shortcut); |
| 704 | 704 | } |
| 705 | − action->setMenuRole(role); | |
| 705 | + action->setMenuRole((QAction::MenuRole)role); | |
| 706 | 706 | |
| 707 | 707 | _actionHash.insert(actionName, action); |
| 708 | 708 | |
| @@ -715,7 +715,7 @@ QAction* Menu::addCheckableActionToQMenuAndActionHash(QMenu* destinationMenu, · 6 unmodified lines | ||
| 715 | 715 | const bool checked, |
| 716 | 716 | const QObject* receiver, |
| 717 | 717 | const char* member) { |
| 718 | − QAction* action = addActionToQMenuAndActionHash(destinationMenu, actionName, shortcut, receiver, member); | |
| 718 | + QAction* action = addActionToQMenuAndActionHash(destinationMenu, actionName, (QKEYSEQUENCE&)shortcut, receiver, member); | |
| 719 | 719 | action->setCheckable(true); |
| 720 | 720 | action->setChecked(checked); |
| 721 | 721 | |