[ADD] More documentation

[ADD] Abilities now hav a description field
[FIX] Fixed up a few minor things in pokemodr

git-svn-id: https://pokegen.svn.sourceforge.net/svnroot/pokegen/trunk@172 6ecfd1a5-f3ed-3746-8530-beee90d26b22

4 files changed, 10 insertions, 13 deletions

diff --git a/pokemodr/models/BaseModel.cpp b/pokemodr/models/BaseModel.cpp
index 789cdccb..c4cc4b99 100644
--- a/pokemodr/models/BaseModel.cpp
+++ b/pokemodr/models/BaseModel.cpp
@@ -22,9 +22,9 @@
 #include "../../pokemod/Object.h"
 
 BaseModel::BaseModel(BaseModel* parent, Object* object, const QString& name) :
+        m_parent(parent),
         m_object(object),
-        m_name(name),
-        m_parent(parent)
+        m_name(name)
 {
 }
 
@@ -51,7 +51,12 @@ int BaseModel::indexNumber() const
     return -1;
 }
 
-const Object * BaseModel::object() const
+QString BaseModel::type() const
+{
+    return "";
+}
+
+const Object* BaseModel::object() const
 {
     return m_object;
 }
diff --git a/pokemodr/models/BaseModel.h b/pokemodr/models/BaseModel.h
index 41d5f353..9de2990c 100644
--- a/pokemodr/models/BaseModel.h
+++ b/pokemodr/models/BaseModel.h
@@ -51,7 +51,7 @@ class BaseModel
         virtual Qt::DropActions supportedDragActions() = 0;
         virtual Qt::DropActions supportedDropActions() = 0;
         
-        virtual QString type() const = 0;
+        virtual QString type() const;
         
         const Object* object() const;
         
@@ -62,10 +62,9 @@ class BaseModel
     protected:
         virtual int findChild(const BaseModel* /*model*/) const;
         
+        BaseModel* m_parent;
         Object* m_object;
         QString m_name;
-        
-        BaseModel* m_parent;
 };
 
 #endif
diff --git a/pokemodr/models/GroupModel.cpp b/pokemodr/models/GroupModel.cpp
index 90beb41f..1503dc14 100644
--- a/pokemodr/models/GroupModel.cpp
+++ b/pokemodr/models/GroupModel.cpp
@@ -80,11 +80,6 @@ Qt::DropActions GroupModel::supportedDropActions()
     return Qt::CopyAction | Qt::MoveAction;
 }
 
-QString GroupModel::type() const
-{
-    return "";
-}
-
 int GroupModel::findChild(const BaseModel* model) const
 {
     return m_objects.indexOf(const_cast<BaseObjectModel*>(static_cast<const BaseObjectModel*>(model)));
diff --git a/pokemodr/models/GroupModel.h b/pokemodr/models/GroupModel.h
index df548a53..46d2d850 100644
--- a/pokemodr/models/GroupModel.h
+++ b/pokemodr/models/GroupModel.h
@@ -49,8 +49,6 @@ class GroupModel : public BaseModel
         
         Qt::DropActions supportedDragActions();
         Qt::DropActions supportedDropActions();
-        
-        QString type() const;
     protected:
         int findChild(const BaseModel* model) const;