Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5549 in orxonox.OLD for trunk


Ignore:
Timestamp:
Nov 11, 2005, 5:21:31 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: cleanup of LoadParam

Location:
trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile.am

    r5463 r5549  
    135135SUBDIRS = lib \
    136136          util \
    137           $(SUB_PROGS) \
    138           .
     137          . \
     138          $(SUB_PROGS)
    139139
    140140
  • trunk/src/Makefile.in

    r5479 r5549  
    9090ETAGS = etags
    9191CTAGS = ctags
    92 DIST_SUBDIRS = lib util subprojects .
     92DIST_SUBDIRS = lib util . subprojects
    9393DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    9494ACLOCAL = @ACLOCAL@
     
    323323SUBDIRS = lib \
    324324          util \
    325           $(SUB_PROGS) \
    326           .
     325          . \
     326          $(SUB_PROGS)
    327327
    328328all: all-recursive
  • trunk/src/util/loading/load_param.cc

    r5546 r5549  
    2020
    2121#include "list.h"
    22 #include "base_object.h"
    2322
    2423#include <stdarg.h>
     
    4039  this->pointerToParam = pointerToParam;
    4140
    42   if (paramCount == 0 || this->pointerToParam)
     41  if (paramCount == 0 || this->pointerToParam != NULL)
    4342    this->loadString = "none";
    4443  else
  • trunk/src/util/loading/load_param.h

    r5546 r5549  
    2323
    2424#include "functor_list.h"
    25 #include "base_object.h"
     25
     26#include "debug.h"
    2627
    2728#include "factory.h"
    28 #include "debug.h"
    2929#include "substring.h"
    3030#include "tinyxml.h"
     31
    3132#include "helper_functions.h"
    3233
  • trunk/src/util/loading/load_param_description.cc

    r5546 r5549  
    1414*/
    1515
    16 #include "functor_list.h"
    17 
    1816#include "load_param_description.h"
    1917#include "list.h"
    20 #include "base_object.h"
    2118#include <stdarg.h>
    22 
     19#include "stdlibincl.h"
     20#include "functor_list.h"
    2321
    2422/**
  • trunk/src/util/loading/load_param_description.h

    r5546 r5549  
    2222#define _LOAD_PARAM_DESCRIPTION_H
    2323
    24 #include "functor_list.h"
    2524#include "base_object.h"
    26 
    27 #include "factory.h"
    28 #include "debug.h"
    29 #include "substring.h"
    30 #include "tinyxml.h"
    31 #include "helper_functions.h"
    3225
    3326// Forward Declaration //
Note: See TracChangeset for help on using the changeset viewer.