Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jul 18, 2009, 4:03:59 PM (15 years ago)
Author:
rgrieder
Message:

Found even more casts. They sure aren't all of them, but I hope to have caught every pointer C-style cast because they can be very dangerous.
Note: I didn't do the pointer casts in the network library because that would have taken way too long.

Location:
code/trunk/src/orxonox
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • code/trunk/src/orxonox/gamestates/GSDedicated.cc

    r3300 r3301  
    193193//                             boost::recursive_mutex::scoped_lock(this->inputLineMutex_);
    194194                            std::cout << endl << CommandExecutor::hint( std::string((const char*)this->commandLine_,inputIterator_) ) << endl;
    195                             strncpy((char*)this->commandLine_, CommandExecutor::complete( std::string((const char*)this->commandLine_,inputIterator_) ).c_str(), MAX_COMMAND_LENGTH);
     195                            strncpy(reinterpret_cast<char*>(this->commandLine_), CommandExecutor::complete( std::string(reinterpret_cast<char*>(this->commandLine_),inputIterator_) ).c_str(), MAX_COMMAND_LENGTH);
    196196                            inputIterator_ = strlen((const char*)this->commandLine_);
    197197                            break;
    … …  
    275275    void GSDedicated::insertCharacter( unsigned int position, char c )
    276276    {
    277 //         std::cout << endl << (unsigned int)c << endl;
     277//         std::cout << endl << static_cast<unsigned int>(c) << endl;
    278278        // check that we do not exceed MAX_COMMAND_LENGTH
    279279        if( inputIterator_+1 < MAX_COMMAND_LENGTH )

  • code/trunk/src/orxonox/objects/Scene.cc

    r3280 r3301  
    325325    {
    326326        // get the WorldEntity pointers
    327         WorldEntity* object0 = (WorldEntity*)colObj0->getUserPointer();
     327        WorldEntity* object0 = static_cast<WorldEntity*>(colObj0->getUserPointer());
    328328        assert(dynamic_cast<WorldEntity*>(object0));
    329         WorldEntity* object1 = (WorldEntity*)colObj1->getUserPointer();
     329        WorldEntity* object1 = static_cast<WorldEntity*>(colObj1->getUserPointer());
    330330        assert(dynamic_cast<WorldEntity*>(object1));
    331331

  • code/trunk/src/orxonox/objects/collisionshapes/CollisionShape.h

    r2662 r3301  
    6363            virtual void setScale3D(const Vector3& scale);
    6464            virtual void setScale(float scale);
    65             inline const Vector3& getScale3D(void) const
     65            inline const Vector3& getScale3D() const
    6666                { return this->scale_; }
    6767

  • code/trunk/src/orxonox/objects/controllers/WaypointPatrolController.cc

    r3196 r3301  
    8585
    8686        Vector3 myposition = this->getControllableEntity()->getPosition();
    87         float shortestsqdistance = (unsigned int)-1;
     87        float shortestsqdistance = static_cast<unsigned int>(-1);
    8888
    8989        for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)

  • code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc

    r3300 r3301  
    7474                playersperteam[it->second]++;
    7575
    76         unsigned int minplayers = (unsigned int)-1;
     76        unsigned int minplayers = static_cast<unsigned int>(-1);
    7777        size_t minplayersteam = 0;
    7878        for (size_t i = 0; i < this->teams_; ++i)

  • code/trunk/src/orxonox/objects/gametypes/UnderAttack.cc

    r3300 r3301  
    5151
    5252        this->setConfigValues();
    53         this->timesequence_ = static_cast<this->gameTime_);
     53        this->timesequence_ = static_cast<int>(this->gameTime_);
    5454    }
    5555

  • code/trunk/src/orxonox/objects/weaponsystem/Munition.cc

    r3196 r3301  
    354354            return false;
    355355
    356         if (amount <= (unsigned int)needed_magazines)
     356        if (amount <= static_cast<unsigned int>(needed_magazines))
    357357        {
    358358            // We need more magazines than we get, so just add them

  • code/trunk/src/orxonox/objects/weaponsystem/WeaponSystem.h

    r3196 r3301  
    8484
    8585            static const unsigned int MAX_FIRE_MODES = 8;
    86             static const unsigned int FIRE_MODE_UNASSIGNED = (unsigned int)-1;
     86            static const unsigned int FIRE_MODE_UNASSIGNED = static_cast<unsigned int>(-1);
    8787
    8888            static const unsigned int MAX_WEAPON_MODES = 8;
    89             static const unsigned int WEAPON_MODE_UNASSIGNED = (unsigned int)-1;
     89            static const unsigned int WEAPON_MODE_UNASSIGNED = static_cast<unsigned int>(-1);
    9090
    9191        private:

  • code/trunk/src/orxonox/objects/worldentities/ParticleEmitter.h

    r3300 r3301  
    6666                { this->LOD_ = static_cast<LODParticle::Value>(level); this->LODchanged(); }
    6767            inline unsigned int getLODxml() const
    68                 { return (unsigned int)this->LOD_; }
     68                { return static_cast<unsigned int>(this->LOD_); }
    6969
    7070            void sourceChanged();

  • code/trunk/src/orxonox/objects/worldentities/WorldEntity.h

    r3196 r3301  
    148148            inline void setScale3D(float x, float y, float z)
    149149                { this->setScale3D(Vector3(x, y, z)); }
    150             const Vector3& getScale3D(void) const;
     150            const Vector3& getScale3D() const;
    151151            const Vector3& getWorldScale3D() const;
    152152
    … …  
    457457    inline const Quaternion& WorldEntity::getOrientation() const
    458458        { return this->node_->getOrientation(); }
    459     inline const Vector3& WorldEntity::getScale3D(void) const
     459    inline const Vector3& WorldEntity::getScale3D() const
    460460        { return this->node_->getScale(); }
    461461#endif

  • code/trunk/src/orxonox/overlays/GUIOverlay.cc

    r3300 r3301  
    6767            std::string str;
    6868            std::stringstream out;
    69             out << static_cast<long>(this);
     69            out << reinterpret_cast<long>(this);
    7070            str = out.str();
    7171            GUIManager::getInstance().executeCode("showCursor()");

  • code/trunk/src/orxonox/overlays/OrxonoxOverlay.cc

    r3300 r3301  
    8282        // Get aspect ratio from the render window. Later on, we get informed automatically
    8383        Ogre::RenderWindow* defaultWindow = GraphicsManager::getInstance().getRenderWindow();
    84         this->windowAspectRatio_ = (float)defaultWindow->getWidth() / defaultWindow->getHeight();
     84        this->windowAspectRatio_ = static_cast<float>(defaultWindow->getWidth()) / defaultWindow->getHeight();
    8585        this->sizeCorrectionChanged();
    8686
    … …  
    183183    void OrxonoxOverlay::windowResized(unsigned int newWidth, unsigned int newHeight)
    184184    {
    185         this->windowAspectRatio_ = newWidth/(float)newHeight;
     185        this->windowAspectRatio_ = static_cast<float>(newWidth) / newHeight;
    186186        this->sizeCorrectionChanged();
    187187    }
    … …  
    215215            if (angle < 0.0)
    216216                angle = -angle;
    217             angle -= 180.0f * static_caste<int>(angle / 180.0);
     217            angle -= 180.0f * static_cast<int>(angle / 180.0);
    218218
    219219            // take the reverse if angle is about 90 degrees

  • code/trunk/src/orxonox/overlays/console/InGameConsole.cc

    r3300 r3301  
    9393        @brief Destructor: Destroys the TextAreas.
    9494    */
    95     InGameConsole::~InGameConsole(void)
     95    InGameConsole::~InGameConsole()
    9696    {
    9797        this->deactivate();

  • code/trunk/src/orxonox/overlays/hud/HUDNavigation.cc

    r3280 r3301  
    141141
    142142        // set text
    143         int dist = (int) getDist2Focus();
     143        int dist = static_cast<int>(getDist2Focus());
    144144        navText_->setCaption(multi_cast<std::string>(dist));
    145145        float textLength = multi_cast<std::string>(dist).size() * navText_->getCharHeight() * 0.3;

  • code/trunk/src/orxonox/overlays/notifications/NotificationOverlay.cc

    r3196 r3301  
    129129    std::string NotificationOverlay::clipMessage(const std::string & message)
    130130    {
    131         if(message.length() <= (unsigned int)this->queue_->getNotificationLength()) //!< If the message is not too long.
     131        if(message.length() <= static_cast<unsigned int>(this->queue_->getNotificationLength())) //!< If the message is not too long.
    132132            return message;
    133133        return message.substr(0, this->queue_->getNotificationLength());

  • code/trunk/src/orxonox/overlays/notifications/NotificationQueue.cc

    r3196 r3301  
    398398        timeString.erase(timeString.length()-1);
    399399        std::ostringstream stream;
    400         stream << (unsigned long)notification;
     400        stream << reinterpret_cast<unsigned long>(notification);
    401401        std::string addressString = stream.str() ;
    402402        container->name = "NotificationOverlay(" + timeString + ")&" + addressString;

  • code/trunk/src/orxonox/tools/ParticleInterface.cc

    r3280 r3301  
    7979        }
    8080
    81         this->setDetailLevel((unsigned int)detaillevel);
     81        this->setDetailLevel(static_cast<unsigned int>(detaillevel));
    8282    }
    8383
    … …  
    185185    void ParticleInterface::detailLevelChanged(unsigned int newlevel)
    186186    {
    187         if (newlevel >= (unsigned int)this->detaillevel_)
     187        if (newlevel >= static_cast<unsigned int>(this->detaillevel_))
    188188            this->bAllowedByLOD_ = true;
    189189        else

  • code/trunk/src/orxonox/tools/Shader.cc

    r3196 r3301  
    165165            if (pointer->first)
    166166            {
    167                 if ((*((float*)pointer->second)) != value)
    168                 {
    169                     (*((float*)pointer->second)) = value;
     167                if ((*static_cast<float*>(pointer->second)) != value)
     168                {
     169                    (*static_cast<float*>(pointer->second)) = value;
    170170                    return true;
    171171                }
    … …  
    173173            else
    174174            {
    175                 if ((*((int*)pointer->second)) != (int)value)
    176                 {
    177                     (*((int*)pointer->second)) = (int)value;
     175                if ((*static_cast<int*>(pointer->second)) != static_cast<int>(value))
     176                {
     177                    (*static_cast<int*>(pointer->second)) = static_cast<int>(value);
    178178                    return true;
    179179                }
    … …  
    190190            if (pointer->first)
    191191            {
    192                 if ((*((float*)pointer->second)) != (float)value)
    193                 {
    194                     (*((float*)pointer->second)) = (float)value;
     192                if ((*static_cast<float*>(pointer->second)) != static_cast<float>(value))
     193                {
     194                    (*static_cast<float*>(pointer->second)) = static_cast<float>(value);
    195195                    return true;
    196196                }
    … …  
    198198            else
    199199            {
    200                 if ((*((int*)pointer->second)) != value)
    201                 {
    202                     (*((int*)pointer->second)) = value;
     200                if ((*static_cast<int*>(pointer->second)) != value)
     201                {
     202                    (*static_cast<int*>(pointer->second)) = value;
    203203                    return true;
    204204                }
    … …  
    214214        {
    215215            if (pointer->first)
    216                 return (*((float*)pointer->second));
     216                return (*static_cast<float*>(pointer->second));
    217217            else
    218                 return static_cast<float>(*((int*)pointer->second));
     218                return static_cast<float>(*static_cast<int*>(pointer->second));
    219219        }
    220220        else
    … …  
    309309                        {
    310310                            void* temp = (definition_iterator->second.isFloat())
    311                                             ? (void*)parameter_pointer->getFloatPointer(definition_iterator->second.physicalIndex)
    312                                             : (void*)parameter_pointer->getIntPointer(definition_iterator->second.physicalIndex);
     311                                            ? static_cast<void*>(parameter_pointer->getFloatPointer(definition_iterator->second.physicalIndex))
     312                                            : static_cast<void*>(parameter_pointer->getIntPointer(definition_iterator->second.physicalIndex));
    313313                            ParameterPointer parameter_pointer = ParameterPointer(definition_iterator->second.isFloat(), temp);
    314314

  • code/trunk/src/orxonox/tools/Timer.cc

    r3196 r3301  
    136136        {
    137137            // If active: Decrease the timer by the duration of the last frame
    138             this->time_ -= (long long)(time.getDeltaTimeMicroseconds() * this->getTimeFactor());
     138            this->time_ -= static_cast<long long>(time.getDeltaTimeMicroseconds() * this->getTimeFactor());
    139139
    140140            if (this->time_ <= 0)

  • code/trunk/src/orxonox/tools/Timer.h

    r3300 r3301  
    103103            /** @brief Gives the Timer some extra time. @param time The amount of extra time in seconds */
    104104            inline void addTime(float time)
    105                 { if (time > 0.0f) this->time_ += (long long)(time * 1000000.0f); }
     105                { if (time > 0.0f) this->time_ += static_cast<long long>(time * 1000000.0f); }
    106106            /** @brief Decreases the remaining time of the Timer. @param time The amount of time to remove */
    107107            inline void removeTime(float time)
    108                 { if (time > 0.0f) this->time_ -= (long long)(time * 1000000.0f); }
     108                { if (time > 0.0f) this->time_ -= static_cast<long long>(time * 1000000.0f); }
    109109            /** @brief Sets the interval of the Timer. @param interval The interval */
    110110            inline void setInterval(float interval)
    111                 { this->interval_ = (long long)(interval * 1000000.0f); }
     111                { this->interval_ = static_cast<long long>(interval * 1000000.0f); }
    112112            /** @brief Sets bLoop to a given value. @param bLoop True = loop */
    113113            inline void setLoop(bool bLoop)
Note: See TracChangeset for help on using the changeset viewer.