Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4746 in orxonox.OLD


Ignore:
Timestamp:
Jul 1, 2005, 12:48:48 PM (19 years ago)
Author:
bensch
Message:

orxonox/trunk: changed (void) → ()

Location:
orxonox/trunk/src
Files:
92 edited

Legend:

Unmodified
Added
Removed

  • orxonox/trunk/src/glmenu/glmenu_imagescreen.h

    r4597 r4746  
    2020  virtual ~GLMenuImageScreen ();
    2121
    22   void draw ();
     22  void draw();
    2323
    2424  void setBackgroundImage(const char* backImageName);
    … …  
    3232  void setMaximum (int maxValue);
    3333  /** \returns the maximum of countable steps*/
    34   inline int GLMenuImageScreen::getMaximum(void) const { return this->maxValue; };
     34  inline int GLMenuImageScreen::getMaximum() const { return this->maxValue; };
    3535
    3636  void setValue (int currentValue);
    37   int getValue ();
     37  int  getValue ();
    3838  void step ();
    3939

  • orxonox/trunk/src/lib/collision_detection/cd_engine.h

    r4710 r4746  
    3434
    3535 public:
    36   virtual ~CDEngine(void);
     36  virtual ~CDEngine();
    3737  /** \returns a Pointer to the only object of this Class */
    38   static CDEngine* getInstance(void) { if (!singletonRef) singletonRef = new CDEngine(); return singletonRef; }
     38  static CDEngine* getInstance() { if (!singletonRef) singletonRef = new CDEngine(); return singletonRef; }
    3939  void init();
    4040
    … …  
    5555
    5656 private:
    57   CDEngine(void);
     57  CDEngine();
    5858  static CDEngine* singletonRef;
    5959

  • orxonox/trunk/src/lib/collision_detection/lin_alg.h

    r4674 r4746  
    180180  private:
    181181    void ComputeEigenpair(int);
    182     void matrixUpdate(void);
    183     void getP(void);
    184     void printMatrix(void);
     182    void matrixUpdate();
     183    void getP();
     184    void printMatrix();
    185185
    186186  private:
    … …  
    330330}
    331331//
    332 void EVJacobi::printMatrix(void)
     332void EVJacobi::printMatrix()
    333333{
    334334  for (int i=1; i<=ndim; ++i)
    … …  
    339339}
    340340//
    341 void EVJacobi::matrixUpdate(void)
     341void EVJacobi::matrixUpdate()
    342342{
    343343  double a_new[NDIM][NDIM], vec_new[NDIM][NDIM];
    … …  
    404404//      ev[1] <= ev[2] <= ... <= ev[ndim].
    405405//
    406 void EVJacobi::getP(void)
     406void EVJacobi::getP()
    407407{
    408408  for (int i=1; i<=ndim; ++i) p[i] = i;

  • orxonox/trunk/src/lib/collision_detection/obb_tree_node.cc

    r4718 r4746  
    998998
    999999
    1000 void OBBTreeNode::debug(void) const
     1000void OBBTreeNode::debug() const
    10011001{
    10021002

  • orxonox/trunk/src/lib/collision_detection/obb_tree_node.h

    r4702 r4746  
    3838    virtual void drawBV(int depth, int drawMode);
    3939
    40     void debug(void) const;
     40    void debug() const;
    4141
    4242  private:

  • orxonox/trunk/src/lib/coord/p_node.h

    r4610 r4746  
    104104  inline void parentDirChanged () { this->bRelDirChanged = true; }
    105105  /** \returns the last calculated coordinate */
    106   inline Vector getLastAbsCoor(void) {return this->lastAbsCoordinate;}
     106  inline Vector getLastAbsCoor() {return this->lastAbsCoordinate;}
    107107
    108108

  • orxonox/trunk/src/lib/event/event_handler.h

    r4519 r4746  
    1919
    2020 public:
    21   virtual ~EventHandler(void);
     21  virtual ~EventHandler();
    2222  /** \returns a Pointer to the only object of this Class */
    23   inline static EventHandler* getInstance(void) { if (!singletonRef) singletonRef = new EventHandler();  return singletonRef; };
     23  inline static EventHandler* getInstance() { if (!singletonRef) singletonRef = new EventHandler();  return singletonRef; };
    2424  void init();
    2525
    … …  
    3434
    3535 private:
    36   EventHandler(void);
     36  EventHandler();
    3737 
    3838

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

    r4739 r4746  
    119119   \brief Sets the GL-attributes
    120120*/
    121 int GraphicsEngine::setGLattribs(void)
     121int GraphicsEngine::setGLattribs()
    122122{
    123123  // Set video mode
    … …  
    208208   this is a GL-Projection-mode, that is orthogonal, for placing the font in fron of everything else
    209209*/
    210 void GraphicsEngine::enter2DMode(void)
     210void GraphicsEngine::enter2DMode()
    211211{
    212212  GraphicsEngine::storeMatrices();
    … …  
    242242
    243243/**
    244    \brief leaves the 2DMode again also \see Font::enter2DMode(void)
    245 */
    246 void GraphicsEngine::leave2DMode(void)
     244   \brief leaves the 2DMode again also \see Font::enter2DMode()
     245*/
     246void GraphicsEngine::leave2DMode()
    247247{
    248248  glMatrixMode(GL_MODELVIEW);
    … …  
    258258   \brief stores the GL_matrices
    259259*/
    260 void GraphicsEngine::storeMatrices(void)
     260void GraphicsEngine::storeMatrices()
    261261{
    262262  glGetDoublev(GL_PROJECTION_MATRIX, GraphicsEngine::projMat);
    … …  
    277277   \brief outputs all the Fullscreen modes.
    278278*/
    279 void GraphicsEngine::listModes(void)
     279void GraphicsEngine::listModes()
    280280{
    281281  /* Get available fullscreen/hardware modes */

  • orxonox/trunk/src/lib/graphics/graphics_engine.h

    r4681 r4746  
    2727    virtual ~GraphicsEngine();
    2828    /** \returns a Pointer to the only object of this Class */
    29     inline static GraphicsEngine* getInstance(void) { if (!singletonRef) singletonRef = new GraphicsEngine();  return singletonRef; };
     29    inline static GraphicsEngine* getInstance() { if (!singletonRef) singletonRef = new GraphicsEngine();  return singletonRef; };
    3030
    3131    int initVideo();
    3232
    3333    void setWindowName(const char* windowName, const char* icon);
    34     int setGLattribs(void);
     34    int setGLattribs();
    3535    int setResolution(int width, int height, int bpp);
    3636    void setFullscreen(bool fullscreen = false);
    … …  
    3838
    3939    /** \returns the x resolution */
    40     inline int getResolutionX(void) const { return this->resolutionX; };
     40    inline int getResolutionX() const { return this->resolutionX; };
    4141    /** \returns the y resolution */
    42     inline int getResolutionY(void) const { return this->resolutionY; };
     42    inline int getResolutionY() const { return this->resolutionY; };
    4343    /** \returns the Bits Per Pixel */
    44     inline int getbbp(void) const { return this->bitsPerPixel; };
     44    inline int getbbp() const { return this->bitsPerPixel; };
    4545
    4646    int resolutionChanged(SDL_ResizeEvent* resizeInfo);
    4747
    48     static void enter2DMode(void);
    49     static void leave2DMode(void);
     48    static void enter2DMode();
     49    static void leave2DMode();
    5050
    51     static void storeMatrices(void);
     51    static void storeMatrices();
    5252    static GLdouble modMat[16];
    5353    static GLdouble projMat[16];
    … …  
    5757    void displayFPS(bool display);
    5858
    59     void listModes(void);
     59    void listModes();
    6060
    6161    /** \brief swaps the GL_BUFFERS */
    62     static void swapBuffers(void) { SDL_GL_SwapBuffers(); };
     62    static void swapBuffers() { SDL_GL_SwapBuffers(); };
    6363
    6464  public:

  • orxonox/trunk/src/lib/graphics/importer/array.h

    r4580 r4746  
    3232    ~Array();
    3333
    34     void finalizeArray (void);
     34    void finalizeArray ();
    3535    void addEntry (T entry);
    3636    void addEntry(T entry0, T entry1, T entry2);
    … …  
    3939    inline const T* getArray () const { return this->array; };
    4040    /**   \returns The Count of entries in the Array*/
    41     inline unsigned int getCount(void)const { return this->entryCount; };
    42     void debug(void) const ;
     41    inline unsigned int getCount()const { return this->entryCount; };
     42    void debug() const ;
    4343
    4444  private:
    … …  
    9797*/
    9898template<class T>
    99 void Array<T>::finalizeArray (void)
     99void Array<T>::finalizeArray ()
    100100{
    101101  PRINTF(4)("Finalizing array. Length: %i\n", entryCount);
    … …  
    157157*/
    158158template<class T>
    159 void Array<T>::debug (void) const
     159void Array<T>::debug () const
    160160{
    161161  PRINT(0)("entryCount=%i, address=%p\n", this->entryCount, this->array);

  • orxonox/trunk/src/lib/graphics/importer/material.cc

    r4584 r4746  
    6464   \brief sets the material with which the following Faces will be painted
    6565*/
    66 bool Material::select (void)
     66bool Material::select ()
    6767{
    6868  // setting diffuse color

  • orxonox/trunk/src/lib/graphics/importer/material.h

    r4584 r4746  
    2828  ~Material ();
    2929
    30   bool select (void);
     30  bool select ();
    3131
    3232  void setIllum (int illum);

  • orxonox/trunk/src/lib/graphics/importer/model.cc

    r4677 r4746  
    113113   actually does the same as the delete Operator, but does not delete the predecessing group
    114114*/
    115 void ModelGroup::cleanup(void)
     115void ModelGroup::cleanup()
    116116{
    117117  PRINTF(5)("Cleaning up group\n");
    … …  
    164164   Looks if any from model allocated space is still in use, and if so deleted it.
    165165*/
    166 Model::~Model(void)
     166Model::~Model()
    167167{
    168168  PRINTF(4)("Deleting Model ");
    … …  
    198198   \brief Finalizes an Object. This can be done outside of the Class.
    199199*/
    200 void Model::finalize(void)
     200void Model::finalize()
    201201{
    202202  // this creates the display List.
    … …  
    218218   It does this by just calling the Lists that must have been created earlier.
    219219*/
    220 void Model::draw (void) const
     220void Model::draw () const
    221221{
    222222  PRINTF(4)("drawing the 3D-Models\n");
    … …  
    292292   \brief deletes all the arrays
    293293*/
    294 bool Model::deleteArrays(void)
     294bool Model::deleteArrays()
    295295{
    296296  if (this->vertices)
    … …  
    310310   This funcion is needed, to delete all the Lists, and arrays that are no more needed because they are already imported into openGL. This will be applied at the end of the importing Process.
    311311*/
    312 bool Model::cleanup(void)
     312bool Model::cleanup()
    313313{
    314314  PRINTF(4)("cleaning up the 3D-Model to save Memory.\n");
    … …  
    702702   \brief reads and includes the Faces/Materials into the openGL state Machine
    703703*/
    704 bool Model::importToDisplayList(void)
     704bool Model::importToDisplayList()
    705705{
    706706  // finalize the Arrays
    … …  
    794794   \brief reads and includes the Faces/Materials into the openGL state Machine
    795795*/
    796 bool Model::importToVertexArray(void)
     796bool Model::importToVertexArray()
    797797{
    798798  // finalize the Arrays
    … …  
    857857   This will inject a Cube, because this is the most basic model.
    858858*/
    859 void Model::cubeModel(void)
     859void Model::cubeModel()
    860860{
    861861  this->addVertex (-0.5, -0.5, 0.5);

  • orxonox/trunk/src/lib/graphics/importer/model.h

    r4678 r4746  
    9999 public:
    100100  Model(const char* modelName = NULL, MODEL_TYPE type = MODEL_DISPLAY_LIST);
    101   virtual ~Model(void);
     101  virtual ~Model();
    102102
    103   void draw(void) const;
     103  void draw() const;
    104104  void draw(int groupNumber) const;
    105105  void draw(char* groupName) const;
    106106
    107107  /** \returns Count of the Models (Groups) in this File */
    108   inline int getGroupCount(void) const { return this->groupCount; };
     108  inline int getGroupCount() const { return this->groupCount; };
    109109
    110110  /** \returns a Pointer to the Vertex-Array, if it was deleted it returns NULL */
    111   inline const GLfloat* getVertexArray(void) const { return this->vertices->getArray(); };
     111  inline const GLfloat* getVertexArray() const { return this->vertices->getArray(); };
    112112  /** \returns the VertexCount of this Model */
    113   inline unsigned int getVertexCount(void) const { return this->vertexCount; };
     113  inline unsigned int getVertexCount() const { return this->vertexCount; };
    114114
    115115  /** \returns a Pointer to the Normals-Array, if it was deleted it returns NULL */
    116   inline const GLfloat* getNormalsArray(void) const { return this->normals->getArray(); };
     116  inline const GLfloat* getNormalsArray() const { return this->normals->getArray(); };
    117117  /** \returns the NormalsCount of this Model */
    118   inline unsigned int getNormalsCount(void) const { return this->normalCount; };
     118  inline unsigned int getNormalsCount() const { return this->normalCount; };
    119119
    120120  /** \returns a Pointer to the TexCoord-Array, if it was deleted it returns NULL */
    121   inline const GLfloat* getTexCoordArray(void) const { return this->vTexture->getArray(); };
     121  inline const GLfloat* getTexCoordArray() const { return this->vTexture->getArray(); };
    122122  /** \returns the TexCoord-Count of this Model */
    123   inline unsigned int getTexCoordCount(void) const { return this->texCoordCount; };
     123  inline unsigned int getTexCoordCount() const { return this->texCoordCount; };
    124124
    125125  /** \returns the Count of Faces of this Model */
    … …  
    141141  bool setMaterial(const char* mtlString);
    142142  bool setMaterial(Material* mtl);
    143   void finalize(void);
     143  void finalize();
    144144
    145145
    146146 protected:
    147   void cubeModel(void);
     147  void cubeModel();
    148148
    149149  Material* findMaterialByName(const char* materialName);
    … …  
    154154
    155155 private:
    156   bool buildVertexNormals(void);
     156  bool buildVertexNormals();
    157157
    158   bool importToDisplayList(void);
     158  bool importToDisplayList();
    159159  bool addGLElement(ModelFaceElement* elem);
    160160
    161   bool importToVertexArray(void);
     161  bool importToVertexArray();
    162162
    163   bool deleteArrays(void);
    164   bool cleanup(void);
     163  bool deleteArrays();
     164  bool cleanup();
    165165
    166166 private:

  • orxonox/trunk/src/lib/graphics/importer/texture.cc

    r4662 r4746  
    4343   Frees Data, and deletes the textures from GL
    4444*/
    45 Texture::~Texture(void)
     45Texture::~Texture()
    4646{
    4747  if (this->texture)

  • orxonox/trunk/src/lib/graphics/importer/texture.h

    r4466 r4746  
    2525  //  Texture(TEXTURE_TYPE type, int resolution);
    2626
    27   ~Texture(void);
     27  ~Texture();
    2828
    2929  /** \returns The textureID of this texture.  */
    30   inline GLuint getTexture(void) {return this->texture;}
     30  inline GLuint getTexture() {return this->texture;}
    3131  GLuint loadTexToGL (SDL_Surface* surface);
    3232  /** \returns true if texture has alpha, false otherwise */
    33   inline bool hasAlpha(void) const {return bAlpha;}
     33  inline bool hasAlpha() const {return bAlpha;}
    3434
    3535  bool loadImage(const char* imageName);

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

    r4739 r4746  
    7373   \brief destroys a Light
    7474*/
    75 Light::~Light(void)
     75Light::~Light()
    7676{
    7777  glDisable(lightsV[this->lightNumber]);
    … …  
    181181   \brief draws this Light. Being a World-entity the possibility to do this lies at hand.
    182182*/
    183 void Light::draw(void) const
     183void Light::draw() const
    184184{
    185185  float pos[4] = {this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z, 1.0};
    … …  
    192192   \brief Prints out some nice formated debug information about the Light
    193193*/
    194 void Light::debug(void) const
     194void Light::debug() const
    195195{
    196196  PRINT(0)(":: %d ::  -- reference %p\n", this->lightNumber, this);
    … …  
    348348   \brief outputs debug information about the Class and its lights
    349349*/
    350 void LightManager::debug(void) const
     350void LightManager::debug() const
    351351{
    352352  PRINT(0)("=================================\n");

  • orxonox/trunk/src/lib/graphics/light.h

    r4738 r4746  
    2727 public:
    2828  Light(const TiXmlElement* root = NULL);
    29   virtual ~Light(void);
     29  virtual ~Light();
    3030
    3131  void loadParams(const TiXmlElement* root);
    … …  
    3939
    4040  /** \returns the lightNumber*/
    41   int getLightNumber(void) const {return this->lightNumber;}
     41  int getLightNumber() const {return this->lightNumber;}
    4242
    4343  virtual void draw() const;
    4444
    45   void debug(void) const;
     45  void debug() const;
    4646
    4747  // attributes
    … …  
    8484
    8585   for some nice output just use:
    86    \li void debug(void) const; (either on LightManager for a resume or on any Light for single information.)
     86   \li void debug() const; (either on LightManager for a resume or on any Light for single information.)
    8787*/
    8888class LightManager : public BaseObject
    … …  
    9191
    9292 public:
    93   virtual ~LightManager(void);
     93  virtual ~LightManager();
    9494  /** \returns a Pointer to the only object of this Class */
    95   inline static LightManager* getInstance(void) { if (!singletonRef) singletonRef = new LightManager();  return singletonRef; };
     95  inline static LightManager* getInstance() { if (!singletonRef) singletonRef = new LightManager();  return singletonRef; };
    9696
    9797  void loadParams(const TiXmlElement* root);
    … …  
    105105  void draw() const;
    106106
    107   void debug(void) const;
     107  void debug() const;
    108108
    109109 private:
    110   LightManager(void);
     110  LightManager();
    111111
    112112  int  registerLight(Light* light);

  • orxonox/trunk/src/lib/graphics/text_engine.cc

    r4709 r4746  
    7171   This also ereases the text from the textList of the TextEngine
    7272*/
    73 Text::~Text(void)
     73Text::~Text()
    7474{
    7575  TextEngine::getInstance()->deleteText(this);
    … …  
    167167   this is only for TEXT_STATIC-mode
    168168*/
    169 void Text::createTexture(void)
     169void Text::createTexture()
    170170{
    171171  SDL_Surface* tmpSurf;
    … …  
    187187   \brief draws the Font
    188188*/
    189 void Text::draw(void) const
     189void Text::draw() const
    190190{
    191191  // setting the Position of this Text.
    … …  
    271271   \brief prints out some nice debug information about this text
    272272*/
    273 void Text::debug(void) const
     273void Text::debug() const
    274274{
    275275  PRINT(0)("=== TEXT: %s ===\n", this->text);
    … …  
    415415   \brief destructs a font
    416416*/
    417 Font::~Font(void)
     417Font::~Font()
    418418{
    419419  // deleting the List of all Texts
    … …  
    509509   \returns the maximum height of the Font, if the font was initialized, 0 otherwise
    510510*/
    511 int Font::getMaxHeight(void)
     511int Font::getMaxHeight()
    512512{
    513513  if (likely (this->font != NULL))
    … …  
    522522   the ascent is the pixels of the font above the baseline
    523523*/
    524 int Font::getMaxAscent(void)
     524int Font::getMaxAscent()
    525525{
    526526  if (likely(this->font != NULL))
    … …  
    535535   the descent is the pixels of the font below the baseline
    536536*/
    537 int Font::getMaxDescent(void)
     537int Font::getMaxDescent()
    538538{
    539539  if (likely(this->font != NULL))
    … …  
    568568}
    569569
    570 GLuint Font::createFastTexture(void)
     570GLuint Font::createFastTexture()
    571571{
    572572  /* interesting GLYPHS:
    … …  
    730730   openGL-version < 1.2 compatibility ( and because it is realy easy like this :))
    731731*/
    732 int Font::findOptimalFastTextureSize(void)
     732int Font::findOptimalFastTextureSize()
    733733{
    734734  int i;
    … …  
    775775   \brief a simple function to get some interesting information about this class
    776776*/
    777 void Font::debug(void)
     777void Font::debug()
    778778{
    779779  // print the loaded font's style
    … …  
    832832   \brief function to enable TTF_Fonts
    833833*/
    834 void TextEngine::enableFonts(void)
     834void TextEngine::enableFonts()
    835835{
    836836  if (!TTF_WasInit())
    … …  
    848848   \brief function to disable TTF_fonts
    849849*/
    850 void TextEngine::disableFonts(void)
     850void TextEngine::disableFonts()
    851851{
    852852  if (TTF_WasInit())
    … …  
    900900   \brief deletes all the Text, and tries to delete all allocated fonts
    901901*/
    902 void TextEngine::flush(void)
     902void TextEngine::flush()
    903903{
    904904  tIterator<Text>* textIterator = textList->getIterator();
    … …  
    915915   \brief draws all the Texts that have been initialized
    916916*/
    917 void TextEngine::draw(void) const
     917void TextEngine::draw() const
    918918{
    919919  // entering 3D-mode
    … …  
    937937   \todo there should also be something outputted about Font
    938938*/
    939 void TextEngine::debug(void) const
     939void TextEngine::debug() const
    940940{
    941941  PRINT(0)("+-------------------------------+\n");
    … …  
    960960   \returns true if match, false otherwise
    961961*/
    962 bool TextEngine::checkVersion(void)
     962bool TextEngine::checkVersion()
    963963{
    964964  SDL_version compile_version;

  • orxonox/trunk/src/lib/graphics/text_engine.h

    r4662 r4746  
    108108  friend class TextEngine;
    109109 public:
    110   ~Text(void);
     110  ~Text();
    111111
    112112  void setBindNode(PNode* bindNode);
    … …  
    124124  void createTexture();
    125125
    126   void draw(void) const;
    127 
    128   void debug(void) const;
     126  void draw() const;
     127
     128  void debug() const;
    129129
    130130 private:
    … …  
    175175
    176176  /** \returns a Pointer to the Array of Glyphs */
    177   inline Glyph** getGlyphArray(void) const {return glyphArray;}
     177  inline Glyph** getGlyphArray() const {return glyphArray;}
    178178  /** \returns the texture to the fast-texture */
    179   inline GLuint getFastTextureID(void) const {return fastTextureID;}
    180 
    181  private:
    182   int getMaxHeight(void);
    183   int getMaxAscent(void);
    184   int getMaxDescent(void);
     179  inline GLuint getFastTextureID() const {return fastTextureID;}
     180
     181 private:
     182  int getMaxHeight();
     183  int getMaxAscent();
     184  int getMaxDescent();
    185185  Glyph* getGlyphMetrics(Uint16 character);
    186186
    … …  
    188188
    189189  void initGlyphs(Uint16 from, Uint16 count);
    190   int findOptimalFastTextureSize(void);
    191 
    192   void debug(void);
     190  int findOptimalFastTextureSize();
     191
     192  void debug();
    193193
    194194 private:
    … …  
    216216{
    217217 public:
    218   virtual ~TextEngine(void);
     218  virtual ~TextEngine();
    219219  /** \returns a Pointer to the only object of this Class */
    220   inline static TextEngine* getInstance(void) { if (!singletonRef) singletonRef = new TextEngine();  return singletonRef; };
     220  inline static TextEngine* getInstance() { if (!singletonRef) singletonRef = new TextEngine();  return singletonRef; };
    221221
    222222  Text* createText(const char* fontFile,
    … …  
    228228
    229229  void deleteText(Text* text);
    230   void flush(void);
    231 
    232   void draw(void) const;
    233 
    234   void debug(void) const;
    235 
    236  private:
    237   TextEngine(void);
     230  void flush();
     231
     232  void draw() const;
     233
     234  void debug() const;
     235
     236 private:
     237  TextEngine();
    238238  static TextEngine* singletonRef;
    239239
    240240  // general
    241   static void enableFonts(void);
    242   static void disableFonts(void);
    243   static bool checkVersion(void);
     241  static void enableFonts();
     242  static void disableFonts();
     243  static bool checkVersion();
    244244
    245245 private:

  • orxonox/trunk/src/lib/gui/gui.cc

    r4427 r4746  
    123123   \brief starts the OrxonoxGUI
    124124*/
    125 void Gui::startGui(void)
     125void Gui::startGui()
    126126{
    127127  mainloopGUI();
    … …  
    145145   \brief Destructor.
    146146*/
    147 Gui::~Gui(void)
     147Gui::~Gui()
    148148{
    149149  delete video;

  • orxonox/trunk/src/lib/gui/gui.h

    r4427 r4746  
    2424 public:
    2525  Gui(int argc, char *argv[]);
    26   ~Gui(void);
     26  ~Gui();
    2727
    28   void startGui(void);
    29   void printHelp(void);
     28  void startGui();
     29  void printHelp();
    3030
    3131  static bool startOrxonox;

  • orxonox/trunk/src/lib/gui/gui_audio.cc

    r4427 r4746  
    3131   \brief Creates an Audio-Frame
    3232*/
    33 GuiAudio::GuiAudio(void)
     33GuiAudio::GuiAudio()
    3434{
    3535  Frame* audioFrame;        //!< The Frame that holds the audio Options.
    … …  
    7474    \brief Destructs the Audio-Stuff
    7575*/
    76 GuiAudio::~GuiAudio(void)
     76GuiAudio::~GuiAudio()
    7777{
    7878  // nothing to do here.

  • orxonox/trunk/src/lib/gui/gui_audio.h

    r4427 r4746  
    1313{
    1414 public:
    15   GuiAudio(void);
    16   ~GuiAudio(void);
     15  GuiAudio();
     16  ~GuiAudio();
    1717};
    1818#endif /* _GUI_AUDIO_H */

  • orxonox/trunk/src/lib/gui/gui_banner.cc

    r4427 r4746  
    3434   \brief Creates a new BannerEventBox and its content.
    3535*/
    36 GuiBanner::GuiBanner(void)
     36GuiBanner::GuiBanner()
    3737{
    3838  // the banner Frame
    … …  
    9292   \brief Destructs it.
    9393*/
    94 GuiBanner::~GuiBanner(void)
     94GuiBanner::~GuiBanner()
    9595{
    9696  // nothing to do here

  • orxonox/trunk/src/lib/gui/gui_banner.h

    r4427 r4746  
    1515{
    1616 public:
    17   GuiBanner(void);
    18   ~GuiBanner(void);
     17  GuiBanner();
     18  ~GuiBanner();
    1919};
    2020

  • orxonox/trunk/src/lib/gui/gui_element.h

    r4427 r4746  
    1818 
    1919  /** \returns the main Widget of this GuiElement. */
    20   Widget* getWidget(void) {return this->mainWidget;}
     20  Widget* getWidget() {return this->mainWidget;}
    2121 protected:
    2222  void setMainWidget(Widget* widget);

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

    r4427 r4746  
    4141    \brief Creates the Exec-Frame
    4242*/
    43 GuiExec::GuiExec(void)
     43GuiExec::GuiExec()
    4444{
    4545  Frame* execFrame;            //!< The Frame that holds the ExecutionOptions.
    … …  
    133133   \brief Destructs the Execution-stuff
    134134*/
    135 GuiExec::~GuiExec(void)
     135GuiExec::~GuiExec()
    136136{
    137137  if(this->confFile)
    … …  
    178178   \returns The name of the Configuration-File
    179179*/
    180 const char* GuiExec::getConfigFile(void) const
     180const char* GuiExec::getConfigFile() const
    181181{
    182182  return this->confFile;

  • orxonox/trunk/src/lib/gui/gui_exec.h

    r4427 r4746  
    3333
    3434 public:
    35   GuiExec(void);
    36   ~GuiExec(void);
     35  GuiExec();
     36  ~GuiExec();
    3737 
    3838  void setConfDir(const char* confDir);
    3939  void setConfFile(const char* confFile);
    40   const char* getConfigFile(void) const;
    41   int shouldsave(void);
     40  const char* getConfigFile() const;
     41  int shouldsave();
    4242  void writeToFile(Widget* widget);
    4343  void writeFileText(Widget* widget, int depth);

  • orxonox/trunk/src/lib/gui/gui_flags.cc

    r4427 r4746  
    2929   \brief Creates the Flags-Frame
    3030*/
    31 GuiFlags::GuiFlags(void)
     31GuiFlags::GuiFlags()
    3232{
    3333  this->flagsFrame = new Frame("Orxonox-Startup-Flags:");
    … …  
    4848   \brief Destructs the Flags-stuff
    4949*/
    50 GuiFlags::~GuiFlags(void)
     50GuiFlags::~GuiFlags()
    5151{
    5252  // nothing to do here

  • orxonox/trunk/src/lib/gui/gui_flags.h

    r4427 r4746  
    2121
    2222 public:
    23   GuiFlags(void);
    24   ~GuiFlags(void);
     23  GuiFlags();
     24  ~GuiFlags();
    2525
    2626  void setTextFromFlags(Widget* widget);

  • orxonox/trunk/src/lib/gui/gui_gtk.cc

    r4427 r4746  
    6666   \brief enters the GUI's main-loop
    6767*/
    68 bool mainloopGUI(void)
     68bool mainloopGUI()
    6969{
    7070#ifdef HAVE_GTK2
    … …  
    146146   \brief constructs a Widget
    147147*/
    148 Widget::Widget(void)
     148Widget::Widget()
    149149{
    150150  next = NULL;
    … …  
    156156   This is still pretty crappy.
    157157*/
    158 Widget::~Widget(void)
     158Widget::~Widget()
    159159{
    160160  if (this->title)
    … …  
    190190   \brief makes the widget visible.
    191191*/
    192 void Widget::show(void)
     192void Widget::show()
    193193{
    194194#ifdef HAVE_GTK2
    … …  
    200200   \brief hides the widget.
    201201*/
    202 void Widget::hide(void)
     202void Widget::hide()
    203203{
    204204#ifdef HAVE_GTK2
    … …  
    571571   \brief Constructs a Packer
    572572*/
    573 Packer::Packer(void)
     573Packer::Packer()
    574574{
    575575  this->down = NULL;
    … …  
    580580   \brief Destroys a Packer.
    581581*/
    582 Packer::~Packer(void)
     582Packer::~Packer()
    583583{
    584584  PRINTF(5)("deleting the Packer part.\n");
    … …  
    611611   sets the Container-Specific defaults.
    612612*/
    613 Container::Container(void)
     613Container::Container()
    614614{
    615615  this->optionType = GUI_CONTAINER;
    … …  
    619619   \brief Destroys a Container.
    620620*/
    621 Container::~Container(void)
     621Container::~Container()
    622622{
    623623  PRINTF(5)("deleting the Container part.\n");
    … …  
    694694   \brief Destructs a Window.
    695695*/
    696 Window::~Window(void)
     696Window::~Window()
    697697{
    698698  PRINTF(5)("deleting the Window: %s\n", this->title);
    … …  
    725725   \brief Shows all Widgets that are included within this->widget.
    726726*/
    727 void Window::showall(void)
     727void Window::showall()
    728728{
    729729#ifdef HAVE_GTK2
    … …  
    753753   \brief opens up a Window and fixes the Focus to it
    754754*/
    755 void Window::open(void)
     755void Window::open()
    756756{
    757757  if (this != mainWindow)
    … …  
    768768   \brief closes up a Window and removes the Focus from it
    769769*/
    770 void Window::close(void)
     770void Window::close()
    771771{
    772772  if (this != mainWindow)
    … …  
    831831   \brief destrcucts a Frame
    832832*/
    833 Frame::~Frame(void)
     833Frame::~Frame()
    834834{
    835835  PRINTF(5)("deleting the Frame: %s\n", this->title);
    … …  
    872872   \brief destructs an EventBox.
    873873*/
    874 EventBox::~EventBox(void)
     874EventBox::~EventBox()
    875875{
    876876  PRINTF(5)("deleting the EventBox: %s\n", this->title);
    … …  
    899899   \brief destructs a Box.
    900900*/
    901 Box::~Box(void)
     901Box::~Box()
    902902{
    903903  PRINTF(5)("deleting the Box: %s\n", this->title);
    … …  
    934934   sets all Option-Specific-Values to their defaults.
    935935*/
    936 Option::Option(void)
     936Option::Option()
    937937{
    938938  this->value = 0;
    … …  
    950950   \brief Destroys an Option.
    951951*/
    952 Option::~Option(void)
     952Option::~Option()
    953953{
    954954  PRINTF(5)("deleting the Option Part.\n");
    … …  
    10511051   this is a default Option save
    10521052*/
    1053 char* Option::save(void)
     1053char* Option::save()
    10541054{
    10551055  char* value = new char [30];
    … …  
    10721072   \returns The saveable-state.
    10731073*/
    1074 bool Option::isSaveable(void)
     1074bool Option::isSaveable()
    10751075{
    10761076  return this->saveable;
    … …  
    11141114   \brief destructs a Button.
    11151115*/
    1116 Button::~Button(void)
     1116Button::~Button()
    11171117{
    11181118  PRINTF(5)("deleting the Label: %s\n", this->title);
    … …  
    11381138   \todo not implemented yet
    11391139*/
    1140 void Button::redraw(void)
     1140void Button::redraw()
    11411141{
    11421142}
    … …  
    11471147   \todo Actions for non-GTK-mode
    11481148*/
    1149 void Button::changeOption(void)
     1149void Button::changeOption()
    11501150{
    11511151  // This will possibly be used for ACTIONS !
    … …  
    11781178   \brief destructs a CheckButton.
    11791179*/
    1180 CheckButton::~CheckButton(void)
     1180CheckButton::~CheckButton()
    11811181{
    11821182  if (this->title)
    … …  
    12041204   \returns the Active state of the checkButton
    12051205*/
    1206 bool CheckButton::isActive(void)
     1206bool CheckButton::isActive()
    12071207{
    12081208#ifdef HAVE_GTK2
    … …  
    12141214   \brief Changed the Option, call this Function
    12151215*/
    1216 void CheckButton::changeOption(void)
     1216void CheckButton::changeOption()
    12171217{
    12181218#ifdef HAVE_GTK2
    … …  
    12341234   Example: if new settings are loaded the Button must be redrawn for the GUI to display that Change
    12351235*/
    1236 void CheckButton::redraw(void)
     1236void CheckButton::redraw()
    12371237{
    12381238#ifdef HAVE_GTK2
    … …  
    12701270   \brief destructs a Slider.
    12711271*/
    1272 Slider::~Slider(void)
     1272Slider::~Slider()
    12731273{
    12741274  PRINTF(5)("deleting the Slider: %s\n", this->title);
    … …  
    12981298/**
    12991299   \brief Redraws the widget
    1300    Example: see void CheckButton::redraw(void)
    1301 */
    1302 void Slider::redraw(void)
     1300   Example: see void CheckButton::redraw()
     1301*/
     1302void Slider::redraw()
    13031303{
    13041304#ifdef HAVE_GTK2
    … …  
    13101310   \brief Changed the Option, call this Function
    13111311*/
    1312 void Slider::changeOption(void)
     1312void Slider::changeOption()
    13131313{
    13141314#ifdef HAVE_GTK2
    … …  
    13281328}
    13291329
    1330 char* Slider::save(void)
     1330char* Slider::save()
    13311331{
    13321332  char* value = new char [30];
    … …  
    13801380   \brief destructs a Menu.
    13811381*/
    1382 Menu::~Menu(void)
     1382Menu::~Menu()
    13831383{
    13841384  PRINTF(5)("deleting the Menu: %s\n", this->title);
    … …  
    14011401   \brief Initializes a new Menu with no items
    14021402*/
    1403 void Menu::init(void)
     1403void Menu::init()
    14041404{
    14051405  this->optionType = GUI_INT;
    … …  
    14181418   \returns the name of the selected Menu-Item
    14191419*/
    1420 char* Menu::save(void)
     1420char* Menu::save()
    14211421{
    14221422  MenuItem* tmpItem = this->firstItem;
    … …  
    14911491/**
    14921492   \brief Redraws the widget
    1493    Example: see void CheckButton::redraw(void)
    1494 */
    1495 void Menu::redraw(void)
     1493   Example: see void CheckButton::redraw()
     1494*/
     1495void Menu::redraw()
    14961496{
    14971497#ifdef HAVE_GTK2
    … …  
    15031503   \brief Changed the Option, call this Function
    15041504*/
    1505 void Menu::changeOption(void)
     1505void Menu::changeOption()
    15061506{
    15071507#ifdef HAVE_GTK2
    … …  
    15401540   \brief destructs an OptionLabel.
    15411541*/
    1542 OptionLabel::~OptionLabel(void)
     1542OptionLabel::~OptionLabel()
    15431543{
    15441544  PRINTF(5)("deleting the OptionLabel: %s\n", this->title);
    … …  
    15641564   \brief Redraws an OptionLabel(not implemented yet, but it works).
    15651565*/
    1566 void OptionLabel::redraw(void)
     1566void OptionLabel::redraw()
    15671567{
    15681568#ifdef HAVE_GTK2
    … …  
    15741574   \brief Changed the Option, call this Function
    15751575*/
    1576 void OptionLabel::changeOption(void)
     1576void OptionLabel::changeOption()
    15771577{
    15781578#ifdef HAVE_GTK2
    … …  
    15921592   \returns the String to save.
    15931593*/
    1594 char* OptionLabel::save(void)
     1594char* OptionLabel::save()
    15951595{
    15961596  return cValue;
    … …  
    16301630   \brief destructs a Label.
    16311631*/
    1632 Label::~Label(void)
     1632Label::~Label()
    16331633{
    16341634  PRINTF(5)("deleting the Label: %s\n", this->title);
    … …  
    16531653   \brief ereases the Text of a Label
    16541654*/
    1655 void Label::ereaseText(void)
     1655void Label::ereaseText()
    16561656{
    16571657  this->setTitle("");
    … …  
    16981698   \return The Text the Label holds.
    16991699*/
    1700 const char* Label::getText(void)
     1700const char* Label::getText()
    17011701{
    17021702  return this->title;
    … …  
    17281728   \brief destructs a ProgressBar
    17291729*/
    1730 ProgressBar::~ProgressBar(void)
     1730ProgressBar::~ProgressBar()
    17311731{
    17321732  PRINTF(5)("deleting the ProgressBar: %s\n", this->title);
    … …  
    17621762    \brief returns the Progress Status
    17631763*/
    1764 double ProgressBar::getProgress(void)
     1764double ProgressBar::getProgress()
    17651765{
    17661766  return this->progress;
    … …  
    18001800   \brief destructs an Image.
    18011801*/
    1802 Image::~Image(void)
     1802Image::~Image()
    18031803{
    18041804  PRINTF(5)("deleting the Image: %s\n", this->title);
    … …  
    18611861   \brief destructs a FileDialog
    18621862*/
    1863 FileDialog::~FileDialog(void)
     1863FileDialog::~FileDialog()
    18641864{
    18651865  PRINTF(5)("deleting FileDialog %s\n", this->title);
    … …  
    19031903   \brief disables the File Operator Buttons
    19041904*/
    1905 void FileDialog::disableFileOpts(void)
     1905void FileDialog::disableFileOpts()
    19061906{
    19071907#ifdef HAVE_GTK2
    … …  
    19131913   \brief The ok-button has been pressed
    19141914*/
    1915 void FileDialog::okEvent(void)
     1915void FileDialog::okEvent()
    19161916{
    19171917  if (this->okFunc)
    … …  
    19361936   \biref opens up the FileDialog-Window
    19371937*/
    1938 void FileDialog::open(void)
     1938void FileDialog::open()
    19391939{
    19401940  isOpen = true;
    … …  
    19481948   \closes the FileDialog-Window
    19491949*/
    1950 void FileDialog::close(void)
     1950void FileDialog::close()
    19511951{
    19521952  this->isOpen = false;

  • orxonox/trunk/src/lib/gui/gui_gtk.h

    r4427 r4746  
    4545
    4646bool initGUI(int argc, char* argv[]);
    47 bool mainloopGUI(void);
     47bool mainloopGUI();
    4848
    4949//! This is the topmost object that can be displayed all others are derived from it.
    … …  
    5353
    5454 public:
    55   Widget(void);
    56   virtual ~Widget(void);
    57 
    58   void show(void);
    59   void hide(void);
     55  Widget();
     56  virtual ~Widget();
     57
     58  void show();
     59  void hide();
    6060  void setSize(int width, int height);
    6161
    6262  virtual void setTitle(const char* title);  //!< An abstract Function, that sets the title of Widgets.
    63   virtual const char* getTitle(void) const { return this->title; };
     63  virtual const char* getTitle() const { return this->title; };
    6464
    6565  Widget* findWidgetByName(char* name, unsigned int depth);
    … …  
    115115{
    116116 public:
    117   Packer(void);
    118   virtual ~Packer(void);
     117  Packer();
     118  virtual ~Packer();
    119119
    120120  Widget* down;                      //!< this points to the Widget below this.
    … …  
    123123  void setGroupName(const char* name);
    124124  /** \returns the GroupName if existent NULL otherwise */
    125   inline const char* getGroupName(void) const {return this->groupName;}
     125  inline const char* getGroupName() const {return this->groupName;}
    126126
    127127
    … …  
    142142 
    143143 public:
    144   Container(void);
    145   virtual ~Container(void);
     144  Container();
     145  virtual ~Container();
    146146
    147147  void setBorderWidth(int borderwidth);
    … …  
    163163
    164164  Window(const char* windowName = NULL);
    165   virtual ~Window(void);
     165  virtual ~Window();
    166166 
    167167  virtual void setTitle(const char* title);
    168   void showall(void);
    169   void open(void);
    170   void close(void);
     168  void showall();
     169  void open();
     170  void close();
    171171
    172172#ifdef HAVE_GTK2
    … …  
    189189 public:
    190190  Frame(const char* frameName = NULL);
    191   virtual ~Frame(void);
     191  virtual ~Frame();
    192192
    193193  virtual void setTitle(const char* title);
    … …  
    202202 public:
    203203  EventBox(const char* eventBoxName = NULL);
    204   virtual ~EventBox(void);
     204  virtual ~EventBox();
    205205};
    206206
    … …  
    215215 public:
    216216  Box(char boxtype = 'h');
    217   virtual ~Box(void);
     217  virtual ~Box();
    218218 
    219219  virtual void fill(Widget* lowerWidget);
    … …  
    230230 
    231231 public:
    232   Option(void);
    233   virtual ~Option(void);
     232  Option();
     233  virtual ~Option();
    234234
    235235  int value;                  //!< every option has a value either true or false(0,1) or something else like 25 for 25% of the volume
    … …  
    242242
    243243  void saveability(bool isSaveable = true);
    244   virtual char* save(void);
     244  virtual char* save();
    245245  virtual void load(char* loadString);
    246246
    247   bool isSaveable(void);
     247  bool isSaveable();
    248248  void setDefaultValue(int defaultValue);
    249249  void setFlagName(const char* flagname, int defaultvalue);
    … …  
    251251  void setDescription(const char* shortDescription, const char* longDescription = NULL);
    252252
    253   virtual void redraw(void) = 0;       //!< A Option must be able to redraw itself.
    254   virtual void changeOption(void) = 0; //!< What to do, if an Option is Changed. eacht option decides for itself.
     253  virtual void redraw() = 0;       //!< A Option must be able to redraw itself.
     254  virtual void changeOption() = 0; //!< What to do, if an Option is Changed. eacht option decides for itself.
    255255#ifdef HAVE_GTK2
    256256    // Signals 
    … …  
    267267 public:
    268268  Button(const char* buttonName = NULL);
    269   virtual ~Button(void);
     269  virtual ~Button();
    270270
    271271  virtual void setTitle(const char* title);
    272   virtual void redraw(void);
    273   virtual void changeOption(void);
     272  virtual void redraw();
     273  virtual void changeOption();
    274274};
    275275
    … …  
    281281 public:
    282282  CheckButton(const char* buttonName = NULL);
    283   virtual ~CheckButton(void);
    284 
    285   bool isActive(void);
     283  virtual ~CheckButton();
     284
     285  bool isActive();
    286286
    287287  virtual void setTitle(const char* title);
    288   virtual void redraw(void);
    289   virtual void changeOption(void);
     288  virtual void redraw();
     289  virtual void changeOption();
    290290};
    291291
    … …  
    302302 public:
    303303  Slider(const char* slidername, float start, float end);
    304   virtual ~Slider(void);
     304  virtual ~Slider();
    305305
    306306  void setExactness(int exactness);
    307307  void setValue(float value);
    308   virtual void redraw(void);
    309   virtual void changeOption(void);
    310 
    311   virtual char* save(void);
     308  virtual void redraw();
     309  virtual void changeOption();
     310
     311  virtual char* save();
    312312  virtual void load(char* loadString);
    313313};
    … …  
    338338  Menu(const char* menuName);
    339339  Menu(char* menuname, ...);
    340   virtual ~Menu(void);
    341   void init(void);
    342 
    343   virtual char* save(void);
     340  virtual ~Menu();
     341  void init();
     342
     343  virtual char* save();
    344344  virtual void load(char* loadString);
    345345 
    346346  void addItem(char* itemName);
    347   virtual void redraw(void);
    348   virtual void changeOption(void);
     347  virtual void redraw();
     348  virtual void changeOption();
    349349};
    350350
    … …  
    354354 public:
    355355  OptionLabel(const char* label, const char* value);
    356   virtual ~OptionLabel(void);
     356  virtual ~OptionLabel();
    357357 
    358358  void setValue(const char* newValue);
    359359
    360   virtual char* save(void);
     360  virtual char* save();
    361361  virtual void load(char* loadString);
    362362
    363   virtual void redraw(void);
    364   virtual void changeOption(void);
     363  virtual void redraw();
     364  virtual void changeOption();
    365365
    366366  char* cValue;                          //!< The Value the Label will have. \todo make private
    … …  
    372372 public:
    373373  EntryField(const char* name = NULL);
    374   virtual ~EntryField(void);
     374  virtual ~EntryField();
    375375 
    376376  void setValue(const char* newValue);
    377   virtual char* save(void);
     377  virtual char* save();
    378378  virtual void load(char* loadString);
    379379 
    380   virtual void redraw(void);
    381   virtual void changeOption(void);
     380  virtual void redraw();
     381  virtual void changeOption();
    382382};
    383383
    … …  
    387387 public:
    388388  Label(const char* text = NULL);
    389   virtual ~Label(void);
     389  virtual ~Label();
    390390 
    391391  virtual void setTitle(const char* text);
    392   void ereaseText(void);
     392  void ereaseText();
    393393  void appendText(char* textToAppend);
    394394  void appendInt(int intToAppend);
    395   const char* getText(void);
     395  const char* getText();
    396396};
    397397
    … …  
    401401 public:
    402402  ProgressBar(const char* label = NULL);
    403   virtual ~ProgressBar(void);
     403  virtual ~ProgressBar();
    404404
    405405  void setProgress(double progress);
    406406  void setTotalSize(double totalSize);
    407   double getProgress(void);
     407  double getProgress();
    408408
    409409 private:
    … …  
    425425  Image(const char* imgaeName);
    426426  Image(char** imageData);
    427   virtual ~Image(void);
     427  virtual ~Image();
    428428  void init(const char* name);
    429429};
    … …  
    441441 public:
    442442  FileDialog(const char* fileDialogName);
    443   virtual ~FileDialog(void);
     443  virtual ~FileDialog();
    444444
    445445  void setChangeOption(OptionLabel* changeOption);
    … …  
    448448  void setDefaultFileName(const char* defaultFileName);
    449449  void setMask(const char* mask);
    450   void disableFileOpts(void);
     450  void disableFileOpts();
    451451
    452452  void okEvent();

  • orxonox/trunk/src/lib/gui/gui_keys.cc

    r4427 r4746  
    3131   \brief Creates an Keyboard-Frame
    3232*/
    33 GuiKeys::GuiKeys(void)
     33GuiKeys::GuiKeys()
    3434{
    3535  Frame* keysFrame;      //!< The Frame that holds the keyOptions.
    … …  
    7979   \brief Destructs the Keys-stuff
    8080*/
    81 GuiKeys::~GuiKeys(void)
     81GuiKeys::~GuiKeys()
    8282{
    8383  // nothing to do here.
    … …  
    149149   \returns the OpenButton of a Player
    150150*/
    151 Button* PlayerKeys::getOpenButton(void)
     151Button* PlayerKeys::getOpenButton()
    152152{
    153153  return this->openButton;
    … …  
    214214   \returns the OpenButton of a Misc
    215215*/
    216 Button* MiscKeys::getOpenButton(void)
     216Button* MiscKeys::getOpenButton()
    217217{
    218218  return this->openButton;

  • orxonox/trunk/src/lib/gui/gui_keys.h

    r4427 r4746  
    2727{
    2828 public:
    29   GuiKeys(void);
    30   ~GuiKeys(void);
     29  GuiKeys();
     30  ~GuiKeys();
    3131
    3232  static Window* inputWindow; //!< A Window that gets keyboard clicks. Static, because only one needed.
    … …  
    4444  PlayerKeys(char* player);
    4545
    46   Button* getOpenButton(void);
     46  Button* getOpenButton();
    4747};
    4848
    … …  
    5555  MiscKeys();
    5656
    57   Button* getOpenButton(void); 
     57  Button* getOpenButton(); 
    5858};
    5959

  • orxonox/trunk/src/lib/gui/gui_update.cc

    r4427 r4746  
    3535   \brief Creates an Update-Frame
    3636*/
    37 GuiUpdate::GuiUpdate(void)
     37GuiUpdate::GuiUpdate()
    3838{
    3939  FileDialog* dataDirDialog;   //!< A FileDialog for the selection of the DataRepos
    … …  
    100100   \brief Destructs the Update-stuff
    101101*/
    102 GuiUpdate::~GuiUpdate(void)
     102GuiUpdate::~GuiUpdate()
    103103{
    104104
    … …  
    128128    \brief Look what info we can get from this system
    129129*/
    130 bool GuiUpdate::getSystemInfo(void)
     130bool GuiUpdate::getSystemInfo()
    131131{
    132132  PRINTF(5)("Grabbing system information\n");
    … …  
    155155
    156156#ifdef HAVE_CURL
    157 bool* GuiUpdate::checkForUpdates(void)
     157bool* GuiUpdate::checkForUpdates()
    158158{
    159159  PRINTF(4)("checking for new version of orxonox\n");
    … …  
    169169   \brief Creates a window, and all it contains for the Data-update.
    170170*/
    171 void GuiUpdate::updateDataWindowCreate(void)
     171void GuiUpdate::updateDataWindowCreate()
    172172{
    173173  this->updateDataWindow = new Window("update orxonox::Data");   
    … …  
    208208   \returns A Pointer to the Button of the UpdaterDataWindow
    209209*/
    210 Button* GuiUpdate::updateDataWindowGetButton(void)
     210Button* GuiUpdate::updateDataWindowGetButton()
    211211{
    212212  return this->updateDataWindowButton;
    … …  
    216216   \brief Creates a window, and all it contains for the Source-update.
    217217*/
    218 void GuiUpdate::updateSourceWindowCreate(void)
     218void GuiUpdate::updateSourceWindowCreate()
    219219{
    220220  // the button, that opens this Window.
    … …  
    247247   \returns A Pointer to the Button of the UpdaterSourceWindow
    248248*/
    249 Button* GuiUpdate::updateSourceWindowGetButton(void)
     249Button* GuiUpdate::updateSourceWindowGetButton()
    250250{
    251251  return this->updateSourceWindowButton;

  • orxonox/trunk/src/lib/gui/gui_update.h

    r4427 r4746  
    3737  char* userName;                       //!< The user logged in.
    3838
    39   bool getSystemInfo(void);
     39  bool getSystemInfo();
    4040 
    4141  // Window creation.
    … …  
    9999
    100100 public:
    101   GuiUpdate(void);
    102   ~GuiUpdate(void);
     101  GuiUpdate();
     102  ~GuiUpdate();
    103103 
    104104#ifdef HAVE_CURL   
    105   void updateDataWindowCreate(void);
    106   Button* updateDataWindowGetButton(void);
     105  void updateDataWindowCreate();
     106  Button* updateDataWindowGetButton();
    107107
    108   void updateSourceWindowCreate(void);
    109   Button* updateSourceWindowGetButton(void);
     108  void updateSourceWindowCreate();
     109  Button* updateSourceWindowGetButton();
    110110
    111   bool* checkForUpdates(void);
     111  bool* checkForUpdates();
    112112 
    113113#endif /* HAVE_CURL */

  • orxonox/trunk/src/lib/gui/gui_video.cc

    r4427 r4746  
    3434   \brief Creates the Video-Option-Frame
    3535*/
    36 GuiVideo::GuiVideo(void)
     36GuiVideo::GuiVideo()
    3737{
    3838  Frame* videoFrame;        //!< The Frame that holds the video options.
    … …  
    7676   \brief Destructs the Video-stuff
    7777*/
    78 GuiVideo::~GuiVideo(void)
     78GuiVideo::~GuiVideo()
    7979{
    8080  // nothing to do here.
    … …  
    8484   \brief Creates a window, and all it contains for the Source-update.
    8585*/
    86 Widget* GuiVideo::advancedWindowCreate(void)
     86Widget* GuiVideo::advancedWindowCreate()
    8787{
    8888  // advanced-Performance-Options

  • orxonox/trunk/src/lib/gui/gui_video.h

    r4427 r4746  
    1717{
    1818 private:
    19   //  Button* advancedWindowGetButton(void);
     19  //  Button* advancedWindowGetButton();
    2020 
    2121 public:
    22   GuiVideo(void);
    23   ~GuiVideo(void);
     22  GuiVideo();
     23  ~GuiVideo();
    2424
    2525 private:
    2626  void getResolutions(Menu* menu);
    27   Widget* advancedWindowCreate(void);
     27  Widget* advancedWindowCreate();
    2828};
    2929#endif /* _GUI_VIDEO_H */

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

    r4744 r4746  
    114114 * @brief displays everything this class is
    115115 */
    116 void BaseObject::whatIs(void) const
     116void BaseObject::whatIs() const
    117117{
    118118  PRINT(0)("object %s of class %s: ", this->getName(), this->getClassName());

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

    r4744 r4746  
    2828  void setName (const char* newName);
    2929  /** \brief returns the Name of this Object */
    30   inline const char* getName (void)const { return this->objectName; };
     30  inline const char* getName ()const { return this->objectName; };
    3131
    3232  /** \returns the className of the corresponding Object */
    33   inline const char* getClassName(void) const { return this->className; };
     33  inline const char* getClassName() const { return this->className; };
    3434  /** \returns the classID of the corresponding Object */
    35   inline int getClassID(void) const { return this->classID; }
     35  inline int getClassID() const { return this->classID; }
    3636
    3737  bool isA (ClassID classID) const;
    38   void whatIs(void) const;
     38  void whatIs() const;
    3939
    4040  /** \returns if the object is finalized */
    … …  
    4646
    4747  /** \brief this finalizes an object and makes it ready to be garbage collected */
    48   void finalize(void) { this->finalized = true; };
     48  void finalize() { this->finalized = true; };
    4949
    5050  private:

  • orxonox/trunk/src/lib/math/curve.cc

    r4472 r4746  
    3636    \brief default constructor for a Curve
    3737*/
    38 Curve::Curve(void)
     38Curve::Curve()
    3939{
    4040  nodeCount = 0;
    … …  
    128128   \brief Outputs information about the state of this Curve
    129129*/
    130 void Curve::debug(void)
     130void Curve::debug()
    131131{
    132132  printf("<<-------------------------------\n");
    … …  
    150150   \brief Creates a new BezierCurve
    151151*/
    152 BezierCurve::BezierCurve (void)
     152BezierCurve::BezierCurve ()
    153153{
    154154  this->derivation = 0;
    … …  
    170170   It does this by freeing all the space taken over from the nodes
    171171*/
    172 BezierCurve::~BezierCurve(void)
     172BezierCurve::~BezierCurve()
    173173{
    174174  PathNode* tmpNode;
    … …  
    187187   \brief Rebuilds a Curve
    188188*/
    189 void BezierCurve::rebuild(void)
     189void BezierCurve::rebuild()
    190190{
    191191  PathNode* tmpNode = firstNode;
    … …  
    291291  \return a Vector to the calculated position
    292292*/
    293 Vector BezierCurve::getPos(void) const
     293Vector BezierCurve::getPos() const
    294294{
    295295  return curvePoint;

  • orxonox/trunk/src/lib/math/curve.h

    r4597 r4746  
    3131
    3232 public:
    33   Curve(void);
     33  Curve();
    3434
    3535  void addNode(const Vector& newNode);
    … …  
    3737  Vector getNode(unsigned int nodeToFind);
    3838  /** \returns the count of nodes in this curve */
    39   inline int getNodeCount(void) const { return this->nodeCount; };
     39  inline int getNodeCount() const { return this->nodeCount; };
    4040  /** \returns the directional Curve */
    41   Curve* getDirCurve(void) const { return this->dirCurve; };
     41  Curve* getDirCurve() const { return this->dirCurve; };
    4242
    4343  /** \param t the value on the curve [0-1] \returns Vector to the position */
    … …  
    5151
    5252  // DEBUG
    53   void debug(void);
     53  void debug();
    5454
    5555 private:
    5656  /** \brief rebuilds the curve */
    57   virtual void rebuild(void) = 0;
     57  virtual void rebuild() = 0;
    5858
    5959 protected:
    … …  
    7878{
    7979 public:
    80   BezierCurve(void);
     80  BezierCurve();
    8181  BezierCurve(int derivation);
    82   virtual ~BezierCurve(void);
     82  virtual ~BezierCurve();
    8383
    8484  virtual Vector calcPos(float t);
    … …  
    8888
    8989
    90   Vector getPos(void) const;
     90  Vector getPos() const;
    9191
    9292 private:
    93   void rebuild(void);
     93  void rebuild();
    9494};
    9595

  • orxonox/trunk/src/lib/math/vector.cc

    r4611 r4746  
    5959   \brief Outputs the values of the Vector
    6060*/
    61 void Vector::debug(void) const
     61void Vector::debug() const
    6262{
    6363  PRINT(0)("Vector Debug information\n");
    … …  
    391391   \brief outputs some nice formated debug information about this quaternion
    392392*/
    393 void Quaternion::debug(void)
     393void Quaternion::debug()
    394394{
    395395  PRINT(0)("Quaternion Debug Information\n");

  • orxonox/trunk/src/lib/particles/particle_emitter.cc

    r4726 r4746  
    159159}
    160160
    161 const char* ParticleEmitter::getTypeC(void) const
     161const char* ParticleEmitter::getTypeC() const
    162162{
    163163  if (this->type == EMITTER_PLANE)
    … …  
    310310   \brief outputs some nice debug information
    311311*/
    312 void ParticleEmitter::debug(void) const
     312void ParticleEmitter::debug() const
    313313{
    314314  PRINT(0)(" Emitter %s\n", this->getName());

  • orxonox/trunk/src/lib/particles/particle_emitter.h

    r4726 r4746  
    3636                  float emissionRate = 1.0, float velocity = 1.0);
    3737  ParticleEmitter(const TiXmlElement* root);
    38   virtual ~ParticleEmitter(void);
     38  virtual ~ParticleEmitter();
    3939
    4040  void init();
    … …  
    5959
    6060  /** \returns the type of the emitter */
    61   inline EMITTER_TYPE getType(void) const { return this->type; };
     61  inline EMITTER_TYPE getType() const { return this->type; };
    6262  /** \returns the Type as a const char * */
    63   const char* getTypeC(void) const;
     63  const char* getTypeC() const;
    6464  /** \returns the Size of the emitter */
    65   inline float getSize(void) const { return this->emitterSize; };
     65  inline float getSize() const { return this->emitterSize; };
    6666  /** \returns the emissionRate */
    67   inline float getEmissionRate(void) const { return this->emissionRate; };
     67  inline float getEmissionRate() const { return this->emissionRate; };
    6868  /** \returns the inherit-speed-factor */
    69   inline float getInheritSpeed(void) const { return this->inheritSpeed; };
     69  inline float getInheritSpeed() const { return this->inheritSpeed; };
    7070  /** \returns the SpreadAngle of the emitter */
    71   inline float getSpread(void) const { return this->angle; };
     71  inline float getSpread() const { return this->angle; };
    7272  /** \returns the EmissionVelocity of the emitter */
    73   inline float getEmissionVelocity(void) const { return this->velocity; };
     73  inline float getEmissionVelocity() const { return this->velocity; };
    7474  /** \returns the EmissionMomentum of this emitter */
    75   inline float getEmissionMomentum(void) const { return this->momentum; };
     75  inline float getEmissionMomentum() const { return this->momentum; };
    7676
    77   void debug(void) const;
     77  void debug() const;
    7878
    7979 private:

  • orxonox/trunk/src/lib/particles/particle_engine.cc

    r4726 r4746  
    389389   \brief outputs some nice debug information
    390390*/
    391 void ParticleEngine::debug(void)
     391void ParticleEngine::debug()
    392392{
    393393  PRINT(0)("+-----------------------------------+\n");

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

    r4726 r4746  
    3333
    3434 public:
    35   virtual ~ParticleEngine(void);
     35  virtual ~ParticleEngine();
    3636  /** \returns a Pointer to the only object of this Class */
    37   inline static ParticleEngine* getInstance(void) { if (!singletonRef) singletonRef = new ParticleEngine();  return singletonRef; };
     37  inline static ParticleEngine* getInstance() { if (!singletonRef) singletonRef = new ParticleEngine();  return singletonRef; };
    3838
    3939  void loadParams(const TiXmlElement* root);
    4040
    4141  void tick(float dt);
    42   void draw(void) const;
     42  void draw() const;
    4343
    4444  void addSystem(ParticleSystem* system);
    … …  
    6161
    6262 private:
    63   ParticleEngine(void);
     63  ParticleEngine();
    6464  static ParticleEngine* singletonRef;        //!< The reference to the engine.
    6565

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

    r4732 r4746  
    8989  \brief initializes the ParticleSystem with default values
    9090*/
    91 void ParticleSystem::init(void)
     91void ParticleSystem::init()
    9292{
    9393  this->setClassID(CL_PARTICLE_SYSTEM, "ParticleSystem");
    … …  
    367367 * \returns the count of Faces of this ParticleSystem
    368368 */
    369 unsigned int ParticleSystem::getFaceCount(void) const
     369unsigned int ParticleSystem::getFaceCount() const
    370370{
    371371  switch (this->particleType)
    … …  
    389389   This is just the fastest Way to do this, but will most likely be changed in the future.
    390390 */
    391 void ParticleSystem::draw(void) const
     391void ParticleSystem::draw() const
    392392{
    393393  glPushAttrib(GL_ENABLE_BIT);
    … …  
    581581   \brief outputs some nice debug information
    582582*/
    583 void ParticleSystem::debug(void) const
     583void ParticleSystem::debug() const
    584584{
    585585  PRINT(0)("  ParticleSystem %s, type: ", this->getName());

  • orxonox/trunk/src/lib/particles/particle_system.h

    r4727 r4746  
    7373  virtual ~ParticleSystem();
    7474
    75   void init(void);
     75  void init();
    7676  void loadParams(const TiXmlElement* root);
    7777
    … …  
    9090
    9191  /** \returns the Type of the particles */
    92   inline PARTICLE_TYPE getType(void) const { return this->particleType; };
     92  inline PARTICLE_TYPE getType() const { return this->particleType; };
    9393  /** \returns the Material that lies on this particles */
    94   inline const Material* getMaterial(void) const { return this->material; };
     94  inline const Material* getMaterial() const { return this->material; };
    9595  /** \returns the lifespan of the particles */
    96   inline float getLifeSpan(void) const { return this->lifeSpan; };
     96  inline float getLifeSpan() const { return this->lifeSpan; };
    9797  /** \returns the starting-radius of the particles */
    98   inline float getStartRadius(void) { return this->radiusAnim.getValue(0.0); };
     98  inline float getStartRadius() { return this->radiusAnim.getValue(0.0); };
    9999  /** \returns the end-radius of the particles */
    100   inline float getEndRadius(void) { return this->radiusAnim.getValue(1.0); };
     100  inline float getEndRadius() { return this->radiusAnim.getValue(1.0); };
    101101  /** \returns the conserve-factor of the particles */
    102   inline float getConserve(void) const { return this->conserve; };
     102  inline float getConserve() const { return this->conserve; };
    103103  /** \returns the initial mass of the particles */
    104   inline float getMass(void) const { return this->initialMass; };
     104  inline float getMass() const { return this->initialMass; };
    105105
    106   virtual unsigned int getFaceCount(void) const;
     106  virtual unsigned int getFaceCount() const;
    107107
    108108
    … …  
    114114
    115115  virtual void tick(float dt);
    116   virtual void draw(void) const;
     116  virtual void draw() const;
    117117
    118   void debug(void) const;
     118  void debug() const;
    119119
    120120 private:

  • orxonox/trunk/src/lib/particles/quick_animation.cc

    r4657 r4746  
    3030   \brief standard constructor
    3131*/
    32 QuickAnimation::QuickAnimation (void)
     32QuickAnimation::QuickAnimation ()
    3333{
    3434   this->setClassID(CL_QUICK_ANIMATION, "QuickAnimation");
    … …  
    4545   \brief deletes all the deconstructor stuff
    4646*/
    47 QuickAnimation::~QuickAnimation (void)
     47QuickAnimation::~QuickAnimation ()
    4848{
    4949  this->current = this->first;
    … …  
    228228   \brief outputs some nice information about this class
    229229*/
    230 void QuickAnimation::debug(void)
     230void QuickAnimation::debug()
    231231{
    232232  this->current = this->first;

  • orxonox/trunk/src/lib/particles/quick_animation.h

    r4657 r4746  
    4949  float getValue(float position);
    5050
    51   void debug(void);
     51  void debug();
    5252
    5353 private:

  • orxonox/trunk/src/lib/physics/fields/field.cc

    r4730 r4746  
    4444  \brief initializes a Field
    4545*/
    46 void Field::init(void)
     46void Field::init()
    4747{
    4848  this->setClassID(CL_FIELD, "Field");

  • orxonox/trunk/src/lib/physics/fields/field.h

    r4730 r4746  
    3838  virtual ~Field();
    3939
    40   void init(void);
     40  void init();
    4141  void loadParams(const TiXmlElement* root);
    4242
    … …  
    4949  void setMagnitude(float magnitude);
    5050  /** \returns The Magnitude of the Field */
    51   inline const float& getMagnitude(void) const {return this->magnitude;}
     51  inline const float& getMagnitude() const {return this->magnitude;}
    5252
    5353  void setAttenuation(float attenuation);
    5454  /** \returns The Attenuation of the Fiels */
    55   inline const float& getAttenuation(void) const {return this->attenuation;}
     55  inline const float& getAttenuation() const {return this->attenuation;}
    5656
    5757 private:

  • orxonox/trunk/src/lib/physics/physics_connection.cc

    r4731 r4746  
    101101    \brief applies the Force to some Object.
    102102*/
    103 void PhysicsConnection::apply(void) const
     103void PhysicsConnection::apply() const
    104104{
    105105  if (likely(this->type == PCON_PhysIField && this->field->getMagnitude() != 0.0

  • orxonox/trunk/src/lib/physics/physics_connection.h

    r4731 r4746  
    3737  void setField(const char* fieldName);
    3838
    39   void apply(void) const;
     39  void apply() const;
    4040
    4141 private:

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

    r4733 r4746  
    3131   \brief standard constructor
    3232*/
    33 PhysicsEngine::PhysicsEngine(void)
     33PhysicsEngine::PhysicsEngine()
    3434{
    3535  this->setClassID(CL_PHYSICS_ENGINE, "PhysicsEngine");
    … …  
    4949
    5050*/
    51 PhysicsEngine::~PhysicsEngine(void)
     51PhysicsEngine::~PhysicsEngine()
    5252{
    5353  PhysicsEngine::singletonRef = NULL;
    … …  
    268268   \brief print out interesting debug information of this class
    269269*/
    270 void PhysicsEngine::debug(void) const
     270void PhysicsEngine::debug() const
    271271{
    272272  PRINT(0)("====================================\n");

  • orxonox/trunk/src/lib/physics/physics_engine.h

    r4733 r4746  
    2222
    2323 public:
    24   virtual ~PhysicsEngine(void);
     24  virtual ~PhysicsEngine();
    2525  /** \returns a Pointer to the only object of this Class */
    26   inline static PhysicsEngine* getInstance(void) { if (!singletonRef) singletonRef = new PhysicsEngine();  return singletonRef; };
     26  inline static PhysicsEngine* getInstance() { if (!singletonRef) singletonRef = new PhysicsEngine();  return singletonRef; };
    2727
    2828  void loadParams(const TiXmlElement* root);
    … …  
    4545  void                   tick(float dt);
    4646
    47   void                   debug(void) const;
     47  void                   debug() const;
    4848
    4949 private:
    50   PhysicsEngine(void);
     50  PhysicsEngine();
    5151
    5252 private:

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

    r4605 r4746  
    7979}
    8080
    81 SoundBuffer::~SoundBuffer(void)
     81SoundBuffer::~SoundBuffer()
    8282{
    8383  SoundEngine::getInstance()->removeBuffer(this);
    … …  
    115115   \brief deletes a SoundSource
    116116*/
    117 SoundSource::~SoundSource(void)
     117SoundSource::~SoundSource()
    118118{
    119119  SoundEngine::getInstance()->removeSource(this);
    … …  
    306306   \brief updates all The positions, Directions and Velocities of all Sounds
    307307*/
    308 void SoundEngine::update(void)
     308void SoundEngine::update()
    309309{
    310310
    … …  
    351351   \brief Removes all the Buffers that are not anymore needed by any Sources
    352352*/
    353 void SoundEngine::flushUnusedBuffers(void)
     353void SoundEngine::flushUnusedBuffers()
    354354{
    355355  tIterator<SoundBuffer>* bufferIterator = this->bufferList->getIterator();
    … …  
    376376   \brief SourceEngine::flushAllBuffers
    377377*/
    378 void SoundEngine::flushAllBuffers(void)
     378void SoundEngine::flushAllBuffers()
    379379{
    380380    tIterator<SoundBuffer>* bufferIterator = this->bufferList->getIterator();
    … …  
    391391   \brief initializes Audio in general
    392392*/
    393 bool SoundEngine::initAudio(void)
     393bool SoundEngine::initAudio()
    394394{
    395395  ALenum result;

  • orxonox/trunk/src/lib/sound/sound_engine.h

    r4597 r4746  
    2424 public:
    2525  SoundBuffer(const char* fileName);
    26   ~SoundBuffer(void);
     26  ~SoundBuffer();
    2727
    2828  /** \returns the ID of the buffer used in this SoundBuffer */
    29   inline ALuint getID(void) { return this->bufferID; }
     29  inline ALuint getID() { return this->bufferID; }
    3030
    3131 private:
    … …  
    4141 public:
    4242  SoundSource(SoundBuffer* buffer, PNode* sourceNode = NULL);
    43   ~SoundSource(void);
     43  ~SoundSource();
    4444
    4545  // user interaction
    … …  
    5151  // development functions
    5252  /** \returns The ID of this Source */
    53   inline ALuint getID(void) const { return this->sourceID; }
     53  inline ALuint getID() const { return this->sourceID; }
    5454  /** \returns the SoundBuffer of this Source */
    55   inline SoundBuffer* getBuffer(void) const { return this->buffer; }
     55  inline SoundBuffer* getBuffer() const { return this->buffer; }
    5656  /** \returns the SourceNode of this Source */
    57   inline PNode* getNode(void) const { return this->sourceNode;}
     57  inline PNode* getNode() const { return this->sourceNode;}
    5858
    5959  void setRolloffFactor(ALfloat rolloffFactor);
    … …  
    7171
    7272 public:
    73   virtual ~SoundEngine(void);
     73  virtual ~SoundEngine();
    7474  /** \returns a Pointer to the only object of this Class */
    75   inline static SoundEngine* getInstance(void) { if (!singletonRef) singletonRef = new SoundEngine();  return singletonRef; };
     75  inline static SoundEngine* getInstance() { if (!singletonRef) singletonRef = new SoundEngine();  return singletonRef; };
    7676
    7777  SoundSource* createSource(const char* fileName, PNode* sourceNode = NULL);
    … …  
    8686  void removeSource(SoundSource* source);
    8787
    88   void update(void);
     88  void update();
    8989
    9090  // administrative
    91   void flushUnusedBuffers(void);
    92   void flushAllBuffers(void);
    93   bool initAudio(void);
     91  void flushUnusedBuffers();
     92  void flushAllBuffers();
     93  bool initAudio();
    9494
    9595  // error handling:
    … …  
    9999
    100100 private:
    101   SoundEngine(void);
     101  SoundEngine();
    102102  static SoundEngine*      singletonRef;             //!< Reference to this class
    103103

  • orxonox/trunk/src/orxonox.cc

    r4619 r4746  
    8989   \returns reference or new Object of Orxonox if not existent.
    9090*/
    91 Orxonox* Orxonox::getInstance (void)
     91Orxonox* Orxonox::getInstance ()
    9292{
    9393  if (singletonRef == NULL)

  • orxonox/trunk/src/story_entities/world.h

    r4621 r4746  
    3939  static WorldInterface* getInstance();
    4040  void init(World* world);
    41   inline World* getCurrentWorld(void) {return this->worldReference;}
     41  inline World* getCurrentWorld() {return this->worldReference;}
    4242  tList<WorldEntity>* getEntityList();
    4343
    … …  
    9696  void setPath( const char* name);
    9797
    98   inline Camera* getLocalCamera(void) {return this->localCamera;}
     98  inline Camera* getLocalCamera() {return this->localCamera;}
    9999
    100100 private:

  • orxonox/trunk/src/subprojects/benchmark.h

    r4554 r4746  
    88#define _BENCHMARK_H
    99
    10 int startBenchmarks(void);
     10int startBenchmarks();
    1111
    1212

  • orxonox/trunk/src/util/animation/animation.cc

    r4597 r4746  
    2525   This also adds the Animation automatically to the AnimationPlayer's list
    2626*/
    27 Animation::Animation(void)
     27Animation::Animation()
    2828{
    2929  this->setClassID(CL_ANIMATION, "Animation");
    … …  
    4848   this also takes the animation out of the AnimationPlayer's list (if it is there)
    4949*/
    50 Animation::~Animation(void)
     50Animation::~Animation()
    5151{
    5252  this->doNotHandle();
    … …  
    5959   This means that it will not be ticked, and not be deleted with the AnimationPlayer
    6060*/
    61 void Animation::doNotHandle(void)
     61void Animation::doNotHandle()
    6262{
    6363  if (this->bHandled)
    … …  
    7777   \brief handles the Animation if it gets out of boundraries eg. if animation is finished.
    7878*/
    79 void Animation::handleInfinity(void)
     79void Animation::handleInfinity()
    8080{
    8181  switch (this->postInfinity)

  • orxonox/trunk/src/util/animation/animation.h

    r4597 r4746  
    7575{
    7676 public:
    77   virtual ~Animation(void);
    78   void doNotHandle(void);
     77  virtual ~Animation();
     78  void doNotHandle();
    7979
    8080  void setInfinity(ANIM_INFINITY postInfinity = ANIM_INF_CONSTANT);
    … …  
    9292
    9393  /** \returns the BaseObject, this animation operates on */
    94   BaseObject* getBaseObject(void) const { return this->baseObject; };
     94  BaseObject* getBaseObject() const { return this->baseObject; };
    9595
    9696  /** \returns if the Animation should be deleted */
    97   inline bool ifDelete(void) { return bDelete; };
     97  inline bool ifDelete() { return bDelete; };
    9898
    9999 protected:
    100   Animation(void);
     100  Animation();
    101101
    102   void handleInfinity(void);
     102  void handleInfinity();
    103103
    104104 protected:

  • orxonox/trunk/src/util/animation/animation3d.cc

    r4597 r4746  
    5454   deletes all the Keyframes
    5555*/
    56 Animation3D::~Animation3D(void)
     56Animation3D::~Animation3D()
    5757{
    5858  // delete all the KeyFrames
    … …  
    7171   \brief rewinds the Animation to the beginning (first KeyFrame and time == 0)
    7272*/
    73 void Animation3D::rewind(void)
     73void Animation3D::rewind()
    7474{
    7575  this->currentKeyFrame = keyFrameList->firstElement();

  • orxonox/trunk/src/util/animation/animation3d.h

    r4597 r4746  
    3232 public:
    3333  Animation3D(PNode* object);
    34   virtual ~Animation3D(void);
     34  virtual ~Animation3D();
    3535
    36   virtual void rewind(void);
     36  virtual void rewind();
    3737
    3838  void addKeyFrame(Vector position, Quaternion direction, float time, ANIM_FUNCTION animFuncMov = ANIM_DEFAULT_FUNCTION, ANIM_FUNCTION animFuncRot = ANIM_NULL);

  • orxonox/trunk/src/util/animation/animation_player.cc

    r4597 r4746  
    8282   \brief empties the list AND deletes all the Animations
    8383*/
    84 void AnimationPlayer::flush(void)
     84void AnimationPlayer::flush()
    8585{
    8686  // deleting the Animation List AND all the elements of the List
    … …  
    126126   \brief starts playing the AnimationPlayer
    127127*/
    128 void AnimationPlayer::play(void)
     128void AnimationPlayer::play()
    129129{
    130130  this->bRunning = true;
    … …  
    134134   \brief pauses playing of the AnimationPlayer
    135135*/
    136 void AnimationPlayer::pause(void)
     136void AnimationPlayer::pause()
    137137{
    138138  this->bRunning = false;
    … …  
    166166   \brief Outputs some nice debug-information
    167167*/
    168 void AnimationPlayer::debug(void)
     168void AnimationPlayer::debug()
    169169{
    170170  PRINT(0)("+------------------------------------+\n");

  • orxonox/trunk/src/util/animation/animation_player.h

    r4597 r4746  
    3030 public:
    3131  /** \returns a Pointer to the only object of this Class */
    32   inline static AnimationPlayer* getInstance(void) { if (!singletonRef) singletonRef = new AnimationPlayer();  return singletonRef; };
     32  inline static AnimationPlayer* getInstance() { if (!singletonRef) singletonRef = new AnimationPlayer();  return singletonRef; };
    3333
    34   virtual ~AnimationPlayer(void);
     34  virtual ~AnimationPlayer();
    3535
    3636  // animation handling
    3737  void addAnimation(Animation* animation);
    3838  void removeAnimation(Animation* animation);
    39   void flush(void);
     39  void flush();
    4040
    4141  // time functions
    4242  void tick(float timePassed);
    43   void play(void);
    44   void pause(void);
     43  void play();
     44  void pause();
    4545
    4646  Animation* getAnimationFromBaseObject(const BaseObject* baseObject) const;
    4747
    48   void debug(void);
     48  void debug();
    4949
    5050 private:
    5151  /* singleton */
    52   AnimationPlayer(void);
     52  AnimationPlayer();
    5353  static AnimationPlayer*      singletonRef;          //!< SingletonReference to this class.
    5454

  • orxonox/trunk/src/util/animation/t_animation.h

    r4597 r4746  
    122122*/
    123123template<class T>
    124 void tAnimation<T>::rewind(void)
     124void tAnimation<T>::rewind()
    125125{
    126126  this->currentKeyFrame = keyFrameList->firstElement();

  • orxonox/trunk/src/util/garbage_collector.h

    r4519 r4746  
    2424  virtual ~GarbageCollector();
    2525  /** \returns a Pointer to the only object of this Class */
    26   inline static GarbageCollector* getInstance(void) { if (!singletonRef) singletonRef = new GarbageCollector();  return singletonRef; };
     26  inline static GarbageCollector* getInstance() { if (!singletonRef) singletonRef = new GarbageCollector();  return singletonRef; };
    2727
    2828  void setCollectionDelay(float delay);

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

    r4739 r4746  
    5353  static Factory* getFirst() { return Factory::first; };
    5454  /** \returns the next factory */
    55   Factory* getNext(void) const { return this->next; };
     55  Factory* getNext() const { return this->next; };
    5656
    5757

  • orxonox/trunk/src/util/loading/load_param.cc

    r4734 r4746  
    179179   \brief removes all the alocated memory
    180180*/
    181 LoadParamDescription::~LoadParamDescription(void)
     181LoadParamDescription::~LoadParamDescription()
    182182{
    183183  for(int i = 0; i < this->paramCount; i++)
    … …  
    208208   \brief prints out this parameter, its input method and the description (if availiable)
    209209*/
    210 void LoadParamDescription::print(void) const
     210void LoadParamDescription::print() const
    211211{
    212212  PRINT(3)(" <%s>", this->paramName);
    … …  
    268268   \brief deletes a classDescription (deletes all the parameterDescriptions as well
    269269*/
    270 LoadClassDescription::~LoadClassDescription(void)
     270LoadClassDescription::~LoadClassDescription()
    271271{
    272272  delete []this->className;

  • orxonox/trunk/src/util/loading/load_param.h

    r4734 r4746  
    254254 public:
    255255  LoadParamDescription(const char* paramName);
    256   ~LoadParamDescription(void);
     256  ~LoadParamDescription();
    257257
    258258  void setDescription(const char* descriptionText);
    259259  /** \returns the descriptionString */
    260   const char* getDescription(void) { return this->description; };
    261 
    262   void print(void) const;
     260  const char* getDescription() { return this->description; };
     261
     262  void print() const;
    263263 private:
    264264  char*         paramName;             //!< The name of the parameter.
    … …  
    275275 public:
    276276  LoadClassDescription(const char* className);
    277   ~LoadClassDescription(void);
     277  ~LoadClassDescription();
    278278
    279279  static LoadClassDescription* addClass(const char* className);

  • orxonox/trunk/src/util/object_manager.cc

    r4699 r4746  
    9292   \brief outputs some simple debug information about the ObjectManage
    9393*/
    94 void ObjectManager::debug(void) const
     94void ObjectManager::debug() const
    9595{
    9696  PRINT(0)("\n==========================| ObjectManager::debug() |===\n");

  • orxonox/trunk/src/util/object_manager.h

    r4744 r4746  
    4444
    4545 public:
    46   virtual ~ObjectManager(void);
     46  virtual ~ObjectManager();
    4747  /** \returns a Pointer to the only object of this Class */
    48   inline static ObjectManager* getInstance(void) { if (!singletonRef) singletonRef = new ObjectManager();  return singletonRef; };
     48  inline static ObjectManager* getInstance() { if (!singletonRef) singletonRef = new ObjectManager();  return singletonRef; };
    4949
    5050  void registerClass(ClassID classID);
    … …  
    5555  BaseObject* getFromDeadList(int index, int number = 1);
    5656
    57   void debug(void) const;
     57  void debug() const;
    5858
    5959 private:
    60   ObjectManager(void);
     60  ObjectManager();
    6161
    6262 private:

  • orxonox/trunk/src/util/resource_manager.cc

    r4653 r4746  
    6666   \brief standard destructor
    6767*/
    68 ResourceManager::~ResourceManager (void)
     68ResourceManager::~ResourceManager ()
    6969{
    7070  // deleting the Resources-List
    … …  
    780780   \brief outputs debug information about the ResourceManager
    781781*/
    782 void ResourceManager::debug(void) const
     782void ResourceManager::debug() const
    783783{
    784784  PRINT(0)("=RM===================================\n");

  • orxonox/trunk/src/util/resource_manager.h

    r4653 r4746  
    100100  virtual ~ResourceManager();
    101101  /** \returns a Pointer to the only object of this Class */
    102   inline static ResourceManager* getInstance(void) { if (!singletonRef) singletonRef = new ResourceManager();  return singletonRef; };
     102  inline static ResourceManager* getInstance() { if (!singletonRef) singletonRef = new ResourceManager();  return singletonRef; };
    103103
    104104  bool setDataDir(const char* dataDir);
    105105  /** \returns the Name of the data directory */
    106   inline const char* getDataDir(void) const {return this->dataDir;}
     106  inline const char* getDataDir() const {return this->dataDir;}
    107107
    108108  bool checkDataDir(const char* fileInside);
    … …  
    116116  bool unloadAllByPriority(ResourcePriority prio);
    117117
    118   void debug(void) const;
     118  void debug() const;
    119119
    120120

  • orxonox/trunk/src/util/state.h

    r4597 r4746  
    1717 public:
    1818  /** \returns a Pointer to the only object of this Class */
    19   inline static State* getInstance(void) { if (!singletonRef) singletonRef = new State();  return singletonRef; };
     19  inline static State* getInstance() { if (!singletonRef) singletonRef = new State();  return singletonRef; };
    2020
    21   virtual ~State(void);
     21  virtual ~State();
    2222
    2323  void setCamera(const PNode* camera, const PNode* cameraTarget);
    2424  /** \returns a Pointer to the PNode of the Camera */
    25   const PNode* getCamera(void) const { return this->camera; };
     25  const PNode* getCamera() const { return this->camera; };
    2626  /** \returns a Pointer to the CameraTarget */
    27   const PNode* getCameraTarget(void) const { return this->cameraTarget; };
     27  const PNode* getCameraTarget() const { return this->cameraTarget; };
    2828
    2929 private:
    30   State(void);
     30  State();
    3131  static State*       singletonRef;       //!< a reference to this class
    3232

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

    r4597 r4746  
    3838   \brief initializes a TrackElement (sets the default values)
    3939*/
    40 TrackElement::TrackElement(void)
     40TrackElement::TrackElement()
    4141{
    4242  this->setClassID(CL_TRACK_ELEMENT, "TrackElement");
    … …  
    6969    \todo eventually when deleting a TrackElement you would not like to delete all its preceding TrackElements
    7070*/
    71 TrackElement::~TrackElement(void)
     71TrackElement::~TrackElement()
    7272{
    7373  // deleting the Curve
    … …  
    152152   You actually have to act on false!!
    153153*/
    154 bool TrackElement::backLoopCheck(void) const
     154bool TrackElement::backLoopCheck() const
    155155{
    156156  tList<const TrackElement>* trackList = new tList<const TrackElement>;
    … …  
    216216   \brief prints out debug information about this TrackElement
    217217*/
    218 void TrackElement::debug(void) const
     218void TrackElement::debug() const
    219219{
    220220  PRINT(0)("--== TrackElement:%i ==--", this->ID);
    … …  
    357357
    358358*/
    359 TrackManager::TrackManager(void)
     359TrackManager::TrackManager()
    360360{
    361361  this->setClassID(CL_TRACK_MANAGER, "TrackManager");
    … …  
    456456   \brief standard destructor
    457457*/
    458 TrackManager::~TrackManager(void)
     458TrackManager::~TrackManager()
    459459{
    460460  PRINTF(3)("Destruct TrackManager\n");
    … …  
    997997   \todo check for any inconsistencies, output errors
    998998*/
    999 void TrackManager::finalize(void)
     999void TrackManager::finalize()
    10001000{
    10011001  for (int i = 1; i<= trackElemCount ;i++)
    … …  
    10611061   \returns the current Width of the track
    10621062*/
    1063 float TrackManager::getWidth(void) const
     1063float TrackManager::getWidth() const
    10641064{
    10651065  return this->currentTrackElem->width;
    … …  
    11521152   \returns the main TrackNode
    11531153*/
    1154 PNode* TrackManager::getTrackNode(void)
     1154PNode* TrackManager::getTrackNode()
    11551155{
    11561156  return this->trackNode;

  • orxonox/trunk/src/util/track/track_manager.h

    r4584 r4746  
    4343{
    4444 public:
    45   TrackElement(void);
    46   ~TrackElement(void);
     45  TrackElement();
     46  ~TrackElement();
    4747
    4848  TrackElement* findByID(unsigned int trackID);
    4949  TrackElement* findByName(const char* trackName);
    50   bool backLoopCheck(void) const;
     50  bool backLoopCheck() const;
    5151
    5252  TrackElement* getChild(int childNumber) const;
    … …  
    7878  TrackElement* history;     //!< a pointer to the last TrackElement we were on. This is if you want to walk the path backwards again.
    7979
    80   void debug(void) const;
     80  void debug() const;
    8181
    8282  // CONDITION FUNCTIONS and STUFF
    … …  
    135135{
    136136 public:
    137   virtual ~TrackManager(void);
     137  virtual ~TrackManager();
    138138  /** \returns a Pointer to the only object of this Class */
    139   inline static TrackManager* getInstance(void) { if (!singletonRef) singletonRef = new TrackManager();  return singletonRef; };
     139  inline static TrackManager* getInstance() { if (!singletonRef) singletonRef = new TrackManager();  return singletonRef; };
    140140
    141141  bool loadParams(TiXmlElement* root);
    … …  
    166166  void joinS(unsigned int cound, ...);
    167167  void joinV(unsigned int count, int* trackIDs);
    168   void finalize(void);
     168  void finalize();
    169169
    170170  // Methods to calculate the position on the Path (runtime)
    171   inline Vector calcPos(void) const;
    172   inline Vector calcDir(void) const;
    173   float getWidth(void) const;
     171  inline Vector calcPos() const;
     172  inline Vector calcDir() const;
     173  float getWidth() const;
    174174  void tick(float dt);
    175175  void jumpTo(float time);
    … …  
    177177
    178178  void setBindSlave(PNode* bindSlave);
    179   PNode* getTrackNode(void);
     179  PNode* getTrackNode();
    180180
    181181  // DEBUG //
    … …  
    184184
    185185 private:
    186   TrackManager(void);
     186  TrackManager();
    187187  void initChildren(unsigned int childCount, TrackElement* trackElem = NULL);
    188188

  • orxonox/trunk/src/world_entities/camera.cc

    r4490 r4746  
    3333   \brief creates a Camera
    3434*/
    35 Camera::Camera(void)
     35Camera::Camera()
    3636{
    3737  this->setClassID(CL_CAMERA, "Camera");
    … …  
    5555   \brief default destructor
    5656*/
    57 Camera::~Camera(void)
     57Camera::~Camera()
    5858{
    5959  EventHandler::getInstance()->unsubscribe(this);
    … …  
    7272   \returns The PNode of the Target (from there you can get position and so on
    7373*/
    74 PNode* Camera::getTarget(void)
     74PNode* Camera::getTarget()
    7575{
    7676  return (PNode*)this->target;

  • orxonox/trunk/src/world_entities/camera.h

    r4592 r4746  
    3333{
    3434 public:
    35   Camera(void);
    36   virtual ~Camera(void);
     35  Camera();
     36  virtual ~Camera();
    3737
    3838  void lookAt(PNode* target);
    … …  
    4545  void setViewMode(ViewMode mode);
    4646  void tick(float dt);
    47   void apply (void);
     47  void apply ();
    4848
    4949  void process(const Event &event);
    … …  
    6767
    6868 private:
    69   CameraTarget(void);
     69  CameraTarget();
    7070
    7171 public:
    72   virtual ~CameraTarget(void);
     72  virtual ~CameraTarget();
    7373};
    7474

  • orxonox/trunk/src/world_entities/npc.h

    r3544 r4746  
    2020  float zCor;
    2121
    22   void drawNPC(void);
    23   void paint(void);
     22  void drawNPC();
     23  void paint();
    2424  void setPosition(float x, float y, float z);
    2525  void getPosition(float* x, float* y, float* z);
    2626  void addAI(AI* ai);
    2727  void setCollisionRadius(float r);
    28   float getCollisionRadius(void);
    29   int hit(void);
    30   void die(void);
     28  float getCollisionRadius();
     29  int hit();
     30  void die();
    3131
    3232 private:

  • orxonox/trunk/src/world_entities/player.h

    r4404 r4746  
    6565 
    6666  void move(float time);
    67   void weapon(void);
     67  void weapon();
    6868 
    6969};

  • orxonox/trunk/src/world_entities/skybox.cc

    r4680 r4746  
    6868}
    6969
    70 void SkyBox::preInit(void)
     70void SkyBox::preInit()
    7171{
    7272  this->setClassID(CL_SKYBOX, "SkyBox");
    … …  
    8686}
    8787
    88 void SkyBox::postInit(void)
     88void SkyBox::postInit()
    8989{
    9090  this->rebuild();

  • orxonox/trunk/src/world_entities/skybox.h

    r4680 r4746  
    2626  virtual ~SkyBox();
    2727
    28   void preInit(void);
     28  void preInit();
    2929
    3030  void loadParams(const TiXmlElement* root);
    3131
    32   void postInit(void);
     32  void postInit();
    3333
    3434

  • orxonox/trunk/src/world_entities/terrain.cc

    r4607 r4746  
    7373
    7474*/
    75 Terrain::~Terrain (void)
     75Terrain::~Terrain ()
    7676{
    7777  if (objectList)
    … …  
    8080
    8181
    82 void Terrain::init(void)
     82void Terrain::init()
    8383{
    8484  this->setClassID(CL_TERRAIN, "Terrain");

  • orxonox/trunk/src/world_entities/terrain.h

    r4607 r4746  
    2828  Terrain(const char* fileName);
    2929  Terrain(DebugTerrain debugTerrain);
    30   virtual ~Terrain(void);
     30  virtual ~Terrain();
    3131
    32   void init(void);
     32  void init();
    3333  void loadParams(const TiXmlElement* root);
    3434

  • orxonox/trunk/src/world_entities/test_gun.h

    r3888 r4746  
    4040  virtual ~TestGun ();
    4141
    42   virtual void activate(void);
    43   virtual void deactivate(void);
     42  virtual void activate();
     43  virtual void deactivate();
    4444
    45   virtual void fire(void);
     45  virtual void fire();
    4646  virtual void hit (WorldEntity* weapon, Vector* loc);
    47   virtual void destroy(void);
     47  virtual void destroy();
    4848 
    4949  virtual void tick(float time);
    50   virtual void weaponIdle(void);
    51   virtual void draw(void);
     50  virtual void weaponIdle();
     51  virtual void draw();
    5252
    5353

  • orxonox/trunk/src/world_entities/weapon.h

    r4597 r4746  
    109109  virtual ~Weapon ();
    110110
    111   void enable(void);
    112   void disable(void);
    113   bool isEnabled(void);
     111  void enable();
     112  void disable();
     113  bool isEnabled();
    114114
    115115  void setProjectile(Projectile* projectile);
    116   Projectile* getProjectile(void);
     116  Projectile* getProjectile();
    117117
    118   virtual void activate(void);
    119   virtual void deactivate(void);
    120   bool isActive(void);
     118  virtual void activate();
     119  virtual void deactivate();
     120  bool isActive();
    121121
    122122
    … …  
    136136     shoot again
    137137  */
    138   inline float getWeaponIdleTime(void) const { return this->idleTime;}
     138  inline float getWeaponIdleTime() const { return this->idleTime;}
    139139  /**
    140140     \brief checks if the idle time is elapsed
    … …  
    144144   shoot again
    145145  */
    146   inline bool hasWeaponIdleTimeElapsed(void) const { return (this->localTime>this->idleTime)?true:false; }
     146  inline bool hasWeaponIdleTimeElapsed() const { return (this->localTime>this->idleTime)?true:false; }
    147147
    148148  /**
    … …  
    151151     this is called from the player.cc, when fire-button is been pushed
    152152  */
    153   virtual void fire(void) = 0;
     153  virtual void fire() = 0;
    154154  virtual void hit (WorldEntity* weapon, Vector* loc);
    155   virtual void destroy(void);
     155  virtual void destroy();
    156156
    157157  virtual void tick(float time);
    158   virtual void weaponIdle(void);
    159   virtual void draw(void);
     158  virtual void weaponIdle();
     159  virtual void draw();
    160160
    161161 protected:

  • orxonox/trunk/src/world_entities/world_entity.h

    r4689 r4746  
    5151
    5252  /** \returns the Count of Faces on this WorldEntity */
    53   virtual unsigned int getFaceCount (void) const { if (this->model) return this->model->getFaceCount(); else return 0; };
     53  virtual unsigned int getFaceCount () const { if (this->model) return this->model->getFaceCount(); else return 0; };
    5454
    5555  void processDraw ();
Note: See TracChangeset for help on using the changeset viewer.