Cleaned up Containment class

2 files changed, 15 insertions, 14 deletions

diff --git a/sigencore/Containment.cpp b/sigencore/Containment.cpp
index 23047e91..a89075bf 100644
--- a/sigencore/Containment.cpp
+++ b/sigencore/Containment.cpp
@@ -31,20 +31,25 @@ Sigencore::Containment::Containment(Sigscript::SigmodWrapper* sigmod, Sigscript:
 {
 }
 
+Sigencore::Containment::~Containment()
+{
+}
+
 QList<Sigencore::TeamMember*> Sigencore::Containment::members() const
 {
     return m_members;
 }
 
+int Sigencore::Containment::numMembers() const
+{
+    return m_members.size();
+}
+
 bool Sigencore::Containment::addMember(TeamMember* member)
 {
-    if (m_members.size() < sigmod()->rules()->maxParty())
-    {
-        m_members.append(member);
-//         member->reparent(this);
-        return true;
-    }
-    return false;
+    member->setContainment(this);
+    m_members.append(member);
+    return true;
 }
 
 Sigencore::TeamMember* Sigencore::Containment::findMember(const QUuid& id) const
diff --git a/sigencore/Containment.h b/sigencore/Containment.h
index a9256d8e..2f335296 100644
--- a/sigencore/Containment.h
+++ b/sigencore/Containment.h
@@ -44,21 +44,17 @@ class SIGENCORE_EXPORT Containment : public Sigscript::Config
     
     public:
         Containment(Sigscript::SigmodWrapper* sigmod, Sigscript::Config* parent);
+        virtual ~Containment();
         
         QList<TeamMember*> members() const;
-        bool addMember(TeamMember* member);
-        
-        virtual bool isMutable() const = 0;
-        
+        int numMembers() const;
+        virtual bool addMember(TeamMember* member);
         TeamMember* findMember(const QUuid& id) const;
         
         Sigscript::SigmodWrapper* sigmod() const;
-    public slots:
-    signals:
     protected:
         Sigscript::SigmodWrapper* m_sigmod;
         QList<TeamMember*> m_members;
-    protected slots:
 };
 }
 Q_DECLARE_METATYPE(Sigencore::Containment*)