summaryrefslogtreecommitdiffstats
path: root/src/core/window.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/window.h')
-rw-r--r--src/core/window.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/core/window.h b/src/core/window.h
index 067634029..87cbe306c 100644
--- a/src/core/window.h
+++ b/src/core/window.h
@@ -45,8 +45,6 @@
#include <QWindow>
#include <Qt3DCore/qt3dcore_global.h>
-#include <QQmlEngine>
-
QT_BEGIN_NAMESPACE
class QTimer;
@@ -67,18 +65,11 @@ public:
explicit Window(QScreen *screen = 0);
~Window();
- void setSource( const QUrl& url );
void setRootObject( QObject* obj );
- enum Status { Null, Ready, Loading, Error };
- Status status() const;
-
QSharedPointer<QObject> rootObject() { return m_root; }
void registerAspect(AbstractAspect *aspect);
-Q_SIGNALS:
- void statusChanged( Qt3D::Window::Status );
-
protected:
virtual void keyPressEvent(QKeyEvent *e);
virtual void keyReleaseEvent( QKeyEvent* e );
@@ -89,20 +80,14 @@ protected:
virtual void resizeEvent(QResizeEvent *e);
private slots:
- void continueExecute();
-
void onUpdate();
-private:
-
- QScopedPointer<QQmlEngine> m_engine;
+protected:
QSharedPointer<QObject> m_root;
- QSharedPointer<QQmlComponent> m_component;
// The various aspects (subsystems) that will be interested in (parts)
// of the objects in the object tree.
QAspectEngine *m_aspectEngine;
-
Camera* m_camera;
// temporary, borrowed from training material