History

more overlay wip

SamGondelman committed 7 years ago

Commit 5ce8f561 parent ca8d64b62 files · +620 −864Browse files

Showing the changes to interface/src/scripting/KeyboardScriptingInterface.h (1 of 62 files). Show all

Unified · Split

interface/src/scripting/KeyboardScriptingInterface.h+1−2
@@ -16,7 +16,6 @@ · 15 unmodified lines
16#include <QtCore/QUuid>16#include <QtCore/QUuid>
17 17
18#include "DependencyManager.h"18#include "DependencyManager.h"
19#include "ui/overlays/Overlay.h"
20 19
21/**jsdoc20/**jsdoc
22 * The Keyboard API provides facilities to use 3D Physical keyboard.21 * The Keyboard API provides facilities to use 3D Physical keyboard.
@@ -46,7 +45,7 @@ public: · 23 unmodified lines
46 Q_INVOKABLE void disableRightMallet();45 Q_INVOKABLE void disableRightMallet();
47 Q_INVOKABLE void setLeftHandLaser(unsigned int leftHandLaser);46 Q_INVOKABLE void setLeftHandLaser(unsigned int leftHandLaser);
48 Q_INVOKABLE void setRightHandLaser(unsigned int rightHandLaser);47 Q_INVOKABLE void setRightHandLaser(unsigned int rightHandLaser);
49 Q_INVOKABLE bool containsID(OverlayID overlayID) const;48 Q_INVOKABLE bool containsID(const QUuid& overlayID) const;
50private:49private:
51 bool getPreferMalletsOverLasers() const;50 bool getPreferMalletsOverLasers() const;
52 bool isRaised() const;51 bool isRaised() const;