Showing the changes to interface/src/scripting/MenuScriptingInterface.cpp (1 of 39 files). Show all
Unified · Split
| @@ -44,7 +44,7 @@ bool MenuScriptingInterface::menuExists(const QString& menu) { · 43 unmodified lines | |||
| 44 | return Menu::getInstance()->menuExists(menu); | 44 | return Menu::getInstance()->menuExists(menu); |
| 45 | } | 45 | } |
| 46 | bool result; | 46 | bool result; |
| 47 | hifi::qt::blockingInvokeMethod(Menu::getInstance(), "menuExists", | 47 | BLOCKING_INVOKE_METHOD(Menu::getInstance(), "menuExists", |
| 48 | Q_RETURN_ARG(bool, result), | 48 | Q_RETURN_ARG(bool, result), |
| 49 | Q_ARG(const QString&, menu)); | 49 | Q_ARG(const QString&, menu)); |
| 50 | return result; | 50 | return result; |
| @@ -87,7 +87,7 @@ bool MenuScriptingInterface::menuItemExists(const QString& menu, const QString& · 36 unmodified lines | |||
| 87 | return Menu::getInstance()->menuItemExists(menu, menuitem); | 87 | return Menu::getInstance()->menuItemExists(menu, menuitem); |
| 88 | } | 88 | } |
| 89 | bool result; | 89 | bool result; |
| 90 | hifi::qt::blockingInvokeMethod(Menu::getInstance(), "menuItemExists", | 90 | BLOCKING_INVOKE_METHOD(Menu::getInstance(), "menuItemExists", |
| 91 | Q_RETURN_ARG(bool, result), | 91 | Q_RETURN_ARG(bool, result), |
| 92 | Q_ARG(const QString&, menu), | 92 | Q_ARG(const QString&, menu), |
| 93 | Q_ARG(const QString&, menuitem)); | 93 | Q_ARG(const QString&, menuitem)); |
| @@ -115,7 +115,7 @@ bool MenuScriptingInterface::isOptionChecked(const QString& menuOption) { · 21 unmodified lines | |||
| 115 | return Menu::getInstance()->isOptionChecked(menuOption); | 115 | return Menu::getInstance()->isOptionChecked(menuOption); |
| 116 | } | 116 | } |
| 117 | bool result; | 117 | bool result; |
| 118 | hifi::qt::blockingInvokeMethod(Menu::getInstance(), "isOptionChecked", | 118 | BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isOptionChecked", |
| 119 | Q_RETURN_ARG(bool, result), | 119 | Q_RETURN_ARG(bool, result), |
| 120 | Q_ARG(const QString&, menuOption)); | 120 | Q_ARG(const QString&, menuOption)); |
| 121 | return result; | 121 | return result; |
| @@ -132,7 +132,7 @@ bool MenuScriptingInterface::isMenuEnabled(const QString& menuOption) { · 10 unmodified lines | |||
| 132 | return Menu::getInstance()->isOptionChecked(menuOption); | 132 | return Menu::getInstance()->isOptionChecked(menuOption); |
| 133 | } | 133 | } |
| 134 | bool result; | 134 | bool result; |
| 135 | hifi::qt::blockingInvokeMethod(Menu::getInstance(), "isMenuEnabled", | 135 | BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isMenuEnabled", |
| 136 | Q_RETURN_ARG(bool, result), | 136 | Q_RETURN_ARG(bool, result), |
| 137 | Q_ARG(const QString&, menuOption)); | 137 | Q_ARG(const QString&, menuOption)); |
| 138 | return result; | 138 | return result; |
| @@ -158,7 +158,7 @@ bool MenuScriptingInterface::isInfoViewVisible(const QString& path) { · 19 unmodified lines | |||
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | bool result; | 160 | bool result; |
| 161 | hifi::qt::blockingInvokeMethod(Menu::getInstance(), "isInfoViewVisible", | 161 | BLOCKING_INVOKE_METHOD(Menu::getInstance(), "isInfoViewVisible", |
| 162 | Q_RETURN_ARG(bool, result), Q_ARG(const QString&, path)); | 162 | Q_RETURN_ARG(bool, result), Q_ARG(const QString&, path)); |
| 163 | return result; | 163 | return result; |
| 164 | } | 164 | } |