Index: code/branches/presentation/src/orxonox/overlays/notifications/Notification.cc
===================================================================
--- code/branches/presentation/src/orxonox/overlays/notifications/Notification.cc	(revision 2385)
+++ code/branches/presentation/src/orxonox/overlays/notifications/Notification.cc	(revision 2435)
@@ -34,6 +34,6 @@
 #include "NotificationManager.h"
 
-namespace orxonox {
-
+namespace orxonox
+{
     Notification::Notification(BaseObject* creator) : BaseObject(creator)
     {
@@ -41,5 +41,5 @@
     }
     
-    Notification::Notification(const std::string & message, const std::string & title, float time) : BaseObject(this)
+    Notification::Notification(BaseObject* creator, const std::string & message, const std::string & title, float time) : BaseObject(creator)
     {
         this->title_ = title;
@@ -59,5 +59,5 @@
         this->title_ = "";
         this->message_ = "";
-        this->displayTime_ = DISPLAY_TIME;
+        this->displayTime_ = NOTIFICATION_DISPLAY_TIME;
         this->sent_ = false;
     }
@@ -68,5 +68,5 @@
         if(successful)
             this->sent_ = true;
-	return successful;
+        return successful;
     }
     
@@ -75,6 +75,6 @@
         if(this->isSent())
             return false;
-	this->title_ = title;
-	return true;
+        this->title_ = title;
+        return true;
     }
     
@@ -83,6 +83,6 @@
         if(this->isSent())
             return false;
-	this->message_ = message;
-	return true;
+        this->message_ = message;
+        return true;
     }
     
@@ -92,12 +92,11 @@
         {
             return false;
-	}
-	if(time > 0)
-	{
-	    this->displayTime_ = time;
-	    return true;
-	}
-	return false;
+        }
+        if(time > 0)
+        {
+            this->displayTime_ = time;
+            return true;
+        }
+        return false;
     }
-
 }
Index: code/branches/presentation/src/orxonox/overlays/notifications/Notification.h
===================================================================
--- code/branches/presentation/src/orxonox/overlays/notifications/Notification.h	(revision 2385)
+++ code/branches/presentation/src/orxonox/overlays/notifications/Notification.h	(revision 2435)
@@ -36,9 +36,11 @@
 #include "core/BaseObject.h"
 
