Changeset 2435 for code/branches/presentation/src/orxonox/overlays/notifications/Notification.h

Timestamp:

Dec 14, 2008, 1:42:17 AM (17 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.h (modified) (2 diffs)

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

@@ -36 +36 @@
 #include "core/BaseObject.h"
 
-namespace orxonox {
+namespace orxonox
+{
+    static const float NOTIFICATION_DISPLAY_TIME = 4.0;
 
     /**
     @brief
-        This is rather temporary, so don't start relying on it, some better version will come soon but the Interface will not likely be the same.
+        This is rather temporary, so don't start relying on it, some better version will come soon but the Interface will not likely be the same.
     @author
         Damian 'Mozork' Frick
@@ -46 +48 @@
     class _OrxonoxExport Notification : public BaseObject
     {
-        public:
-            Notification(BaseObject* creator);
-            Notification(const std::string & message, const std::string & title = "", float time = DISPLAY_TIME);
-            virtual ~Notification();
-            
-            bool send(void);
-            
-            inline bool isSent(void) const
-                { return this->sent_; }
-            inline const std::string & getTitle(void) const
-                { return this->title_; }
-            inline const std::string & getMessage(void) const
-                { return this->message_; }
-            inline const float getDisplayTime(void) const
-                { return displayTime_; }
-            
-            bool setTitle(const std::string & title);
-            bool setMessage(const std::string & message);
-            bool setDisplayTime(float time);
-            
-        private:
-            static const float DISPLAY_TIME = 4.0;
-        
-            std::string title_; //!< The title of the Notification.
-            std::string message_; //!< The Notification message.
-            float displayTime_; //!< The time duration the Notification is displayed in seconds.
-            bool sent_; //!< Whether Notification has been sent, if so it cannot be changed.
-            
-            void initialize(void);
-        
+    public:
+        Notification(BaseObject* creator);
+        Notification(BaseObject* creator, const std::string & message, const std::string & title = "", float time = NOTIFICATION_DISPLAY_TIME);
+        virtual ~Notification();
+        
+        bool send(void);
+        
+        inline bool isSent(void) const
+            { return this->sent_; }
+        inline const std::string & getTitle(void) const
+            { return this->title_; }
+        inline const std::string & getMessage(void) const
+            { return this->message_; }
+        inline const float getDisplayTime(void) const
+            { return displayTime_; }
+        
+        bool setTitle(const std::string & title);
+        bool setMessage(const std::string & message);
+        bool setDisplayTime(float time);
+        
+    private:
+        std::string title_; //!< The title of the Notification.
+        std::string message_; //!< The Notification message.
+        float displayTime_; //!< The time duration the Notification is displayed in seconds.
+        bool sent_; //!< Whether Notification has been sent, if so it cannot be changed.
+        
+        void initialize(void);
     };
-
 }