From c014db49f5044f15e7ad0236437ac9ae4aa3b23f Mon Sep 17 00:00:00 2001
From: Ben Boeckel <MathStuf@gmail.com>
Date: Mon, 4 Aug 2008 17:44:07 +0000
Subject: [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
---
 pokescripting/ObjectWrapper.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pokescripting/ObjectWrapper.h')

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)
 {
 }
-- 
cgit