Changeset 3300 for code/trunk/src/core

Timestamp:

Jul 17, 2009, 11:53:35 PM (16 years ago)

Author:

rgrieder

Message:

Found a few more C-Style casts.

Location:

code/trunk/src/core

Files:

• CommandLine.h (modified) (1 diff)
• Game.cc (modified) (2 diffs)
• Shell.cc (modified) (2 diffs)
• TclThreadManager.cc (modified) (1 diff)

code/trunk/src/core/CommandLine.h

@@ -196 +196 @@
     inline void CommandLine::getValue<std::string>(const std::string& name, std::string* value)
     {
-        *value = (std::string)(getArgument(name)->getValue().getString());
+        *value = getArgument(name)->getValue().getString();
     }
 

code/trunk/src/core/Game.cc

@@ -287 +287 @@
                 assert(it != this->statisticsTickTimes_.end());
                 int64_t lastTime = currentTime - this->configuration_->statisticsAvgLength_;
-                if ((int64_t)it->tickTime < lastTime)
+                if (static_cast<int64_t>(it->tickTime) < lastTime)
                 {
                     do
@@ -295 +295 @@
                         ++it;
                         assert(it != this->statisticsTickTimes_.end());
-                    } while ((int64_t)it->tickTime < lastTime);
+                    } while (static_cast<int64_t>(it->tickTime) < lastTime);
                     this->statisticsTickTimes_.erase(this->statisticsTickTimes_.begin(), it);
                 }

code/trunk/src/core/Shell.cc

@@ -129 +129 @@
         this->inputBuffer_->registerListener(this, &Shell::backspace, '\b', true);
         this->inputBuffer_->registerListener(this, &Shell::deletechar, KeyCode::Delete);
-        this->inputBuffer_->registerListener(this, &Shell::exit, (char)27, true);
+        this->inputBuffer_->registerListener(this, &Shell::exit, static_cast<char>(27), true);
         this->inputBuffer_->registerListener(this, &Shell::cursor_right, KeyCode::Right);
         this->inputBuffer_->registerListener(this, &Shell::cursor_left, KeyCode::Left);
@@ -149 +149 @@
         Shell& instance = Shell::getInstance();
 
-        for (int i = instance.historyOffset_; i < (int)instance.commandHistory_.size(); ++i)
+        for (unsigned int i = instance.historyOffset_; i < instance.commandHistory_.size(); ++i)
             instance.addLine(instance.commandHistory_[i], -1);
-        for (int i =  0; i < (int)instance.historyOffset_; ++i)
+        for (unsigned int i =  0; i < instance.historyOffset_; ++i)
             instance.addLine(instance.commandHistory_[i], -1);
     }

code/trunk/src/core/TclThreadManager.cc

@@ -577 +577 @@
                         this->debug("TclThread_query: " + command);
                         try
-                        {   output = (std::string)target->interpreter_->eval(command);   }
+                        {   output = static_cast<std::string>(target->interpreter_->eval(command));   }
                         catch (Tcl::tcl_error const &e)
-                        {   this->error("Tcl error: " + (std::string)e.what());   }
+                        {   this->error("Tcl error: " + static_cast<std::string>(e.what()));   }
                         catch (std::exception const &e)
-                        {   this->error("Error while executing Tcl: " + (std::string)e.what());   }
+                        {   this->error("Error while executing Tcl: " + static_cast<std::string>(e.what()));   }
                     }
                     else