Index: code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc	(revision 7096)
+++ code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc	(revision 7127)
@@ -52,5 +52,5 @@
         RegisterRootObject(GametypeMessageListener);
     }
-    
+
     //----------------------------
     // PickupCarrier
@@ -59,8 +59,8 @@
     {
         RegisterRootObject(PickupCarrier);
-        
+
         this->setCarrierName("PickupCarrier");
     }
-    
+
     PickupCarrier::~PickupCarrier()
     {
@@ -85,5 +85,5 @@
         this->isForPlayer_ = true;
     }
-    
+
     //----------------------------
     // RadarListener
Index: code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h	(revision 7096)
+++ code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h	(revision 7127)
@@ -68,5 +68,5 @@
         friend class Pickupable;
         friend class PickupManager;
-        //! Friends. 
+        //! Friends.
         friend class Pickup;
         friend class HealthPickup;
@@ -170,5 +170,5 @@
             */
             virtual const Vector3& getCarrierPosition(void) = 0;
-            
+
             /**
             @brief Get the name of this PickupCarrier.
@@ -176,6 +176,6 @@
             */
             const std::string& getCarrierName(void) { return this->carrierName_; } // tolua_export
-            
-        protected:        
+
+        protected:
             /**
             @brief Get all direct children of this PickupSpawner.
@@ -198,5 +198,5 @@
             std::set<Pickupable*>& getPickups(void)
                 { return this->pickups_; }
-                
+
             /**
             @brief Set the name of this PickupCarrier.
@@ -206,9 +206,9 @@
             void setCarrierName(const std::string& name)
                 { this->carrierName_ = name; }
-        
+
         private:
             std::set<Pickupable*> pickups_; //!< The list of Pickupables carried by this PickupCarrier.
             std::string carrierName_; //!< The name of the PickupCarrier, as displayed in the PickupInventory.
-            
+
             /**
             @brief Get the number of carrier children this PickupCarrier has.
@@ -222,5 +222,5 @@
                     return size;
                 }
-            
+
             /**
             @brief Get the index-th child of this PickupCarrier.
@@ -237,5 +237,5 @@
                     return carrier;
                 }
-            
+
             /**
             @brief Get the number of Pickupables this PickupCarrier carries.
@@ -244,5 +244,5 @@
             unsigned int getNumPickups(void)
                 { return this->pickups_.size(); }
-            
+
             /**
             @brief Get the index-th Pickupable of this PickupCarrier.
@@ -259,5 +259,5 @@
                     return *it;
                 }
-            
+
     };
 }
Index: code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc	(revision 7096)
+++ code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc	(revision 7127)
@@ -46,5 +46,5 @@
 namespace orxonox
 {
-    
+
     /**
     @brief
@@ -52,15 +52,15 @@
     */
     Pickupable::Pickupable() : pickupIdentifier_(NULL), used_(false), pickedUp_(false)
-    {        
+    {
         RegisterRootObject(Pickupable);
-        
+
         this->carrier_ = NULL;
-        
+
         this->pickupIdentifier_ = new PickupIdentifier(this);
     }
-    
-    /**
-    @brief
-        Destructor. 
+
+    /**
+    @brief
+        Destructor.
     */
     Pickupable::~Pickupable()
@@ -68,5 +68,5 @@
         if(this->isUsed())
             this->setUsed(false);
-        
+
         if(this->isPickedUp() && this->getCarrier() != NULL)
         {
@@ -74,9 +74,9 @@
             this->setCarrier(NULL);
         }
-        
+
         if(this->pickupIdentifier_ != NULL)
             this->pickupIdentifier_->destroy();
     }
