[Orxonox-commit 3454] r8140 - code/branches/dockingsystem/src/modules/docking

[sven at orxonox.net]

Author: sven
Date: 2011-03-28 15:24:12 +0200 (Mon, 28 Mar 2011)
New Revision: 8140

Modified:
   code/branches/dockingsystem/src/modules/docking/Dock.cc
   code/branches/dockingsystem/src/modules/docking/Dock.h
   code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h
Log:
fixed includes

Modified: code/branches/dockingsystem/src/modules/docking/Dock.cc
===================================================================
--- code/branches/dockingsystem/src/modules/docking/Dock.cc	2011-03-28 13:19:26 UTC (rev 8139)
+++ code/branches/dockingsystem/src/modules/docking/Dock.cc	2011-03-28 13:24:12 UTC (rev 8140)
@@ -33,10 +33,7 @@
 
 #include "Dock.h"
 
-#include "core/CoreIncludes.h"
-#include "core/XMLPort.h"
 
-
 namespace orxonox
 {
 
@@ -46,7 +43,7 @@
     Dock::Dock(BaseObject* creator) : StaticEntity(creator)
     {
         RegisterObject(Dock);
-		COUT(0) << "Registering dock..." << endl;
+		COUT(0) << "Registering dock..." << std::endl;
     }
 
     Dock::~Dock()
@@ -74,7 +71,8 @@
 
     bool Dock::execute(bool bTriggered, BaseObject* trigger)
 	{
-		COUT(0) << "Dock executed (bTriggered = " << (bTriggered? "true":"false") << ").." << endl;
+		COUT(0) << "Dock executed (bTriggered = " << (bTriggered? "true":"false") << ").." << std::endl;
+		return true;
 	}
 
 

Modified: code/branches/dockingsystem/src/modules/docking/Dock.h
===================================================================
--- code/branches/dockingsystem/src/modules/docking/Dock.h	2011-03-28 13:19:26 UTC (rev 8139)
+++ code/branches/dockingsystem/src/modules/docking/Dock.h	2011-03-28 13:24:12 UTC (rev 8140)
@@ -35,6 +35,11 @@
 #ifndef _Dock_H__
 #define _Dock_H__
 
+#include "core/CoreIncludes.h"
+#include "core/XMLPort.h"
+#include "core/EventIncludes.h"
+
+#include "worldentities/StaticEntity.h"
 #include "DockingPrereqs.h"
 
 namespace orxonox { 
@@ -49,7 +54,7 @@
         virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
 
         bool execute(bool bTriggered, BaseObject* trigger);
-	}
+	};
 
 
 }

Modified: code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h
===================================================================
--- code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h	2011-03-28 13:19:26 UTC (rev 8139)
+++ code/branches/dockingsystem/src/modules/docking/DockingPrereqs.h	2011-03-28 13:24:12 UTC (rev 8140)
@@ -64,14 +64,7 @@
 
 namespace orxonox
 {
-    class Notification;
-    class NotificationDispatcher;
-    class NotificationManager;
-    class NotificationQueue;
-    
-    //dispatchers
-    class CommandNotification;
-    class SimpleNotification;
+    class Dock;
 }
 
 #endif /* _DockingPrereqs_H__ */