Changeset 1786 for code/trunk

Timestamp:

Sep 15, 2008, 11:11:16 AM (16 years ago)

Author:

rgrieder

Message:

Corrected types when using 'const Type' constants

Location:

code/trunk/src

Files:

• core/Executor.cc (modified) (2 diffs)
• core/Executor.h (modified) (1 diff)
• core/Functor.h (modified) (1 diff)
• core/TclThreadManager.cc (modified) (1 diff)
• ois/linux/LinuxKeyboard.cpp (modified) (1 diff)

code/trunk/src/core/Executor.cc

@@ -130 +130 @@
     }
 
-    Executor& Executor::setDescriptionParam(int param, const std::string& description)
+    Executor& Executor::setDescriptionParam(unsigned int param, const std::string& description)
     {
         if (param >= 0 && param < MAX_FUNCTOR_ARGUMENTS)
@@ -148 +148 @@
     }
 
-    const std::string& Executor::getDescriptionParam(int param) const
+    const std::string& Executor::getDescriptionParam(unsigned int param) const
     {
         if (param >= 0 && param < MAX_FUNCTOR_ARGUMENTS)

code/trunk/src/core/Executor.h

@@ -163 +163 @@
             const std::string& getDescription() const;
 
-            Executor& setDescriptionParam(int param, const std::string& description);
-            const std::string& getDescriptionParam(int param) const;
+            Executor& setDescriptionParam(unsigned int param, const std::string& description);
+            const std::string& getDescriptionParam(unsigned int param) const;
 
             Executor& setDescriptionReturnvalue(const std::string& description);

code/trunk/src/core/Functor.h

@@ -39 +39 @@
 namespace orxonox
 {
-    const int MAX_FUNCTOR_ARGUMENTS = 5;
+    const unsigned int MAX_FUNCTOR_ARGUMENTS = 5;
 
     enum FunctionType

code/trunk/src/core/TclThreadManager.cc

@@ -46 +46 @@
 namespace orxonox
 {
-    const int TCLTHREADMANAGER_MAX_QUEUE_LENGTH = 100;
-    const int TCLTHREADMANAGER_MAX_CPU_USAGE    = 0.50;
+    const unsigned int TCLTHREADMANAGER_MAX_QUEUE_LENGTH = 100;
+    const float TCLTHREADMANAGER_MAX_CPU_USAGE = 0.50f;
 
     SetConsoleCommandShortcutAlias(TclThreadManager, execute, "tclexecute").argumentCompleter(0, autocompletion::tclthreads());

code/trunk/src/ois/linux/LinuxKeyboard.cpp

@@ -283 +283 @@
         }
 
-        for(int i = 1; i < len; i++)
+        for(unsigned int i = 1; i < len; i++)
                 val = (val << 6) | (buf[i] & 0x3F);