Changeset 5549 in orxonox.OLD for trunk

Timestamp:

Nov 11, 2005, 5:21:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: cleanup of LoadParam

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• util/loading/load_param.cc (modified) (2 diffs)
• util/loading/load_param.h (modified) (1 diff)
• util/loading/load_param_description.cc (modified) (1 diff)
• util/loading/load_param_description.h (modified) (1 diff)

trunk/src/Makefile.am

@@ -135 +135 @@
 SUBDIRS = lib \
           util \
-          $(SUB_PROGS) \
-          .
+          . \
+          $(SUB_PROGS)
 
 

trunk/src/Makefile.in

@@ -90 +90 @@
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = lib util subprojects .
+DIST_SUBDIRS = lib util . subprojects
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -323 +323 @@
 SUBDIRS = lib \
           util \
-          $(SUB_PROGS) \
-          .
+          . \
+          $(SUB_PROGS)
 
 all: all-recursive

trunk/src/util/loading/load_param.cc

@@ -20 +20 @@
 
 #include "list.h"
-#include "base_object.h"
 
 #include <stdarg.h>
@@ -40 +39 @@
   this->pointerToParam = pointerToParam;
 
-  if (paramCount == 0 || this->pointerToParam)
+  if (paramCount == 0 || this->pointerToParam != NULL)
     this->loadString = "none";
   else

trunk/src/util/loading/load_param.h

@@ -23 +23 @@
 
 #include "functor_list.h"
-#include "base_object.h"
+
+#include "debug.h"
 
 #include "factory.h"
-#include "debug.h"
 #include "substring.h"
 #include "tinyxml.h"
+
 #include "helper_functions.h"
 

trunk/src/util/loading/load_param_description.cc

@@ -14 +14 @@
 */
 
-#include "functor_list.h"
-
 #include "load_param_description.h"
 #include "list.h"
-#include "base_object.h"
 #include <stdarg.h>
-
+#include "stdlibincl.h"
+#include "functor_list.h"
 
 /**

trunk/src/util/loading/load_param_description.h

@@ -22 +22 @@
 #define _LOAD_PARAM_DESCRIPTION_H
 
-#include "functor_list.h"
 #include "base_object.h"
-
-#include "factory.h"
-#include "debug.h"
-#include "substring.h"
-#include "tinyxml.h"
-#include "helper_functions.h"
 
 // Forward Declaration //