[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bgluon=5D_/=3A_Use_Q*=2C_Gluon*_macro_order_in_the_h?=
From: Laszlo Papp <lpapp () kde ! org>
Date: 2011-07-10 21:36:19
Message-ID: 20110710213619.4D632A60B4 () git ! kde ! org
[Download RAW message or body]
Git commit 317f2fa2a75f94e10e02bae51b63dbc4e731a37c by Laszlo Papp.
Committed on 10/07/2011 at 22:13.
Pushed by lpapp into branch 'master'.
Use Q*, Gluon* macro order in the header files consistently
M +4 -2 core/gluonobject.h
M +3 -1 core/gluonobjectfactory.h
M +0 -1 engine/components/audio/soundemitter/soundemittercomponent.h
M +1 -1 engine/components/graphics/beamrenderer/beamrenderercomponent.h
M +2 -1 engine/components/graphics/cameracontroller/cameracontrollercomponent.h \
M +1 -1 engine/components/graphics/discrenderer/discrenderercomponent.h
M +2 -1 engine/components/graphics/spriterenderer/spriterenderercomponent.h \
M +2 -1 engine/components/graphics/textrenderer/textrenderercomponent.h
M +2 -1 engine/components/graphics/uimanager/uimanagercomponent.h
M +3 -2 engine/components/scripting/scriptingcomponent.h
M +2 -1 engine/prefabinstance.h
M +1 -1 input/mouse.h
http://commits.kde.org/gluon/317f2fa2a75f94e10e02bae51b63dbc4e731a37c
diff --git a/core/gluonobject.h b/core/gluonobject.h
index 5811469..134b6c8 100644
--- a/core/gluonobject.h
+++ b/core/gluonobject.h
@@ -16,17 +16,19 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#ifndef GLUON_CORE_GLUONOBJECT_H
#define GLUON_CORE_GLUONOBJECT_H
-#include "gluonobjectfactory.h"
#include "gluon_core_export.h"
+#include "gluonobjectfactory.h"
+
+#include <QtScript/QScriptValue>
#include <QtCore/QList>
#include <QtCore/QUrl>
#include <QtCore/QStringList>
#include <QtCore/QVariant>
-#include <QtScript/QScriptValue>
Q_DECLARE_METATYPE( QList<QUrl> )
diff --git a/core/gluonobjectfactory.h b/core/gluonobjectfactory.h
index c6cb952..7db45ab 100644
--- a/core/gluonobjectfactory.h
+++ b/core/gluonobjectfactory.h
@@ -16,11 +16,13 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
#ifndef GLUON_CORE_GLUONOBJECTFACTORY_H
#define GLUON_CORE_GLUONOBJECTFACTORY_H
-#include "singleton.h"
#include "gluon_core_export.h"
+
+#include "singleton.h"
#include "debughelper.h"
#include <QtCore/QHash>
diff --git a/engine/components/audio/soundemitter/soundemittercomponent.h \
b/engine/components/audio/soundemitter/soundemittercomponent.h index 4d6d12c..cecb425 \
100644
--- a/engine/components/audio/soundemitter/soundemittercomponent.h
+++ b/engine/components/audio/soundemitter/soundemittercomponent.h
@@ -37,7 +37,6 @@ namespace GluonEngine
Q_PROPERTY( bool loop READ isLooping WRITE setLoop )
Q_PROPERTY( bool autoPlay READ autoPlay WRITE setAutoPlay )
-
Q_INTERFACES( GluonEngine::Component )
GLUON_OBJECT( GluonEngine::SoundEmitterComponent )
diff --git a/engine/components/graphics/beamrenderer/beamrenderercomponent.h \
b/engine/components/graphics/beamrenderer/beamrenderercomponent.h index \
9750009..0ac7d2a 100644
--- a/engine/components/graphics/beamrenderer/beamrenderercomponent.h
+++ b/engine/components/graphics/beamrenderer/beamrenderercomponent.h
@@ -35,12 +35,12 @@ namespace GluonEngine
class GLUON_COMPONENT_BEAMRENDERER_EXPORT BeamRendererComponent : public \
Component {
Q_OBJECT
- GLUON_OBJECT( GluonEngine::BeamRendererComponent )
Q_PROPERTY( QSizeF size READ size WRITE setSize )
Q_PROPERTY( GluonGraphics::MaterialInstance* baseMaterial READ \
baseMaterial WRITE setBaseMaterial )
Q_PROPERTY( GluonGraphics::MaterialInstance* beamMaterial READ \
beamMaterial WRITE setBeamMaterial )
Q_PROPERTY( GluonGraphics::MaterialInstance* tipMaterial READ \
tipMaterial WRITE setTipMaterial ) Q_INTERFACES( GluonEngine::Component )
+ GLUON_OBJECT( GluonEngine::BeamRendererComponent )
public:
Q_INVOKABLE BeamRendererComponent( QObject* parent = 0 );
diff --git a/engine/components/graphics/cameracontroller/cameracontrollercomponent.h \
b/engine/components/graphics/cameracontroller/cameracontrollercomponent.h index \
a2a847e..7dd5db6 100644
--- a/engine/components/graphics/cameracontroller/cameracontrollercomponent.h
+++ b/engine/components/graphics/cameracontroller/cameracontrollercomponent.h
@@ -33,13 +33,14 @@ namespace GluonEngine
class GLUON_COMPONENT_CAMERACONTROLLER_EXPORT CameraControllerComponent : public \
Component {
Q_OBJECT
- GLUON_OBJECT( GluonEngine::CameraControllerComponent )
Q_PROPERTY( bool active READ isActive WRITE setActive )
Q_PROPERTY( QSizeF visibleArea READ visibleArea WRITE setVisibleArea )
Q_PROPERTY( float nearPlane READ nearPlane WRITE setNearPlane )
Q_PROPERTY( float farPlane READ farPlane WRITE setFarPlane )
Q_PROPERTY( GluonGraphics::MaterialInstance* renderTargetMaterial READ \
renderTargetMaterial WRITE setRenderTargetMaterial ) +
Q_INTERFACES( GluonEngine::Component )
+ GLUON_OBJECT( GluonEngine::CameraControllerComponent )
public:
Q_INVOKABLE CameraControllerComponent( QObject* parent = 0 );
diff --git a/engine/components/graphics/discrenderer/discrenderercomponent.h \
b/engine/components/graphics/discrenderer/discrenderercomponent.h index \
f327185..60caab2 100644
--- a/engine/components/graphics/discrenderer/discrenderercomponent.h
+++ b/engine/components/graphics/discrenderer/discrenderercomponent.h
@@ -29,12 +29,12 @@ namespace GluonEngine
class GLUON_COMPONENT_DISCRENDERER_EXPORT DiscRendererComponent : public \
Component {
Q_OBJECT
- GLUON_OBJECT( GluonEngine::DiscRendererComponent )
Q_PROPERTY( float radius READ radius WRITE setRadius )
Q_PROPERTY( uint nbPoints READ nbPoints WRITE setNbPoints )
Q_PROPERTY( QColor color READ color WRITE setColor )
Q_PROPERTY( GluonEngine::Asset* texture READ texture WRITE setTexture )
Q_INTERFACES( GluonEngine::Component )
+ GLUON_OBJECT( GluonEngine::DiscRendererComponent )
public:
Q_INVOKABLE DiscRendererComponent( QObject* parent = 0 );
diff --git a/engine/components/graphics/spriterenderer/spriterenderercomponent.h \
b/engine/components/graphics/spriterenderer/spriterenderercomponent.h index \
186c411..02d1d61 100644
--- a/engine/components/graphics/spriterenderer/spriterenderercomponent.h
+++ b/engine/components/graphics/spriterenderer/spriterenderercomponent.h
@@ -34,10 +34,11 @@ namespace GluonEngine
class GLUON_COMPONENT_SPRITERENDERER_EXPORT SpriteRendererComponent : public \
Component {
Q_OBJECT
- GLUON_OBJECT( GluonEngine::SpriteRendererComponent )
Q_PROPERTY( QSizeF size READ size WRITE setSize )
Q_PROPERTY( GluonGraphics::MaterialInstance* material READ material \
WRITE setMaterial ) +
Q_INTERFACES( GluonEngine::Component )
+ GLUON_OBJECT( GluonEngine::SpriteRendererComponent )
public:
Q_INVOKABLE SpriteRendererComponent( QObject* parent = 0 );
diff --git a/engine/components/graphics/textrenderer/textrenderercomponent.h \
b/engine/components/graphics/textrenderer/textrenderercomponent.h index \
767aaf4..6644a70 100644
--- a/engine/components/graphics/textrenderer/textrenderercomponent.h
+++ b/engine/components/graphics/textrenderer/textrenderercomponent.h
@@ -31,11 +31,12 @@ namespace GluonEngine
class GLUON_COMPONENT_TEXTRENDERER_EXPORT TextRendererComponent : public \
Component {
Q_OBJECT
- GLUON_OBJECT( GluonEngine::TextRendererComponent )
Q_PROPERTY( QString text READ text WRITE setText )
Q_PROPERTY( QFont font READ font WRITE setFont )
Q_PROPERTY( QColor color READ color WRITE setColor )
+
Q_INTERFACES( GluonEngine::Component )
+ GLUON_OBJECT( GluonEngine::TextRendererComponent )
public:
Q_INVOKABLE TextRendererComponent( QObject* parent = 0 );
diff --git a/engine/components/graphics/uimanager/uimanagercomponent.h \
b/engine/components/graphics/uimanager/uimanagercomponent.h index 94c8cde..1b718a0 \
100644
--- a/engine/components/graphics/uimanager/uimanagercomponent.h
+++ b/engine/components/graphics/uimanager/uimanagercomponent.h
@@ -33,10 +33,11 @@ namespace GluonEngine
class GLUON_COMPONENT_UIMANAGER_EXPORT UiManagerComponent : public Component
{
Q_OBJECT
- GLUON_OBJECT( GluonEngine::UiManagerComponent )
Q_PROPERTY( QSizeF size READ size WRITE setSize )
Q_PROPERTY( GluonEngine::UiAsset* ui READ ui WRITE setUi )
+
Q_INTERFACES( GluonEngine::Component )
+ GLUON_OBJECT( GluonEngine::UiManagerComponent )
public:
Q_INVOKABLE UiManagerComponent( QObject* parent = 0 );
diff --git a/engine/components/scripting/scriptingcomponent.h \
b/engine/components/scripting/scriptingcomponent.h index e563791..531581c 100644
--- a/engine/components/scripting/scriptingcomponent.h
+++ b/engine/components/scripting/scriptingcomponent.h
@@ -31,10 +31,11 @@ namespace GluonEngine
class GLUON_COMPONENT_SCRIPTING_EXPORT ScriptingComponent : public Component
{
Q_OBJECT
- GLUON_OBJECT( GluonEngine::ScriptingComponent )
+ Q_PROPERTY( GluonEngine::ScriptingAsset* script READ script WRITE \
setScript ) +
Q_INTERFACES( GluonEngine::Component )
+ GLUON_OBJECT( GluonEngine::ScriptingComponent )
- Q_PROPERTY( GluonEngine::ScriptingAsset* script READ script WRITE \
setScript ) public:
Q_INVOKABLE ScriptingComponent( QObject* parent = 0 );
virtual ~ScriptingComponent();
diff --git a/engine/prefabinstance.h b/engine/prefabinstance.h
index 471b9f9..0bad670 100644
--- a/engine/prefabinstance.h
+++ b/engine/prefabinstance.h
@@ -39,7 +39,6 @@ namespace GluonEngine
class GLUON_ENGINE_EXPORT PrefabInstance : public GameObject
{
Q_OBJECT
- GLUON_OBJECT( GluonEngine::PrefabInstance )
/**
* The prefab link property describes which Prefab this instance is an \
instance of.
* Setting the property will immediately delete all existing children \
and rebuild the @@ -48,6 +47,8 @@ namespace GluonEngine
*/
Q_PROPERTY( GluonEngine::Prefab* prefabLink READ prefabLink WRITE \
setPrefabLink )
+ GLUON_OBJECT( GluonEngine::PrefabInstance )
+
public:
PrefabInstance( QObject* parent = 0 );
PrefabInstance( const PrefabInstance& other );
diff --git a/input/mouse.h b/input/mouse.h
index 36d32dc..4685ec1 100644
--- a/input/mouse.h
+++ b/input/mouse.h
@@ -33,8 +33,8 @@ namespace GluonInput
class GLUON_INPUT_EXPORT Mouse : public InputDevice
{
Q_OBJECT
- GLUON_OBJECT( GluonInput::Mouse )
Q_ENUMS( MouseButton )
+ GLUON_OBJECT( GluonInput::Mouse )
public:
enum MouseButton
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic