Changeset 3301 for code/trunk/src/core

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/core

Files:

• ConfigFileManager.cc (modified) (1 diff)
• ConfigValueContainer.h (modified) (1 diff)
• Executor.cc (modified) (1 diff)
• Executor.h (modified) (1 diff)
• IRC.cc (modified) (1 diff)
• LuaBind.cc (modified) (1 diff)
• Shell.cc (modified) (2 diffs)
• Super.h (modified) (2 diffs)
• TclThreadManager.cc (modified) (3 diffs)
• XMLPort.h (modified) (4 diffs)
• input/InputBuffer.cc (modified) (1 diff)
• input/InputManager.cc (modified) (1 diff)
• input/KeyBinder.cc (modified) (3 diffs)

code/trunk/src/core/ConfigFileManager.cc

@@ -572 +572 @@
         else
         {
-            COUT(1) << "ConfigFileManager: Can't find a config file for type with ID " << (int)type << std::endl;
+            COUT(1) << "ConfigFileManager: Can't find a config file for type with ID " << static_cast<int>(type) << std::endl;
             COUT(1) << "Using " << DEFAULT_CONFIG_FILE << " file." << std::endl;
             this->setFilename(type, DEFAULT_CONFIG_FILE);

code/trunk/src/core/ConfigValueContainer.h

@@ -69 +69 @@
             inline virtual ~ConfigValueCallback() {}
             inline virtual void call(void* object)
-                { if (!Identifier::isCreatingHierarchy()) { (((T*)object)->*this->function_)(); } }
+            {
+                if (!Identifier::isCreatingHierarchy())
+                    (static_cast<T*>(object)->*this->function_)();
+            }
 
         private:

code/trunk/src/core/Executor.cc

@@ -99 +99 @@
 
             // assign all given arguments to the multitypes
-            for (unsigned int i = 0; i < std::min(tokens.size(), (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++)
+            for (unsigned int i = 0; i < std::min(tokens.size(), MAX_FUNCTOR_ARGUMENTS); i++)
                 param[i] = tokens[i];
 
             // fill the remaining multitypes with default values
-            for (unsigned int i = tokens.size(); i < std::min(paramCount, (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++)
+            for (unsigned int i = tokens.size(); i < std::min(paramCount, MAX_FUNCTOR_ARGUMENTS); i++)
                 param[i] = this->defaultValue_[i];
 
             // evaluate the param types through the functor
-            for (unsigned int i = 0; i < std::min(paramCount, (unsigned int)MAX_FUNCTOR_ARGUMENTS); i++)
+            for (unsigned int i = 0; i < std::min(paramCount, MAX_FUNCTOR_ARGUMENTS); i++)
                 this->functor_->evaluateParam(i, param[i]);
 

code/trunk/src/core/Executor.h

@@ -104 +104 @@
             COUT(5) << tokens[i]; \
         } \
-        COUT(5) << ") and " << std::max((int)paramCount - (int)tokens.size(), 0) << " default values ("; \
+        COUT(5) << ") and " << std::max(static_cast<int>(paramCount) - static_cast<int>(tokens.size()), 0) << " default values ("; \
         for (unsigned int i = tokens.size(); i < paramCount; i++) \
         { \

code/trunk/src/core/IRC.cc

@@ -52 +52 @@
     void IRC::initialize()
     {
-        unsigned int threadID = (unsigned int)IRC_TCL_THREADID;
+        unsigned int threadID = IRC_TCL_THREADID;
         TclThreadManager::createID(threadID);
         this->bundle_ = TclThreadManager::getInstance().getInterpreterBundle(threadID);

code/trunk/src/core/LuaBind.cc

@@ -124 +124 @@
   const char * LuaBind::lua_Chunkreader(lua_State *L, void *data, size_t *size)
   {
-    LoadS* ls = ((LoadS*)data);
+    LoadS* ls = static_cast<LoadS*>(data);
     if (ls->size == 0) return NULL;
     *size = ls->size;

code/trunk/src/core/Shell.cc

@@ -228 +228 @@
     std::string Shell::getFromHistory() const
     {
-        unsigned int index = mod(((int)this->historyOffset_) - ((int)this->historyPosition_), this->maxHistoryLength_);
+        unsigned int index = mod(static_cast<int>(this->historyOffset_) - static_cast<int>(this->historyPosition_), this->maxHistoryLength_);
         if (index < this->commandHistory_.size() && this->historyPosition_ != 0)
             return this->commandHistory_[index];
@@ -249 +249 @@
             {
                 if (this->bAddOutputLevel_)
-                    output.insert(0, 1, (char)OutputHandler::getOutStream().getOutputLevel());
+                    output.insert(0, 1, static_cast<char>(OutputHandler::getOutStream().getOutputLevel()));
 
                 this->lines_.insert(this->lines_.begin(), output);

code/trunk/src/core/Super.h

@@ -91 +91 @@
             static void check() \
             { \
-                SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply((T*)0); \
+                SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(0)); \
                 SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::check(); \
             } \
@@ -149 +149 @@
                 // This call to the apply-function is the whole check. By calling the function with
                 // a T* pointer, the right function get's called.
-                SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply((T*)0);
+                SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(0));
 
                 // Go go the check for of next super-function (functionnumber + 1)

code/trunk/src/core/TclThreadManager.cc

@@ -278 +278 @@
     std::string TclThreadManager::tcl_query(int querierID, Tcl::object const &args)
     {
-        return TclThreadManager::getInstance().evalQuery((unsigned int)querierID, stripEnclosingBraces(args.get()));
+        return TclThreadManager::getInstance().evalQuery(static_cast<unsigned int>(querierID), stripEnclosingBraces(args.get()));
     }
 
     std::string TclThreadManager::tcl_crossquery(int querierID, int threadID, Tcl::object const &args)
     {
-        return TclThreadManager::getInstance().evalQuery((unsigned int)querierID, (unsigned int)threadID, stripEnclosingBraces(args.get()));
+        return TclThreadManager::getInstance().evalQuery(static_cast<unsigned int>(querierID), static_cast<unsigned int>(threadID), stripEnclosingBraces(args.get()));
     }
 
     bool TclThreadManager::tcl_running(int threadID)
     {
-        TclInterpreterBundle* bundle = TclThreadManager::getInstance().getInterpreterBundle((unsigned int)threadID);
+        TclInterpreterBundle* bundle = TclThreadManager::getInstance().getInterpreterBundle(static_cast<unsigned int>(threadID));
         if (bundle)
         {
@@ -556 +556 @@
                     try
                     {
-                        if (querierID == 0 || std::find(querier->queriers_.begin(), querier->queriers_.end(), (unsigned int)0) != querier->queriers_.end())
+                        if (querierID == 0 || std::find(querier->queriers_.begin(), querier->queriers_.end(), 0U) != querier->queriers_.end())
                             successfullyLocked = interpreter_lock.try_lock();
                         else
@@ -631 +631 @@
             boost::try_mutex::scoped_lock interpreter_lock(this->orxonoxInterpreterBundle_.interpreterMutex_);
 #endif
-            unsigned long maxtime = (unsigned long)(time.getDeltaTime() * 1000000 * TCLTHREADMANAGER_MAX_CPU_USAGE);
+            unsigned long maxtime = static_cast<unsigned long>(time.getDeltaTime() * 1000000 * TCLTHREADMANAGER_MAX_CPU_USAGE);
             Ogre::Timer timer;
             while (!this->queueIsEmpty())

code/trunk/src/core/XMLPort.h

@@ -93 +93 @@
 */
 #define XMLPortParamVariable(classname, paramname, variable, xmlelement, mode) \
-    XMLPortVariableHelperClass xmlcontainer##variable##dummy((void*)&variable); \
+    XMLPortVariableHelperClass xmlcontainer##variable##dummy(static_cast<void*>(&variable)); \
     static ExecutorMember<orxonox::XMLPortVariableHelperClass>* xmlcontainer##variable##loadexecutor = static_cast<ExecutorMember<orxonox::XMLPortVariableHelperClass>*>(orxonox::createExecutor(orxonox::createFunctor(orxonox::XMLPortVariableHelperClass::getLoader(variable)), std::string( #classname ) + "::" + #variable + "loader")); \
     static ExecutorMember<orxonox::XMLPortVariableHelperClass>* xmlcontainer##variable##saveexecutor = static_cast<ExecutorMember<orxonox::XMLPortVariableHelperClass>*>(orxonox::createExecutor(orxonox::createFunctor(orxonox::XMLPortVariableHelperClass::getSaver (variable)), std::string( #classname ) + "::" + #variable + "saver" )); \
@@ -561 +561 @@
                                                     COUT(4) << object->getLoaderIndentation() << "fabricating " << child->Value() << "..." << std::endl;
 
-                                                    BaseObject* newObject = identifier->fabricate((BaseObject*)object);
+                                                    BaseObject* newObject = identifier->fabricate(static_cast<BaseObject*>(object));
                                                     assert(newObject);
                                                     newObject->setLoaderIndentation(object->getLoaderIndentation() + "  ");
@@ -571 +571 @@
                                                     {
                                                         newObject->XMLPort(*child, XMLPort::LoadObject);
-                                                        COUT(4) << object->getLoaderIndentation() << "assigning " << child->Value() << " (objectname " << newObject->getName() << ") to " << this->identifier_->getName() << " (objectname " << ((BaseObject*)object)->getName() << ")" << std::endl;
+                                                        COUT(4) << object->getLoaderIndentation() << "assigning " << child->Value() << " (objectname " << newObject->getName() << ") to " << this->identifier_->getName() << " (objectname " << static_cast<BaseObject*>(object)->getName() << ")" << std::endl;
                                                     }
                                                     else
                                                     {
-                                                        COUT(4) << object->getLoaderIndentation() << "assigning " << child->Value() << " (object not yet loaded) to " << this->identifier_->getName() << " (objectname " << ((BaseObject*)object)->getName() << ")" << std::endl;
+                                                        COUT(4) << object->getLoaderIndentation() << "assigning " << child->Value() << " (object not yet loaded) to " << this->identifier_->getName() << " (objectname " << static_cast<BaseObject*>(object)->getName() << ")" << std::endl;
                                                     }
 
@@ -671 +671 @@
             template <class T>
             void load(const T& value)
-                { *((T*)this->variable_) = value; }
+                { *static_cast<T*>(this->variable_) = value; }
 
             template <class T>
             const T& save()
-                { return *((T*)this->variable_); }
+                { return *static_cast<T*>(this->variable_); }
 
             template <class T>

code/trunk/src/core/input/InputBuffer.cc

@@ -218 +218 @@
         }
 
-        this->insert((char)evt.text);
+        this->insert(static_cast<char>(evt.text));
     }
 

code/trunk/src/core/input/InputManager.cc

@@ -175 +175 @@
 
             // Fill parameter list
-            windowHndStr << (unsigned int)windowHnd_;
+            windowHndStr << static_cast<unsigned int>(windowHnd);
             paramList.insert(std::make_pair(std::string("WINDOW"), windowHndStr.str()));
 #if defined(ORXONOX_PLATFORM_WINDOWS)

code/trunk/src/core/input/KeyBinder.cc

@@ -444 +444 @@
                     if (mousePosition_[i] < 0)
                     {
-                        mouseAxes_[2*i + 0].absVal_ =  -mousePosition_[i]/(float)mouseClippingSize_ * mouseSensitivity_;
-                        mouseAxes_[2*i + 1].absVal_ =  0.0f;
+                        mouseAxes_[2*i + 0].absVal_ = -mouseSensitivity_ * mousePosition_[i] / mouseClippingSize_;
+                        mouseAxes_[2*i + 1].absVal_ = 0.0f;
                     }
                     else
                     {
-                        mouseAxes_[2*i + 0].absVal_ =  0.0f;
-                        mouseAxes_[2*i + 1].absVal_ =   mousePosition_[i]/(float)mouseClippingSize_ * mouseSensitivity_;
+                        mouseAxes_[2*i + 0].absVal_ = 0.0f;
+                        mouseAxes_[2*i + 1].absVal_ =  mouseSensitivity_ * mousePosition_[i] / mouseClippingSize_;
                     }
                 }
@@ -460 +460 @@
         {
             if (rel[i] < 0)
-                mouseAxes_[0 + 2*i].relVal_ = -((float)rel[i])/(float)mouseClippingSize_ * mouseSensitivity_;
+                mouseAxes_[0 + 2*i].relVal_ = -mouseSensitivity_ * rel[i] / mouseClippingSize_;
             else
-                mouseAxes_[1 + 2*i].relVal_ =  ((float)rel[i])/(float)mouseClippingSize_ * mouseSensitivity_;
+                mouseAxes_[1 + 2*i].relVal_ =  mouseSensitivity_ * rel[i] / mouseClippingSize_;
         }
     }
@@ -474 +474 @@
         if (rel < 0)
             for (int i = 0; i < -rel/mouseWheelStepSize_; i++)
-                mouseButtons_[8].execute(KeybindMode::OnPress, ((float)abs)/mouseWheelStepSize_);
+                mouseButtons_[8].execute(KeybindMode::OnPress, static_cast<float>(abs)/mouseWheelStepSize_);
         else
             for (int i = 0; i < rel/mouseWheelStepSize_; i++)
-                mouseButtons_[9].execute(KeybindMode::OnPress, ((float)abs)/mouseWheelStepSize_);
+                mouseButtons_[9].execute(KeybindMode::OnPress, static_cast<float>(abs)/mouseWheelStepSize_);
     }