From e9086460e3bd7f2ef3603ca1273096b51d74790c Mon Sep 17 00:00:00 2001 From: Dante Ruiz Date: Wed, 8 Mar 2017 18:14:32 +0000 Subject: [PATCH] changed function names --- libraries/script-engine/src/TabletScriptingInterface.cpp | 6 +++--- libraries/script-engine/src/TabletScriptingInterface.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/script-engine/src/TabletScriptingInterface.cpp b/libraries/script-engine/src/TabletScriptingInterface.cpp index 59027da102..6cfd26b230 100644 --- a/libraries/script-engine/src/TabletScriptingInterface.cpp +++ b/libraries/script-engine/src/TabletScriptingInterface.cpp @@ -276,7 +276,7 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr } // force to the tablet to go to the homescreen - gotoHomeScreen(true); + loadHomeScreen(true); QMetaObject::invokeMethod(_qmlTabletRoot, "setUsername", Q_ARG(const QVariant&, QVariant(getUsername()))); @@ -295,7 +295,7 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr } void TabletProxy::gotoHomeScreen() { - gotoHomeScreen(false); + loadHomeScreen(false); } void TabletProxy::gotoMenuScreen(const QString& submenu) { @@ -338,7 +338,7 @@ void TabletProxy::loadQMLSource(const QVariant& path) { } } -void TabletProxy::gotoHomeScreen(bool forceOntoHomeScreen) { +void TabletProxy::loadHomeScreen(bool forceOntoHomeScreen) { if (_state != State::Home && ( _state != State::Uninitialized || forceOntoHomeScreen)) { if (!_toolbarMode && _qmlTabletRoot) { auto loader = _qmlTabletRoot->findChild("loader"); diff --git a/libraries/script-engine/src/TabletScriptingInterface.h b/libraries/script-engine/src/TabletScriptingInterface.h index 42f32ff219..12cb2f4d2d 100644 --- a/libraries/script-engine/src/TabletScriptingInterface.h +++ b/libraries/script-engine/src/TabletScriptingInterface.h @@ -188,7 +188,7 @@ protected slots: void desktopWindowClosed(); protected: void removeButtonsFromHomeScreen(); - void gotoHomeScreen(bool forceOntoHomeScreen); + void loadHomeScreen(bool forceOntoHomeScreen); void addButtonsToToolbar(); void removeButtonsFromToolbar();