diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-10-17 05:46:40 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-10-17 05:46:40 +0000 |
| commit | b3e1495f7a626bb4429ff5e4f3ad39ae9654f23b (patch) | |
| tree | 8a188df964484e7dcf630e792dccfa1766c2f8f0 /sigmod/MapWarp.h | |
| parent | 47428274a07bce9be5e62f82aeeb7e57aa21037f (diff) | |
| download | sigen-b3e1495f7a626bb4429ff5e4f3ad39ae9654f23b.tar.gz sigen-b3e1495f7a626bb4429ff5e4f3ad39ae9654f23b.tar.xz sigen-b3e1495f7a626bb4429ff5e4f3ad39ae9654f23b.zip | |
[FIX] Moved Hat, Fraction, Matrix, and Script to sigcore
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@281 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'sigmod/MapWarp.h')
| -rw-r--r-- | sigmod/MapWarp.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sigmod/MapWarp.h b/sigmod/MapWarp.h index d0ffb778..f99afdf3 100644 --- a/sigmod/MapWarp.h +++ b/sigmod/MapWarp.h @@ -18,9 +18,11 @@ #ifndef SIGMOD_MAPWARP #define SIGMOD_MAPWARP +// Sigcore includes +#include "../sigcore/Script.h" + // Sigmod includes #include "Object.h" -#include "Script.h" // Qt includes #include <QtCore/QPoint> @@ -60,14 +62,14 @@ class SIGMOD_EXPORT MapWarp : public Object void setType(const Type type); void setToMap(const int toMap); void setToWarp(const int toWarp); - void setScript(const Script& script); + void setScript(const Sigcore::Script& script); QString name() const; QPoint coordinate() const; Type type() const; int toMap() const; int toWarp() const; - Script script() const; + Sigcore::Script script() const; MapWarp& operator=(const MapWarp& rhs); private: @@ -76,7 +78,7 @@ class SIGMOD_EXPORT MapWarp : public Object Type m_type; int m_toMap; int m_toWarp; - Script m_script; + Sigcore::Script m_script; }; } Q_DECLARE_METATYPE(Sigmod::MapWarp::Type) |