mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 20:58:38 +02:00
Rename internal function to distinguish signatures and reflect function
This commit is contained in:
parent
57649811d7
commit
e9d138a961
2 changed files with 5 additions and 8 deletions
|
@ -869,16 +869,14 @@ void TabletProxy::loadHTMLSourceImpl(const QVariant& url, const QString& injectJ
|
||||||
void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase) {
|
void TabletProxy::gotoWebScreen(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase) {
|
||||||
bool localSafeContext = hifi::scripting::isLocalAccessSafeThread();
|
bool localSafeContext = hifi::scripting::isLocalAccessSafeThread();
|
||||||
if (QThread::currentThread() != thread()) {
|
if (QThread::currentThread() != thread()) {
|
||||||
QMetaObject::invokeMethod(this, "loadHTMLSourceImpl", Q_ARG(QString, url), Q_ARG(QString, injectedJavaScriptUrl), Q_ARG(bool, loadOtherBase), Q_ARG(bool, localSafeContext));
|
QMetaObject::invokeMethod(this, "loadHTMLSourceOnTopImpl", Q_ARG(QString, url), Q_ARG(QString, injectedJavaScriptUrl), Q_ARG(bool, loadOtherBase), Q_ARG(bool, localSafeContext));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
loadHTMLSourceOnTopImpl(url, injectedJavaScriptUrl, loadOtherBase, localSafeContext);
|
||||||
loadHTMLSourceImpl(url, injectedJavaScriptUrl, loadOtherBase, localSafeContext);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void TabletProxy::loadHTMLSourceImpl(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase, bool localSafeContext) {
|
void TabletProxy::loadHTMLSourceOnTopImpl(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase, bool localSafeContext) {
|
||||||
|
|
||||||
QObject* root = nullptr;
|
QObject* root = nullptr;
|
||||||
if (!_toolbarMode && _qmlTabletRoot) {
|
if (!_toolbarMode && _qmlTabletRoot) {
|
||||||
root = _qmlTabletRoot;
|
root = _qmlTabletRoot;
|
||||||
|
@ -911,7 +909,6 @@ void TabletProxy::loadHTMLSourceImpl(const QString& url, const QString& injected
|
||||||
_initialWebPathParams.first = injectedJavaScriptUrl;
|
_initialWebPathParams.first = injectedJavaScriptUrl;
|
||||||
_initialWebPathParams.second = loadOtherBase;
|
_initialWebPathParams.second = loadOtherBase;
|
||||||
_initialScreen = true;
|
_initialScreen = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -307,11 +307,11 @@ public:
|
||||||
Q_INVOKABLE void loadHTMLSourceImpl(const QVariant& url, const QString& injectJavaScriptUrl, bool localSafeContext);
|
Q_INVOKABLE void loadHTMLSourceImpl(const QVariant& url, const QString& injectJavaScriptUrl, bool localSafeContext);
|
||||||
|
|
||||||
/**jsdoc
|
/**jsdoc
|
||||||
* @function TabletProxy#loadHTMLSourceImpl
|
* @function TabletProxy#loadHTMLSourceOnTopImpl
|
||||||
* @deprecated This function is deprecated and will be removed.
|
* @deprecated This function is deprecated and will be removed.
|
||||||
*/
|
*/
|
||||||
// Internal function, do not call from scripts.
|
// Internal function, do not call from scripts.
|
||||||
Q_INVOKABLE void loadHTMLSourceImpl(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase, bool localSafeContext);
|
Q_INVOKABLE void loadHTMLSourceOnTopImpl(const QString& url, const QString& injectedJavaScriptUrl, bool loadOtherBase, bool localSafeContext);
|
||||||
|
|
||||||
/**jsdoc
|
/**jsdoc
|
||||||
* @function TabletProxy#returnToPreviousAppImpl
|
* @function TabletProxy#returnToPreviousAppImpl
|
||||||
|
|
Loading…
Reference in a new issue