-namespace orxonox {
+namespace orxonox
+{
+    static const float NOTIFICATION_DISPLAY_TIME = 4.0;
 
     /**
     @brief
-	This is rather temporary, so don't start relying on it, some better version will come soon but the Interface will not likely be the same.
+        This is rather temporary, so don't start relying on it, some better version will come soon but the Interface will not likely be the same.
     @author
         Damian 'Mozork' Frick
@@ -46,36 +48,32 @@
     class _OrxonoxExport Notification : public BaseObject
     {
-	public:
-	    Notification(BaseObject* creator);
-	    Notification(const std::string & message, const std::string & title = "", float time = DISPLAY_TIME);
-	    virtual ~Notification();
-	    
-	    bool send(void);
-	    
-	    inline bool isSent(void) const
-                { return this->sent_; }
-	    inline const std::string & getTitle(void) const
-                { return this->title_; }
-	    inline const std::string & getMessage(void) const
-                { return this->message_; }
-	    inline const float getDisplayTime(void) const
-                { return displayTime_; }
-	    
-	    bool setTitle(const std::string & title);
-	    bool setMessage(const std::string & message);
-	    bool setDisplayTime(float time);
-	    
-	private:
-            static const float DISPLAY_TIME = 4.0;
-	
-            std::string title_; //!< The title of the Notification.
-            std::string message_; //!< The Notification message.
-            float displayTime_; //!< The time duration the Notification is displayed in seconds.
-            bool sent_; //!< Whether Notification has been sent, if so it cannot be changed.
-            
-            void initialize(void);
-	
+    public:
+        Notification(BaseObject* creator);
+        Notification(BaseObject* creator, const std::string & message, const std::string & title = "", float time = NOTIFICATION_DISPLAY_TIME);
+        virtual ~Notification();
+        
+        bool send(void);
+        
+        inline bool isSent(void) const
+            { return this->sent_; }
+        inline const std::string & getTitle(void) const
+            { return this->title_; }
+        inline const std::string & getMessage(void) const
+            { return this->message_; }
+        inline const float getDisplayTime(void) const
+            { return displayTime_; }
+        
+        bool setTitle(const std::string & title);
+        bool setMessage(const std::string & message);
+        bool setDisplayTime(float time);
+        
+    private:
+        std::string title_; //!< The title of the Notification.
+        std::string message_; //!< The Notification message.
+        float displayTime_; //!< The time duration the Notification is displayed in seconds.
+        bool sent_; //!< Whether Notification has been sent, if so it cannot be changed.
+        
+        void initialize(void);
     };
-
 }
 
Index: code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.cc
===================================================================
--- code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.cc	(revision 2385)
+++ code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.cc	(revision 2435)
@@ -36,6 +36,6 @@
 #include "NotificationQueue.h"
 
-namespace orxonox {
-
+namespace orxonox
+{
     std::list<NotificationContainer*> NotificationManager::notifications_s;
 
@@ -55,22 +55,22 @@
     
         for (std::list<NotificationContainer*>::iterator notification = notifications_s.begin(); notification != notifications_s.end(); ++notification)
-	{
+        {
             NotificationContainer* container = *notification;
             if(container->remainingTime == 0)
             {
                 continue;
-	    }
-	    else if(container->remainingTime - dt <= 0)
-	    {
-	       container->remainingTime = 0;
-	       update = true;
-	    }
-	    else
-	    {
+            }
+            else if(container->remainingTime - dt <= 0)
+            {
+                container->remainingTime = 0;
+                update = true;
+            }
+            else
+            {
                 container->remainingTime = container->remainingTime -dt;
-	    }
-	}
-	
-	if(update)
+            }
+        }
+    
+        if(update)
             updateQueue();
     }
@@ -81,7 +81,7 @@
             return false;
             
-	NotificationContainer* container = new NotificationContainer;
-	container->notification = notification;
-	container->remainingTime = notification->getDisplayTime();
+        NotificationContainer* container = new NotificationContainer;
+        container->notification = notification;
+        container->remainingTime = notification->getDisplayTime();
         notifications_s.push_front(container);
         
@@ -105,5 +105,5 @@
                 continue;
             
-	    text = text + "\n\n\n------------\n\n" + clipMessage(container->notification->getTitle()) + "\n\n" + clipMessage(container->notification->getMessage());
+            text = text + "\n\n\n------------\n\n" + clipMessage(container->notification->getTitle()) + "\n\n" + clipMessage(container->notification->getMessage());
         }
         
Index: code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.h
===================================================================
--- code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.h	(revision 2385)
+++ code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.h	(revision 2435)
@@ -37,6 +37,6 @@
 #include <string>
 
-namespace orxonox {
-
+namespace orxonox
+{
     struct NotificationContainer
     {
@@ -54,17 +54,17 @@
     {
     
-        public:
-	    NotificationManager(BaseObject* creator);
-	    virtual ~NotificationManager();
-	    
-	    static bool insertNotification(Notification* notification);
-	    
-	    static void tick(float dt);
-	    
-	private:
-            static std::list<NotificationContainer*> notifications_s;
-            
-            static void updateQueue(void);
-            static const std::string clipMessage(const std::string & message);
+    public:
+        NotificationManager(BaseObject* creator);
+        virtual ~NotificationManager();
+        
+        static bool insertNotification(Notification* notification);
+        
+        static void tick(float dt);
+        
+    private:
+        static std::list<NotificationContainer*> notifications_s;
+        
+        static void updateQueue(void);
+        static const std::string clipMessage(const std::string & message);
 
     };
Index: code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.cc
===================================================================
--- code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.cc	(revision 2385)
+++ code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.cc	(revision 2435)
@@ -35,6 +35,6 @@
 #include "NotificationManager.h"
 
-namespace orxonox {
-
+namespace orxonox
+{
     NotificationQueue* NotificationQueue::queue_s = 0;
     
@@ -46,14 +46,14 @@
         //TDO: Does this work?
         if(queue_s != NULL)
-	{
-            COUT(2) << "There is now more than one NotificationQueue, this shouldn't happen, since only the first NotificationQueue will be targeted by the NotificationManager." << std::endl;
-	}
-	else
-	{
-            queue_s = this;
-	}
-	
-	this->length_ = 3;
-	this->width_ = 50;
+        {
+                COUT(2) << "There is now more than one NotificationQueue, this shouldn't happen, since only the first NotificationQueue will be targeted by the NotificationManager." << std::endl;
+        }
+        else
+        {
+                queue_s = this;
+        }
+        
+        this->length_ = 3;
+        this->width_ = 50;
     }
     
Index: code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.h
===================================================================
--- code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.h	(revision 2385)
+++ code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.h	(revision 2435)
@@ -38,6 +38,6 @@
 #include <string>
 
-namespace orxonox {
-
+namespace orxonox
+{
     /**
     @brief
@@ -48,29 +48,29 @@
     class _OrxonoxExport NotificationQueue : public OverlayText, public Tickable
     {
-	public:
-	    NotificationQueue(BaseObject* creator);
-	    virtual ~NotificationQueue();
-	    
-	    static NotificationQueue* queue_s; //TDO Singleton? oder im level.
-	    
-	    virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
-	    
-	    virtual void tick(float dt);
-	    
-	    void update(void);
-	    
-	    int getLength(void) const
+    public:
+        NotificationQueue(BaseObject* creator);
+        virtual ~NotificationQueue();
+        
+        static NotificationQueue* queue_s; //TDO Singleton? oder im level.
+        
+        virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
+        
+        virtual void tick(float dt);
+        
+        void update(void);
+        
+        int getLength(void) const
                 { return this->length_; }
-	    int getWidth(void) const
+        int getWidth(void) const
                 { return this->width_; }
-	    
-	    void setQueueText(const std::string & text);
-	    bool setLength(int length);
-	    bool setWidth(int width);
-	    
-	private:
-            Ogre::UTFString queueText_;
-            int length_;
-            int width_;
+        
+        void setQueueText(const std::string & text);
+        bool setLength(int length);
+        bool setWidth(int width);
+        
+    private:
+        Ogre::UTFString queueText_;
+        int length_;
+        int width_;
     
     };
