[FIX] Started documenting Sigmod

[FIX] A few minor bugs

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

1 files changed, 13 insertions, 11 deletions

diff --git a/sigbattle/ActionQueue.h b/sigbattle/ActionQueue.h
index 91797932..9c456c84 100644
--- a/sigbattle/ActionQueue.h
+++ b/sigbattle/ActionQueue.h
@@ -29,43 +29,45 @@
 
 namespace Sigbattle
 {
-class SIGBATTLE_EXPORT ActionQueue : public QQueue<TeamMember::RequestedAction>
+class SIGBATTLE_EXPORT ActionQueue
 {
     public:
-        ActionQueue();
-        
         TeamMember::RequestedAction dequeue();
         void enqueue(const TeamMember::RequestedAction& action);
         
+        bool isEmpty();
+        
         TeamMember::RequestedAction& head();
         
         void lock();
         void unlock();
     private:
+        QQueue<TeamMember::RequestedAction> m_queue;
         QMutex m_mutex;
 };
 
-inline ActionQueue::ActionQueue() :
-        QQueue<TeamMember::RequestedAction>()
-{
-}
-
 inline TeamMember::RequestedAction ActionQueue::dequeue()
 {
     QMutexLocker locker(&m_mutex);
-    return QQueue<TeamMember::RequestedAction>::dequeue();
+    return m_queue.dequeue();
 }
 
 inline void ActionQueue::enqueue(const TeamMember::RequestedAction& action)
 {
     QMutexLocker locker(&m_mutex);
-    QQueue<TeamMember::RequestedAction>::enqueue(action);
+    m_queue.enqueue(action);
 }
 
 inline TeamMember::RequestedAction& ActionQueue::head()
 {
     QMutexLocker locker(&m_mutex);
-    return QQueue<TeamMember::RequestedAction>::head();
+    return m_queue.head();
+}
+
+inline bool ActionQueue::isEmpty()
+{
+    QMutexLocker locker(&m_mutex);
+    return m_queue.isEmpty();
 }
 
 inline void ActionQueue::lock()