diff options
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) { } |
