Changeset 3301 for code/trunk/src/orxonox/overlays

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/orxonox/overlays

Files:

• GUIOverlay.cc (modified) (1 diff)
• OrxonoxOverlay.cc (modified) (3 diffs)
• console/InGameConsole.cc (modified) (1 diff)
• hud/HUDNavigation.cc (modified) (1 diff)
• notifications/NotificationOverlay.cc (modified) (1 diff)
• notifications/NotificationQueue.cc (modified) (1 diff)

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

@@ -67 +67 @@
             std::string str;
             std::stringstream out;
-            out << static_cast<long>(this);
+            out << reinterpret_cast<long>(this);
             str = out.str();
             GUIManager::getInstance().executeCode("showCursor()");

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

@@ -82 +82 @@
         // Get aspect ratio from the render window. Later on, we get informed automatically
         Ogre::RenderWindow* defaultWindow = GraphicsManager::getInstance().getRenderWindow();
-        this->windowAspectRatio_ = (float)defaultWindow->getWidth() / defaultWindow->getHeight();
+        this->windowAspectRatio_ = static_cast<float>(defaultWindow->getWidth()) / defaultWindow->getHeight();
         this->sizeCorrectionChanged();
 
@@ -183 +183 @@
     void OrxonoxOverlay::windowResized(unsigned int newWidth, unsigned int newHeight)
     {
-        this->windowAspectRatio_ = newWidth/(float)newHeight;
+        this->windowAspectRatio_ = static_cast<float>(newWidth) / newHeight;
         this->sizeCorrectionChanged();
     }
@@ -215 +215 @@
             if (angle < 0.0)
                 angle = -angle;
-            angle -= 180.0f * static_caste<int>(angle / 180.0);
+            angle -= 180.0f * static_cast<int>(angle / 180.0);
 
             // take the reverse if angle is about 90 degrees

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

@@ -93 +93 @@
         @brief Destructor: Destroys the TextAreas.
     */
-    InGameConsole::~InGameConsole(void)
+    InGameConsole::~InGameConsole()
     {
         this->deactivate();

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

@@ -141 +141 @@
 
         // set text
-        int dist = (int) getDist2Focus();
+        int dist = static_cast<int>(getDist2Focus());
         navText_->setCaption(multi_cast<std::string>(dist));
         float textLength = multi_cast<std::string>(dist).size() * navText_->getCharHeight() * 0.3;

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

@@ -129 +129 @@
     std::string NotificationOverlay::clipMessage(const std::string & message)
     {
-        if(message.length() <= (unsigned int)this->queue_->getNotificationLength()) //!< If the message is not too long.
+        if(message.length() <= static_cast<unsigned int>(this->queue_->getNotificationLength())) //!< If the message is not too long.
             return message;
         return message.substr(0, this->queue_->getNotificationLength());

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

@@ -398 +398 @@
         timeString.erase(timeString.length()-1);
         std::ostringstream stream;
-        stream << (unsigned long)notification;
+        stream << reinterpret_cast<unsigned long>(notification);
         std::string addressString = stream.str() ;
         container->name = "NotificationOverlay(" + timeString + ")&" + addressString;