Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4746 in orxonox.OLD for orxonox/trunk/src/util


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

orxonox/trunk: changed (void) → ()

Location:
orxonox/trunk/src/util
Files:
18 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.