1 files changed, 2 insertions, 7 deletions
diff --git a/project2/if.h b/project2/if.h
index 9c9acd8..b33bca1 100644
--- a/project2/if.h
+++ b/project2/if.h
@@ -1,7 +1,7 @@
 #ifndef IF_H
 #define IF_H
 
-#include "noOutputExecute.h"
+#include "iHaveSubTasks.h"
 #include "view.h"
 #include "paramChecker.h"
 
@@ -19,7 +19,7 @@ class IfSet : public virtual IntrusivePtrBase {
 };
 
 /// Project2 component to conditionally execute its children
-class If : public NoOutputExecute, public View, public IfSet {
+class If : public IHaveSubTasks, public View, public IfSet {
 	public:
 		If(const xmlpp::Element *);
 
@@ -27,14 +27,9 @@ class If : public NoOutputExecute, public View, public IfSet {
 		virtual void execute(const Presenter*) const;
 		virtual void execute() const;
 
-		const bool localErrorHandling;
-
 	private:
 		typedef ANONSTORAGEOF(View) SubViews;
 		SubViews subViews;
-		typedef ANONORDEREDSTORAGEOF(NoOutputExecute) SubNOEs;
-		SubNOEs normNOEs;
-		SubNOEs errorNOEs;
 
 		const std::string & getName() const;
 };