Changeset 8371 for code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.h

Timestamp:

May 1, 2011, 2:43:33 PM (14 years ago)

Author:

dafrick

Message:

Merging tutoriallevel branch into tutoriallevel2 branch.

Location:

code/branches/tutoriallevel2

Files:

• . (modified) (1 prop)
• src/modules/notifications/NotificationQueue.h (modified) (3 diffs)

code/branches/tutoriallevel2/src/modules/notifications/NotificationQueue.h

@@ -121 +121 @@
                 { return this->maxSize_; }
 
-            void setDisplayTime(unsigned int time); //!< Sets the maximum number of seconds a Notification is displayed.
+            void setDisplayTime(int time); //!< Sets the maximum number of seconds a Notification is displayed.
             /**
             @brief Returns the time interval the Notification is displayed.
             @return Returns the display time.
             */
-            inline unsigned int getDisplayTime() const
+            inline int getDisplayTime() const
                 { return this->displayTime_; }
             // tolua_end
@@ -152 +152 @@
             static const unsigned int DEFAULT_SIZE = 5; //!< The default maximum number of Notifications displayed.
             static const unsigned int DEFAULT_DISPLAY_TIME = 30; //!< The default display time.
+            static const int INF = -1; //!< Constant denoting infinity.
 
             std::string name_; //!< The name of the NotificationQueue.
@@ -157 +158 @@
             unsigned int maxSize_; //!< The maximal number of Notifications displayed.
             unsigned int size_; //!< The number of Notifications displayed.
-            unsigned int displayTime_; //!< The time a Notification is displayed.
+            int displayTime_; //!< The time a Notification is displayed.
 
             bool registered_; //!< Helper variable to remember whether the NotificationQueue is registered already.