diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-03-19 18:02:36 -0400 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-03-19 18:02:36 -0400 |
| commit | f0e0a403376f263cba7b3698e5ecc811a155b591 (patch) | |
| tree | c89c81c40d5bb17222a52ca9cbc997abf0ccf394 /sigscript | |
| parent | b318d695fddbfaa71755cec4c7d85e9e9bdca8f2 (diff) | |
| download | sigen-f0e0a403376f263cba7b3698e5ecc811a155b591.tar.gz sigen-f0e0a403376f263cba7b3698e5ecc811a155b591.tar.xz sigen-f0e0a403376f263cba7b3698e5ecc811a155b591.zip | |
Update sigscript
Diffstat (limited to 'sigscript')
| -rw-r--r-- | sigscript/MapEffectWrapper.cpp | 3 | ||||
| -rw-r--r-- | sigscript/MapEffectWrapper.h | 5 | ||||
| -rw-r--r-- | sigscript/MapWarpWrapper.cpp | 3 | ||||
| -rw-r--r-- | sigscript/MapWarpWrapper.h | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/sigscript/MapEffectWrapper.cpp b/sigscript/MapEffectWrapper.cpp index 491a3d3c..3bbacff9 100644 --- a/sigscript/MapEffectWrapper.cpp +++ b/sigscript/MapEffectWrapper.cpp @@ -48,9 +48,8 @@ QString MapEffectWrapper::name() const return m_effect->name(); } -QRect MapEffectWrapper::area() const +QPainterPath MapEffectWrapper::area() const { - ALLOW_OVERRIDE_SO(effect, QRect, area); return m_effect->area(); } diff --git a/sigscript/MapEffectWrapper.h b/sigscript/MapEffectWrapper.h index 52b6d84c..0b9b5863 100644 --- a/sigscript/MapEffectWrapper.h +++ b/sigscript/MapEffectWrapper.h @@ -24,6 +24,9 @@ // Sigcore includes #include <sigcore/Script.h> +// Qt includes +#include <QtGui/QPainterPath> + // Forward declarations namespace Sigmod { @@ -43,7 +46,7 @@ class SIGSCRIPT_EXPORT MapEffectWrapper : public ObjectWrapper static MapEffectWrapper* create(const Sigmod::MapEffect* effect, MapWrapper* parent); Q_SCRIPTABLE QString name() const; - Q_SCRIPTABLE QRect area() const; + Q_SCRIPTABLE QPainterPath area() const; Q_SCRIPTABLE SkinWrapper* skin(); Q_SCRIPTABLE bool isGhost() const; Q_SCRIPTABLE Sigcore::Script script() const; diff --git a/sigscript/MapWarpWrapper.cpp b/sigscript/MapWarpWrapper.cpp index 898deef1..44011c97 100644 --- a/sigscript/MapWarpWrapper.cpp +++ b/sigscript/MapWarpWrapper.cpp @@ -58,9 +58,8 @@ QString MapWarpWrapper::name() const return m_warp->name(); } -QRect MapWarpWrapper::area() const +QPainterPath MapWarpWrapper::area() const { - ALLOW_OVERRIDE_SO(warp, QRect, area); return m_warp->area(); } diff --git a/sigscript/MapWarpWrapper.h b/sigscript/MapWarpWrapper.h index 69fa6021..b239a884 100644 --- a/sigscript/MapWarpWrapper.h +++ b/sigscript/MapWarpWrapper.h @@ -39,7 +39,7 @@ class SIGSCRIPT_EXPORT MapWarpWrapper : public ObjectWrapper Q_SCRIPTABLE Sigmod::MapWarp::Type type(const QString& name) const; Q_SCRIPTABLE QString name() const; - Q_SCRIPTABLE QRect area() const; + Q_SCRIPTABLE QPainterPath area() const; Q_SCRIPTABLE Sigmod::MapWarp::Type type() const; Q_SCRIPTABLE MapWarpWrapper* toWarp(); Q_SCRIPTABLE Sigcore::Script script() const; |