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

Timestamp:

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

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

@@ -38 +38 @@
 #include <string>
 
-namespace orxonox {
-
+namespace orxonox
+{
     /**
     @brief
@@ -48 +48 @@
     class _OrxonoxExport NotificationQueue : public OverlayText, public Tickable
     {
-        public:
-            NotificationQueue(BaseObject* creator);
-            virtual ~NotificationQueue();
-            
-            static NotificationQueue* queue_s; //TDO Singleton? oder im level.
-            
-            virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
-            
-            virtual void tick(float dt);
-            
-            void update(void);
-            
-            int getLength(void) const
+    public:
+        NotificationQueue(BaseObject* creator);
+        virtual ~NotificationQueue();
+        
+        static NotificationQueue* queue_s; //TDO Singleton? oder im level.
+        
+        virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode);
+        
+        virtual void tick(float dt);
+        
+        void update(void);
+        
+        int getLength(void) const
                 { return this->length_; }
-            int getWidth(void) const
+        int getWidth(void) const
                 { return this->width_; }
-            
-            void setQueueText(const std::string & text);
-            bool setLength(int length);
-            bool setWidth(int width);
-            
-        private:
-            Ogre::UTFString queueText_;
-            int length_;
-            int width_;
+        
+        void setQueueText(const std::string & text);
+        bool setLength(int length);
+        bool setWidth(int width);
+        
+    private:
+        Ogre::UTFString queueText_;
+        int length_;
+        int width_;
     
     };