-    
+
     /**
     @brief
@@ -91,7 +91,7 @@
         if(this->used_ == used)
             return false;
-        
+
         COUT(4) << "Pickupable (&" << this << ") set to used " << used << "." << std::endl;
-        
+
         this->used_ = used;
         this->changedUsed();
@@ -100,5 +100,5 @@
         return true;
     }
-    
+
     /**
     @brief
@@ -115,5 +115,5 @@
         return this->isTarget(carrier->getIdentifier());
     }
-    
+
     /**
     @brief
@@ -134,5 +134,5 @@
         return false;
     }
-        
+
     /**
     @brief
@@ -147,5 +147,5 @@
         return this->addTarget(target->getIdentifier());
     }
-    
+
     /**
     @brief
@@ -160,12 +160,12 @@
         if(this->isTarget(target)) //!< If the input target is already present in the list of targets.
             return false;
-        
+
         COUT(4) << "Target " << target->getName() << " added to Pickupable (&" << this << ")." << std::endl;
         this->targets_.push_back(target);
         return true;
     }
-    
-    /**
-    @brief  
+
+    /**
+    @brief
         Sets the Pickupable to picked up.
         This method will be called by the PickupCarrier picking the Pickupable up.
@@ -179,5 +179,5 @@
         if(this->isPickedUp()) //!< If the Pickupable is already picked up.
             return false;
-        
+
         COUT(4) << "Pickupable (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << std::endl;
         this->setCarrier(carrier);
@@ -185,5 +185,5 @@
         return true;
     }
-    
+
     /**
     @brief
@@ -198,7 +198,7 @@
         if(this->pickedUp_ == pickedUp)
             return false;
-        
+
         COUT(4) << "Pickupable (&" << this << ") set to pickedUp " << pickedUp << "." << std::endl;
-        
+
         this->pickedUp_ = pickedUp;
         this->changedPickedUp();
@@ -206,5 +206,5 @@
         return true;
     }
-        
+
     /**
     @brief
@@ -217,7 +217,7 @@
         if(this->carrier_ == carrier)
             return false;
-        
+
         COUT(4) << "Pickupable (&" << this << ") changed Carrier (& " << carrier << ")." << std::endl;
-        
+
         this->carrier_ = carrier;
         this->changedCarrier();
@@ -226,7 +226,7 @@
         return true;
     }
-    
-    /**
-    @brief 
+
+    /**
+    @brief
         Sets the Pickupable to not picked up or dropped.
         This method will be called by the PickupCarrier dropping the Pickupable.
@@ -238,21 +238,21 @@
         if(!this->isPickedUp()) //!< If the Pickupable is not picked up.
             return false;
-        
+
         COUT(4) << "Pickupable (&" << this << ") got dropped up by a PickupCarrier (&" << this->getCarrier() << ")." << std::endl;
         this->setUsed(false);
         this->setPickedUp(false);
-        
+
         bool created = this->createSpawner();
-        
+
         this->setCarrier(NULL);
-        
+
         if(!created)
         {
             this->destroy();
         }
-        
-        return true;
-    }
-    
+
+        return true;
+    }
+
     /**
     @brief
@@ -265,11 +265,11 @@
         OrxonoxClass* item = NULL;
         this->clone(item);
-        
+
         Pickupable* pickup = dynamic_cast<Pickupable*>(item);
-        
+
         COUT(4) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << std::endl;
         return pickup;
     }
-    
+
     /**
     @brief
@@ -299,4 +299,4 @@
         return carrier->pickup(this);
     }
-    
+
 }
Index: code/branches/presentation3/src/orxonox/interfaces/Pickupable.h
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/Pickupable.h	(revision 7096)
+++ code/branches/presentation3/src/orxonox/interfaces/Pickupable.h	(revision 7127)
@@ -45,5 +45,5 @@
 namespace orxonox // tolua_export
 { // tolua_export
-    
+
     /**
     @brief
@@ -57,8 +57,8 @@
         protected:
             Pickupable(); //!< Default constructor.
-        
+
         public:
             virtual ~Pickupable(); //!< Default destructor.
-            
+
             /**
             @brief Get whether the pickup is currently in use or not.
@@ -71,5 +71,5 @@
             */
             virtual void changedUsed(void) {}
-            
+
             /**
             @brief Get the carrier of the pickup.
@@ -83,5 +83,5 @@
             */
             virtual void changedCarrier(void) {}
-            
+
             /**
             @brief Returns whether the Pickupable is currently picked up.
@@ -94,16 +94,16 @@
             */
             virtual void changedPickedUp(void) {}
-            
+
             bool pickedUp(PickupCarrier* carrier); //!< Sets the Pickupable to picked up.
             bool dropped(void); //!< Sets the Pickupable to not picked up or dropped.
-            
+
             virtual bool isTarget(PickupCarrier* carrier) const; //!< Get whether the given PickupCarrier is a target of this pickup.
             bool isTarget(const Identifier* identifier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this Pickupable.
             bool addTarget(PickupCarrier* target); //!< Add a PickupCarrier as target of this pickup.
             bool addTarget(Identifier* identifier); //!< Add a class, representetd by the input Identifier, as target of this pickup.
-            
+
             Pickupable* clone(void); //!< Creates a duplicate of the Pickupable.
             virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
-            
+
             /**
             @brief Get the PickupIdentifier of this Pickupable.
@@ -112,9 +112,9 @@
             virtual const PickupIdentifier* getPickupIdentifier(void)
                 { return this->pickupIdentifier_; }
-                
+
             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.
             bool setCarrier(PickupCarrier* carrier, bool tell = false); //!< Sets the carrier of the pickup.
-            
+
         protected:
             /**
@@ -122,5 +122,5 @@
             */
             void initializeIdentifier(void) {}
-            
+
             /**
             @brief Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
@@ -131,12 +131,12 @@
             */
             virtual bool createSpawner(void) = 0;
-            
+
             PickupIdentifier* pickupIdentifier_; //!< The PickupIdentifier of this Pickupable.
-            
+
         private:
-            
+
             bool used_; //!< Whether the pickup is currently in use or not.
             bool pickedUp_; //!< Whether the pickup is currently picked up or not.
-            
+
             PickupCarrier* carrier_; //!< The carrier of the pickup.
             std::list<Identifier*> targets_; //!< The possible targets of this pickup.
@@ -147,5 +147,5 @@
 
     };  // tolua_export
-    
+
     SUPER_FUNCTION(10, Pickupable, changedUsed, false);
     SUPER_FUNCTION(12, Pickupable, changedCarrier, false);
Index: code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc	(revision 7096)
+++ code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc	(revision 7127)
@@ -65,5 +65,5 @@
     RadarViewable::~RadarViewable()
     {
-        
+
         if( this->bInitialized_ )
         {
@@ -109,5 +109,5 @@
         }
     }
-    
+
     void RadarViewable::settingsChanged()
     {
Index: code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h	(revision 7096)
+++ code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h	(revision 7127)
@@ -88,5 +88,5 @@
 
         inline void setRadarVisibility(bool b)
-            { 
+            {
                 if(b!=this->bVisibility_)
                 {
