Changes in src/Actions/ActionQueue.hpp [8859b5:11d433]

File:

• src/Actions/ActionQueue.hpp (modified) (10 diffs)

src/Actions/ActionQueue.hpp

@@ -16 +16 @@
 #include "CodePatterns/Singleton.hpp"
 
-#include "CodePatterns/Observer/Channels.hpp"
-#include "CodePatterns/Observer/Observable.hpp"
 
 #ifdef HAVE_ACTION_THREAD
@@ -33 +31 @@
 #endif
 
+class CommandLineParser;
+
 namespace MoleCuilder {
 
@@ -38 +38 @@
 class ActionRegistry;
 class ActionTrait;
-
-namespace Queuedetail {
-  template <class T> const T* lastChanged()
-  {
-    ASSERT(0, "Queuedetail::lastChanged() - only specializations may be used.");
-    return NULL;
-  }
-}
 
 /** This class combines the whole handling of Actions into a single class.
@@ -52 +44 @@
  * automatically queued and placed into a History after execution.
  */
-class ActionQueue : public Singleton<ActionQueue>, public Observable
+class ActionQueue : public Singleton<ActionQueue>
 {
   friend class Singleton<ActionQueue>;
@@ -59 +51 @@
   typedef std::vector< Action * > ActionQueue_t;
 
-  //!> channels for this observable
-  enum NotificationType {
-    ActionQueued,  // new action was queued
-    NotificationType_MAX  // denotes the maximum of available notification types
-  };
-
-  //>! access to last changed element (atom or molecule)
-  template <class T> const T* lastChanged() const
-  { return Queuedetail::lastChanged<T>(); }
-
   /** Queues the Action with \a name to be called.
    *
@@ -81 +63 @@
    * \param state whether Actions needs to be filled via a Dialog or not
    */
-  void queueAction(Action *_action, enum Action::QueryOptions state = Action::Interactive);
+  void queueAction(const Action * const _action, enum Action::QueryOptions state = Action::Interactive);
 
   /** Returns the spawned action by token \a name.
@@ -167 +149 @@
   //!> grant Action access to internal history functions.
   friend class Action;
+  //!> grant CommandLineParser access to stop and clearQueue()
+  friend class ::CommandLineParser;
 
   /** Wrapper function to add state to ActionHistory.
@@ -185 +169 @@
    */
   void clear();
+
+  /** Clears all actions currently present in the actionqueues.
+   *
+   */
+  void clearQueue();
 
 #ifdef HAVE_ACTION_THREAD
@@ -233 +222 @@
   ~ActionQueue();
 
-private:
-  friend const Action *Queuedetail::lastChanged<Action>();
-  static const Action *_lastchangedaction;
-
   //!> ActionRegistry to spawn new actions
   ActionRegistry *AR;
@@ -275 +260 @@
   ActionStatusList StatusList;
 };
-namespace Queuedetail {
-  template <>       inline  const Action* lastChanged<Action>() { return ActionQueue::_lastchangedaction; }
-}
 
 };