Changeset 5693 for code/trunk/src/orxonox/overlays/GUIOverlay.h
- Timestamp:
- Aug 29, 2009, 10:19:38 PM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/libraries (added) merged: 5612-5613,5615-5619,5621-5623,5625-5640,5642-5643,5647-5649,5665-5666,5685-5687,5692
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/overlays/GUIOverlay.h
r3196 r5693 30 30 #define _GUIOverlay_H__ 31 31 32 #include " OrxonoxPrereqs.h"32 #include "overlays/OverlaysPrereqs.h" 33 33 34 34 #include <string> … … 37 37 namespace orxonox 38 38 { 39 class _O rxonoxExport GUIOverlay : public OrxonoxOverlay39 class _OverlaysExport GUIOverlay : public OrxonoxOverlay 40 40 { 41 41 public: … … 46 46 virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode); 47 47 48 inline void setGUIName(const std::string& name) { this->guiName_ = name; }48 void setGUIName(const std::string& name); 49 49 inline const std::string& getGUIName() const { return this->guiName_; } 50 50
Note: See TracChangeset
for help on using the changeset viewer.