Changeset 2435 for code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.cc

Timestamp:

Dec 14, 2008, 1:42:17 AM (15 years ago)

Author:

rgrieder

Message:

• updated msvc files
• Fixed build by including util/Integer.h in NetworkPrereqs.h instead of util/Math.h
• Fixed issue with a this pointer used in the base class c'tor initialisation
• Fixed build under windows: INFINITE seems to be a macro, defined in winbase.h. Constant was somewhere in the quest files.
• Fixed build: Only integral types can have header-file value when declared as static const. Float is not supported by the standard.
• Fixed a potential bug in Planet.cc: "if (cond) doOne; doTwo" —> missing brances (indentation was correct, so I assume there have to be brances)
• Corrected lots of indentation problems with tabs/spaces mix.
• Changed all "@file Blubb.h" to "@file": Doxygen then assumes the actual filename. This gives more flexibility.

File:

• code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.cc (modified) (4 diffs)

code/branches/presentation/src/orxonox/overlays/notifications/NotificationManager.cc

@@ -36 +36 @@
 #include "NotificationQueue.h"
 
-namespace orxonox {
-
+namespace orxonox
+{
     std::list<NotificationContainer*> NotificationManager::notifications_s;
 
@@ -55 +55 @@
     
         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 +81 @@
             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 +105 @@
                 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());
         }