Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 05:36:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

changed function names

Browse source
This commit is contained in:
Dante Ruiz 2017-03-08 18:14:32 +00:00
parent fd3e1fb320
commit e9086460e3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/script-engine/src/TabletScriptingInterface.cpp
View file

@ -276,7 +276,7 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr
} }
// force to the tablet to go to the homescreen // force to the tablet to go to the homescreen
gotoHomeScreen(true); loadHomeScreen(true);
QMetaObject::invokeMethod(_qmlTabletRoot, "setUsername", Q_ARG(const QVariant&, QVariant(getUsername()))); QMetaObject::invokeMethod(_qmlTabletRoot, "setUsername", Q_ARG(const QVariant&, QVariant(getUsername())));
@ -295,7 +295,7 @@ void TabletProxy::setQmlTabletRoot(QQuickItem* qmlTabletRoot, QObject* qmlOffscr
} }
void TabletProxy::gotoHomeScreen() { void TabletProxy::gotoHomeScreen() {
gotoHomeScreen(false); loadHomeScreen(false);
} }
void TabletProxy::gotoMenuScreen(const QString& submenu) { 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 (_state != State::Home && ( _state != State::Uninitialized || forceOntoHomeScreen)) {
if (!_toolbarMode && _qmlTabletRoot) { if (!_toolbarMode && _qmlTabletRoot) {
auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader"); auto loader = _qmlTabletRoot->findChild<QQuickItem*>("loader");

2
libraries/script-engine/src/TabletScriptingInterface.h
View file

@ -188,7 +188,7 @@ protected slots:
void desktopWindowClosed(); void desktopWindowClosed();
protected: protected:
void removeButtonsFromHomeScreen(); void removeButtonsFromHomeScreen();
void gotoHomeScreen(bool forceOntoHomeScreen); void loadHomeScreen(bool forceOntoHomeScreen);
void addButtonsToToolbar(); void addButtonsToToolbar();
void removeButtonsFromToolbar(); void removeButtonsFromToolbar();