Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9642


Ignore:
Timestamp:
Aug 11, 2013, 9:39:59 PM (11 years ago)
Author:
landauf
Message:

removed unnecessary functions
cleanup

Location:
code/branches/core6/src/libraries
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core6/src/libraries/core/class/IdentifierManager.h

    r9641 r9642  
    4747            static IdentifierManager& getInstance();
    4848
    49             /////////////////////////////
    50             ////// Class Hierarchy //////
    51             /////////////////////////////
    5249            Identifier* getIdentifierSingleton(const std::string& name, Identifier* proposal);
     50            void registerIdentifier(Identifier* identifier);
    5351
    5452            unsigned int getUniqueClassId()
    5553                { return this->classIDCounter_s++; }
    5654
    57             void registerIdentifier(Identifier* identifier);
    5855
     56            /////////////////////////////
     57            ////// Class Hierarchy //////
     58            /////////////////////////////
    5959            void createClassHierarchy();
     60            void destroyAllIdentifiers();
    6061
    6162            /// Returns true, if a branch of the class-hierarchy is being created, causing all new objects to store their parents.
     
    6768            ///// Identifier Map /////
    6869            //////////////////////////
    69             void destroyAllIdentifiers();
    70 
    7170            Identifier* getIdentifierByString(const std::string& name);
    7271            Identifier* getIdentifierByLowercaseString(const std::string& name);
     
    7675
    7776            /// Returns the map that stores all Identifiers with their names.
    78             inline const std::map<std::string, Identifier*>& getStringIdentifierMap()
     77            inline const std::map<std::string, Identifier*>& getIdentifierByStringMap()
    7978                { return this->identifierByString_; }
    80             /// Returns a const_iterator to the beginning of the map that stores all Identifiers with their names.
    81             inline std::map<std::string, Identifier*>::const_iterator getStringIdentifierMapBegin()
    82                 { return this->identifierByString_.begin(); }
    83             /// Returns a const_iterator to the end of the map that stores all Identifiers with their names.
    84             inline std::map<std::string, Identifier*>::const_iterator getStringIdentifierMapEnd()
    85                 { return this->identifierByString_.end(); }
    86 
    8779            /// Returns the map that stores all Identifiers with their names in lowercase.
    88             inline const std::map<std::string, Identifier*>& getLowercaseStringIdentifierMap()
     80            inline const std::map<std::string, Identifier*>& getIdentifierByLowercaseStringMap()
    8981                { return this->identifierByLowercaseString_; }
    90             /// Returns a const_iterator to the beginning of the map that stores all Identifiers with their names in lowercase.
    91             inline std::map<std::string, Identifier*>::const_iterator getLowercaseStringIdentifierMapBegin()
    92                 { return this->identifierByLowercaseString_.begin(); }
    93             /// Returns a const_iterator to the end of the map that stores all Identifiers with their names in lowercase.
    94             inline std::map<std::string, Identifier*>::const_iterator getLowercaseStringIdentifierMapEnd()
    95                 { return this->identifierByLowercaseString_.end(); }
    96 
    9782            /// Returns the map that stores all Identifiers with their IDs.
    98             inline const std::map<uint32_t, Identifier*>& getIDIdentifierMap()
     83            inline const std::map<uint32_t, Identifier*>& getIdentifierByNetworkIdMap()
    9984                { return this->identifierByNetworkId_; }
    100             /// Returns a const_iterator to the beginning of the map that stores all Identifiers with their IDs.
    101             inline std::map<uint32_t, Identifier*>::const_iterator getIDIdentifierMapBegin()
    102                 { return this->identifierByNetworkId_.begin(); }
    103             /// Returns a const_iterator to the end of the map that stores all Identifiers with their IDs.
    104             inline std::map<uint32_t, Identifier*>::const_iterator getIDIdentifierMapEnd()
    105                 { return this->identifierByNetworkId_.end(); }
    10685
    10786        private:
  • code/branches/core6/src/libraries/network/packet/ClassID.cc

    r9640 r9642  
    5555
    5656  //calculate total needed size (for all strings and integers)
    57   std::map<std::string, Identifier*>::const_iterator it = IdentifierManager::getInstance().getStringIdentifierMapBegin();
    58   for(;it != IdentifierManager::getInstance().getStringIdentifierMapEnd();++it){
     57  std::map<std::string, Identifier*>::const_iterator it = IdentifierManager::getInstance().getIdentifierByStringMap().begin();
     58  for(;it != IdentifierManager::getInstance().getIdentifierByStringMap().end();++it){
    5959    id = it->second;
    6060    if(id == NULL || !id->hasFactory())
Note: See TracChangeset for help on using the changeset viewer.