History

Replace Application::getInstance() with qApp

Atlante45 committed 11 years ago

Commit cf3b33a1 parent 2c276bb37 files · +197 −181Browse files

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

Unified · Split

interface/src/scripting/HMDScriptingInterface.h+11−7
@@ -12,32 +12,36 @@ · 11 unmodified lines
1212 #ifndef hifi_HMDScriptingInterface_h
1313 #define hifi_HMDScriptingInterface_h
1414
15+#include <QtScript/QScriptValue>
16+
1517 #include <GLMHelpers.h>
1618
17−#include "Application.h"
19+class QScriptContext;
20+class QScriptEngine;
21+
1822
1923 class HMDScriptingInterface : public QObject {
2024 Q_OBJECT
2125 Q_PROPERTY(bool magnifier READ getMagnifier)
2226 Q_PROPERTY(bool active READ isHMDMode)
2327 Q_PROPERTY(float ipd READ getIPD)
28+
2429 public:
2530 static HMDScriptingInterface& getInstance();
26−
31+
2732 static QScriptValue getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine);
2833 static QScriptValue getHUDLookAtPosition3D(QScriptContext* context, QScriptEngine* engine);
2934
3035 public slots:
31− void toggleMagnifier() { Application::getInstance()->getApplicationCompositor().toggleMagnifier(); };
36+ void toggleMagnifier();
3237
3338 private:
34− HMDScriptingInterface() {};
35− bool getMagnifier() const { return Application::getInstance()->getApplicationCompositor().hasMagnifier(); };
36− bool isHMDMode() const { return Application::getInstance()->isHMDMode(); }
39+ HMDScriptingInterface() = default;
40+ bool getMagnifier() const;
41+ bool isHMDMode() const;
3742 float getIPD() const;
3843
3944 bool getHUDLookAtPosition3D(glm::vec3& result) const;
40−
4145 };
4246
4347 #endif // hifi_HMDScriptingInterface_h