Showing the changes to interface/src/scripting/MenuScriptingInterface.cpp (1 of 21 files). Show all
Unified · Split
| @@ -28,72 +28,50 @@ void MenuScriptingInterface::menuItemTriggered() { · 27 unmodified lines | ||
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | void MenuScriptingInterface::addMenu(const QString& menu) { |
| 31 | − QMetaObject::invokeMethod(Menu::getInstance(), "addMenu", Q_ARG(const QString&, menu)); | |
| 31 | + Menu::getInstance()->addMenu("", menu); | |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | 34 | void MenuScriptingInterface::removeMenu(const QString& menu) { |
| 35 | − QMetaObject::invokeMethod(Menu::getInstance(), "removeMenu", Q_ARG(const QString&, menu)); | |
| 35 | + Menu::getInstance()->removeMenu(menu); | |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | 38 | bool MenuScriptingInterface::menuExists(const QString& menu) { |
| 39 | − bool result; | |
| 40 | − QMetaObject::invokeMethod(Menu::getInstance(), "menuExists", Qt::BlockingQueuedConnection, | |
| 41 | − Q_RETURN_ARG(bool, result), | |
| 42 | − Q_ARG(const QString&, menu)); | |
| 43 | − return result; | |
| 39 | + return Menu::getInstance()->menuExists(menu); | |
| 44 | 40 | } |
| 45 | 41 | |
| 46 | 42 | void MenuScriptingInterface::addSeparator(const QString& menuName, const QString& separatorName) { |
| 47 | − QMetaObject::invokeMethod(Menu::getInstance(), "addSeparator", | |
| 48 | − Q_ARG(const QString&, menuName), | |
| 49 | − Q_ARG(const QString&, separatorName)); | |
| 43 | + Menu::getInstance()->addSeparator(menuName, separatorName); | |
| 50 | 44 | } |
| 51 | 45 | |
| 52 | 46 | void MenuScriptingInterface::removeSeparator(const QString& menuName, const QString& separatorName) { |
| 53 | − QMetaObject::invokeMethod(Menu::getInstance(), "removeSeparator", | |
| 54 | − Q_ARG(const QString&, menuName), | |
| 55 | − Q_ARG(const QString&, separatorName)); | |
| 47 | + Menu::getInstance()->removeSeparator(menuName, separatorName); | |
| 56 | 48 | } |
| 57 | 49 | |
| 58 | 50 | void MenuScriptingInterface::addMenuItem(const MenuItemProperties& properties) { |
| 59 | − QMetaObject::invokeMethod(Menu::getInstance(), "addMenuItem", Q_ARG(const MenuItemProperties&, properties)); | |
| 51 | + Menu::getInstance()->addMenuItem(properties); | |
| 60 | 52 | } |
| 61 | 53 | |
| 62 | 54 | void MenuScriptingInterface::addMenuItem(const QString& menu, const QString& menuitem, const QString& shortcutKey) { |
| 63 | − MenuItemProperties properties(menu, menuitem, shortcutKey); | |
| 64 | − QMetaObject::invokeMethod(Menu::getInstance(), "addMenuItem", Q_ARG(const MenuItemProperties&, properties)); | |
| 55 | + Menu::getInstance()->addItem(menu, menuitem); | |
| 56 | + Menu::getInstance()->setItemShortcut(menuitem, shortcutKey); | |
| 65 | 57 | } |
| 66 | 58 | |
| 67 | 59 | void MenuScriptingInterface::addMenuItem(const QString& menu, const QString& menuitem) { |
| 68 | − MenuItemProperties properties(menu, menuitem); | |
| 69 | − QMetaObject::invokeMethod(Menu::getInstance(), "addMenuItem", Q_ARG(const MenuItemProperties&, properties)); | |
| 60 | + Menu::getInstance()->addItem(menu, menuitem); | |
| 70 | 61 | } |
| 71 | 62 | |
| 72 | 63 | void MenuScriptingInterface::removeMenuItem(const QString& menu, const QString& menuitem) { |
| 73 | − QMetaObject::invokeMethod(Menu::getInstance(), "removeMenuItem", | |
| 74 | − Q_ARG(const QString&, menu), | |
| 75 | − Q_ARG(const QString&, menuitem)); | |
| 64 | + Menu::getInstance()->removeItem(menuitem); | |
| 76 | 65 | }; |
| 77 | 66 | |
| 78 | 67 | bool MenuScriptingInterface::menuItemExists(const QString& menu, const QString& menuitem) { |
| 79 | − bool result; | |
| 80 | − QMetaObject::invokeMethod(Menu::getInstance(), "menuItemExists", Qt::BlockingQueuedConnection, | |
| 81 | − Q_RETURN_ARG(bool, result), | |
| 82 | − Q_ARG(const QString&, menu), | |
| 83 | − Q_ARG(const QString&, menuitem)); | |
| 84 | − return result; | |
| 68 | + return Menu::getInstance()->itemExists(menu, menuitem); | |
| 85 | 69 | } |
| 86 | 70 | |
| 87 | 71 | bool MenuScriptingInterface::isOptionChecked(const QString& menuOption) { |
| 88 | − bool result; | |
| 89 | − QMetaObject::invokeMethod(Menu::getInstance(), "isOptionChecked", Qt::BlockingQueuedConnection, | |
| 90 | − Q_RETURN_ARG(bool, result), | |
| 91 | − Q_ARG(const QString&, menuOption)); | |
| 92 | − return result; | |
| 72 | + return Menu::getInstance()->isChecked(menuOption); | |
| 93 | 73 | } |
| 94 | 74 | |
| 95 | 75 | void MenuScriptingInterface::setIsOptionChecked(const QString& menuOption, bool isChecked) { |
| 96 | − QMetaObject::invokeMethod(Menu::getInstance(), "setIsOptionChecked", Qt::BlockingQueuedConnection, | |
| 97 | − Q_ARG(const QString&, menuOption), | |
| 98 | − Q_ARG(bool, isChecked)); | |
| 76 | + Menu::getInstance()->setChecked(menuOption, isChecked); | |
| 99 | 77 | } |