Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1787 for code/trunk/src


Ignore:
Timestamp:
Sep 15, 2008, 11:19:54 AM (16 years ago)
Author:
rgrieder
Message:

Replaced macro "Class" with "GetClassIdentifier" to avoid future collision because the macro is very short.
"ID" was already replaced with the introduction of CEGUI which used ID somewhere as non-macro. The compiler error was completely misleading though…

Location:
code/trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/core/CoreIncludes.h

    r1755 r1787  
    9797    @param ClassName The name of the class
    9898*/
    99 #define Class(ClassName) \
     99#define GetClassIdentifier(ClassName) \
    100100    ClassIdentifier<ClassName>::getIdentifier()
    101101
  • code/trunk/src/core/XMLPort.cc

    r1505 r1787  
    4040    bool XMLPortObjectContainer::identifierIsIncludedInLoaderMask(const Identifier* identifier)
    4141    {
    42         return ((!this->bApplyLoaderMask_) || identifier->isA(Class(Namespace)) || Loader::currentMask_s.isIncluded(identifier));
     42        return ((!this->bApplyLoaderMask_) || identifier->isA(GetClassIdentifier(Namespace)) || Loader::currentMask_s.isIncluded(identifier));
    4343    }
    4444}
  • code/trunk/src/core/XMLPort.h

    r1755 r1787  
    301301                                if (identifier)
    302302                                {
    303                                     if (identifier->isA(Class(O)))
     303                                    if (identifier->isA(GetClassIdentifier(O)))
    304304                                    {
    305305                                        if (this->identifierIsIncludedInLoaderMask(identifier))
     
    333333                                    else
    334334                                    {
    335                                         COUT(2) << ((BaseObject*)object)->getLoaderIndentation() << "Warning: '" << child->Value() << "' is not a '" << Class(O)->getName() << "'." << std::endl;
     335                                        COUT(2) << ((BaseObject*)object)->getLoaderIndentation() << "Warning: '" << child->Value() << "' is not a '" << GetClassIdentifier(O)->getName() << "'." << std::endl;
    336336                                    }
    337337                                }
     
    346346                    {
    347347                        COUT(1) << std::endl;
    348                         COUT(1) << "An error occurred in XMLPort.h while loading a '" << Class(O)->getName() << "' in '" << this->sectionname_ << "' of '" << this->identifier_->getName() << "' (objectname: " << ((BaseObject*)object)->getName() << ") in " << object->getLevelfile() << ":" << std::endl;
     348                        COUT(1) << "An error occurred in XMLPort.h while loading a '" << GetClassIdentifier(O)->getName() << "' in '" << this->sectionname_ << "' of '" << this->identifier_->getName() << "' (objectname: " << ((BaseObject*)object)->getName() << ") in " << object->getLevelfile() << ":" << std::endl;
    349349                        COUT(1) << ex.what() << std::endl;
    350350                    }
  • code/trunk/src/orxonox/objects/Model.cc

    r1769 r1787  
    8585        COUT(4) << "Loader (Model.cc): Created model" << std::endl;
    8686      }
    87       if(this->isExactlyA(Class(Model)))
     87      if(this->isExactlyA(GetClassIdentifier(Model)))
    8888        setObjectFrequency(300); //sync all 10 seconds (this only applies to asteroids and other isExactlyA(Model)
    8989      return true;
  • code/trunk/src/orxonox/objects/Projectile.cc

    r1747 r1787  
    101101                {
    102102                    // hit
    103                     if (it->isA(Class(SpaceShipAI)))
     103                    if (it->isA(GetClassIdentifier(SpaceShipAI)))
    104104                        ((SpaceShipAI*)(*it))->damage(this->damage_);
    105105                    ParticleSpawner* explosion = new ParticleSpawner(this->explosionTemplateName_, LODParticle::low, 2.0);
  • code/trunk/src/orxonox/objects/SpaceShip.cc

    r1783 r1787  
    7777      ObjectList<SpaceShip>::iterator it;
    7878      for(it = ObjectList<SpaceShip>::begin(); it; ++it){
    79         assert(it->isA(Class(SpaceShip)));
     79        assert(it->isA(GetClassIdentifier(SpaceShip)));
    8080        if( (it)->myShip_ || (network::Host::running() && network::Host::getShipID()==(it)->objectID) ){
    8181//        COUT(1) << "^^^^^^^^^^ myShip_:" << *it << " classname: " << (*it)->getIdentifier()->getName() << " objectid: " << (*it)->objectID << std::endl;
     
    273273            // END CREATING ADDITIONAL EFFECTS
    274274
    275             if (this->isExactlyA(Class(SpaceShip)))
     275            if (this->isExactlyA(GetClassIdentifier(SpaceShip)))
    276276            {
    277277                // START of testing crosshair
     
    376376        COUT(4) << "requesting focus for camera" << std::endl;
    377377        //CameraHandler::getInstance()->requestFocus(cam_);
    378         if(this->isExactlyA(Class(SpaceShip))){
     378        if(this->isExactlyA(GetClassIdentifier(SpaceShip))){
    379379          getFocus();
    380380          COUT(4) << "getting focus for obj id: " << objectID << std::endl;
     
    421421        myShip_=true; //TODO: this is a hack
    422422        SpaceShip::create();
    423         /*if (this->isExactlyA(Class(SpaceShip)))
     423        /*if (this->isExactlyA(GetClassIdentifier(SpaceShip)))
    424424            getFocus();*/
    425425    }
Note: See TracChangeset for help on using the changeset viewer.