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

 #ifndef hifi_HMDScriptingInterface_h
 #define hifi_HMDScriptingInterface_h
+#include <QtScript/QScriptValue>
 #include <GLMHelpers.h>
-#include "Application.h"
+class QScriptContext;
+class QScriptEngine;
 class HMDScriptingInterface : public QObject {
     Q_OBJECT
     Q_PROPERTY(bool magnifier READ getMagnifier)
     Q_PROPERTY(bool active READ isHMDMode)
     Q_PROPERTY(float ipd READ getIPD)
 public:
     static HMDScriptingInterface& getInstance();
     static QScriptValue getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine);
     static QScriptValue getHUDLookAtPosition3D(QScriptContext* context, QScriptEngine* engine);
 public slots:
-    void toggleMagnifier() { Application::getInstance()->getApplicationCompositor().toggleMagnifier(); };
+    void toggleMagnifier();
 private:
-    HMDScriptingInterface() {};
+    HMDScriptingInterface() = default;
-    bool getMagnifier() const { return Application::getInstance()->getApplicationCompositor().hasMagnifier(); };
+    bool getMagnifier() const;
-    bool isHMDMode() const { return Application::getInstance()->isHMDMode(); }
+    bool isHMDMode() const;
     float getIPD() const;
     bool getHUDLookAtPosition3D(glm::vec3& result) const;
 };
 #endif // hifi_HMDScriptingInterface_h