[Orxonox-commit 1822] r6539 - in code/trunk/src: modules/pickup/items orxonox/interfaces

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-03-16 18:23:06 +0100 (Tue, 16 Mar 2010)
New Revision: 6539

Modified:
   code/trunk/src/modules/pickup/items/MetaPickup.h
   code/trunk/src/orxonox/interfaces/Pickupable.h
Log:
Ups. Complies and runs now.


Modified: code/trunk/src/modules/pickup/items/MetaPickup.h
===================================================================
--- code/trunk/src/modules/pickup/items/MetaPickup.h	2010-03-16 17:15:45 UTC (rev 6538)
+++ code/trunk/src/modules/pickup/items/MetaPickup.h	2010-03-16 17:23:06 UTC (rev 6539)
@@ -78,7 +78,6 @@
             const std::string& getMetaType(void); //!< Get the meta type of this MetaPickup.
             
         protected:
-            void initialize(void); //!< Initializes the object.
             void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
             
             /**

Modified: code/trunk/src/orxonox/interfaces/Pickupable.h
===================================================================
--- code/trunk/src/orxonox/interfaces/Pickupable.h	2010-03-16 17:15:45 UTC (rev 6538)
+++ code/trunk/src/orxonox/interfaces/Pickupable.h	2010-03-16 17:23:06 UTC (rev 6539)
@@ -94,7 +94,6 @@
             */
             virtual void changedPickedUp(void) {}
             
-            //TODO: Better private, or protected?
             bool pickedUp(PickupCarrier* carrier); //!< Sets the Pickupable to picked up.
             bool dropped(void); //!< Sets the Pickupable to not picked up or dropped.