Changeset 2926 for code/trunk/src/orxonox/overlays

Timestamp:

Apr 19, 2009, 10:46:06 PM (15 years ago)

Author:

rgrieder

Message:

• Using class { static const float foo = 3.2; }; is non standard C++, only integral types are allowed to be defined this way. —> Exported symbol to the source file
• Removed two unsigned/signed comparison warnings

Location:

code/trunk/src/orxonox/overlays/notifications

Files:

• NotificationQueue.cc (modified) (2 diffs)
• NotificationQueue.h (modified) (1 diff)

code/trunk/src/orxonox/overlays/notifications/NotificationQueue.cc

@@ -54 +54 @@
     const std::string NotificationQueue::DEFAULT_FONT = "VeraMono";
     const Vector2 NotificationQueue::DEFAULT_POSITION = Vector2(0.0,0.0);
+    const float NotificationQueue::DEFAULT_FONT_SIZE  = 0.025;
 
     /**
@@ -273 +274 @@
         string->clear();
         bool first = true;
-        for(std::set<std::string>::iterator it = this->targets_.begin(); it != this->targets_.end(); it++) //!< Iterate through the set of targets.
+        for(std::set<std::string>::const_iterator it = this->targets_.begin(); it != this->targets_.end(); it++) //!< Iterate through the set of targets.
         {
             if(!first)

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

@@ -166 +166 @@
             static const int DEFAULT_LENGTH = 64; //!< The default maximum number of Notifications displayed.
             static const int DEFAULT_DISPLAY_TIME = 30; //!< The default display time.
-            static const float DEFAULT_FONT_SIZE = 0.025; //!< The default font size.
+            static const float DEFAULT_FONT_SIZE; //!< The default font size.
 
             static const std::string DEFAULT_FONT; //!< The default font.