Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4261 in orxonox.OLD for orxonox/trunk/src/lib


Ignore:
Timestamp:
May 22, 2005, 3:19:57 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the levelLoader-branche back into the trunk, because it seems to be stable.
merged with command:
svn merge -r 4230:HEAD levelLoader ../trunk
no conflicts of any interesst

Location:
orxonox/trunk/src/lib
Files:
1 deleted
8 edited
7 copied

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/lib/Makefile.in

    r4130 r4261  
    183183          esac; \
    184184        done; \
    185         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/Makefile'; \
     185        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/Makefile'; \
    186186        cd $(top_srcdir) && \
    187           $(AUTOMAKE) --foreign  src/lib/Makefile
     187          $(AUTOMAKE) --gnu  src/lib/Makefile
    188188.PRECIOUS: Makefile
    189189Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/graphics/Makefile.in

    r4130 r4261  
    177177          esac; \
    178178        done; \
    179         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/Makefile'; \
     179        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/Makefile'; \
    180180        cd $(top_srcdir) && \
    181           $(AUTOMAKE) --foreign  src/lib/graphics/Makefile
     181          $(AUTOMAKE) --gnu  src/lib/graphics/Makefile
    182182.PRECIOUS: Makefile
    183183Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/graphics/importer/Makefile.in

    r4130 r4261  
    235235          esac; \
    236236        done; \
    237         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile'; \
     237        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile'; \
    238238        cd $(top_srcdir) && \
    239           $(AUTOMAKE) --foreign  src/lib/graphics/importer/Makefile
     239          $(AUTOMAKE) --gnu  src/lib/graphics/importer/Makefile
    240240.PRECIOUS: Makefile
    241241Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/gui/Makefile.in

    r4130 r4261  
    179179          esac; \
    180180        done; \
    181         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/Makefile'; \
     181        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/Makefile'; \
    182182        cd $(top_srcdir) && \
    183           $(AUTOMAKE) --foreign  src/lib/gui/Makefile
     183          $(AUTOMAKE) --gnu  src/lib/gui/Makefile
    184184.PRECIOUS: Makefile
    185185Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/gui/console/Makefile.in

    r4130 r4261  
    205205          esac; \
    206206        done; \
    207         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile'; \
     207        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile'; \
    208208        cd $(top_srcdir) && \
    209           $(AUTOMAKE) --foreign  src/lib/gui/console/Makefile
     209          $(AUTOMAKE) --gnu  src/lib/gui/console/Makefile
    210210.PRECIOUS: Makefile
    211211Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/gui/gui/Makefile.in

    r4130 r4261  
    265265          esac; \
    266266        done; \
    267         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile'; \
     267        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile'; \
    268268        cd $(top_srcdir) && \
    269           $(AUTOMAKE) --foreign  src/lib/gui/gui/Makefile
     269          $(AUTOMAKE) --gnu  src/lib/gui/gui/Makefile
    270270.PRECIOUS: Makefile
    271271Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

  • orxonox/trunk/src/lib/lang/base_object.cc

    r3651 r4261  
    3939BaseObject::~BaseObject ()
    4040{
    41   delete []this->className;
     41  //  delete []this->className;
    4242}
    4343
    44 void BaseObject::setClassName (char* className)
     44void BaseObject::setClassName (const char* className)
    4545{
    46   this->className = new char[strlen(className)+1];
    47   strcpy(this->className, className);
    48 }
    49 
    50 char* BaseObject::getClassName(void) const
    51 {
    52   return className;
     46  this->className = className;
    5347}
    5448

  • orxonox/trunk/src/lib/lang/base_object.h

    r3651 r4261  
    1717  virtual ~BaseObject ();
    1818
    19   void setClassName (char* className);
    20   char* getClassName(void) const;
     19  void setClassName (const char* className);
     20  inline const char* getClassName(void) const { return this->className;};
    2121  bool isA (char* className);
    2222
    … …  
    2525
    2626 private:
    27   char* className;
     27  const char* className;
    2828  bool finalized;
    2929};
Note: See TracChangeset for help on using the changeset viewer.