Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing typos in callback implementation

Browse source
This commit is contained in:
Wayne Chen 2019-01-10 08:17:17 -08:00
parent ed39b43d3b
commit 39a68a88f0
4 changed files with 2 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/ui/LoginDialog.cpp
View file

@ -46,10 +46,6 @@ LoginDialog::LoginDialog(QQuickItem *parent) : OffscreenQmlDialog(parent) {
this, &LoginDialog::handleLoginFailed);
connect(qApp, &Application::loginDialogFocusEnabled, this, &LoginDialog::focusEnabled);
connect(qApp, &Application::loginDialogFocusDisabled, this, &LoginDialog::focusDisabled);
if (auto oculusPlatformPlugin = PluginManager::getInstance()->getOculusPlatformPlugin()) {
connect(oculusPlatformPlugin.get(), &OculusPlatformPlugin::loginReady, this, &LoginDialog::onLoginThroughOculusReady);
connect(oculusPlatformPlugin.get(), &OculusPlatformPlugin::linkAccountReady, this, &LoginDialog::onLinkOculusReady);
}
connect(this, SIGNAL(dismissedLoginDialog()), qApp, SLOT(onDismissedLoginDialog()));
#endif
}

14
libraries/plugins/src/plugins/OculusPlatformPlugin.cpp
View file

@ -1,14 +0,0 @@
//
// Created by Wayne Chen on 2018/12/20
// Copyright 2018 High Fidelity Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2-0.html
//
#include "OculusPlatformPlugin.h"
OculusPlatformPlugin::OculusPlatformPlugin() {
}
OculusPlatformPlugin::~OculusPlatformPlugin() {
}

8
libraries/plugins/src/plugins/OculusPlatformPlugin.h
View file

@ -15,17 +15,11 @@ using NonceUserIDCallback = std::function<void(QString, QString)>;
class OculusPlatformPlugin {
public:
OculusPlatformPlugin();
virtual ~OculusPlatformPlugin();
virtual ~OculusPlatformPlugin() = default;
virtual const QString getName() const = 0;
virtual void requestNonceAndUserID(NonceUserIDCallback callback) = 0;
virtual void handleOVREvents() = 0;
signals:
void loginReady(QString nonce, QString userID);
void linkAccountReady(QString nonce, QString userID);
void createAccountReady(QString nonce, QString userID);
};

3
plugins/oculus/src/OculusPlatformPlugin.cpp
View file

@ -91,8 +91,7 @@ void OculusAPIPlugin::handleOVREvents() {
}
if (_nonceChanged) {
_nonceUserIDCallback(_nonce, _user);`
_loginState = LoginState::INVALID_STATE;
_nonceUserIDCallback(_nonce, _user);
_nonce = _user = "";
_nonceChanged = false;
}