Changeset 7552 for code/trunk/src/orxonox/interfaces

Timestamp:

Oct 17, 2010, 10:50:43 PM (14 years ago)

Author:

dafrick

Message:

Resolving some TODOs and doing some additional cleanup. Almost done now…

Location:

code/trunk/src/orxonox/interfaces

Files:

• NotificationListener.h (modified) (1 diff)
• PickupCarrier.h (modified) (2 diffs)
• Pickupable.h (modified) (3 diffs)

code/trunk/src/orxonox/interfaces/NotificationListener.h

@@ -56 +56 @@
         The NotificationListener interface presents a means to being informed when @ref orxonox::Notification "Notifications" in the target set of this NotificationListener change. (e.g. @ref orxonox::Notification "Notifications" were added or removed)
         When inheriting from a NotificationListener it is important to register (in the constructor) and unregister (in the destructor) it to and from the @ref orxonox::NotificationManager "NotificationManager".
+
     @author
         Fabian 'x3n' Landau
+
+    @ingroup Notifications
     */
-    //TODO: Needed? Remove or move some NotificationQueue things over here.
     class _OrxonoxExport NotificationListener : virtual public OrxonoxClass
     {

code/trunk/src/orxonox/interfaces/PickupCarrier.h

@@ -47 +47 @@
 
     // Forward-declarations.
-    class PickupManager;
-    class Pickup;
-    class HealthPickup;
-    class InvisiblePickup;
     class MetaPickup;
-    class DronePickup;
-    class SpeedPickup;
 
     /**
@@ -78 +72 @@
         friend class PickupManager;
         // Friends.
-        friend class Pickup;
-        friend class HealthPickup;
-        friend class InvisiblePickup;
         friend class MetaPickup;
-        friend class DronePickup;
-        friend class SpeedPickup;
 
         public:

code/trunk/src/orxonox/interfaces/Pickupable.h

@@ -62 +62 @@
     class _OrxonoxExport Pickupable : virtual public OrxonoxClass, public Rewardable
     {
+        friend class PickupCarrier;
+
         protected:
             Pickupable(); //!< Default constructor.
@@ -146 +148 @@
             bool setUsed(bool used); //!< Sets the Pickupable to used or unused, depending on the input.
             bool setPickedUp(bool pickedUp); //!< Helper method to set the Pickupable to either picked up or not picked up.
-            //TODO: private?
             bool setCarrier(PickupCarrier* carrier, bool tell = true); //!< Sets the carrier of the Pickupable.
-
-            //TODO: private?
-            virtual void carrierDestroyed(void); //!< Is called by the PickupCarrier when it is being destroyed.
 
             void destroy(void); //!< Is called internally within the Pickupable module to destroy pickups.
@@ -162 +160 @@
             virtual void preDestroy(void); //!< A method that is called by OrxonoxClass::destroy() before the object is actually destroyed.
             virtual void destroyPickup(void); //!< Destroys a Pickupable.
+            virtual void carrierDestroyed(void); //!< Is called by the PickupCarrier when it is being destroyed.
 
             /**