[Orxonox-commit 2705] r7410 - in code/trunk/src/modules: notifications objects

[dafrick at orxonox.net]

Author: dafrick
Date: 2010-09-11 15:17:39 +0200 (Sat, 11 Sep 2010)
New Revision: 7410

Modified:
   code/trunk/src/modules/notifications/Notification.cc
   code/trunk/src/modules/notifications/NotificationQueue.cc
   code/trunk/src/modules/notifications/NotificationQueue.h
   code/trunk/src/modules/objects/Script.cc
Log:
Removing some warnings (both compiler and doxygen).


Modified: code/trunk/src/modules/notifications/Notification.cc
===================================================================
--- code/trunk/src/modules/notifications/Notification.cc	2010-09-11 13:16:38 UTC (rev 7409)
+++ code/trunk/src/modules/notifications/Notification.cc	2010-09-11 13:17:39 UTC (rev 7410)
@@ -103,6 +103,8 @@
     /**
     @brief
         Sends the Notification to the Notificationmanager, which then in turn distributes it to the different NotificationQueues.
+    @param clientID
+        The id of the client that this Notification is sent to.
     @param sender
         The sender the Notification was sent by. Used by the NotificationManager to distributes the notification to the correct NotificationQueues.
     @return

Modified: code/trunk/src/modules/notifications/NotificationQueue.cc
===================================================================
--- code/trunk/src/modules/notifications/NotificationQueue.cc	2010-09-11 13:16:38 UTC (rev 7409)
+++ code/trunk/src/modules/notifications/NotificationQueue.cc	2010-09-11 13:17:39 UTC (rev 7410)
@@ -150,7 +150,7 @@
 
             std::multiset<NotificationContainer*, NotificationContainerCompare>::iterator it = this->ordering_.begin();
             // Iterate through all elements whose creation time is smaller than the current time minus the display time.
-            while(it != this->ordering_.upper_bound(&this->timeLimit_) && it != this->ordering_.end())
+            while(it != this->ordering_.upper_bound(&this->timeLimit_))
             {
                 NotificationContainer* temp = *it;
                 it++;

Modified: code/trunk/src/modules/notifications/NotificationQueue.h
===================================================================
--- code/trunk/src/modules/notifications/NotificationQueue.h	2010-09-11 13:16:38 UTC (rev 7409)
+++ code/trunk/src/modules/notifications/NotificationQueue.h	2010-09-11 13:17:39 UTC (rev 7410)
@@ -108,7 +108,7 @@
             @brief Returns the time interval the Notification is displayed.
             @return Returns the display time.
             */
-            inline float getDisplayTime() const
+            inline unsigned int getDisplayTime() const
                 { return this->displayTime_; }
             // tolua_end
 

Modified: code/trunk/src/modules/objects/Script.cc
===================================================================
--- code/trunk/src/modules/objects/Script.cc	2010-09-11 13:16:38 UTC (rev 7409)
+++ code/trunk/src/modules/objects/Script.cc	2010-09-11 13:17:39 UTC (rev 7410)
@@ -178,6 +178,8 @@
                 return Script::NORMAL;
             case ScriptMode::lua:
                 return Script::LUA;
+            default: // This will never happen...
+                return Script::NORMAL;
         }
     }