Changeset 6073 for code/trunk/src/libraries

Timestamp:

Nov 15, 2009, 11:44:58 PM (15 years ago)

Author:

rgrieder

Message:

Found more tabs in the trunk.

Location:

code/trunk/src/libraries

Files:

• core/DynLib.cc (modified) (2 diffs)
• core/DynLib.h (modified) (2 diffs)
• core/DynLibManager.cc (modified) (1 diff)
• network/FunctionCallManager.cc (modified) (1 diff)
• network/FunctionCallManager.h (modified) (1 diff)
• network/GamestateHandler.h (modified) (1 diff)
• network/Host.h (modified) (1 diff)
• network/TrafficControl.cc (modified) (7 diffs)
• network/TrafficControl.h (modified) (1 diff)
• network/packet/Acknowledgement.h (modified) (1 diff)
• network/packet/Chat.h (modified) (1 diff)
• network/packet/ClassID.h (modified) (1 diff)
• network/packet/DeleteObjects.h (modified) (1 diff)
• network/packet/FunctionCalls.h (modified) (1 diff)
• network/packet/FunctionIDs.h (modified) (1 diff)
• network/packet/Gamestate.h (modified) (1 diff)
• network/packet/Packet.h (modified) (1 diff)
• network/packet/Welcome.h (modified) (1 diff)
• network/synchronisable/NetworkCallback.h (modified) (1 diff)

code/trunk/src/libraries/core/DynLib.cc

@@ -70 +70 @@
         COUT(2) << "Loading module " << mName << std::endl;
 
-                std::string name = mName;
+        std::string name = mName;
 #ifdef ORXONOX_PLATFORM_LINUX
         // dlopen() does not add .so to the filename, like windows does for .dll
@@ -93 +93 @@
 
         if( DYNLIB_UNLOAD( m_hInst ) )
-                {
+        {
             ThrowException(
                 General,
                 "Could not unload dynamic library " + mName +
                 ".  System Error: " + dynlibError());
-                }
+        }
 
     }

code/trunk/src/libraries/core/DynLib.h

@@ -72 +72 @@
             Resource
     */
