Changeset 7410

Timestamp:

Sep 11, 2010, 3:17:39 PM (14 years ago)

Author:

dafrick

Message:

Removing some warnings (both compiler and doxygen).

Location:

code/trunk/src/modules

Files:

• notifications/Notification.cc (modified) (1 diff)
• notifications/NotificationQueue.cc (modified) (1 diff)
• notifications/NotificationQueue.h (modified) (1 diff)
• objects/Script.cc (modified) (1 diff)

code/trunk/src/modules/notifications/Notification.cc

@@ -104 +104 @@
     @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.

code/trunk/src/modules/notifications/NotificationQueue.cc

@@ -151 +151 @@
             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;

code/trunk/src/modules/notifications/NotificationQueue.h

@@ -109 +109 @@
             @return Returns the display time.
             */
-            inline float getDisplayTime() const
+            inline unsigned int getDisplayTime() const
                 { return this->displayTime_; }
             // tolua_end

code/trunk/src/modules/objects/Script.cc

@@ -179 +179 @@
             case ScriptMode::lua:
                 return Script::LUA;
+            default: // This will never happen...
+                return Script::NORMAL;
         }
     }