Showing the changes to interface/src/scripting/MenuScriptingInterface.cpp (1 of 45 files). Show all
Unified · Split
| @@ -14,6 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <QtCore/QCoreApplication> |
| 15 | 15 | #include <QtCore/QThread> |
| 16 | 16 | |
| 17 | +#include <shared/QtHelpers.h> | |
| 17 | 18 | #include <MenuItemProperties.h> |
| 18 | 19 | #include "Menu.h" |
| 19 | 20 | |
| @@ -43,7 +44,7 @@ bool MenuScriptingInterface::menuExists(const QString& menu) { · 23 unmodified lines | ||
| 43 | 44 | return Menu::getInstance()->menuExists(menu); |
| 44 | 45 | } |
| 45 | 46 | bool result; |
| 46 | − QMetaObject::invokeMethod(Menu::getInstance(), "menuExists", Qt::BlockingQueuedConnection, | |
| 47 | + hifi::qt::blockingInvokeMethod(Menu::getInstance(), "menuExists", | |
| 47 | 48 | Q_RETURN_ARG(bool, result), |
| 48 | 49 | Q_ARG(const QString&, menu)); |
| 49 | 50 | return result; |
| @@ -86,7 +87,7 @@ bool MenuScriptingInterface::menuItemExists(const QString& menu, const QString& · 36 unmodified lines | ||
| 86 | 87 | return Menu::getInstance()->menuItemExists(menu, menuitem); |
| 87 | 88 | } |
| 88 | 89 | bool result; |
| 89 | − QMetaObject::invokeMethod(Menu::getInstance(), "menuItemExists", Qt::BlockingQueuedConnection, | |
| 90 | + hifi::qt::blockingInvokeMethod(Menu::getInstance(), "menuItemExists", | |
| 90 | 91 | Q_RETURN_ARG(bool, result), |
| 91 | 92 | Q_ARG(const QString&, menu), |
| 92 | 93 | Q_ARG(const QString&, menuitem)); |
| @@ -114,7 +115,7 @@ bool MenuScriptingInterface::isOptionChecked(const QString& menuOption) { · 21 unmodified lines | ||
| 114 | 115 | return Menu::getInstance()->isOptionChecked(menuOption); |
| 115 | 116 | } |
| 116 | 117 | bool result; |
| 117 | − QMetaObject::invokeMethod(Menu::getInstance(), "isOptionChecked", Qt::BlockingQueuedConnection, | |
| 118 | + hifi::qt::blockingInvokeMethod(Menu::getInstance(), "isOptionChecked", | |
| 118 | 119 | Q_RETURN_ARG(bool, result), |
| 119 | 120 | Q_ARG(const QString&, menuOption)); |
| 120 | 121 | return result; |
| @@ -131,7 +132,7 @@ bool MenuScriptingInterface::isMenuEnabled(const QString& menuOption) { · 10 unmodified lines | ||
| 131 | 132 | return Menu::getInstance()->isOptionChecked(menuOption); |
| 132 | 133 | } |
| 133 | 134 | bool result; |
| 134 | − QMetaObject::invokeMethod(Menu::getInstance(), "isMenuEnabled", Qt::BlockingQueuedConnection, | |
| 135 | + hifi::qt::blockingInvokeMethod(Menu::getInstance(), "isMenuEnabled", | |
| 135 | 136 | Q_RETURN_ARG(bool, result), |
| 136 | 137 | Q_ARG(const QString&, menuOption)); |
| 137 | 138 | return result; |
| @@ -157,7 +158,7 @@ bool MenuScriptingInterface::isInfoViewVisible(const QString& path) { · 19 unmodified lines | ||
| 157 | 158 | } |
| 158 | 159 | |
| 159 | 160 | bool result; |
| 160 | − QMetaObject::invokeMethod(Menu::getInstance(), "isInfoViewVisible", Qt::BlockingQueuedConnection, | |
| 161 | + hifi::qt::blockingInvokeMethod(Menu::getInstance(), "isInfoViewVisible", | |
| 161 | 162 | Q_RETURN_ARG(bool, result), Q_ARG(const QString&, path)); |
| 162 | 163 | return result; |
| 163 | 164 | } |