diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2008-08-04 17:44:07 +0000 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2008-08-04 17:44:07 +0000 |
| commit | c014db49f5044f15e7ad0236437ac9ae4aa3b23f (patch) | |
| tree | ba9b1fe82b1a43155b99259d324ff444f1cdcf14 /pokescripting/ObjectWrapper.h | |
| parent | 38b4604019a93ecd053939e8e722fd36b8d7236d (diff) | |
| download | sigen-c014db49f5044f15e7ad0236437ac9ae4aa3b23f.tar.gz sigen-c014db49f5044f15e7ad0236437ac9ae4aa3b23f.tar.xz sigen-c014db49f5044f15e7ad0236437ac9ae4aa3b23f.zip | |
[FIX] Move no longer uses the overworld flag (will just check to see if the worldScript is empty)
[FIX] TeamMember now inherits from Config
[FIX] Wrapper now inherit from Config
git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@235 6ecfd1a5-f3ed-3746-8530-beee90d26b22
Diffstat (limited to 'pokescripting/ObjectWrapper.h')
| -rw-r--r-- | pokescripting/ObjectWrapper.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pokescripting/ObjectWrapper.h b/pokescripting/ObjectWrapper.h index 5c26f6dc..8b3aee29 100644 --- a/pokescripting/ObjectWrapper.h +++ b/pokescripting/ObjectWrapper.h @@ -19,7 +19,7 @@ #define __POKESCRIPTING_OBJECTWRAPPER__ // Pokescripting includes -#include "Global.h" +#include "Config.h" // Pokemod includes #include "../pokemod/Object.h" @@ -30,7 +30,7 @@ namespace Pokescripting { -class POKESCRIPTING_EXPORT ObjectWrapper : public QObject +class POKESCRIPTING_EXPORT ObjectWrapper : public Config { Q_OBJECT Q_PROPERTY(int id READ id) @@ -45,7 +45,7 @@ class POKESCRIPTING_EXPORT ObjectWrapper : public QObject }; inline ObjectWrapper::ObjectWrapper(const Pokemod::Object* object, QObject* parent) : - QObject(parent), + Config(parent), m_object(object) { } |