Changeset 8619 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Jun 20, 2006, 1:24:11 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the gui-branche back.
merged with command:
svn merge -r8520:HEAD ​https://svn.orxonox.net/orxonox/branches/gui
no conflicts

Location:

trunk/src/lib/util

Files:

• color.cc (modified) (1 diff)
• executor/functor_list.h (modified) (1 diff)
• filesys/file.cc (modified) (1 diff)
• filesys/file.h (modified) (1 diff)

trunk/src/lib/util/color.cc

@@ -24 +24 @@
   printf("r:%0.2f g:%0.2f, b:%0.2f, a:%0.2f\n", r(), g(), b(), a());
 }
+
+
 
 /**

trunk/src/lib/util/executor/functor_list.h

@@ -144 +144 @@
   FUNCTOR_LIST(3)(l_STRING, l_UINT, l_UINT);
 
+  FUNCTOR_LIST(5)(l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT, l_STRING);
+
 #endif /* FUNCTOR_LIST */

trunk/src/lib/util/filesys/file.cc

@@ -205 +205 @@
 
 /// FIXME NEXT THREE FUNCTIONS
-bool File::isReadeable() const
+bool File::isReadable() const
 {
 #ifndef __WIN32__

trunk/src/lib/util/filesys/file.h

@@ -51 +51 @@
   bool isFile() const;
   bool isDirectory() const;
-  bool isReadeable() const;
+  bool isReadable() const;
   bool isWriteable() const;
   bool isExecutable() const;