Changeset 4223 in orxonox.OLD for orxonox/branches/physics/src/lib

Timestamp:

May 19, 2005, 7:45:28 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged back the Trunk into the Physics-branche
merged with command:
svn merge -r 4178:HEAD ../trunk/ physics
no conflicts in relevant files

Location:

orxonox/branches/physics/src/lib

Files:

• Makefile.in (modified) (1 diff)
• graphics/Makefile.in (modified) (1 diff)
• graphics/importer/Makefile.in (modified) (1 diff)
• gui/Makefile.in (modified) (1 diff)
• gui/console/Makefile.in (modified) (1 diff)
• gui/gui/Makefile.in (modified) (1 diff)
• util/substring.cc (modified) (4 diffs)
• util/substring.h (modified) (2 diffs)

orxonox/branches/physics/src/lib/Makefile.in

@@ -183 +183 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/Makefile
+          $(AUTOMAKE) --gnu  src/lib/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/branches/physics/src/lib/graphics/Makefile.in

@@ -177 +177 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
+          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/branches/physics/src/lib/graphics/importer/Makefile.in

@@ -235 +235 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
+          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/branches/physics/src/lib/gui/Makefile.in

@@ -179 +179 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/gui/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/branches/physics/src/lib/gui/console/Makefile.in

@@ -205 +205 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/branches/physics/src/lib/gui/gui/Makefile.in

@@ -265 +265 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
+          $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/branches/physics/src/lib/util/substring.cc

@@ -22 +22 @@
 #include "substring.h"
 
+#include <string.h>
+#include <assert.h>
+
 SubString::SubString( const char* string)
 {
-        n = 0;
+  n = 0;
         
-        assert( string != NULL);
+  assert( string != NULL);
         
-        for( int i = 0; i < strlen(string); i++) if( string[i] == ',') n++;
+  for( int i = 0; i < strlen(string); i++) if( string[i] == ',') n++;
 
-        n += 1;
+  n += 1;
         
-        strings = new char*[n];
+  strings = new char*[n];
+
+  assert (strings != NULL);
         
-        assert( strings != NULL);
+  int i = 0;
+  int l = 0;
         
-        int i = 0;
-        int l = 0;
+  const char* offset = string;
+  char* end = strchr( string, ',');
+  while( end != NULL)
+    {
+      assert( i < n);
+      l = end - offset;
+      strings[i] = new char[l + 1];
+      assert( strings[i] != NULL);
+      strncpy( strings[i], offset, l);
+      strings[i][l] = 0;
+      i++;
+      end++;
+      offset = end;
+      end = strchr( offset, ',');
+    }
         
-        const char* offset = string;
-        char* end = strchr( string, ',');
-        while( end != NULL)
-        {
-                assert( i < n);
-                l = end - offset;
-                strings[i] = new char[l + 1];
-                assert( strings[i] != NULL);
-                strncpy( strings[i], offset, l);
-                strings[i][l] = 0;
-                i++;
-                end++;
-                offset = end;
-                end = strchr( offset, ',');
-        }
-        
-        strings[i] = new char[l + 1];
-        l = strlen( offset);
-        strncpy( strings[i], offset, l);
-        strings[i][l] = 0;
+  strings[i] = new char[l + 1];
+  l = strlen( offset);
+  strncpy( strings[i], offset, l);
+  strings[i][l] = 0;
 }
 
@@ -66 +69 @@
 SubString::~SubString()
 {
-        for( int i = 0; i < n; i++)
-        {
-                delete strings[i];
-        }
+  for( int i = 0; i < n; i++)
+    {
+      delete strings[i];
+    }
         
-        delete strings;
+  delete strings;
 }
 
@@ -78 +81 @@
    \returns the amount of substrings
 */
-int SubString::getN()
+int SubString::getCount()
 {
-        return n;
+  return n;
 }
 
@@ -90 +93 @@
 const char* SubString::getString( int i)
 {
-        if( i < n && i >= 0) return strings[i];
-        else return NULL;
+  if( i < n && i >= 0) return strings[i];
+  else return NULL;
 }

orxonox/branches/physics/src/lib/util/substring.h

@@ -1 +1 @@
 /*! 
-    \file substring.h
-    \brief a small class to get the parts of a string separated by commas
+  \file substring.h
+  \brief a small class to get the parts of a string separated by commas
 */
 
@@ -7 +7 @@
 #define _SUBSTRING_H
 
-#include "stdincl.h"
-
 class SubString
 {
-        public:
+ public:
         
-                SubString( const char* string);
-                ~SubString();
+  SubString( const char* string);
+  ~SubString();
                 
-                int getN();
-                const char* getString( int i);
+  int getCount();
+  const char* getString( int i);
                 
-        private:
-                char** strings;
-                int n;
+ private:
+  char** strings;
+  int n;
 };