Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 21, 2009, 1:28:10 PM (14 years ago)
Author:
rgrieder
Message:

Found some end of line leftover spaces.

Location:
code/branches/presentation2/src
Files:
42 edited

Legend:

Unmodified
Added
Removed

  • code/branches/presentation2/src/libraries/core/ConfigValueIncludes.h

    r6368 r6388  
    174174*/
    175175#define ModifyConfigValue(varname, modifier, ...) \
    176     ModifyConfigValueGeneric(this, &varname, #varname, modifier, __VA_ARGS__) 
     176    ModifyConfigValueGeneric(this, &varname, #varname, modifier, __VA_ARGS__)
    177177
    178178#endif /* _ConfigValueIncludes_H__ */

  • code/branches/presentation2/src/libraries/core/EventIncludes.h

    r6387 r6388  
    8282/**
    8383    @brief This macro is needed to fire an event with this name. The event name must previously be declared with @ref CreateEventName.
    84 */   
     84*/
    8585#define FireEventName(classname, name) \
    8686    eventname##classname##name

  • code/branches/presentation2/src/libraries/core/GUIManager.h

    r6371 r6388  
    6767        ~GUIManager();
    6868
    69         void preUpdate(const Clock& time); 
     69        void preUpdate(const Clock& time);
    7070
    7171        static void showGUI(const std::string& name, bool hidePrevious=false, bool showCursor=true);

  • code/branches/presentation2/src/libraries/core/MemoryArchive.cc

    r5940 r6388  
    6464    }
    6565
    66     void MemoryArchive::findFiles(const String& pattern, bool bRecursive, 
     66    void MemoryArchive::findFiles(const String& pattern, bool bRecursive,
    6767        bool bDirs, StringVector* simpleList, FileInfoList* detailList)
    6868    {
    … …  
    118118    }
    119119
    120     FileInfoListPtr MemoryArchive::findFileInfo(const String& pattern, 
     120    FileInfoListPtr MemoryArchive::findFileInfo(const String& pattern,
    121121        bool recursive, bool dirs)
    122122    {

  • code/branches/presentation2/src/libraries/core/MemoryArchive.h

    r5781 r6388  
    7979
    8080    private:
    81         void findFiles(const Ogre::String& pattern, bool bRecursive, 
     81        void findFiles(const Ogre::String& pattern, bool bRecursive,
    8282            bool bDirs, Ogre::StringVector* simpleList, Ogre::FileInfoList* detailList);
    8383

  • code/branches/presentation2/src/libraries/core/Resource.h

    r6203 r6388  
    7373            must provide a fully qualified name to this method.
    7474        @param groupName
    75             The name of the resource group; this determines which 
    76             locations are searched. 
     75            The name of the resource group; this determines which
     76            locations are searched.
    7777        @param searchGroupsIfNotFound
    78             If true, if the resource is not found in 
     78            If true, if the resource is not found in
    7979            the group specified, other groups will be searched.
    8080        @return
    … …  
    9696        @brief
    9797            Open all resources matching a given pattern (which can contain
    98             the character '*' as a wildcard), and return a collection of 
     98            the character '*' as a wildcard), and return a collection of
    9999            DataStream objects on them.
    100100        @param pattern
    … …  
    112112
    113113        /**
    114             Find out if the named file exists in a group. 
     114            Find out if the named file exists in a group.
    115115        @param filename
    116116            Fully qualified name of the file to test for

  • code/branches/presentation2/src/libraries/core/input/InputCommands.h

    r5781 r6388  
    7171    @brief
    7272        Executes a simple command with no additional paramters.
    73     @return 
     73    @return
    7474        True if command execution was successful, false otherwise.
    7575    */

  • code/branches/presentation2/src/libraries/core/input/InputManager.cc

    r6183 r6388  
    508508        if (mouseStates.empty())
    509509            requestedMode = MouseMode::Nonexclusive;
    510         else 
     510        else
    511511            requestedMode = mouseStates.front()->getMouseMode();
    512512        if (requestedMode != MouseMode::Dontcare && mouseMode_ != requestedMode)
    … …  
    554554    }
    555555
    556     //! Gets called by WindowEventListener upon focus change --> clear buffers 
     556    //! Gets called by WindowEventListener upon focus change --> clear buffers
    557557    void InputManager::windowFocusChanged()
    558558    {

  • code/branches/presentation2/src/libraries/core/input/JoyStickQuantityListener.h

    r5781 r6388  
    2929/**
    3030@file
    31 @brief 
     31@brief
    3232*/
    3333

  • code/branches/presentation2/src/libraries/core/input/KeyBinder.cc

    r6387 r6388  
    285285
    286286     void KeyBinder::addButtonToCommand(std::string command, Button* button)
    287      { 
     287     {
    288288        std::ostringstream stream;
    289289        stream << button->groupName_  << "." << button->name_;

  • code/branches/presentation2/src/libraries/network/ClientConnection.cc

    r6387 r6388  
    148148
    149149  uint32_t ClientConnection::getRTT()
    150   { 
     150  {
    151151    assert(server_);
    152152    return server_->roundTripTime;

  • code/branches/presentation2/src/libraries/network/ClientConnectionListener.cc

    r6387 r6388  
    3636{
    3737    ClientConnectionListener::ClientConnectionListener()
    38     { 
    39         RegisterRootObject(ClientConnectionListener); 
     38    {
     39        RegisterRootObject(ClientConnectionListener);
    4040    }
    4141

  • code/branches/presentation2/src/libraries/network/FunctionCallManager.cc

    r6387 r6388  
    3737
    3838void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID)
    39 { 
    40   if(clientMap_.find(clientID)==clientMap_.end()) 
     39{
     40  if(clientMap_.find(clientID)==clientMap_.end())
    4141  {
    42     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    43     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    44   } 
     42    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     43    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     44  }
    4545  FunctionCallManager::clientMap_[clientID]->addCallStatic(functionID);
    4646}
    4747void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1)
    48 { 
    49   if(clientMap_.find(clientID)==clientMap_.end()) 
     48{
     49  if(clientMap_.find(clientID)==clientMap_.end())
    5050  {
    51     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    52     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    53   } 
     51    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     52    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     53  }
    5454  FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1);
    5555}
    5656void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2)
    57 { 
    58   if(clientMap_.find(clientID)==clientMap_.end()) 
     57{
     58  if(clientMap_.find(clientID)==clientMap_.end())
    5959  {
    60     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    61     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    62   } 
     60    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     61    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     62  }
    6363  FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2);
    6464}
    6565void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
    66 { 
    67   if(clientMap_.find(clientID)==clientMap_.end()) 
     66{
     67  if(clientMap_.find(clientID)==clientMap_.end())
    6868  {
    69     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    70     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    71   } 
     69    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     70    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     71  }
    7272  FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2, &mt3);
    7373}
    7474void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
    75 { 
    76   if(clientMap_.find(clientID)==clientMap_.end()) 
     75{
     76  if(clientMap_.find(clientID)==clientMap_.end())
    7777  {
    78     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    79     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    80   } 
     78    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     79    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     80  }
    8181  FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2, &mt3, &mt4);
    8282}
    8383void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
    84 { 
    85   if(clientMap_.find(clientID)==clientMap_.end()) 
     84{
     85  if(clientMap_.find(clientID)==clientMap_.end())
    8686  {
    87     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    88     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    89   } 
     87    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     88    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     89  }
    9090  FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, &mt1, &mt2, &mt3, &mt4, &mt5);
    9191}
    … …  
    9595
    9696void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID)
    97 { 
    98   if(clientMap_.find(clientID)==clientMap_.end()) 
     97{
     98  if(clientMap_.find(clientID)==clientMap_.end())
    9999  {
    100     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    101     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    102   } 
     100    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     101    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     102  }
    103103  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID);
    104104}
    105105void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1)
    106 { 
    107   if(clientMap_.find(clientID)==clientMap_.end()) 
     106{
     107  if(clientMap_.find(clientID)==clientMap_.end())
    108108  {
    109     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    110     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    111   } 
     109    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     110    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     111  }
    112112  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1);
    113113}
    114114void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2)
    115 { 
    116   if(clientMap_.find(clientID)==clientMap_.end()) 
     115{
     116  if(clientMap_.find(clientID)==clientMap_.end())
    117117  {
    118     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    119     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    120   } 
     118    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     119    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     120  }
    121121  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2);
    122122}
    123123void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
    124 { 
    125   if(clientMap_.find(clientID)==clientMap_.end()) 
     124{
     125  if(clientMap_.find(clientID)==clientMap_.end())
    126126  {
    127     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    128     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    129   } 
     127    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     128    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     129  }
    130130  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2, &mt3);
    131131}
    132132void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
    133 { 
    134   if(clientMap_.find(clientID)==clientMap_.end()) 
     133{
     134  if(clientMap_.find(clientID)==clientMap_.end())
    135135  {
    136     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    137     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    138   } 
     136    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     137    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     138  }
    139139  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2, &mt3, &mt4);
    140140}
    141141void FunctionCallManager::addCallMember(uint32_t functionID, uint32_t objectID, uint32_t clientID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
    142 { 
    143   if(clientMap_.find(clientID)==clientMap_.end()) 
     142{
     143  if(clientMap_.find(clientID)==clientMap_.end())
    144144  {
    145     FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
    146     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
    147   } 
     145    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls;
     146    FunctionCallManager::clientMap_[clientID]->setClientID(clientID);
     147  }
    148148  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, &mt1, &mt2, &mt3, &mt4, &mt5);
    149149}

  • code/branches/presentation2/src/libraries/network/GamestateManager.cc

    r6387 r6388  
    159159      clientGamestates.push(0);
    160160      finishGamestate( cid, &clientGamestates.back(), client, reference );
    161       //FunctorMember<GamestateManager>* functor = 
     161      //FunctorMember<GamestateManager>* functor =
    162162//       ExecutorMember<GamestateManager>* executor = createExecutor( createFunctor(&GamestateManager::finishGamestate, this) );
    163163//       executor->setDefaultValues( cid, &clientGamestates.back(), client, reference );

  • code/branches/presentation2/src/libraries/network/NetworkFunction.h

    r6387 r6388  
    8383    {
    8484        std::map<std::string, NetworkFunctionBase*>& map = NetworkFunctionBase::getNameMap();
    85         assert( map.find(name)!=map.end() ); 
     85        assert( map.find(name)!=map.end() );
    8686        map[name]->setNetworkID(id);
    8787    }
    … …  
    139139    static NetworkMemberFunctionBase* getFunction( const NetworkFunctionPointer& p ){ assert( functorMap_.find(p) != functorMap_.end() ); return functorMap_[p]; }
    140140
    141     // 
     141    //
    142142    virtual void call(uint32_t objectID)=0;
    143143    virtual void call(uint32_t objectID, const MultiType& mt1)=0;
    … …  
    159159
    160160    inline void call(uint32_t objectID)
    161     { 
     161    {
    162162      if ( Synchronisable::getSynchronisable(objectID)!=0 )
    163163        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)));
    164164    }
    165165    inline void call(uint32_t objectID, const MultiType& mt1)
    166     { 
     166    {
    167167      if ( Synchronisable::getSynchronisable(objectID)!=0 )
    168168        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1);
    169169    }
    170170    inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2)
    171     { 
     171    {
    172172      if ( Synchronisable::getSynchronisable(objectID)!=0 )
    173173        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2);
    174174    }
    175175    inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
    176     { 
     176    {
    177177      if ( Synchronisable::getSynchronisable(objectID)!=0 )
    178178        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3);
    179179    }
    180180    inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
    181     { 
     181    {
    182182      if ( Synchronisable::getSynchronisable(objectID)!=0 )
    183183        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4);
    184184    }
    185185    inline void call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
    186     { 
     186    {
    187187      if ( Synchronisable::getSynchronisable(objectID)!=0 )
    188188        (*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4, mt5);

  • code/branches/presentation2/src/libraries/network/Server.cc

    r6387 r6388  
    162162
    163163  /**
    164    * @brief: returns ping time to client in milliseconds 
     164   * @brief: returns ping time to client in milliseconds
    165165   */
    166166  unsigned int Server::getRTT(unsigned int clientID){

  • code/branches/presentation2/src/libraries/network/TrafficControl.h

    r6387 r6388  
    105105    *evaluates Data given (list) and produces result(->Data to be updated)
    106106    */
    107     void evaluateList(unsigned int clientID, std::list<obj>& list);//done   
     107    void evaluateList(unsigned int clientID, std::list<obj>& list);//done
    108108    void ack(unsigned int clientID, unsigned int gamestateID);  // this function gets called when the server receives an ack from the client
    109109
    … …  
    121121    /**
    122122    *is being used by GSManager from Server:
    123     *list contains: ObjIds, CreatorIds, Size (in this order) from Client XY 
     123    *list contains: ObjIds, CreatorIds, Size (in this order) from Client XY
    124124    *Elements of list are accessed by *list[i]
    125125    *Elements of struct i are therefore: *list[i].objID

  • code/branches/presentation2/src/libraries/network/packet/FunctionIDs.cc

    r6387 r6388  
    4848FunctionIDs::FunctionIDs( ) : Packet(){
    4949  std::string functionname;
    50   unsigned int nrOfFunctions=0; 
     50  unsigned int nrOfFunctions=0;
    5151  unsigned int packetSize=2*sizeof(uint32_t); //space for the packetID and for the nroffunctions
    5252  uint32_t networkID;

  • code/branches/presentation2/src/libraries/network/packet/Gamestate.cc

    r6387 r6388  
    437437//   uint8_t *ndata = new uint8_t[dest_length*sizeof(uint8_t)+GamestateHeader::getSize()];
    438438//   uint8_t *dest = ndata + GamestateHeader::getSize();
    439 //   
    440 //   
     439//
     440//
    441441//   // LOOP-UNROLLED DIFFING
    442442//   uint32_t *dest32 = (uint32_t*)dest, *base32 = (uint32_t*)basep, *gs32 = (uint32_t*)gs;
    … …  
    465465//     }
    466466//   }
    467 // 
     467//
    468468//   Gamestate *g = new Gamestate(ndata, getClientID());
    469469//   *(g->header_) = *header_;

  • code/branches/presentation2/src/libraries/network/packet/Packet.cc

    r6387 r6388  
    102102    Destroys a packet completely.
    103103
    104     That also means destroying the ENetPacket if one exists. There 
     104    That also means destroying the ENetPacket if one exists. There
    105105*/
    106106Packet::~Packet(){

  • code/branches/presentation2/src/libraries/network/synchronisable/NetworkCallbackManager.cc

    r6387 r6388  
    3636
    3737  void NetworkCallbackManager::registerCallback(NetworkCallbackBase *cb)
    38   { 
    39     callbackSet_.insert(cb); 
     38  {
     39    callbackSet_.insert(cb);
    4040  }
    4141  void NetworkCallbackManager::deleteCallback(NetworkCallbackBase *cb)

  • code/branches/presentation2/src/libraries/network/synchronisable/Synchronisable.h

    r6387 r6388  
    6666
    6767  /**
    68    * @brief: stores information about a Synchronisable 
    69    * 
     68   * @brief: stores information about a Synchronisable
     69   *
    7070   * This class stores the information about a Synchronisable (objectID_, classID_, creatorID_, dataSize)
    7171   * in an emulated bitset.

  • code/branches/presentation2/src/libraries/util/Serialise.h

    r6387 r6388  
    616616    template <> inline uint32_t returnSize( const mbool& variable )
    617617    {
    618         return returnSize( (unsigned char&)((mbool&)variable).getMemory() ); 
     618        return returnSize( (unsigned char&)((mbool&)variable).getMemory() );
    619619    }
    620620

  • code/branches/presentation2/src/modules/objects/collisionshapes/BoxCollisionShape.cc

    r5781 r6388  
    6666        XMLPortParam(BoxCollisionShape, "halfExtents",  setHalfExtents,  getHalfExtents,  xmlelement, mode);
    6767        XMLPortParamLoadOnly(BoxCollisionShape, "width",  setWidth,  xmlelement, mode);
    68         XMLPortParamLoadOnly(BoxCollisionShape, "height", setHeight, xmlelement, mode);   
    69         XMLPortParamLoadOnly(BoxCollisionShape, "length", setLength, xmlelement, mode);   
     68        XMLPortParamLoadOnly(BoxCollisionShape, "height", setHeight, xmlelement, mode);
     69        XMLPortParamLoadOnly(BoxCollisionShape, "length", setLength, xmlelement, mode);
    7070    }
    7171

  • code/branches/presentation2/src/modules/objects/collisionshapes/ConeCollisionShape.cc

    r5781 r6388  
    6666
    6767        XMLPortParam(ConeCollisionShape, "radius", setRadius, getRadius, xmlelement, mode);
    68         XMLPortParam(ConeCollisionShape, "height", setHeight, getHeight, xmlelement, mode);   
     68        XMLPortParam(ConeCollisionShape, "height", setHeight, getHeight, xmlelement, mode);
    6969    }
    7070

  • code/branches/presentation2/src/modules/objects/collisionshapes/PlaneCollisionShape.cc

    r5781 r6388  
    6767
    6868        XMLPortParam(PlaneCollisionShape, "normal", setNormal, getNormal, xmlelement, mode);
    69         XMLPortParam(PlaneCollisionShape, "offset", setOffset, getOffset, xmlelement, mode);   
     69        XMLPortParam(PlaneCollisionShape, "offset", setOffset, getOffset, xmlelement, mode);
    7070    }
    7171

  • code/branches/presentation2/src/modules/questsystem/QuestGUI.cc

    r6387 r6388  
    268268        index = tempIndex; //!< Reset the index to the original level.
    269269
    270         return index;       
     270        return index;
    271271    }
    272272

  • code/branches/presentation2/src/modules/questsystem/QuestGUINode.cc

    r6387 r6388  
    7171    QuestGUINode::QuestGUINode(QuestGUI* gui, QuestGUINode* parent, QuestItem* item, int depth, int index)
    7272    {
    73         this->initialize();   
     73        this->initialize();
    7474
    7575        this->gui_ = gui;
    … …  
    154154
    155155        if(this->details_ == NULL) //!< If the details window was not already created.
    156         { 
     156        {
    157157            std::ostringstream stream;
    158158
    … …  
    297297    */
    298298    bool QuestGUINode::closeDetails(const CEGUI::EventArgs& e)
    299     {       
     299    {
    300300        //CEGUI::Window* window = this->gui_->getRootWindow();
    301301        CEGUI::Window* window = this->gui_->getWindowManager()->getWindow("orxonox/QuestGUI/Background");

  • code/branches/presentation2/src/modules/questsystem/QuestGUINode.h

    r6387 r6388  
    5454            /**
    5555            @brief Retreive the window of this node.
    56             @return The CEGUI Window of this node. 
     56            @return The CEGUI Window of this node.
    5757            */
    5858            inline CEGUI::Window* getWindow(void)

  • code/branches/presentation2/src/modules/questsystem/QuestListener.cc

    r6387 r6388  
    193193        Returns the questId of the Quest the QuestListener reacts to.
    194194    */
    195     const std::string & QuestListener::getQuestId(void)   
     195    const std::string & QuestListener::getQuestId(void)
    196196    {
    197197        return this->quest_->getId();

  • code/branches/presentation2/src/modules/questsystem/QuestManager.h

    r5929 r6388  
    7272            static QuestManager& getInstance() { return Singleton<QuestManager>::getInstance(); } // tolua_export
    7373
    74             //! Retreive the main window for the GUI. 
     74            //! Retreive the main window for the GUI.
    7575            CEGUI::Window* getQuestGUI(const std::string & guiName); // tolua_export
    7676

  • code/branches/presentation2/src/modules/weapons/projectiles/LightningGunProjectile.cc

    r6387 r6388  
    5454    void LightningGunProjectile::setMaterial(const std::string& material)
    5555    {
    56         this->materialBase_ = material;   
     56        this->materialBase_ = material;
    5757
    5858        BillboardProjectile::setMaterial(material + multi_cast<std::string>(this->textureIndex_));

  • code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc

    r6307 r6388  
    5757
    5858    void LightningGun::fire()
    59     {       
     59    {
    6060        LightningGunProjectile* projectile = new LightningGunProjectile(this);
    6161        projectile->setMaterial("Flares/LightningBall_");

  • code/branches/presentation2/src/orxonox/controllers/HumanController.h

    r6356 r6388  
    3838namespace orxonox
    3939{
    40     class _OrxonoxExport HumanController 
     40    class _OrxonoxExport HumanController
    4141// tolua_end
    4242        : public Controller, public Tickable

  • code/branches/presentation2/src/orxonox/controllers/NewHumanController.cc

    r6387 r6388  
    248248                    HumanController::moveFrontBack(Vector2(1, 0));
    249249                else
    250                     HumanController::moveFrontBack(Vector2(this->acceleration_, 0)); 
     250                    HumanController::moveFrontBack(Vector2(this->acceleration_, 0));
    251251                this->accelerating_ = false;
    252252                //HumanController::moveFrontBack(Vector2(clamp(this->acceleration_ + this->currentAcceleration_, 0.0f, 1.0f), 0));

  • code/branches/presentation2/src/orxonox/overlays/OrxonoxOverlay.h

    r6310 r6388  
    177177        inline OverlayGroup* getOverlayGroup() const
    178178            { return this->group_; }
    179         virtual void changedOverlayGroup() 
     179        virtual void changedOverlayGroup()
    180180            { this->changedVisibility(); }
    181181

  • code/branches/presentation2/src/orxonox/pickup/UsableItem.cc

    r6387 r6388  
    4141        @param creator Pointer to the object which created this item.
    4242    */
    43     UsableItem::UsableItem(BaseObject* creator) : BaseItem(creator) 
     43    UsableItem::UsableItem(BaseObject* creator) : BaseItem(creator)
    4444    {
    4545        RegisterObject(UsableItem);

  • code/branches/presentation2/src/orxonox/sound/AmbientSound.cc

    r6387 r6388  
    118118                this->setSource(path);
    119119            else
    120                 COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;       
     120                COUT(3) << "Sound: " << source << ": Not a valid name! Ambient sound will not change." << std::endl;
    121121        }
    122122    }
    … …  
    134134        if (this->isActive())
    135135            this->play();
    136         else 
     136        else
    137137            this->stop();
    138138    }

  • code/branches/presentation2/src/orxonox/sound/BaseSound.cc

    r6387 r6388  
    177177            pitch = pitch > 2 ? 2 : pitch;
    178178            pitch = pitch < 0.5 ? 0.5 : pitch;
    179         }       
     179        }
    180180        this->pitch_ = pitch;
    181181        if (alIsSource(this->audioSource_))
    … …  
    224224        if (alIsSource(this->audioSource_)) // already playing or paused
    225225        {
    226             // Set new buffer 
     226            // Set new buffer
    227227            alSourcei(this->audioSource_, AL_BUFFER, this->soundBuffer_->getBuffer());
    228228            if (ALuint error = alGetError())

  • code/branches/presentation2/src/orxonox/sound/SoundManager.cc

    r6387 r6388  
    254254    }
    255255
    256     float SoundManager::getVolume(SoundType::Value type) 
     256    float SoundManager::getVolume(SoundType::Value type)
    257257    {
    258258        if (type < 0 || type > SoundType::Effects)
    … …  
    261261    }
    262262
    263     float SoundManager::getRealVolume(SoundType::Value type) 
     263    float SoundManager::getRealVolume(SoundType::Value type)
    264264    {
    265265        if (type != SoundType::Music && type != SoundType::Effects)
    … …  
    339339            }
    340340
    341             if (!this->ambientSounds_.empty()) 
     341            if (!this->ambientSounds_.empty())
    342342            {
    343343                this->fadeOut(ambientSounds_.front().first);
    … …  
    354354            return;
    355355
    356         if (this->ambientSounds_.front().first == oldAmbient) 
     356        if (this->ambientSounds_.front().first == oldAmbient)
    357357        {
    358358            this->fadeOut(oldAmbient);

  • code/branches/presentation2/src/orxonox/sound/WorldSound.cc

    r6387 r6388  
    110110    }
    111111
    112     void WorldSound::changedActivity() 
     112    void WorldSound::changedActivity()
    113113    {
    114114        SUPER(WorldSound, changedActivity);
    115115        if (this->isActive())
    116116            this->play();
    117         else 
     117        else
    118118            this->stop();
    119119    }

  • code/branches/presentation2/src/orxonox/worldentities/MovableEntity.h

    r5929 r6388  
    7070
    7171            inline void setEnableCollisionDamage(bool c)
    72             { 
    73                 this->enableCollisionDamage_ = c; 
     72            {
     73                this->enableCollisionDamage_ = c;
    7474                this->enableCollisionCallback();
    75             } 
     75            }
    7676
    7777            inline bool getEnableCollisionDamage()
Note: See TracChangeset for help on using the changeset viewer.