-        class _CoreExport DynLib
+    class _CoreExport DynLib
     {
-        protected:
-                std::string mName;
+    protected:
+        std::string mName;
         /// Gets the last loading error
         std::string dynlibError(void);
@@ -95 +95 @@
         */
         void unload();
-                /// Get the name of the library
-                const std::string& getName(void) const { return mName; }
+        /// Get the name of the library
+        const std::string& getName(void) const { return mName; }
 
         /**

code/trunk/src/libraries/core/DynLibManager.cc

@@ -41 +41 @@
 
     //-----------------------------------------------------------------------
-        DynLibManager::DynLibManager()
-        {
-        }
-        //-----------------------------------------------------------------------
+    DynLibManager::DynLibManager()
+    {
+    }
+    //-----------------------------------------------------------------------
     DynLib* DynLibManager::load( const std::string& filename)
     {
-                DynLibList::iterator i = mLibList.find(filename);
-                if (i != mLibList.end())
-                {
-                        return i->second;
-                }
-                else
-                {
-                DynLib* pLib = new DynLib(filename);
-                        pLib->load();
-                mLibList[filename] = pLib;
-                return pLib;
-                }
+        DynLibList::iterator i = mLibList.find(filename);
+        if (i != mLibList.end())
+        {
+            return i->second;
+        }
+        else
+        {
+            DynLib* pLib = new DynLib(filename);
+            pLib->load();
+            mLibList[filename] = pLib;
+            return pLib;
+        }
     }
-        //-----------------------------------------------------------------------
-        void DynLibManager::unload(DynLib* lib)
-        {
-                DynLibList::iterator i = mLibList.find(lib->getName());
-                if (i != mLibList.end())
-                {
-                        mLibList.erase(i);
-                }
-                lib->unload();
-                delete lib;
-        }
-        //-----------------------------------------------------------------------
+    //-----------------------------------------------------------------------
+    void DynLibManager::unload(DynLib* lib)
+    {
+        DynLibList::iterator i = mLibList.find(lib->getName());
+        if (i != mLibList.end())
+        {
+            mLibList.erase(i);
+        }
+        lib->unload();
+        delete lib;
+    }
+    //-----------------------------------------------------------------------
     DynLibManager::~DynLibManager()
     {

code/trunk/src/libraries/network/FunctionCallManager.cc

@@ -43 +43 @@
     FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
   } 
-  FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID);
+  FunctionCallManager::clientMap_[clientID]->addCallStatic(functionID);
 }
 void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, const MultiType& mt1)

code/trunk/src/libraries/network/FunctionCallManager.h

@@ -37 +37 @@
 namespace orxonox {
 /**
-        @author
+    @author
 */
 

code/trunk/src/libraries/network/GamestateHandler.h

@@ -35 +35 @@
 
 /**
-        @author Oliver Scheuss
+    @author Oliver Scheuss
 */
 class _NetworkExport GamestateHandler{

code/trunk/src/libraries/network/Host.h

@@ -45 +45 @@
 *       - defines static functions available on both server and client
 *       - is the interface to be used when communicating with the network
-*       @author Oliver Scheuss
+*       @author Oliver Scheuss
 */
 class _NetworkExport Host{

code/trunk/src/libraries/network/TrafficControl.cc

@@ -64 +64 @@
 *Initializing protected members
 */
-        TrafficControl *TrafficControl::instance_=0;
-
-        /**
-        * @brief Constructor: assures that only one reference will be created and sets the pointer
-        */
-        TrafficControl::TrafficControl()
-        {
+    TrafficControl *TrafficControl::instance_=0;
+
+    /**
+    * @brief Constructor: assures that only one reference will be created and sets the pointer
+    */
+    TrafficControl::TrafficControl()
+    {
     RegisterObject(TrafficControl);
-          assert(instance_==0);
-          instance_=this;
+      assert(instance_==0);
+      instance_=this;
     this->setConfigValues();
-        }
-
-        /**
-        * @brief Destructor: resets the instance pointer to 0
-        */
-        TrafficControl::~TrafficControl()
-        {
-          instance_=0;
-        }
+    }
+
+    /**
+    * @brief Destructor: resets the instance pointer to 0
+    */
+    TrafficControl::~TrafficControl()
+    {
+      instance_=0;
+    }
 
 /**
@@ -121 +121 @@
 
 
-        void TrafficControl::processObjectList(unsigned int clientID, unsigned int gamestateID, std::list<obj>& list)
-        {
-          currentClientID=clientID;
-          currentGamestateID=gamestateID;
-          evaluateList(clientID, list);
-          return;
-        }
+    void TrafficControl::processObjectList(unsigned int clientID, unsigned int gamestateID, std::list<obj>& list)
+    {
+      currentClientID=clientID;
+      currentGamestateID=gamestateID;
+      evaluateList(clientID, list);
+      return;
+    }
 
   TrafficControl *TrafficControl::getInstance()
@@ -135 +135 @@
   }
 
-        void TrafficControl::ack(unsigned int clientID, unsigned int gamestateID)
-        {
+    void TrafficControl::ack(unsigned int clientID, unsigned int gamestateID)
+    {
     if ( !this->bActive_ )
       return;
-          std::list<obj>::iterator itvec;  // iterator to iterate through the acked objects
+      std::list<obj>::iterator itvec;  // iterator to iterate through the acked objects
 
     //assertions to make sure the maps already exist
@@ -151 +151 @@
 
     for(itvec = objectListTemp[gamestateID].begin(); itvec != objectListTemp[gamestateID].end(); itvec++)
-          {
+      {
       if(objectListPerm.find((*itvec).objID) != objectListPerm.end()) // check whether the obj already exists in our lists
       {
@@ -165 +165 @@
         objectListPerm[(*itvec).objID].objSize = (*itvec).objSize;
       }
-          }
-           // remove temporary list (with acked objects) from the map
+      }
+       // remove temporary list (with acked objects) from the map
     objectListTemp.erase( objectListTemp.find(gamestateID) );
-        }
+    }
 
 /**
@@ -174 +174 @@
 */
 
-        /**
-        *updateClientListPerm
-        *returns void
-        */
-        void TrafficControl::insertinClientListPerm(unsigned int clientID, obj objinf)
-        {
-          std::map<unsigned int,std::map<unsigned int, objInfo> >::iterator itperm;//iterator clientListPerm over clientIDs
+    /**
+    *updateClientListPerm
+    *returns void
+    */
+    void TrafficControl::insertinClientListPerm(unsigned int clientID, obj objinf)
+    {
+      std::map<unsigned int,std::map<unsigned int, objInfo> >::iterator itperm;//iterator clientListPerm over clientIDs
     unsigned int gsid=GAMESTATEID_INITIAL, gsdiff=currentGamestateID, prioperm=Synchronisable::getSynchronisable(objinf.objID)->getPriority(), priomom=0;
     clientListPerm_[clientID][objinf.objID] = objInfo(objinf.objID, objinf.objCreatorID,gsid,gsdiff, objinf.objSize,prioperm,priomom);
-        }
+    }
 
   /**
@@ -223 +223 @@
 
 
-        /**
-        *evaluateList evaluates whether new obj are there, whether there are things to be updatet and manipulates all this.
-        */
-        void TrafficControl::evaluateList(unsigned int clientID, std::list<obj>& list)
-        {
+    /**
+    *evaluateList evaluates whether new obj are there, whether there are things to be updatet and manipulates all this.
+    */
+    void TrafficControl::evaluateList(unsigned int clientID, std::list<obj>& list)
+    {
 
     if( bActive_ )

code/trunk/src/libraries/network/TrafficControl.h

@@ -130 +130 @@
     static void processAck(unsigned int clientID, unsigned int gamestateID)
     { return instance_->ack(clientID, gamestateID); }
-    void deleteObject(unsigned int objectID);                           // this function gets called when an object has been deleted (in order to clean up lists and maps)
+    void deleteObject(unsigned int objectID);               // this function gets called when an object has been deleted (in order to clean up lists and maps)
     
     bool prioritySort(uint32_t clientID, obj i, obj j);

code/trunk/src/libraries/network/packet/Acknowledgement.h

@@ -37 +37 @@
 namespace packet {
 /**
-        @author
+    @author
 */
 class _NetworkExport Acknowledgement : public Packet

code/trunk/src/libraries/network/packet/Chat.h

@@ -36 +36 @@
 namespace packet {
 /**
-        @author
+    @author
 */
 class _NetworkExport Chat : public Packet

code/trunk/src/libraries/network/packet/ClassID.h

@@ -38 +38 @@
   
 /**
-        @author
+    @author
 */
 class _NetworkExport ClassID : public Packet

code/trunk/src/libraries/network/packet/DeleteObjects.h

@@ -35 +35 @@
 namespace packet {
 /**
-        @author
+    @author
 */
 class _NetworkExport DeleteObjects : public Packet

code/trunk/src/libraries/network/packet/FunctionCalls.h

@@ -40 +40 @@
 namespace packet {
 /**
-        @author
+    @author
 */
 

code/trunk/src/libraries/network/packet/FunctionIDs.h

@@ -38 +38 @@
   
 /**
-        @author
+    @author
 */
 class _NetworkExport FunctionIDs : public Packet

code/trunk/src/libraries/network/packet/Gamestate.h

@@ -96 +96 @@
 
 /**
-        @author Oliver Scheuss
+    @author Oliver Scheuss
 */
 class _NetworkExport Gamestate: public Packet{

code/trunk/src/libraries/network/packet/Packet.h

@@ -57 +57 @@
 
 /**
-        @author Oliver Scheuss <scheusso [at] ee.ethz.ch>
+    @author Oliver Scheuss <scheusso [at] ee.ethz.ch>
 */
 class _NetworkExport Packet{

code/trunk/src/libraries/network/packet/Welcome.h

@@ -36 +36 @@
 
 /**
-        @author
+    @author
 */
 class _NetworkExport Welcome : public Packet

code/trunk/src/libraries/network/synchronisable/NetworkCallback.h

@@ -49 +49 @@
     public:
       NetworkCallback(T* object, void (T::*function) (void)) : object_(object), function_(function) {}
-          virtual ~NetworkCallback() {}
+      virtual ~NetworkCallback() {}
       virtual void call()
         { (this->object_->*function_)(); }