[PATCH 1/3] Made addComponent and removeComponent use fully-qualifi= |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/gluon Archives
]
- Subject: [PATCH 1/3] Made addComponent and removeComponent use fully-qualifi=
- From: Richard Fine <rfine@xxxxxxxx>
- Date: Mon, 31 Jan 2011 23:39:14 +0000
---
engine/gameobject.h | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/engine/gameobject.h b/engine/gameobject.h
index 5b904bf..9c29a36 100644
--- a/engine/gameobject.h
+++ b/engine/gameobject.h
@@ -28,6 +28,7 @@
#include <core/gluonobjectfactory.h>
=20
#include <QtCore/QSharedData>
+#include <QtScript/QScriptEngine>
=20
namespace GluonEngine
{
@@ -187,8 +188,8 @@ namespace GluonEngine
Q_INVOKABLE QList<Component*> findComponentsInChildren( const Q=
String& name ) const;
Q_INVOKABLE QList<Component*> findComponentsInChildrenByType( c=
onst QString& typeName ) const;
Q_INVOKABLE QList<Component*> findComponentsInChildrenByType( i=
nt type ) const;
- Q_INVOKABLE void addComponent( Component* addThis );
- Q_INVOKABLE bool removeComponent( Component* removeThis );
+ Q_INVOKABLE void addComponent( GluonEngine::Component* addThis =
);
+ Q_INVOKABLE bool removeComponent( GluonEngine::Component* remov=
eThis );
Q_INVOKABLE QList<Component*> components() const;
=20
// ------------------------------------------------------------=
----
@@ -346,5 +347,6 @@ namespace GluonEngine
=20
Q_DECLARE_METATYPE( GluonEngine::GameObject )
Q_DECLARE_METATYPE( GluonEngine::GameObject* )
+Q_SCRIPT_DECLARE_QMETAOBJECT( GluonEngine::GameObject, QObject* );
=20
#endif // GLUON_ENGINE_GAMEOBJECT_H
--=20
1.7.1