Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 9, 2010, 9:32:58 PM (14 years ago)
Author:
rgrieder
Message:

Removed excess white space at the end of lines.

Location:
code/branches/presentation3/src/libraries
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation3/src/libraries/core/BaseObject.cc

    r7105 r7127  
    105105        }
    106106    }
    107    
     107
    108108    /** @brief Adds an object which listens to the events of this object. */
    109109    void BaseObject::registerEventListener(BaseObject* object)
     
    125125        XMLPortParam(BaseObject, "mainstate", setMainStateName, getMainStateName, xmlelement, mode);
    126126        XMLPortParamTemplate(BaseObject, "template", addTemplate, getSingleTemplate, xmlelement, mode, const std::string&);
    127        
     127
    128128        XMLPortObjectTemplate(BaseObject, Template, "templates", addTemplate, getTemplate, xmlelement, mode, Template*);
    129129        XMLPortObject(BaseObject, BaseObject, "eventlisteners", addEventListener, getEventListener, xmlelement, mode);
     
    372372    {
    373373        this->registerEventStates();
    374        
     374
    375375        COUT(4) << this->getIdentifier()->getName() << " (&" << this << ") processing event. originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << "), activate: " << event.activate_ << ", name: " << event.name_ << ", statename: " << event.statename_ << "." << std::endl;
    376376
  • code/branches/presentation3/src/libraries/core/BaseObject.h

    r7105 r7127  
    154154            inline Gametype* getOldGametype() const { return this->oldGametype_; }
    155155            virtual void changedGametype() {}
    156            
     156
    157157            inline void setLevel(const SmartPtr<Level>& level)
    158158            {
  • code/branches/presentation3/src/libraries/core/Event.cc

    r6859 r7127  
    6060
    6161        COUT(4) << "Processing event (EventState) : originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << "), activate: " << event.activate_ << ", name: " << event.name_ << ", statename: " << event.statename_ << ", object: " << object->getIdentifier()->getName() << " (&" << object << ")" << "." << std::endl;
    62        
     62
    6363        // check if the originator is an instance of the requested class
    6464        if (event.originator_->isA(this->subclass_))
  • code/branches/presentation3/src/libraries/core/EventIncludes.h

    r6800 r7127  
    5252    } \
    5353    XMLPortEventStateIntern(xmlportevent##function, classname, statename, xmlelement, mode)
    54    
     54
    5555#define XMLPortEventSink(classname, subclassname, statename, function, xmlelement, mode) \
    5656    orxonox::EventState* containername##function = this->getEventState(statename); \
  • code/branches/presentation3/src/libraries/core/GUIManager.h

    r7072 r7127  
    103103
    104104        static GUIManager& getInstance() { return Singleton<GUIManager>::getInstance(); } // tolua_export
    105        
     105
    106106    private:
    107107        GUIManager(const GUIManager& instance); //!< private and undefined copy c'tor (this is a singleton class)
    108108        void executeCode(const std::string& str);
    109        
     109
    110110        template <typename FunctionType>
    111111        bool protectedCall(FunctionType function);
  • code/branches/presentation3/src/libraries/core/OrxonoxClass.h

    r7008 r7127  
    108108            bool isParentOf(const OrxonoxClass* object);
    109109            bool isDirectParentOf(const OrxonoxClass* object);
    110            
     110
    111111            virtual void clone(OrxonoxClass*& item) {}
    112112
     
    172172            std::vector<std::pair<unsigned int, void*> > objectPointers_;
    173173    };
    174    
     174
    175175    SUPER_FUNCTION(11, OrxonoxClass, clone, false);
    176    
     176
    177177}
    178178
  • code/branches/presentation3/src/libraries/core/Super.h

    r6524 r7127  
    267267    #define SUPER_changedGametype(classname, functionname, ...) \
    268268        SUPER_NOARGS(classname, functionname)
    269        
     269
    270270    #define SUPER_changedUsed(classname, functionname, ...) \
    271271        SUPER_NOARGS(classname, functionname)
    272        
     272
    273273    #define SUPER_clone(classname, functionname, ...) \
    274274        SUPER_ARGS(classname, functionname, __VA_ARGS__)
    275        
     275
    276276    #define SUPER_changedCarrier(classname, functionname, ...) \
    277277        SUPER_NOARGS(classname, functionname)
    278        
     278
    279279    #define SUPER_changedPickedUp(classname, functionname, ...) \
    280280        SUPER_NOARGS(classname, functionname)
    281        
     281
    282282    // (1/3) --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <--
    283283
     
    530530            ()
    531531        SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
    532        
     532
    533533        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(10, changedUsed, false)
    534534            ()
     
    538538            (item)
    539539        SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
    540        
     540
    541541        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(12, changedCarrier, false)
    542542            ()
    543543        SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
    544        
     544
    545545        SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(13, changedPickedUp, false)
    546546            ()
  • code/branches/presentation3/src/libraries/core/Template.cc

    r6938 r7127  
    107107            {
    108108                this->bLoadDefaults_ = temp->bLoadDefaults_;
    109                
     109
    110110                if (!temp->bIsReturningXMLElement_)
    111111                {
  • code/branches/presentation3/src/libraries/network/packet/Chat.cc

    r6928 r7127  
    6060  *(unsigned int *)(data_ + _MESSAGELENGTH ) = messageLength_;
    6161
    62   /* cast the hell out of the message string, and copy it into the 
    63    * data buffer. 
     62  /* cast the hell out of the message string, and copy it into the
     63   * data buffer.
    6464   */
    6565  memcpy( data_+_MESSAGE, static_cast<void*>(const_cast<char*>(message.c_str())), messageLength_ );
  • code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.h

    r7105 r7127  
    183183    }
    184184  }
    185  
     185
    186186  template <class T> void Synchronisable::registerVariable( std::set<T>& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional)
    187187  {
  • code/branches/presentation3/src/libraries/util/Serialise.h

    r7105 r7127  
    636636        return checkEquality( (unsigned char&)((mbool&)variable).getMemory(), mem );
    637637    }
    638    
     638
    639639    // =========== std::set
    640    
     640
    641641    template <class T> inline uint32_t returnSize( const std::set<T>& variable )
    642642    {
    643643        uint32_t tempsize = sizeof(uint32_t); // for the number of entries
    644644        for( typename std::set<T>::iterator it=((std::set<T>*)(&variable))->begin(); it!=((std::set<T>*)(&variable))->end(); ++it)
    645             tempsize += returnSize( *it ); 
    646         return tempsize; 
    647     }
    648    
     645            tempsize += returnSize( *it );
     646        return tempsize;
     647    }
     648
    649649    template <class T> inline void saveAndIncrease(  const std::set<T>& variable, uint8_t*& mem )
    650650    {
     
    654654            saveAndIncrease( *it, mem );
    655655    }
    656    
     656
    657657    template <class T> inline void loadAndIncrease( const std::set<T>& variable, uint8_t*& mem )
    658658    {
     
    675675        }
    676676    }
    677    
     677
    678678    template <class T> inline bool checkEquality( const std::set<T>& variable, uint8_t* mem )
    679679    {
Note: See TracChangeset for help on using the changeset viewer.