- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/orxonox/overlays/OrxonoxOverlay.h
r11052 r11054 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) … … 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.