Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-08 07:22:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #12813 from ctrlaltdavid/21826

Browse source 
Fix Controller.getActions(), .getHardware(), and .getStandard()
This commit is contained in:
John Conklin II 2018-04-12 10:42:25 -07:00 committed by GitHub
commit ef133806be
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/controllers/src/controllers/ScriptingInterface.h
View file

@ -96,9 +96,9 @@ namespace controller {
Q_INVOKABLE QObject* parseMapping(const QString& json);
Q_INVOKABLE QObject* loadMapping(const QString& jsonUrl);
Q_INVOKABLE const QVariantMap& getHardware() { return _hardware; }
Q_INVOKABLE const QVariantMap& getActions() { return _actions; }
Q_INVOKABLE const QVariantMap& getStandard() { return _standard; }
Q_INVOKABLE const QVariantMap getHardware() { return _hardware; }
Q_INVOKABLE const QVariantMap getActions() { return _actions; }
Q_INVOKABLE const QVariantMap getStandard() { return _standard; }
Q_INVOKABLE void startInputRecording();
Q_INVOKABLE void stopInputRecording();
Q_INVOKABLE void startInputPlayback();