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

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

@@ -34 +34 @@
 #include "NotificationManager.h"
 
-namespace orxonox {
-
+namespace orxonox
+{
     Notification::Notification(BaseObject* creator) : BaseObject(creator)
     {
@@ -41 +41 @@
     }
     
-    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 +59 @@
         this->title_ = "";
         this->message_ = "";
-        this->displayTime_ = DISPLAY_TIME;
+        this->displayTime_ = NOTIFICATION_DISPLAY_TIME;
         this->sent_ = false;
     }
@@ -68 +68 @@
         if(successful)
             this->sent_ = true;
-        return successful;
+        return successful;
     }
     
@@ -75 +75 @@
         if(this->isSent())
             return false;
-        this->title_ = title;
-        return true;
+        this->title_ = title;
+        return true;
     }
     
@@ -83 +83 @@
         if(this->isSent())
             return false;
-        this->message_ = message;
-        return true;
+        this->message_ = message;
+        return true;
     }
     
@@ -92 +92 @@
         {
             return false;
-        }
-        if(time > 0)
-        {
-            this->displayTime_ = time;
-            return true;
-        }
-        return false;
+        }
+        if(time > 0)
+        {
+            this->displayTime_ = time;
+            return true;
+        }
+        return false;
     }
-
 }