Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 7, 2015, 10:23:42 AM (9 years ago)
Author:
landauf
Message:

no space needed anymore between closing template brackets ('> >' → '>>')

Location:
code/branches/cpp11_v2/src/orxonox/overlays
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc

    r10768 r10769  
    6262    OverlayGroup::~OverlayGroup()
    6363    {
    64         for (std::set< StrongPtr<OrxonoxOverlay> >::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
     64        for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
    6565            (*it)->destroy();
    6666        this->hudElements_.clear();
     
    8686    void OverlayGroup::setScale(const Vector2& scale)
    8787    {
    88         for (std::set< StrongPtr<OrxonoxOverlay> >::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
     88        for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
    8989            (*it)->scale(scale / this->scale_);
    9090        this->scale_ = scale;
     
    9494    void OverlayGroup::setScroll(const Vector2& scroll)
    9595    {
    96         for (std::set< StrongPtr<OrxonoxOverlay> >::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
     96        for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
    9797            (*it)->scroll(scroll - this->scroll_);
    9898        this->scroll_ = scroll;
     
    133133        if (index < this->hudElements_.size())
    134134        {
    135             std::set< StrongPtr<OrxonoxOverlay> >::const_iterator it = hudElements_.begin();
     135            std::set<StrongPtr<OrxonoxOverlay>>::const_iterator it = hudElements_.begin();
    136136            for (unsigned int i = 0; i != index; ++it, ++i)
    137137                ;
     
    147147        SUPER( OverlayGroup, changedVisibility );
    148148
    149         for (std::set< StrongPtr<OrxonoxOverlay> >::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
     149        for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
    150150            (*it)->changedVisibility(); //inform all Child Overlays that our visibility has changed
    151151    }
     
    155155        this->owner_ = owner;
    156156
    157         for (std::set< StrongPtr<OrxonoxOverlay> >::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
     157        for (std::set<StrongPtr<OrxonoxOverlay>>::iterator it = hudElements_.begin(); it != hudElements_.end(); ++it)
    158158            (*it)->setOwner(owner);
    159159    }
  • code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.h

    r10624 r10769  
    6565        static void scrollGroup(const std::string& name, const Vector2& scroll);
    6666
    67         inline const std::set< StrongPtr<OrxonoxOverlay> >& getOverlays() const
     67        inline const std::set<StrongPtr<OrxonoxOverlay>>& getOverlays() const
    6868            { return this->hudElements_; }
    6969
     
    9191
    9292    private:
    93         std::set< StrongPtr<OrxonoxOverlay> > hudElements_;    //!< Contains all the OrxonoxOverlays of the this group.
     93        std::set<StrongPtr<OrxonoxOverlay>> hudElements_;    //!< Contains all the OrxonoxOverlays of the this group.
    9494        Vector2 scale_;                            //!< Current scale (independent of the elements).
    9595        Vector2 scroll_;                           //!< Current scrolling offset.
Note: See TracChangeset for help on using the changeset viewer.