Changeset 11071 for code/trunk/src/orxonox/overlays/OrxonoxOverlay.h
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/overlays/OrxonoxOverlay.h
r11052 r11071 79 79 and in between is everything else. 80 80 */ 81 enum RotationState81 enum class RotationState 82 82 { 83 83 Horizontal, … … 90 90 virtual ~OrxonoxOverlay(); 91 91 92 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) ;93 94 virtual void changedName() ;92 virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; 93 94 virtual void changedName() override; 95 95 96 96 //! Shows the overlay with an detour to BaseObject::visibility_ … … 167 167 void setBackgroundColour(ColourValue colour); 168 168 169 virtual void changedVisibility() ;169 virtual void changedVisibility() override; 170 170 171 171 inline void setOwner(BaseObject* owner) … … 186 186 virtual void changedOverlayGroup() 187 187 { this->changedVisibility(); } 188 v irtual void setZOrder(unsigned short order);188 void setZOrder(unsigned short order); 189 189 190 190 protected: … … 207 207 208 208 private: 209 v oid windowResized(unsigned int newWidth, unsigned int newHeight);209 virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override; 210 210 211 211 static unsigned int hudOverlayCounter_s; //!< Static counter for hud elements
Note: See TracChangeset
for help on using the changeset viewer.