Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9589


Ignore:
Timestamp:
Mar 26, 2013, 11:43:43 PM (12 years ago)
Author:
landauf
Message:

interfaces which are part of the framework and only rely on the object list for calling all instances may inherit from Listable

Location:
code/branches/core6/src
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • code/branches/core6/src/libraries/core/Core.h

    r9578 r9589  
    4747#include "util/DestructionHelper.h"
    4848#include "util/Singleton.h"
    49 #include "class/OrxonoxClass.h"
     49#include "config/Configurable.h"
    5050
    5151namespace orxonox
    5252{
    5353    //! Informs about changes in the Development Mode.
    54     class DevModeListener : virtual public OrxonoxClass
     54    class DevModeListener : virtual public Listable
    5555    {
    5656    public:

  • code/branches/core6/src/libraries/core/ViewportEventListener.h

    r9563 r9589  
    3333
    3434#include "util/OgreForwardRefs.h"
    35 #include "class/OrxonoxClass.h"
     35#include "object/Listable.h"
    3636
    3737namespace orxonox
    3838{
    39     class _CoreExport ViewportEventListener : virtual public OrxonoxClass
     39    class _CoreExport ViewportEventListener : virtual public Listable
    4040    {
    4141        public:

  • code/branches/core6/src/libraries/core/WindowEventListener.h

    r9563 r9589  
    3636
    3737#include "CorePrereqs.h"
    38 #include "class/OrxonoxClass.h"
     38#include "object/Listable.h"
    3939
    4040namespace orxonox
    4141{
    4242    //! Interface for receiving window events like resize, moved and focusChanged
    43     class _CoreExport WindowEventListener : virtual public OrxonoxClass
     43    class _CoreExport WindowEventListener : virtual public Listable
    4444    {
    4545        friend class OgreWindowEventListener;

  • code/branches/core6/src/libraries/core/XMLNameListener.h

    r9563 r9589  
    3636
    3737#include "CorePrereqs.h"
    38 #include "class/OrxonoxClass.h"
     38#include "object/Listable.h"
    3939
    4040namespace orxonox
    4141{
    42     class _CoreExport XMLNameListener : virtual public OrxonoxClass
     42    class _CoreExport XMLNameListener : virtual public Listable
    4343    {
    4444        public:

  • code/branches/core6/src/libraries/core/command/IOConsolePOSIX.cc

    r9550 r9589  
    9999
    100100        resetTerminalMode();
    101         this->shell_->destroy();
     101        delete this->shell_;
    102102
    103103        // Restore this->cout_ redirection

  • code/branches/core6/src/libraries/core/command/IOConsoleWindows.cc

    r9550 r9589  
    113113
    114114        resetTerminalMode();
    115         this->shell_->destroy();
     115        delete this->shell_;
    116116    }
    117117

  • code/branches/core6/src/libraries/core/input/InputManager.cc

    r9578 r9589  
    642642        assert(state && this->activeStates_.find(state->getPriority()) == this->activeStates_.end());
    643643        statesByName_.erase(state->getName());
    644         state->destroy();
     644        delete state;
    645645    }
    646646

  • code/branches/core6/src/libraries/core/input/JoyStickQuantityListener.h

    r9563 r9589  
    3838
    3939#include <vector>
    40 #include "core/class/OrxonoxClass.h"
     40#include "core/object/Listable.h"
    4141
    4242namespace orxonox
    4343{
    4444    //! Derive from this class to get informed when joy sticks get added/removed
    45     class _CoreExport JoyStickQuantityListener : virtual public OrxonoxClass
     45    class _CoreExport JoyStickQuantityListener : virtual public Listable
    4646    {
    4747        friend class InputManager;

  • code/branches/core6/src/libraries/network/ClientConnectionListener.h

    r9563 r9589  
    3131
    3232#include "NetworkPrereqs.h"
    33 #include "core/class/OrxonoxClass.h"
     33#include "core/object/Listable.h"
    3434
    3535namespace orxonox
    3636{
    37     class _NetworkExport ClientConnectionListener : virtual public OrxonoxClass
     37    class _NetworkExport ClientConnectionListener : virtual public Listable
    3838    {
    3939        public:

  • code/branches/core6/src/libraries/network/NetworkChatListener.h

    r9563 r9589  
    3232#include "NetworkPrereqs.h"
    3333
    34 #include "core/class/OrxonoxClass.h"
     34#include "core/object/Listable.h"
    3535
    3636namespace orxonox
    … …  
    4343        in Host and ChatManager. ChatManager is the main derivative of this interface.
    4444    */
    45     class _NetworkExport NetworkChatListener : virtual public OrxonoxClass
     45    class _NetworkExport NetworkChatListener : virtual public Listable
    4646    {
    4747        friend class Host;

  • code/branches/core6/src/libraries/network/NetworkFunction.cc

    r7284 r9589  
    5757    std::map<std::string, NetworkFunctionBase*>::iterator it;
    5858    for( it=map.begin(); it!=map.end(); ++it )
    59       it->second->destroy();
     59      delete it->second;
    6060  }
    6161

  • code/branches/core6/src/libraries/network/NetworkFunction.h

    r9563 r9589  
    3939#include <boost/static_assert.hpp>
    4040
     41#include "core/object/Listable.h"
    4142#include "core/class/Identifier.h"
    4243#include "core/command/Functor.h"
    … …  
    7071
    7172
    72 class _NetworkExport NetworkFunctionBase: virtual public OrxonoxClass {
     73class _NetworkExport NetworkFunctionBase: virtual public Listable {
    7374  public:
    7475    NetworkFunctionBase(const std::string& name);

  • code/branches/core6/src/libraries/tools/interfaces/TimeFactorListener.h

    r9563 r9589  
    3131
    3232#include "tools/ToolsPrereqs.h"
    33 #include "core/class/OrxonoxClass.h"
     33#include "core/object/Listable.h"
    3434
    3535namespace orxonox
    3636{
    37     class _ToolsExport TimeFactorListener : virtual public OrxonoxClass
     37    class _ToolsExport TimeFactorListener : virtual public Listable
    3838    {
    3939        public:

  • code/branches/core6/src/modules/weapons/projectiles/ParticleProjectile.cc

    r8855 r9589  
    6565        {
    6666            this->detachOgreObject(this->particles_->getParticleSystem());
    67             this->particles_->destroy();
     67            delete this->particles_;
    6868        }
    6969    }

  • code/branches/core6/src/orxonox/chat/ChatListener.h

    r9563 r9589  
    3232#include "OrxonoxPrereqs.h"
    3333
    34 #include "core/class/OrxonoxClass.h"
     34#include "core/object/Listable.h"
    3535
    3636namespace orxonox
    … …  
    4040        message was sent through ChatManager.
    4141    */
    42     class _OrxonoxExport ChatListener : virtual public OrxonoxClass
     42    class _OrxonoxExport ChatListener : virtual public Listable
    4343    {
    4444        friend class ChatManager;

  • code/branches/core6/src/orxonox/graphics/ParticleEmitter.cc

    r9550 r9589  
    6363        {
    6464            this->detachOgreObject(this->particles_->getParticleSystem());
    65             this->particles_->destroy();
     65            delete this->particles_;
    6666        }
    6767    }
    … …  
    101101        if (this->particles_)
    102102        {
    103             this->particles_->destroy();
     103            delete this->particles_;
    104104            this->particles_ = 0;
    105105        }

  • code/branches/core6/src/orxonox/overlays/InGameConsole.cc

    r9558 r9589  
    110110
    111111        // destroy the underlaying shell
    112         this->shell_->destroy();
     112        delete this->shell_;
    113113
    114114        Ogre::OverlayManager* ovMan = Ogre::OverlayManager::getSingletonPtr();

  • code/branches/core6/src/orxonox/worldentities/BigExplosion.cc

    r8858 r9589  
    225225            {
    226226                this->debris1_->detachOgreObject(this->debrisFire1_->getParticleSystem());
    227                 this->debrisFire1_->destroy();
     227                delete this->debrisFire1_;
    228228            }
    229229            if (this->debrisSmoke1_)
    230230            {
    231231                this->debris1_->detachOgreObject(this->debrisSmoke1_->getParticleSystem());
    232                 this->debrisSmoke1_->destroy();
     232                delete this->debrisSmoke1_;
    233233            }
    234234
    … …  
    236236            {
    237237                this->debris2_->detachOgreObject(this->debrisFire2_->getParticleSystem());
    238                 this->debrisFire2_->destroy();
     238                delete this->debrisFire2_;
    239239            }
    240240            if (this->debrisSmoke2_)
    241241            {
    242242                this->debris2_->detachOgreObject(this->debrisSmoke2_->getParticleSystem());
    243                 this->debrisSmoke2_->destroy();
     243                delete this->debrisSmoke2_;
    244244            }
    245245
    … …  
    247247            {
    248248                this->debris3_->detachOgreObject(this->debrisFire3_->getParticleSystem());
    249                 this->debrisFire3_->destroy();
     249                delete this->debrisFire3_;
    250250            }
    251251            if (this->debrisSmoke3_)
    252252            {
    253253                this->debris3_->detachOgreObject(this->debrisSmoke3_->getParticleSystem());
    254                 this->debrisSmoke3_->destroy();
     254                delete this->debrisSmoke3_;
    255255            }
    256256
    … …  
    258258            {
    259259                this->debris4_->detachOgreObject(this->debrisFire4_->getParticleSystem());
    260                 this->debrisFire4_->destroy();
     260                delete this->debrisFire4_;
    261261            }
    262262            if (this->debrisSmoke4_)
    263263            {
    264264                this->debris4_->detachOgreObject(this->debrisSmoke4_->getParticleSystem());
    265                 this->debrisSmoke4_->destroy();
     265                delete this->debrisSmoke4_;
    266266            }
    267267        }

  • code/branches/core6/src/orxonox/worldentities/ExplosionChunk.cc

    r8858 r9589  
    9292            {
    9393                this->detachOgreObject(this->fire_->getParticleSystem());
    94                 this->fire_->destroy();
     94                delete this->fire_;
    9595            }
    9696            if (this->smoke_)
    9797            {
    9898                this->detachOgreObject(this->smoke_->getParticleSystem());
    99                 this->smoke_->destroy();
     99                delete this->smoke_;
    100100            }
    101101        }

  • code/branches/core6/src/orxonox/worldentities/pawns/SpaceShip.cc

    r9558 r9589  
    9696
    9797            if (this->boostBlur_)
    98                 this->boostBlur_->destroy();
     98                delete this->boostBlur_;
    9999        }
    100100    }
    … …  
    447447        if (!this->bEnableMotionBlur_ && this->boostBlur_ != NULL)
    448448        {
    449             this->boostBlur_->destroy();
     449            delete this->boostBlur_;
    450450            this->boostBlur_ = NULL;
    451451        }
Note: See TracChangeset for help on using the changeset viewer.