Changeset 3301 for code/trunk/src/util

Timestamp:

Jul 18, 2009, 4:03:59 PM (16 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/util

Files:

• Clipboard.cc (modified) (2 diffs)
• MultiType.h (modified) (4 diffs)
• OutputHandler.cc (modified) (2 diffs)
• SignalHandler.cc (modified) (1 diff)
• StringUtils.cc (modified) (1 diff)

code/trunk/src/util/Clipboard.cc

@@ -66 +66 @@
                 EmptyClipboard();
                 HGLOBAL clipbuffer = GlobalAlloc(GMEM_DDESHARE, text.size() + 1);
-                char* buffer = (char*)GlobalLock(clipbuffer);
+                char* buffer = static_cast<char*>(GlobalLock(clipbuffer));
                 strcpy(buffer, text.c_str());
                 GlobalUnlock(clipbuffer);
@@ -94 +94 @@
             {
                 HANDLE hData = GetClipboardData(CF_TEXT);
-                std::string output = (char*)GlobalLock(hData);
+                std::string output = static_cast<char*>(GlobalLock(hData));
                 GlobalUnlock(hData);
                 CloseClipboard();

code/trunk/src/util/MultiType.h

@@ -303 +303 @@
             inline bool                                   setValue(const char* value);
             /** @brief Assigns a pointer. */
-            template <typename V> inline bool             setValue(V* value)               { if (this->value_) { return this->value_->setValue((void*)value); } else { return this->assignValue((void*)value); } }
+            template <typename V> inline bool             setValue(V* value)               { if (this->value_) { return this->value_->setValue(static_cast<void*>(const_cast<typename TypeStripper<V>::RawType*>(value))); } else { return this->assignValue(static_cast<void*>(const_cast<typename TypeStripper<V>::RawType*>(value))); } }
             /** @brief Assigns the value of the other MultiType and converts it to the current type. */
             bool                                          setValue(const MultiType& other) { if (this->value_) { return this->value_->assimilate(other); } else { if (other.value_) { this->value_ = other.value_->clone(); } return true; } }
@@ -335 +335 @@
             
             /** @brief Saves the value of the MT to a bytestream (pointed at by mem) and increases mem pointer by size of MT */
-            inline void                       exportData(uint8_t*& mem) const { assert(sizeof(MT_Type::Value)<=8); *(uint8_t*)(mem) = this->getType(); mem+=sizeof(uint8_t); this->value_->exportData(mem); }
+            inline void                       exportData(uint8_t*& mem) const { assert(sizeof(MT_Type::Value)<=8); *static_cast<uint8_t*>(mem) = this->getType(); mem+=sizeof(uint8_t); this->value_->exportData(mem); }
             /** @brief Loads the value of the MT from a bytestream (pointed at by mem) and increases mem pointer by size of MT */
-            inline void                       importData(uint8_t*& mem) { assert(sizeof(MT_Type::Value)<=8); this->setType(static_cast<MT_Type::Value>(*(uint8_t*)mem)); mem+=sizeof(uint8_t); this->value_->importData(mem); }
+            inline void                       importData(uint8_t*& mem) { assert(sizeof(MT_Type::Value)<=8); this->setType(static_cast<MT_Type::Value>(*static_cast<uint8_t*>(mem))); mem+=sizeof(uint8_t); this->value_->importData(mem); }
             /** @brief Saves the value of the MT to a bytestream and increases pointer to bytestream by size of MT */
             inline uint8_t*&                  operator << (uint8_t*& mem) { importData(mem); return mem; }
@@ -371 +371 @@
             operator orxonox::Degree()       const;
             /** @brief Returns the current value, converted to a T* pointer. */
-            template <class T> operator T*() const { return ((T*)this->operator void*()); }
+            template <class T> operator T*() const { return (static_cast<T*>(this->operator void*())); }
 
             inline bool getValue(char*                 value) const { if (this->value_) { return this->value_->getValue(value); } return false; } /** @brief Assigns the value to the given pointer. The value gets converted if the types don't match. */
@@ -420 +420 @@
             inline orxonox::Radian          getRadian()           const { return this->operator orxonox::Radian();      } /** @brief Returns the current value, converted to the requested type. */
             inline orxonox::Degree          getDegree()           const { return this->operator orxonox::Degree();      } /** @brief Returns the current value, converted to the requested type. */
-            template <typename T> inline T* getPointer()          const { return ((T*)this->getVoid());                 } /** @brief Returns the current value, converted to a T* pointer. */
+            template <typename T> inline T* getPointer()          const { return static_cast<T*>(this->getVoid());      } /** @brief Returns the current value, converted to a T* pointer. */
 
         private:

code/trunk/src/util/OutputHandler.cc

@@ -97 +97 @@
     void OutputHandler::setSoftDebugLevel(OutputHandler::OutputDevice device, int level)
     {
-        OutputHandler::getOutStream().softDebugLevel_[(unsigned int)device] = level;
+        OutputHandler::getOutStream().softDebugLevel_[static_cast<unsigned int>(device)] = level;
     }
 
@@ -107 +107 @@
     int OutputHandler::getSoftDebugLevel(OutputHandler::OutputDevice device)
     {
-        return OutputHandler::getOutStream().softDebugLevel_[(unsigned int)device];
+        return OutputHandler::getOutStream().softDebugLevel_[static_cast<unsigned int>(device)];
     }
 

code/trunk/src/util/SignalHandler.cc

@@ -203 +203 @@
         dup2( gdbErr[1], STDERR_FILENO );
 
-        execlp( "sh", "sh", "-c", "gdb", (void*)NULL);
+        execlp( "sh", "sh", "-c", "gdb", static_cast<void*>(NULL));
       }
 

code/trunk/src/util/StringUtils.cc

@@ -125 +125 @@
 
         size_t quotecount = 0;
-        size_t quote = (size_t)-1;
+        size_t quote = static_cast<size_t>(-1);
         while ((quote = getNextQuote(str, quote + 1)) < pos)
         {