Changeset 2435 for code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.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/NotificationQueue.cc (modified) (2 diffs)

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

@@ -35 +35 @@
 #include "NotificationManager.h"
 
-namespace orxonox {
-
+namespace orxonox
+{
     NotificationQueue* NotificationQueue::queue_s = 0;
     
@@ -46 +46 @@
         //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;
     }