Changeset 3034 for code/trunk

Timestamp:

May 23, 2009, 10:05:58 PM (16 years ago)

Author:

landauf

Message:

replaced tabs with spaces

Location:

code/trunk/src/orxonox

Files:

• gui/GUIManager.cc (modified) (1 diff)
• objects/worldentities/pawns/Spectator.cc (modified) (1 diff)
• objects/worldentities/triggers/DistanceTrigger.cc (modified) (3 diffs)
• overlays/OverlayGroup.cc (modified) (1 diff)
• overlays/notifications/Notification.h (modified) (2 diffs)
• overlays/notifications/NotificationManager.h (modified) (2 diffs)

code/trunk/src/orxonox/gui/GUIManager.cc

@@ -91 +91 @@
         {
             // destroy our own tolua interfaces
-                lua_pushnil(luaState_);
-                lua_setglobal(luaState_, "Orxonox");
-                lua_pushnil(luaState_);
-                lua_setglobal(luaState_, "Core");
+            lua_pushnil(luaState_);
+            lua_setglobal(luaState_, "Orxonox");
+            lua_pushnil(luaState_);
+            lua_setglobal(luaState_, "Core");
             delete scriptModule_;
         }

code/trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc

@@ -112 +112 @@
     void Spectator::changedFlareVisibility()
     {
-        if ( this->greetingFlare_ )
+        if (this->greetingFlare_)
             this->greetingFlare_->setVisible(this->bGreetingFlareVisible_);
     }

code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

@@ -86 +86 @@
   {
     Identifier* targetId = ClassByString(targets);
-    
+
     //! Checks whether the target is (or is derived from) a ControllableEntity.
     Identifier* controllableEntityId = Class(ControllableEntity);
@@ -93 +93 @@
       this->setForPlayer(true);
     }
-    
+
     if (!targetId)
     {
@@ -131 +131 @@
       if (distanceVec.length() < this->distance_)
       {
-        
-        //! If the target is a player (resp. is a, or is derived from a, ControllableEntity) the triggeringPlayer is set to the target entity.
+
+        // If the target is a player (resp. is a, or is derived from a, ControllableEntity) the triggeringPlayer is set to the target entity.
         if(this->isForPlayer())
-        {
+        {
           Pawn* player = dynamic_cast<Pawn*>(entity);
-          this->setTriggeringPlayer(player);
-        }
-        
+          this->setTriggeringPlayer(player);
+        }
+
         return true;
       }

code/trunk/src/orxonox/overlays/OverlayGroup.cc

@@ -113 +113 @@
     }
 
-        /**
+    /**
     @brief
         Removes an element from the map.

code/trunk/src/orxonox/overlays/notifications/Notification.h

@@ -56 +56 @@
             Notification(const std::string & message);
             virtual ~Notification();
-            
+
             bool send(void); //!< Sends the Notification to the Notificationmanager, with sender NotificationManager::NONE;
             bool send(const std::string & sender); //!< Sends the Notification to the Notificationmanager.
-            
+
             /**
             @brief Checks whether the Notification was sent.
@@ -72 +72 @@
             inline const std::string & getMessage(void) const
                 { return this->message_; }
-                
+
             inline const std::string & getSender(void) const
                 { return this->sender_; }
-            
+
             bool setMessage(const std::string & message); //!< Sets the message of the notification.
-            
+
         private:
             std::string message_; //!< The Notification message.
             std::string sender_; //!< The sender of the notification.
             bool sent_; //!< Whether Notification has been sent, if so it cannot be changed.
-            
+
             void initialize(void);
-        
+
     };
 

code/trunk/src/orxonox/overlays/notifications/NotificationManager.h

@@ -60 +60 @@
             NotificationManager();
             virtual ~NotificationManager();
-                
+
             static const std::string ALL;
             static const std::string NONE;
-         
+
             static NotificationManager & getInstance(); //! Returns a reference to the single instance of the NotificationManager.
 
             bool registerNotification(Notification* notification); //!< Registers a Notification within the NotificationManager.
             bool registerQueue(NotificationQueue* queue); //!< Registers a NotificationQueue within the NotificationManager.
-            
+
             bool getNotifications(NotificationQueue* queue, std::multimap<std::time_t,Notification*>* map, const std::time_t & timeFrameStart, const std::time_t & timeFrameEnd); //!< Returns the Notifications for a specific NotificationQueue in a specified timeframe.
-            
+
             /**
             @brief Fetches the Notifications for a specific NotificationQueue starting at a specified time.
@@ -89 +89 @@
             bool getNotifications(NotificationQueue* queue, std::multimap<std::time_t,Notification*>* map, int timeDelay)
                 { return this->getNotifications(queue, map, std::time(0)-timeDelay, std::time(0)); }
-     
+
         private:
             static NotificationManager* singletonRef_s;
 
             int highestIndex_; //!< This variable holds the highest index (resp. key) in notificationLists_s, to secure that  no key appears twice.
-        
+
             std::multimap<std::time_t,Notification*> allNotificationsList_; //!< Container where all notifications are stored (together with their respecive timestamps).
             std::map<NotificationQueue*,int> queueList_; //!< Container where all NotificationQueues are stored with a number as identifier.
             std::map<int,std::multimap<std::time_t,Notification*>*> notificationLists_; //!< Container where all Notifications, for each identifier (associated with a NotificationQueue), are stored.
-            
+
 
     };