Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5944 in orxonox.OLD


Ignore:
Timestamp:
Dec 6, 2005, 10:06:10 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: ini-parser in own subdir now (also moved tiXml-lib to lib/parser

Location:
trunk
Files:
4 added
18 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/configure.ac

    r5822 r5944  
    3434AM_INIT_AUTOMAKE
    3535
    36 AC_CONFIG_SRCDIR([src])
     36AC_CONFIG_SRCDIR([./src])
    3737AC_CONFIG_HEADER([config.h])
    3838
    … …  
    744744                 src/lib/gui/gtk_gui/Makefile
    745745                 src/lib/gui/gl_gui/Makefile
    746                  src/lib/tinyxml/Makefile
     746                 src/lib/parser/Makefile
     747                 src/lib/parser/tinyxml/Makefile
     748                 src/lib/parser/ini_parser/Makefile
    747749                 src/util/Makefile
    748750                 src/subprojects/Makefile

  • trunk/src/Makefile.am

    r5915 r5944  
    2121                       lib/collision_detection/libORXcd.a \
    2222                       lib/graphics/spatial_separation/libORXquadtree.a \
    23                        lib/tinyxml/libtinyxml.a \
     23                       lib/parser/tinyxml/libtinyxml.a \
     24                       lib/parser/ini_parser/libIniParser.a \
    2425                       lib/gui/gl_gui/libORXglgui.a \
    2526                       lib/shell/libORXshell.a
    … …  
    3637                lib/particles/libORXparticles.a \
    3738                lib/graphics/spatial_separation/libORXquadtree.a \
    38                 lib/tinyxml/libtinyxml.a \
     39                lib/parser/tinyxml/libtinyxml.a \
     40                lib/parser/ini_parser/libIniParser.a \
    3941                lib/gui/gl_gui/libORXglgui.a \
    4042                lib/shell/libORXshell.a \

  • trunk/src/defs/debug.h

    r5930 r5944  
    2727
    2828#include "confincl.h"
    29 #include "shell_buffer.h"
     29#ifndef NO_SHELL
     30 #include "shell_buffer.h"
     31#endif /* NO_SHELL */
    3032
    3133#include <stdio.h>

  • trunk/src/lib/Makefile.am

    r5822 r5944  
    1515                            network/libORXnet.a \
    1616                            graphics/spatial_separation/libORXquadtree.a \
    17                             tinyxml/libtinyxml.a \
     17                            parser/tinyxml/libtinyxml.a \
     18                            parser/ini_parser/libIniParser.a \
    1819                            shell/libORXshell.a
    1920
    … …  
    2930                            network/libORXnet.a \
    3031                            graphics/spatial_separation/libORXquadtree.a \
    31                             tinyxml/libtinyxml.a \
    3232                            shell/libORXshell.a \
    3333                            $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)
    … …  
    3737                        lang/base_object.cc \
    3838                        lang/class_list.cc \
    39                         util/ini_parser.cc \
    4039                        util/substring.cc \
    4140                        util/color.cc \
    … …  
    5352                        graphics/render2D/render_2d.h \
    5453                        lang/class_list.h \
    55                         util/ini_parser.h \
    5654                        util/substring.h \
    5755                        util/array.h \
    … …  
    7573          collision_detection \
    7674          network \
    77           tinyxml \
     75          parser \
    7876          shell \
    7977          gui \

  • trunk/src/lib/event/key_mapper.cc

    r5936 r5944  
    2424
    2525#include "globals.h"
    26 #include "ini_parser.h"
     26#include "parser/ini_parser/ini_parser.h"
    2727#include "key_names.h"
    2828#include "debug.h"

  • trunk/src/lib/graphics/graphics_engine.cc

    r5857 r5944  
    2626#include "debug.h"
    2727
    28 #include "ini_parser.h"
     28#include "parser/ini_parser/ini_parser.h"
    2929#include "substring.h"
    3030#include "text.h"

  • trunk/src/lib/graphics/light.cc

    r5750 r5944  
    2222#include "glincl.h"
    2323#include "vector.h"
    24 #include "tinyxml.h"
     24#include "parser/tinyxml/tinyxml.h"
    2525#include "load_param.h"
    2626#include "factory.h"

  • trunk/src/lib/graphics/render2D/element_2d.cc

    r5783 r5944  
    2323#include "graphics_engine.h"
    2424#include "load_param.h"
    25 #include "tinyxml.h"
     25#include "parser/tinyxml/tinyxml.h"
    2626#include "class_list.h"
    2727

  • trunk/src/lib/gui/gtk_gui/gui_exec.cc

    r5938 r5944  
    2727
    2828#include "resource_manager.h"
    29 #include "ini_parser.h"
     29#include "parser/ini_parser/ini_parser.h"
    3030
    3131#include <string.h>

  • trunk/src/lib/parser/ini_parser/ini_parser.cc

    r5943 r5944  
    2424#include <string.h>
    2525
    26 #if HAVE_CONFIG_H 
    27 #include <config.h> 
     26#if HAVE_CONFIG_H
     27#include <config.h>
    2828#endif
    2929
    3030#ifdef DEBUG
    31  #include "debug.h"
     31 #include "../../../defs/debug.h"
    3232#else
    3333 #define PRINTF(x) printf
    … …  
    6868  {
    6969     IniSection section = this->sections.front();
    70    
     70
    7171    // in all entries of the sections
    7272    while(!section.entries.empty())
    … …  
    107107
    108108/**
    109  * @brief opens a file to parse 
     109 * @brief opens a file to parse
    110110 * @param fileName: path and name of the new file to parse
    111111 * @return true on success false otherwise;
    … …  
    217217      {
    218218        fprintf(stream, "\n [%s]\n", (*section).name);
    219        
     219
    220220        std::list<IniEntry>::const_iterator entry;
    221221        for (entry = (*section).entries.begin(); entry != (*section).entries.end(); entry++)
    … …  
    316316bool IniParser::nextVar()
    317317{
    318   if ( this->sections.empty() 
     318  if ( this->sections.empty()
    319319       || this->currentSection == this->sections.end()
    320320       || this->currentEntry == (*this->currentSection).entries.end())
    … …  
    342342{
    343343  std::list<IniSection>::iterator section;
    344  
     344
    345345  if (sectionName != NULL)
    346346  {
    … …  
    402402    else
    403403      section = this->currentSection;
    404    
     404
    405405   if (section == this->sections.end())
    406406     {
    … …  
    414414        return (*entry).value;
    415415    PRINTF(2)("Entry '%s' in section '%s' not found.\n", entryName, sectionName);
    416    
     416
    417417  }
    418418  else
    … …  
    425425
    426426/**
    427  * @returns the name of the Current selected Section 
    428  */
    429 const char* IniParser::getCurrentSection() const 
     427 * @returns the name of the Current selected Section
     428 */
     429const char* IniParser::getCurrentSection() const
    430430{
    431431  if (!this->sections.empty() &&
    432       this->currentSection != this->sections.end()) 
     432      this->currentSection != this->sections.end())
    433433    return this->currentSection->name;
    434434  else
    … …  
    437437
    438438
    439 /** 
    440  * @returns the current entries Name, or NULL if we havn't selected a Entry 
     439/**
     440 * @returns the current entries Name, or NULL if we havn't selected a Entry
    441441 */
    442442const char* IniParser::getCurrentName() const
    … …  
    451451
    452452/**
    453  * @returns the current entries Value, or NULL if we havn't selected a Entry 
    454  */
    455 const char* IniParser::getCurrentValue() const 
     453 * @returns the current entries Value, or NULL if we havn't selected a Entry
     454 */
     455const char* IniParser::getCurrentValue() const
    456456{
    457457  if (!this->sections.empty() &&
    … …  
    460460    return (*this->currentEntry).value;
    461461  else
    462     return NULL; 
     462    return NULL;
    463463}
    464464

  • trunk/src/lib/particles/particle_engine.h

    r5447 r5944  
    1212#include "particle_emitter.h"
    1313
    14 #include "tinyxml.h"
     14#include "parser/tinyxml/tinyxml.h"
    1515
    1616// FORWARD DECLARATION

  • trunk/src/lib/particles/particle_system.cc

    r5750 r5944  
    3030#include "shell_command.h"
    3131
    32 #include "tinyxml.h"
     32#include "parser/tinyxml/tinyxml.h"
    3333
    3434CREATE_FACTORY(ParticleSystem, CL_PARTICLE_SYSTEM);

  • trunk/src/lib/physics/physics_engine.cc

    r5779 r5944  
    2020#include "class_list.h"
    2121#include "list.h"
    22 #include "tinyxml.h"
     22#include "parser/tinyxml/tinyxml.h"
    2323#include "factory.h"
    2424#include "load_param.h"

  • trunk/src/lib/sound/sound_engine.cc

    r5930 r5944  
    2727#include "resource_manager.h"
    2828#include "debug.h"
    29 #include "ini_parser.h"
     29#include "parser/ini_parser/ini_parser.h"
    3030#include "globals.h"
    3131

  • trunk/src/lib/util/executor/executor_specials.h

    r5754 r5944  
    1010
    1111#include "compiler.h"
    12 #include "tinyxml.h"
     12#include "parser/tinyxml/tinyxml.h"
    1313// FORWARD DECLARATION
    1414

  • trunk/src/orxonox.cc

    r5930 r5944  
    3333
    3434#include "world.h"
    35 #include "ini_parser.h"
     35#include "parser/ini_parser/ini_parser.h"
    3636#include "game_loader.h"
    3737

  • trunk/src/subprojects/framework.cc

    r5819 r5944  
    2424#include "resource_manager.h"
    2525#include "camera.h"
    26 #include "ini_parser.h"
     26#include "parser/ini_parser/ini_parser.h"
    2727#include "globals.h"
    2828

  • trunk/src/util/loading/factory.h

    r5750 r5944  
    2525class BaseObject;
    2626
    27 #include "tinyxml.h"
     27#include "parser/tinyxml/tinyxml.h"
    2828#include "base_object.h"
    2929#include "debug.h"

  • trunk/src/util/track/track_manager.cc

    r5767 r5944  
    2828
    2929
    30 #include "tinyxml.h"
     30#include "parser/tinyxml/tinyxml.h"
    3131#include "substring.h"
    3232
Note: See TracChangeset for help on using the changeset viewer.