[Orxonox-commit 6110] r10768 - in code/branches/cpp11_v2: src/libraries/core src/libraries/core/class src/libraries/core/command src/libraries/core/commandline src/libraries/core/config src/libraries/core/input src/libraries/core/module src/libraries/core/object src/libraries/core/singleton src/libraries/network src/libraries/network/packet src/libraries/network/synchronisable src/libraries/tools src/libraries/util src/libraries/util/output src/modules/dodgerace src/modules/gametypes src/modules/invader src/modules/jump src/modules/mini4dgame src/modules/objects src/modules/objects/controllers src/modules/objects/eventsystem src/modules/overlays/hud src/modules/overlays/stats src/modules/pong src/modules/portals src/modules/tetris src/modules/towerdefense src/modules/weapons/projectiles src/orxonox src/orxonox/collisionshapes src/orxonox/controllers src/orxonox/gamestates src/orxonox/gametypes src/orxonox/graphics src/orxonox/infos src/orxonox/interfaces src/orxonox/items src/orxonox/overlays src/orxonox/weaponsystem src/orxonox/worldentities src/orxonox/worldentities/pawns test/core/command test/core/object test/util
landauf at orxonox.net
landauf at orxonox.net
Fri Nov 6 22:54:37 CET 2015
Author: landauf
Date: 2015-11-06 22:54:34 +0100 (Fri, 06 Nov 2015)
New Revision: 10768
Modified:
code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.cc
code/branches/cpp11_v2/src/libraries/core/BaseObject.cc
code/branches/cpp11_v2/src/libraries/core/BaseObject.h
code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.cc
code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h
code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc
code/branches/cpp11_v2/src/libraries/core/Core.cc
code/branches/cpp11_v2/src/libraries/core/GUIManager.cc
code/branches/cpp11_v2/src/libraries/core/GUIManager.h
code/branches/cpp11_v2/src/libraries/core/Game.cc
code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc
code/branches/cpp11_v2/src/libraries/core/Language.cc
code/branches/cpp11_v2/src/libraries/core/Loader.cc
code/branches/cpp11_v2/src/libraries/core/Namespace.cc
code/branches/cpp11_v2/src/libraries/core/NamespaceNode.h
code/branches/cpp11_v2/src/libraries/core/Template.cc
code/branches/cpp11_v2/src/libraries/core/Thread.cc
code/branches/cpp11_v2/src/libraries/core/ThreadWin.cc
code/branches/cpp11_v2/src/libraries/core/XMLPort.h
code/branches/cpp11_v2/src/libraries/core/class/Identifiable.cc
code/branches/cpp11_v2/src/libraries/core/class/Identifier.cc
code/branches/cpp11_v2/src/libraries/core/class/Identifier.h
code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc
code/branches/cpp11_v2/src/libraries/core/class/SubclassIdentifier.h
code/branches/cpp11_v2/src/libraries/core/class/Super.h
code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc
code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.h
code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h
code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.cc
code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.cc
code/branches/cpp11_v2/src/libraries/core/command/Executor.h
code/branches/cpp11_v2/src/libraries/core/command/Functor.h
code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.cc
code/branches/cpp11_v2/src/libraries/core/command/IRC.cc
code/branches/cpp11_v2/src/libraries/core/command/TclBind.cc
code/branches/cpp11_v2/src/libraries/core/command/TclBind.h
code/branches/cpp11_v2/src/libraries/core/command/TclThreadManager.cc
code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.cc
code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc
code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc
code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.cc
code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.cc
code/branches/cpp11_v2/src/libraries/core/input/Button.cc
code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h
code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h
code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc
code/branches/cpp11_v2/src/libraries/core/input/InputState.cc
code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc
code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.cc
code/branches/cpp11_v2/src/libraries/core/input/Mouse.cc
code/branches/cpp11_v2/src/libraries/core/module/DynLibManager.cc
code/branches/cpp11_v2/src/libraries/core/module/PluginManager.cc
code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.cc
code/branches/cpp11_v2/src/libraries/core/object/Context.cc
code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.cc
code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h
code/branches/cpp11_v2/src/libraries/core/object/StrongPtr.h
code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h
code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.cc
code/branches/cpp11_v2/src/libraries/network/Connection.cc
code/branches/cpp11_v2/src/libraries/network/GamestateHandler.cc
code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc
code/branches/cpp11_v2/src/libraries/network/Host.cc
code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc
code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h
code/branches/cpp11_v2/src/libraries/network/NetworkFunctionManager.cc
code/branches/cpp11_v2/src/libraries/network/Server.cc
code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc
code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.cc
code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h
code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc
code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc
code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h
code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h
code/branches/cpp11_v2/src/libraries/tools/BillboardSet.cc
code/branches/cpp11_v2/src/libraries/tools/DebugDrawer.cc
code/branches/cpp11_v2/src/libraries/tools/Mesh.cc
code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.cc
code/branches/cpp11_v2/src/libraries/tools/Shader.cc
code/branches/cpp11_v2/src/libraries/tools/Shader.h
code/branches/cpp11_v2/src/libraries/tools/Timer.cc
code/branches/cpp11_v2/src/libraries/util/Math.h
code/branches/cpp11_v2/src/libraries/util/MultiType.h
code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h
code/branches/cpp11_v2/src/libraries/util/SharedPtr.h
code/branches/cpp11_v2/src/libraries/util/SignalHandler.cc
code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.cc
code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc
code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.cc
code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.cc
code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc
code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.cc
code/branches/cpp11_v2/src/modules/invader/Invader.cc
code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc
code/branches/cpp11_v2/src/modules/jump/Jump.cc
code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc
code/branches/cpp11_v2/src/modules/jump/JumpItem.cc
code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc
code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc
code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc
code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc
code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.cc
code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.cc
code/branches/cpp11_v2/src/modules/objects/Attacher.cc
code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc
code/branches/cpp11_v2/src/modules/objects/eventsystem/EventDispatcher.cc
code/branches/cpp11_v2/src/modules/objects/eventsystem/EventFilter.cc
code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.cc
code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.cc
code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.cc
code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.cc
code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.cc
code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.cc
code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.cc
code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc
code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.cc
code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc
code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc
code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.cc
code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.cc
code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.cc
code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.cc
code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.cc
code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.cc
code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.cc
code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.cc
code/branches/cpp11_v2/src/modules/overlays/stats/Stats.cc
code/branches/cpp11_v2/src/modules/pong/Pong.cc
code/branches/cpp11_v2/src/modules/pong/PongAI.cc
code/branches/cpp11_v2/src/modules/pong/PongBall.cc
code/branches/cpp11_v2/src/modules/pong/PongScore.cc
code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc
code/branches/cpp11_v2/src/modules/portals/PortalLink.cc
code/branches/cpp11_v2/src/modules/tetris/Tetris.cc
code/branches/cpp11_v2/src/modules/tetris/TetrisScore.cc
code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.cc
code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.cc
code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.cc
code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc
code/branches/cpp11_v2/src/orxonox/CameraManager.cc
code/branches/cpp11_v2/src/orxonox/Level.cc
code/branches/cpp11_v2/src/orxonox/LevelManager.cc
code/branches/cpp11_v2/src/orxonox/PlayerManager.cc
code/branches/cpp11_v2/src/orxonox/Radar.cc
code/branches/cpp11_v2/src/orxonox/Scene.cc
code/branches/cpp11_v2/src/orxonox/Scene.h
code/branches/cpp11_v2/src/orxonox/Test.cc
code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.cc
code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc
code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h
code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc
code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc
code/branches/cpp11_v2/src/orxonox/controllers/Controller.cc
code/branches/cpp11_v2/src/orxonox/controllers/DroneController.cc
code/branches/cpp11_v2/src/orxonox/controllers/FormationController.cc
code/branches/cpp11_v2/src/orxonox/controllers/HumanController.cc
code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.cc
code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.cc
code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.cc
code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.cc
code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc
code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.cc
code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h
code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h
code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.cc
code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h
code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc
code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h
code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h
code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h
code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h
code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.cc
code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h
code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h
code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.cc
code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h
code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc
code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h
code/branches/cpp11_v2/src/orxonox/graphics/Backlight.cc
code/branches/cpp11_v2/src/orxonox/graphics/Light.cc
code/branches/cpp11_v2/src/orxonox/graphics/Model.cc
code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.cc
code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.cc
code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.cc
code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.h
code/branches/cpp11_v2/src/orxonox/items/Engine.cc
code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc
code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.cc
code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.cc
code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc
code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc
code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.cc
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.cc
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.cc
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h
code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc
code/branches/cpp11_v2/src/orxonox/worldentities/BigExplosion.cc
code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc
code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc
code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.cc
code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.cc
code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.cc
code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/ModularSpaceShip.cc
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.cc
code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Spectator.cc
code/branches/cpp11_v2/test/core/command/CommandTest.cc
code/branches/cpp11_v2/test/core/object/StrongPtrTest.cc
code/branches/cpp11_v2/test/core/object/WeakPtrTest.cc
code/branches/cpp11_v2/test/util/SharedPtrTest.cc
code/branches/cpp11_v2/test/util/SmallObjectAllocatorTest.cc
Log:
replace '0' by 'nullptr'
Modified: code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/ApplicationPaths.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -67,7 +67,7 @@
namespace bf = boost::filesystem;
//! Static pointer to the singleton
- ApplicationPaths* ApplicationPaths::singletonPtr_s = 0;
+ ApplicationPaths* ApplicationPaths::singletonPtr_s = nullptr;
ApplicationPaths::ApplicationPaths()
: rootPath_(*(new bf::path()))
Modified: code/branches/cpp11_v2/src/libraries/core/BaseObject.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/BaseObject.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/BaseObject.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -64,9 +64,9 @@
this->bVisible_ = true;
this->bRegisteredEventStates_ = false;
- this->lastLoadedXMLElement_ = 0;
+ this->lastLoadedXMLElement_ = nullptr;
- this->mainStateFunctor_ = 0;
+ this->mainStateFunctor_ = nullptr;
if (context)
this->setContext(context);
@@ -85,7 +85,7 @@
}
else
{
- this->file_ = 0;
+ this->file_ = nullptr;
this->sceneID_ = OBJECTID_UNKNOWN;
}
}
@@ -131,7 +131,7 @@
XMLPortObjectTemplate(BaseObject, Template, "templates", addTemplate, getTemplate, xmlelement, mode, Template*);
XMLPortObject(BaseObject, BaseObject, "eventlisteners", addEventListener, getEventListener, xmlelement, mode);
- Element* events = 0;
+ Element* events = nullptr;
if (mode == XMLPort::LoadObject || mode == XMLPort::ExpandObject)
events = xmlelement.FirstChildElement("events", false);
else if (mode == XMLPort::SaveObject)
@@ -239,7 +239,7 @@
return (*it);
i++;
}
- return 0;
+ return nullptr;
}
/**
@@ -277,7 +277,7 @@
return it->first;
++i;
}
- return 0;
+ return nullptr;
}
/**
@@ -301,7 +301,7 @@
return *it;
++i;
}
- return 0;
+ return nullptr;
}
/**
@@ -330,7 +330,7 @@
if (it != this->eventStates_.end())
return (it->second);
else
- return 0;
+ return nullptr;
}
/**
@@ -422,7 +422,7 @@
*/
void BaseObject::changedMainStateName()
{
- this->mainStateFunctor_ = 0;
+ this->mainStateFunctor_ = nullptr;
if (!this->mainStateName_.empty())
{
Modified: code/branches/cpp11_v2/src/libraries/core/BaseObject.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/BaseObject.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/BaseObject.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -217,7 +217,7 @@
bool bInitialized_; //!< True if the object was initialized (passed the object registration)
const XMLFile* file_; //!< The XMLFile that loaded this object
- Element* lastLoadedXMLElement_; //!< Non 0 if the TinyXML attributes have already been copied to our own lowercase map
+ Element* lastLoadedXMLElement_; //!< Non nullptr if the TinyXML attributes have already been copied to our own lowercase map
std::map<std::string, std::string> xmlAttributes_; //!< Lowercase XML attributes
std::string loaderIndentation_; //!< Indentation of the debug output in the Loader
StrongOrWeakPtr<Namespace> namespace_;
Modified: code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -206,7 +206,7 @@
if (!this->nodes_.empty())
return ((*this->nodes_.top().first) == compare);
else
- return (compare == 0);
+ return (compare == nullptr);
}
/**
@@ -217,7 +217,7 @@
if (!this->nodes_.empty())
return ((*this->nodes_.top().first) != compare);
else
- return (compare != 0);
+ return (compare != nullptr);
}
Modified: code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/ClassTreeMask.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -210,7 +210,7 @@
/// Begin of the ClassTreeMaskObjectIterator.
inline const ClassTreeMask& begin() const { return (*this); }
/// End of the ClassTreeMaskObjectIterator.
- inline BaseObject* end() const { return 0; }
+ inline BaseObject* end() const { return nullptr; }
ClassTreeMask& operator=(const ClassTreeMask& other);
@@ -284,9 +284,9 @@
const ClassTreeMaskObjectIterator& operator++();
/// Returns true if the ClassTreeMaskObjectIterator points at the given object.
- inline bool operator==(BaseObject* pointer) const { return (this->objectIterator_ && (*this->objectIterator_) == pointer) || (!this->objectIterator_ && pointer == 0); }
+ inline bool operator==(BaseObject* pointer) const { return (this->objectIterator_ && (*this->objectIterator_) == pointer) || (!this->objectIterator_ && pointer == nullptr); }
/// Returns true if the ClassTreeMaskObjectIterator doesn't point at the given object.
- inline bool operator!=(BaseObject* pointer) const { return (this->objectIterator_ && (*this->objectIterator_) != pointer) || (!this->objectIterator_ && pointer != 0); }
+ inline bool operator!=(BaseObject* pointer) const { return (this->objectIterator_ && (*this->objectIterator_) != pointer) || (!this->objectIterator_ && pointer != nullptr); }
/// Returns true if the ClassTreeMaskObjectIterator hasn't already reached the end.
inline operator bool() const { return (this->objectIterator_); }
/// Returns the object the ClassTreeMaskObjectIterator currently points at.
Modified: code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -66,7 +66,7 @@
namespace bf = boost::filesystem;
//! Static pointer to the singleton
- ConfigurablePaths* ConfigurablePaths::singletonPtr_s = 0;
+ ConfigurablePaths* ConfigurablePaths::singletonPtr_s = nullptr;
SetCommandLineArgument(externalDataPath, "").information("Path to the external data files");
SetCommandLineArgument(writingPathSuffix, "").information("Additional subfolder for config and log files");
Modified: code/branches/cpp11_v2/src/libraries/core/Core.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Core.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/Core.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -82,7 +82,7 @@
namespace orxonox
{
//! Static pointer to the singleton
- Core* Core::singletonPtr_s = 0;
+ Core* Core::singletonPtr_s = nullptr;
SetCommandLineArgument(settingsFile, "orxonox.ini").information("THE configuration file");
#if !defined(ORXONOX_PLATFORM_APPLE) && !defined(ORXONOX_USE_WINMAIN)
Modified: code/branches/cpp11_v2/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GUIManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/GUIManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -247,7 +247,7 @@
static CEGUI::MouseButton convertButton(MouseButtonCode::ByEnum button);
- GUIManager* GUIManager::singletonPtr_s = 0;
+ GUIManager* GUIManager::singletonPtr_s = nullptr;
/*static*/ const std::string GUIManager::defaultScheme_ = "TaharezGreen"; //Alternative: Orxonox (not fully complete yet, see the graphics menu)
SetConsoleCommand("showGUI", &GUIManager::showGUI).defaultValue(1, false).defaultValue(2, false);
@@ -336,13 +336,13 @@
// Create the CEGUI system singleton
#ifdef ORXONOX_OLD_CEGUI
- guiSystem_ = new System(guiRenderer_, resourceProvider_, 0, scriptModule_);
+ guiSystem_ = new System(guiRenderer_, resourceProvider_, nullptr, scriptModule_);
// Add functions that have been renamed in newer versions
luaState_->doString("CEGUI.SchemeManager.create = CEGUI.SchemeManager.loadScheme");
luaState_->doString("CEGUI.Window.getUnclippedOuterRect = CEGUI.Window.getUnclippedPixelRect");
luaState_->doString("CEGUI.ImagesetManager.createFromImageFile= CEGUI.ImagesetManager.createImagesetFromImageFile");
#else
- guiSystem_ = &System::create(*guiRenderer_, resourceProvider_, 0, imageCodec_, scriptModule_);
+ guiSystem_ = &System::create(*guiRenderer_, resourceProvider_, nullptr, imageCodec_, scriptModule_);
#endif
CEGUI::String defaultXMLParserName = CEGUI::System::getSingleton().getDefaultXMLParserName();
@@ -467,7 +467,7 @@
{
#ifdef ORXONOX_OLD_CEGUI
if (camera == nullptr)
- this->guiRenderer_->setTargetSceneManager(0);
+ this->guiRenderer_->setTargetSceneManager(nullptr);
else
this->guiRenderer_->setTargetSceneManager(camera->getSceneManager());
#else
Modified: code/branches/cpp11_v2/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GUIManager.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/GUIManager.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -134,7 +134,7 @@
inline void setPlayer(const std::string& guiname, PlayerInfo* player)
{ this->players_[guiname] = player; }
- inline orxonox::PlayerInfo* getPlayer(const std::string& guiname) const { std::map<std::string, PlayerInfo*>::const_iterator it = this->players_.find(guiname); return (it != this->players_.end()) ? it->second : 0; } // tolua_export
+ inline orxonox::PlayerInfo* getPlayer(const std::string& guiname) const { std::map<std::string, PlayerInfo*>::const_iterator it = this->players_.find(guiname); return (it != this->players_.end()) ? it->second : nullptr; } // tolua_export
// TODO: Temporary hack because the tolua exported CEGUI method does not seem to work
static void subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function); // tolua_export
Modified: code/branches/cpp11_v2/src/libraries/core/Game.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Game.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/Game.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -65,7 +65,7 @@
SetConsoleCommand("Stats", "printTickTime", &printTickTime);
std::map<std::string, GameStateInfo> Game::gameStateDeclarations_s;
- Game* Game::singletonPtr_s = 0;
+ Game* Game::singletonPtr_s = nullptr;
//! Represents one node of the game state tree.
struct GameStateTreeNode
Modified: code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -92,14 +92,14 @@
{ orxonox::WindowEventListener::moveWindow(); }
};
- GraphicsManager* GraphicsManager::singletonPtr_s = 0;
+ GraphicsManager* GraphicsManager::singletonPtr_s = nullptr;
RegisterAbstractClass(GraphicsManager).inheritsFrom<Configurable>();
GraphicsManager::GraphicsManager(bool bLoadRenderer)
: ogreWindowEventListener_(new OgreWindowEventListener())
- , renderWindow_(0)
- , viewport_(0)
+ , renderWindow_(nullptr)
+ , viewport_(nullptr)
, lastFrameStartTime_(0.0f)
, lastFrameEndTime_(0.0f)
, destructionHelper_(this)
@@ -303,7 +303,7 @@
// Note: This may throw when adding a viewport with an existing z-order!
// But in our case we only have one viewport for now anyway, therefore
// no ScopeGuards or anything to handle exceptions.
- this->viewport_ = this->renderWindow_->addViewport(0, 0);
+ this->viewport_ = this->renderWindow_->addViewport(nullptr, 0);
Ogre::TextureManager::getSingleton().setDefaultNumMipmaps(Ogre::MIP_UNLIMITED);
@@ -311,7 +311,7 @@
#if defined(ORXONOX_PLATFORM_WINDOWS)
HWND hwnd;
this->renderWindow_->getCustomAttribute("WINDOW", (void*)&hwnd);
- LONG iconID = (LONG)LoadIcon(GetModuleHandle(0), MAKEINTRESOURCE(101));
+ LONG iconID = (LONG)LoadIcon(GetModuleHandle(nullptr), MAKEINTRESOURCE(101));
SetClassLong(hwnd, GCL_HICON, iconID);
#endif
Modified: code/branches/cpp11_v2/src/libraries/core/Language.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Language.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/Language.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -87,7 +87,7 @@
// ### Language ###
// ###############################
- Language* Language::singletonPtr_s = 0;
+ Language* Language::singletonPtr_s = nullptr;
/**
@brief Constructor: Reads the default language file and sets some values.
Modified: code/branches/cpp11_v2/src/libraries/core/Loader.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Loader.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/Loader.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -47,7 +47,7 @@
namespace orxonox
{
- Loader* Loader::singletonPtr_s = 0;
+ Loader* Loader::singletonPtr_s = nullptr;
/**
@brief
Modified: code/branches/cpp11_v2/src/libraries/core/Namespace.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Namespace.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/Namespace.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -108,7 +108,7 @@
const BaseObject* Namespace::saveObjects(unsigned int index) const
{
- return 0; // todo
+ return nullptr; // todo
}
bool Namespace::includes(const Namespace* ns) const
Modified: code/branches/cpp11_v2/src/libraries/core/NamespaceNode.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/NamespaceNode.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/NamespaceNode.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -45,7 +45,7 @@
class NamespaceNode
{
public:
- NamespaceNode(const std::string& name, NamespaceNode* parent = 0);
+ NamespaceNode(const std::string& name, NamespaceNode* parent = nullptr);
~NamespaceNode();
std::set<NamespaceNode*> getNodeRelative(const std::string& name);
Modified: code/branches/cpp11_v2/src/libraries/core/Template.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Template.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/Template.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -48,7 +48,7 @@
this->bIsLink_ = false;
this->bLoadDefaults_ = true;
this->bIsReturningXMLElement_ = false;
- this->baseclassIdentifier_ = 0;
+ this->baseclassIdentifier_ = nullptr;
}
Template::~Template()
@@ -175,7 +175,7 @@
else
{
orxout(internal_warning, context::templates) << "Template with name " << name << " doesn't exist." << endl;
- return 0;
+ return nullptr;
}
}
Modified: code/branches/cpp11_v2/src/libraries/core/Thread.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/Thread.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/Thread.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -47,7 +47,7 @@
Thread::Thread():
- executor_(0),
+ executor_(nullptr),
isWorking_(false),
stopThread_(false)
{
@@ -101,7 +101,7 @@
{
(*executor)();
this->executorMutex_->lock();
- this->executor_ = 0;
+ this->executor_ = nullptr;
this->executorMutex_->unlock();
this->isWorkingMutex_->lock();
this->isWorking_=false;
Modified: code/branches/cpp11_v2/src/libraries/core/ThreadWin.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/ThreadWin.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/ThreadWin.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -44,7 +44,7 @@
Thread::Thread():
- executor_(0),
+ executor_(nullptr),
isWorking_(false),
stopThread_(false)
{
@@ -100,7 +100,7 @@
// {
// (*executor)();
// this->executorMutex_->lock();
-// this->executor_ = 0;
+// this->executor_ = nullptr;
// this->executorMutex_->unlock();
// this->isWorkingMutex_->lock();
// this->isWorking_=false;
Modified: code/branches/cpp11_v2/src/libraries/core/XMLPort.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/XMLPort.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/XMLPort.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -244,7 +244,7 @@
if (index < number_of_added_objects_)
return my_added_objects[index];
else
- return 0;
+ return nullptr;
}
@endcode
@@ -398,7 +398,7 @@
this->owner_->xmlAttributes_.clear();
// Iterate through the attributes manually in order to make them case insensitive
ticpp::Attribute* attribute = xmlelement.FirstAttribute(false);
- while (attribute != 0)
+ while (attribute != nullptr)
{
this->owner_->xmlAttributes_[getLowercase(attribute->Name())] = attribute->Value();
attribute = attribute->Next(false);
Modified: code/branches/cpp11_v2/src/libraries/core/class/Identifiable.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/Identifiable.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/class/Identifiable.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -47,7 +47,7 @@
*/
Identifiable::Identifiable()
{
- this->identifier_ = 0;
+ this->identifier_ = nullptr;
this->objectPointers_.reserve(6); // Optimisation
RegisterObject(Identifiable);
Modified: code/branches/cpp11_v2/src/libraries/core/class/Identifier.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/Identifier.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/class/Identifier.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -116,7 +116,7 @@
orxout(user_error) << "Cannot fabricate an object of type '" << this->name_ << "'. Class has no factory." << endl;
orxout(user_error) << "Aborting..." << endl;
abort();
- return 0;
+ return nullptr;
}
}
@@ -392,7 +392,7 @@
if (it != configValues_.end())
return it->second;
else
- return 0;
+ return nullptr;
}
/**
@@ -406,7 +406,7 @@
if (it != this->xmlportParamContainers_.end())
return it->second;
else
- return 0;
+ return nullptr;
}
/**
@@ -437,7 +437,7 @@
if (it != this->xmlportObjectContainers_.end())
return it->second;
else
- return 0;
+ return nullptr;
}
/**
Modified: code/branches/cpp11_v2/src/libraries/core/class/Identifier.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/Identifier.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/class/Identifier.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -55,7 +55,7 @@
object->getIdentifier()->getName(); // returns "MyClass"
- Identifiable* other = object->getIdentifier()->fabricate(0); // fabricates a new instance of MyClass
+ Identifiable* other = object->getIdentifier()->fabricate(nullptr); // fabricates a new instance of MyClass
// test the class hierarchy
@@ -136,7 +136,7 @@
ORX_FORCEINLINE unsigned int getClassID() const { return this->classID_; }
/// Returns true if the Identifier has a Factory.
- inline bool hasFactory() const { return (this->factory_ != 0); }
+ inline bool hasFactory() const { return (this->factory_ != nullptr); }
Identifiable* fabricate(Context* context);
@@ -296,7 +296,7 @@
{ return typeid(T); }
virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const
- { return dynamic_cast<T*>(object) != 0; }
+ { return dynamic_cast<T*>(object) != nullptr; }
virtual void destroyObjects();
@@ -407,7 +407,7 @@
template <class T>
void ClassIdentifier<T>::destroyObjects()
{
- this->destroyObjects((T*)0);
+ this->destroyObjects((T*)nullptr);
}
/**
Modified: code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/class/IdentifierManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -43,7 +43,7 @@
namespace orxonox
{
- IdentifierManager* IdentifierManager::singletonPtr_s = 0;
+ IdentifierManager* IdentifierManager::singletonPtr_s = nullptr;
IdentifierManager::IdentifierManager()
{
@@ -220,7 +220,7 @@
if (it != this->identifierByString_.end())
return it->second;
else
- return 0;
+ return nullptr;
}
/**
@@ -234,7 +234,7 @@
if (it != this->identifierByLowercaseString_.end())
return it->second;
else
- return 0;
+ return nullptr;
}
/**
@@ -248,7 +248,7 @@
if (it != this->identifierByNetworkId_.end())
return it->second;
else
- return 0;
+ return nullptr;
}
/**
@@ -262,7 +262,7 @@
for (std::set<Identifier*>::iterator it = this->identifiers_.begin(); it != this->identifiers_.end(); ++it)
if ((*it)->getTypeInfo() == typeInfo)
return (*it);
- return 0;
+ return nullptr;
}
/**
Modified: code/branches/cpp11_v2/src/libraries/core/class/SubclassIdentifier.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/SubclassIdentifier.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/class/SubclassIdentifier.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -188,7 +188,7 @@
orxout(user_error) << "Aborting..." << endl;
abort();
- return 0;
+ return nullptr;
}
}
Modified: code/branches/cpp11_v2/src/libraries/core/class/Super.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/class/Super.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/class/Super.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -93,7 +93,7 @@
{ \
static void superCheck() \
{ \
- SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(0)); \
+ SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(nullptr)); \
SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::superCheck(); \
} \
\
@@ -107,7 +107,7 @@
if (((ClassIdentifier<T>*)(*it))->bSuperFunctionCaller_##functionname##_isFallback_ && ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_) \
{ \
delete ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_; \
- ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = 0; \
+ ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = nullptr; \
((ClassIdentifier<T>*)(*it))->bSuperFunctionCaller_##functionname##_isFallback_ = false; \
} \
\
@@ -153,7 +153,7 @@
{
// This call to the apply-function is the whole check. By calling the function with
// a T* pointer, the right function get's called.
- SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(0));
+ SuperFunctionCondition<functionnumber, T, 0, templatehack2>::apply(static_cast<T*>(nullptr));
// Go go the superCheck for of next super-function (functionnumber + 1)
SuperFunctionCondition<functionnumber + 1, T, 0, templatehack2>::superCheck();
@@ -177,7 +177,7 @@
{
// Delete the fallback caller an prepare to get a real caller
delete ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_;
- ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = 0;
+ ((ClassIdentifier<T>*)(*it))->superFunctionCaller_##functionname##_ = nullptr;
((ClassIdentifier<T>*)(*it))->bSuperFunctionCaller_##functionname##_isFallback_ = false;
}
Modified: code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -53,8 +53,8 @@
*/
void CommandEvaluation::initialize(const std::string& command)
{
- this->execCommand_ = 0;
- this->hintCommand_ = 0;
+ this->execCommand_ = nullptr;
+ this->hintCommand_ = nullptr;
this->string_ = command;
this->execArgumentsOffset_ = 0;
this->hintArgumentsOffset_ = 0;
Modified: code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -85,7 +85,7 @@
CommandEvaluation();
int execute();
- MultiType query(int* error = 0);
+ MultiType query(int* error = nullptr);
std::string complete();
std::string hint();
@@ -96,7 +96,7 @@
/// Returns true if the command evaluation contains a valid command that can be executed.
inline bool isValid() const
- { return (this->execCommand_ != 0); }
+ { return (this->execCommand_ != nullptr); }
/// Returns the console command that was evaluated by this object.
inline const ConsoleCommand* getConsoleCommand() const
Modified: code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/command/CommandExecutor.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -112,8 +112,8 @@
public:
static int execute(const std::string& command, bool useTcl = true, bool printErrors = true); // tolua_export
- static MultiType queryMT(const std::string& command, int* error = 0, bool useTcl = true);
- static std::string query(const std::string& command, int* error = 0, bool useTcl = true); // tolua_export
+ static MultiType queryMT(const std::string& command, int* error = nullptr, bool useTcl = true);
+ static std::string query(const std::string& command, int* error = NULL, bool useTcl = true); // tolua_export
static CommandEvaluation evaluate(const std::string& command);
Modified: code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommand.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -75,7 +75,7 @@
this->baseFunctor_ = executor->getFunctor();
for (size_t i = 0; i < MAX_FUNCTOR_ARGUMENTS; ++i)
- this->argumentCompleter_[i] = 0;
+ this->argumentCompleter_[i] = nullptr;
this->keybindMode_ = KeybindMode::OnPress;
this->inputConfiguredParam_ = -1;
@@ -352,7 +352,7 @@
void ConsoleCommand::resetFunction()
{
if (this->executor_)
- this->executor_->setFunctor(0);
+ this->executor_->setFunctor(nullptr);
this->objectStack_.clear();
}
@@ -404,7 +404,7 @@
*/
void ConsoleCommand::popObject()
{
- void* newobject = 0;
+ void* newobject = nullptr;
if (!this->objectStack_.empty())
{
newobject = this->objectStack_.back();
@@ -421,7 +421,7 @@
if (this->executor_ && this->executor_->getFunctor())
return this->executor_->getFunctor()->getRawObjectPointer();
else
- return 0;
+ return nullptr;
}
/**
@@ -527,7 +527,7 @@
if (index < 5)
return this->argumentCompleter_[index];
else
- return 0;
+ return nullptr;
}
/**
Modified: code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -38,7 +38,7 @@
namespace orxonox
{
- ConsoleCommandManager* ConsoleCommandManager::singletonPtr_s = 0;
+ ConsoleCommandManager* ConsoleCommandManager::singletonPtr_s = nullptr;
/**
@brief Returns the command with given group an name.
@@ -67,7 +67,7 @@
else
orxout(internal_error, context::commands) << "Couldn't find console command with group \"" << group << "\" and name \"" << name << "\"" << endl;
}
- return 0;
+ return nullptr;
}
/**
@@ -100,7 +100,7 @@
else
orxout(internal_error, context::commands) << "Couldn't find console command with group \"" << group << "\" and name \"" << name << "\"" << endl;
}
- return 0;
+ return nullptr;
}
/**
@@ -124,7 +124,7 @@
return;
// check if a command with this name already exists
- if (this->getCommand(group, name) != 0)
+ if (this->getCommand(group, name) != nullptr)
{
if (group == "")
orxout(internal_warning, context::commands) << "A console command with shortcut \"" << name << "\" already exists." << endl;
Modified: code/branches/cpp11_v2/src/libraries/core/command/Executor.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/Executor.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/command/Executor.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -120,10 +120,10 @@
inline MultiType operator()(const MultiType& arg1, const MultiType& arg2, const MultiType& arg3, const MultiType& arg4, const MultiType& arg5) const
{ return (*this->functor_)(arg1, arg2, arg3, arg4, arg5); }
- MultiType parse(const std::string& arguments, int* error = 0, const std::string& delimiter = " ", bool bPrintError = false) const;
- MultiType parse(const SubString& arguments, int* error = 0, const std::string& delimiter = " ", bool bPrintError = false) const;
+ MultiType parse(const std::string& arguments, int* error = nullptr, const std::string& delimiter = " ", bool bPrintError = false) const;
+ MultiType parse(const SubString& arguments, int* error = nullptr, const std::string& delimiter = " ", bool bPrintError = false) const;
- int evaluateArguments(const SubString& arguments, MultiType arg[MAX_FUNCTOR_ARGUMENTS], int* error = 0, const std::string& delimiter = " ") const;
+ int evaluateArguments(const SubString& arguments, MultiType arg[MAX_FUNCTOR_ARGUMENTS], int* error = nullptr, const std::string& delimiter = " ") const;
/// Changes the functor.
inline void setFunctor(const FunctorPtr& functor)
@@ -248,7 +248,7 @@
using Executor::parse;
/// Overloads Executor::parse() with an additional object-pointer.
- MultiType parse(T* object, const std::string& arguments, int* error = 0, const std::string& delimiter = " ", bool bPrintError = false) const
+ MultiType parse(T* object, const std::string& arguments, int* error = nullptr, const std::string& delimiter = " ", bool bPrintError = false) const
{
T* oldobject = this->functorMember_->getObject();
Modified: code/branches/cpp11_v2/src/libraries/core/command/Functor.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/Functor.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/command/Functor.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -241,7 +241,7 @@
{
public:
/// Constructor: Stores the object-pointer.
- FunctorMember(O* object = 0) : object_(object), bSafeMode_(false) {}
+ FunctorMember(O* object = nullptr) : object_(object), bSafeMode_(false) {}
virtual ~FunctorMember() { if (this->bSafeMode_) { this->unregisterObject(this->object_); } }
/// Calls the function-pointer with up to five arguments and an object. In case of a static-function, the object can be nullptr. @return Returns the return-value of the function (if any; MultiType::Null otherwise)
@@ -309,7 +309,7 @@
/// Will be called by Destroyable::~Destroyable() if the stored object is deleted and the Functor is in safe mode.
inline void objectDeleted()
- { this->object_ = 0; }
+ { this->object_ = nullptr; }
O* object_; ///< The stored object-pointer, used to execute a member-function (or nullptr for static functions)
bool bSafeMode_; ///< If true, the functor is in safe mode and registers itself as listener at the object and changes the pointer to nullptr if the object is deleted
@@ -321,7 +321,7 @@
{
public:
/// Constructor: Stores the object-pointer.
- FunctorMember(void* object = 0) {}
+ FunctorMember(void* object = nullptr) {}
/// Calls the function-pointer with up to five arguments and an object. In case of a static-function, the object can be nullptr. @return Returns the return-value of the function (if any; MultiType::Null otherwise)
virtual MultiType operator()(void* object, const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) = 0;
@@ -329,7 +329,7 @@
// see Functor::operator()()
MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null)
{
- return (*this)((void*)0, param1, param2, param3, param4, param5);
+ return (*this)((void*)nullptr, param1, param2, param3, param4, param5);
}
// see Functor::getType()
@@ -341,7 +341,7 @@
{ orxout(internal_warning) << "Can't assign an object pointer to a static functor" << endl; }
// see Functor::getRawObjectPointer()
inline void* getRawObjectPointer() const
- { return 0; }
+ { return nullptr; }
// see Functor::setSafeMode()
inline void setSafeMode(bool) {}
@@ -368,7 +368,7 @@
{
public:
/// Constructor: Initializes the base class and stores the function-pointer.
- FunctorPointer(F functionPointer, O* object = 0) : FunctorMember<O>(object), functionPointer_(functionPointer) {}
+ FunctorPointer(F functionPointer, O* object = nullptr) : FunctorMember<O>(object), functionPointer_(functionPointer) {}
/// Changes the function-pointer.
inline void setFunction(F functionPointer)
@@ -493,7 +493,7 @@
{
public:
/// Constructor: Initializes the base class.
- FunctorTemplate(typename detail::FunctionPointer<R, O, isconst, P1, P2, P3, P4, P5>::Type functionPointer, O* object = 0) : FunctorPointer<typename detail::FunctionPointer<R, O, isconst, P1, P2, P3, P4, P5>::Type, O>(functionPointer, object) {}
+ FunctorTemplate(typename detail::FunctionPointer<R, O, isconst, P1, P2, P3, P4, P5>::Type functionPointer, O* object = nullptr) : FunctorPointer<typename detail::FunctionPointer<R, O, isconst, P1, P2, P3, P4, P5>::Type, O>(functionPointer, object) {}
// see FunctorMember::operator()()
MultiType operator()(O* object, const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null)
Modified: code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -61,7 +61,7 @@
, cout_(std::cout.rdbuf())
, promptString_("orxonox # ")
, bStatusPrinted_(false)
- , originalTerminalSettings_(0)
+ , originalTerminalSettings_(nullptr)
{
this->setTerminalMode();
this->shell_->registerListener(this);
@@ -325,7 +325,7 @@
{
tcsetattr(0, TCSANOW, IOConsole::singletonPtr_s->originalTerminalSettings_);
delete IOConsole::singletonPtr_s->originalTerminalSettings_;
- IOConsole::singletonPtr_s->originalTerminalSettings_ = 0;
+ IOConsole::singletonPtr_s->originalTerminalSettings_ = nullptr;
}
}
Modified: code/branches/cpp11_v2/src/libraries/core/command/IRC.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/IRC.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/command/IRC.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -65,7 +65,7 @@
*/
IRC::IRC()
{
- this->interpreter_ = 0;
+ this->interpreter_ = nullptr;
}
/**
Modified: code/branches/cpp11_v2/src/libraries/core/command/TclBind.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/TclBind.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/command/TclBind.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -46,7 +46,7 @@
SetConsoleCommand("tcl", &TclBind::tcl);
SetConsoleCommand("bgerror", &TclBind::bgerror).hide();
- TclBind* TclBind::singletonPtr_s = 0;
+ TclBind* TclBind::singletonPtr_s = nullptr;
/**
@brief Constructor: Initializes the Tcl-interpreter with a given data path.
@@ -54,7 +54,7 @@
*/
TclBind::TclBind(const std::string& datapath)
{
- this->interpreter_ = 0;
+ this->interpreter_ = nullptr;
this->bSetTclDataPath_ = false;
this->setDataPath(datapath);
}
Modified: code/branches/cpp11_v2/src/libraries/core/command/TclBind.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/TclBind.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/command/TclBind.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -120,7 +120,7 @@
static std::string tcl_query(Tcl::object const &args);
static void tcl_execute(Tcl::object const &args);
- static std::string eval(const std::string& tclcode, int* error = 0);
+ static std::string eval(const std::string& tclcode, int* error = nullptr);
private:
TclBind(const TclBind& other); ///< Copy-constructor, not implemented
Modified: code/branches/cpp11_v2/src/libraries/core/command/TclThreadManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/command/TclThreadManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/command/TclThreadManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -85,7 +85,7 @@
bool bRunning_; ///< This variable stays true until destroy() gets called
};
- TclThreadManager* TclThreadManager::singletonPtr_s = 0;
+ TclThreadManager* TclThreadManager::singletonPtr_s = nullptr;
/**
@brief Constructor
@@ -288,7 +288,7 @@
}
catch (const Tcl::tcl_error& e)
{
- bundle->interpreter_ = 0;
+ bundle->interpreter_ = nullptr;
orxout(user_error, context::tcl) << "Tcl error while creating Tcl-interpreter (" << id_string << "): " << e.what() << endl;
}
}
@@ -520,7 +520,7 @@
else
{
TclThreadManager::error("No Tcl-interpreter with ID " + multi_cast<std::string>(id) + " existing.");
- return 0;
+ return nullptr;
}
}
Modified: code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineParser.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,7 +39,7 @@
namespace orxonox
{
- CommandLineParser* CommandLineParser::singletonPtr_s = 0;
+ CommandLineParser* CommandLineParser::singletonPtr_s = nullptr;
/**
@brief
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -112,7 +112,7 @@
file.open(filepath.string().c_str(), std::fstream::in);
if (file.is_open())
{
- ConfigFileSection* newsection = 0;
+ ConfigFileSection* newsection = nullptr;
while (file.good() && !file.eof())
{
@@ -139,7 +139,7 @@
}
}
- if (newsection != 0)
+ if (newsection != nullptr)
{
if (isComment(line))
{
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigFileManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -41,7 +41,7 @@
// ConfigFileManager //
///////////////////////
- ConfigFileManager* ConfigFileManager::singletonPtr_s = 0;
+ ConfigFileManager* ConfigFileManager::singletonPtr_s = nullptr;
/// Constructor: Initializes the array of config files with nullptr.
ConfigFileManager::ConfigFileManager()
Modified: code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -52,7 +52,7 @@
this->identifier_ = identifier;
this->sectionname_ = sectionname;
this->varname_ = varname;
- this->callback_ = 0;
+ this->callback_ = nullptr;
this->bContainerIsNew_ = true;
this->bDoInitialCallback_ = false;
this->bAddedDescription_ = false;
Modified: code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/config/SettingsConfigFile.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -56,7 +56,7 @@
SetConsoleCommand(__CC_tconfig_name, &SettingsConfigFile::tconfig).argumentCompleter(0, autocompletion::settingssections()).argumentCompleter(1, autocompletion::settingsentries()).argumentCompleter(2, autocompletion::settingsvalue());
SetConsoleCommand(__CC_getConfig_name, &SettingsConfigFile::getConfig).argumentCompleter(0, autocompletion::settingssections()).argumentCompleter(1, autocompletion::settingsentries());
- SettingsConfigFile* SettingsConfigFile::singletonPtr_s = 0;
+ SettingsConfigFile* SettingsConfigFile::singletonPtr_s = nullptr;
/**
@brief Constructor: Activates the console commands.
@@ -76,11 +76,11 @@
*/
SettingsConfigFile::~SettingsConfigFile()
{
- ModifyConsoleCommand(__CC_load_name).setObject(0);
- ModifyConsoleCommand(__CC_setFilename_name).setObject(0);
- ModifyConsoleCommand(__CC_config_name).setObject(0);
- ModifyConsoleCommand(__CC_tconfig_name).setObject(0);
- ModifyConsoleCommand(__CC_getConfig_name).setObject(0);
+ ModifyConsoleCommand(__CC_load_name).setObject(nullptr);
+ ModifyConsoleCommand(__CC_setFilename_name).setObject(nullptr);
+ ModifyConsoleCommand(__CC_config_name).setObject(nullptr);
+ ModifyConsoleCommand(__CC_tconfig_name).setObject(nullptr);
+ ModifyConsoleCommand(__CC_getConfig_name).setObject(nullptr);
}
/**
Modified: code/branches/cpp11_v2/src/libraries/core/input/Button.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/Button.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/input/Button.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -52,7 +52,7 @@
*/
Button::Button()
: bButtonThresholdUser_(false)
- , paramCommandBuffer_(0)
+ , paramCommandBuffer_(nullptr)
{
nCommands_[0]=0;
nCommands_[1]=0;
@@ -74,7 +74,7 @@
for (unsigned int i = 0; i < nCommands_[j]; i++)
delete commands_[j][i];
delete[] commands_[j];
- commands_[j] = 0;
+ commands_[j] = nullptr;
nCommands_[j] = 0;
}
}
@@ -205,7 +205,7 @@
break;
}
}
- if (cmd->paramCommand_ == 0)
+ if (cmd->paramCommand_ == nullptr)
{
cmd->paramCommand_ = new BufferedParamCommand();
paramCommandBuffer_->push_back(cmd->paramCommand_);
@@ -238,7 +238,7 @@
commands_[j][i] = commands[j][i];
}
else
- commands_[j] = 0;
+ commands_[j] = nullptr;
}
}
Modified: code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -48,7 +48,7 @@
HalfAxis()
: relVal_(0.0f)
, absVal_(0.0f)
- , paramCommands_(0)
+ , paramCommands_(nullptr)
, nParamCommands_(0)
, pressed_(false)
, hasChanged_(false)
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -102,7 +102,7 @@
class _CoreExport ParamCommand : public BaseCommand
{
public:
- ParamCommand() : scale_(1.0f), paramCommand_(0) { }
+ ParamCommand() : scale_(1.0f), paramCommand_(nullptr) { }
bool execute(float abs = 1.0f, float rel = 1.0f);
CommandEvaluation* getEvaluation();
virtual ParamCommand* clone() { return new ParamCommand(*this); }
@@ -117,7 +117,7 @@
if (this->paramCommand_)
return &this->paramCommand_->evaluation_;
else
- return 0;
+ return nullptr;
}
}
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -71,7 +71,7 @@
// Abuse of this source file for the InputHandler
InputHandler InputHandler::EMPTY;
- InputManager* InputManager::singletonPtr_s = 0;
+ InputManager* InputManager::singletonPtr_s = nullptr;
//! Defines the |= operator for easier use.
inline InputManager::State operator|=(InputManager::State& lval, InputManager::State rval)
@@ -93,11 +93,11 @@
// ############################################################
InputManager::InputManager()
: internalState_(Bad)
- , oisInputManager_(0)
+ , oisInputManager_(nullptr)
, devices_(2)
, exclusiveMouse_(false)
- , emptyState_(0)
- , calibratorCallbackHandler_(0)
+ , emptyState_(nullptr)
+ , calibratorCallbackHandler_(nullptr)
{
RegisterObject(InputManager);
@@ -148,8 +148,8 @@
// When loading the devices they should not already be loaded
assert(internalState_ & Bad);
- assert(devices_[InputDeviceEnumerator::Mouse] == 0);
- assert(devices_[InputDeviceEnumerator::Keyboard] == 0);
+ assert(devices_[InputDeviceEnumerator::Mouse] == nullptr);
+ assert(devices_[InputDeviceEnumerator::Keyboard] == nullptr);
assert(devices_.size() == InputDeviceEnumerator::FirstJoyStick);
typedef std::pair<std::string, std::string> StringPair;
@@ -293,8 +293,8 @@
this->destroyDevices();
// Reset console commands
- ModifyConsoleCommand(__CC_InputManager_name, __CC_calibrate_name).setObject(0);
- ModifyConsoleCommand(__CC_InputManager_name, __CC_reload_name).setObject(0);
+ ModifyConsoleCommand(__CC_InputManager_name, __CC_calibrate_name).setObject(nullptr);
+ ModifyConsoleCommand(__CC_InputManager_name, __CC_reload_name).setObject(nullptr);
orxout(internal_status, context::input) << "InputManager: Destruction complete." << endl;
}
@@ -315,7 +315,7 @@
continue;
const std::string& className = device->getClassName();
delete device;
- device = 0;
+ device = nullptr;
orxout(verbose, context::input) << className << " destroyed." << endl;
}
devices_.resize(InputDeviceEnumerator::FirstJoyStick);
@@ -525,7 +525,7 @@
InputState* InputManager::createInputState(const std::string& name, bool bAlwaysGetsInput, bool bTransparent, InputStatePriority priority)
{
if (name.empty())
- return 0;
+ return nullptr;
if (statesByName_.find(name) == statesByName_.end())
{
if (priority >= InputStatePriority::HighPriority || priority == InputStatePriority::Empty)
@@ -538,7 +538,7 @@
{
orxout(internal_warning, context::input) << "Could not add an InputState with the same priority '"
<< static_cast<int>(priority) << "' != 0." << endl;
- return 0;
+ return nullptr;
}
}
}
@@ -550,7 +550,7 @@
else
{
orxout(internal_warning, context::input) << "Could not add an InputState with the same name '" << name << "'." << endl;
- return 0;
+ return nullptr;
}
}
@@ -560,7 +560,7 @@
if (it != statesByName_.end())
return it->second;
else
- return 0;
+ return nullptr;
}
bool InputManager::enterState(const std::string& name)
Modified: code/branches/cpp11_v2/src/libraries/core/input/InputState.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/InputState.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/input/InputState.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,9 +39,9 @@
, exclusiveMouse_(dontcare)
, bExpired_(true)
, handlers_(2)
- , joyStickHandlerAll_(0)
- , enterFunctor_(0)
- , leaveFunctor_(0)
+ , joyStickHandlerAll_(nullptr)
+ , enterFunctor_(nullptr)
+ , leaveFunctor_(nullptr)
{
if (priority >= InputStatePriority::HighPriority || priority == InputStatePriority::Empty)
priority_ = priority;
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -438,7 +438,7 @@
if (button->nCommands_[mode_index] == 0)
{
delete[] button->commands_[mode_index];
- button->commands_[mode_index] = 0;
+ button->commands_[mode_index] = nullptr;
}
// decrement the index since we shifted the array and continue searching for more occurrences of the command
Modified: code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/input/KeyBinderManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -79,10 +79,10 @@
delete it->second;
// Reset console commands
- ModifyConsoleCommand(__CC_keybind_name ).setObject(0);
- ModifyConsoleCommand(__CC_tkeybind_name).setObject(0);
- ModifyConsoleCommand(__CC_unbind_name ).setObject(0);
- ModifyConsoleCommand(__CC_tunbind_name ).setObject(0);
+ ModifyConsoleCommand(__CC_keybind_name ).setObject(nullptr);
+ ModifyConsoleCommand(__CC_tkeybind_name).setObject(nullptr);
+ ModifyConsoleCommand(__CC_unbind_name ).setObject(nullptr);
+ ModifyConsoleCommand(__CC_tunbind_name ).setObject(nullptr);
}
void KeyBinderManager::setConfigValues()
Modified: code/branches/cpp11_v2/src/libraries/core/input/Mouse.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/input/Mouse.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/input/Mouse.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -67,8 +67,8 @@
Mouse::~Mouse()
{
#ifdef ORXONOX_PLATFORM_LINUX
- ModifyConsoleCommand(__CC_Mouse_name, __CC_grab_name).setObject(0);
- ModifyConsoleCommand(__CC_Mouse_name, __CC_ungrab_name).setObject(0);
+ ModifyConsoleCommand(__CC_Mouse_name, __CC_grab_name).setObject(nullptr);
+ ModifyConsoleCommand(__CC_Mouse_name, __CC_ungrab_name).setObject(nullptr);
#endif
}
Modified: code/branches/cpp11_v2/src/libraries/core/module/DynLibManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/module/DynLibManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/module/DynLibManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -37,7 +37,7 @@
{
//-----------------------------------------------------------------------
//! Static pointer to the singleton
- DynLibManager* DynLibManager::singletonPtr_s = 0;
+ DynLibManager* DynLibManager::singletonPtr_s = nullptr;
//-----------------------------------------------------------------------
DynLibManager::DynLibManager()
Modified: code/branches/cpp11_v2/src/libraries/core/module/PluginManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/module/PluginManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/module/PluginManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -45,7 +45,7 @@
SetConsoleCommand("PluginManager", __CC_PluginManager_load_name, &PluginManager::loadPlugin);
SetConsoleCommand("PluginManager", __CC_PluginManager_unload_name, &PluginManager::unloadPlugin);
- PluginManager* PluginManager::singletonPtr_s = 0;
+ PluginManager* PluginManager::singletonPtr_s = nullptr;
PluginManager::PluginManager()
{
Modified: code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -32,7 +32,7 @@
namespace orxonox
{
- StaticInitializationManager* StaticInitializationManager::singletonPtr_s = 0;
+ StaticInitializationManager* StaticInitializationManager::singletonPtr_s = nullptr;
void StaticInitializationManager::addHandler(StaticInitializationHandler* handler)
{
Modified: code/branches/cpp11_v2/src/libraries/core/object/Context.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/Context.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/object/Context.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,7 +39,7 @@
{
RegisterClass(Context);
- Context* Context::rootContext_s = 0;
+ Context* Context::rootContext_s = nullptr;
Context* getContextForInitializationOfOtherContexts()
{
Modified: code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -57,8 +57,8 @@
*/
ObjectListBase::ObjectListBase()
{
- this->first_ = 0;
- this->last_ = 0;
+ this->first_ = nullptr;
+ this->last_ = nullptr;
this->size_ = 0;
}
@@ -72,9 +72,9 @@
{
ObjectListBaseElement* next = current->next_;
- current->list_ = 0;
- current->next_ = 0;
- current->prev_ = 0;
+ current->list_ = nullptr;
+ current->next_ = nullptr;
+ current->prev_ = nullptr;
current = next;
}
@@ -154,9 +154,9 @@
else
this->first_ = element->next_; // If there is no prev_, we deleted the first object and have to update the first_ pointer of the list
- element->list_ = 0;
- element->next_ = 0;
- element->prev_ = 0;
+ element->list_ = nullptr;
+ element->next_ = nullptr;
+ element->prev_ = nullptr;
--this->size_;
}
}
Modified: code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -56,7 +56,7 @@
@brief Constructor: Creates the list-element with an object.
@param objectBase The object to store
*/
- ObjectListBaseElement(Listable* object) : next_(0), prev_(0), objectBase_(object), list_(0) {}
+ ObjectListBaseElement(Listable* object) : next_(nullptr), prev_(nullptr), objectBase_(object), list_(nullptr) {}
virtual ~ObjectListBaseElement() { this->removeFromList(); }
virtual void changeContext(Context* oldContext, Context* newContext) = 0;
@@ -135,11 +135,11 @@
/// Returns a pointer to the first element in the list. Works only with Iterator.
inline ObjectListBaseElement* begin() const { return this->first_; }
/// Returns a pointer to the element after the last element in the list. Works only with Iterator.
- inline ObjectListBaseElement* end() const { return 0; }
+ inline ObjectListBaseElement* end() const { return nullptr; }
/// Returns a pointer to the last element in the list. Works only with Iterator.
inline ObjectListBaseElement* rbegin() const { return this->last_; }
/// Returns a pointer to the element in front of the first element in the list. Works only with Iterator.
- inline ObjectListBaseElement* rend() const { return 0; }
+ inline ObjectListBaseElement* rend() const { return nullptr; }
inline void registerRemovalListener(ObjectListElementRemovalListener* listener) { this->listeners_.push_back(listener); }
inline void unregisterRemovalListener(ObjectListElementRemovalListener* listener)
Modified: code/branches/cpp11_v2/src/libraries/core/object/StrongPtr.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/StrongPtr.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/object/StrongPtr.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -137,7 +137,7 @@
{
public:
/// Constructor: Initializes the strong pointer with a null pointer.
- inline StrongPtr() : pointer_(0), base_(0)
+ inline StrongPtr() : pointer_(nullptr), base_(nullptr)
{
}
@@ -236,21 +236,21 @@
/// Overloaded operator, returns a pointer to the stored object.
inline T* operator->() const
{
- assert(this->pointer_ != 0);
+ assert(this->pointer_ != nullptr);
return this->pointer_;
}
/// Overloaded operator, returns a reference to the stored object.
inline T& operator*() const
{
- assert(this->pointer_ != 0);
+ assert(this->pointer_ != nullptr);
return *this->pointer_;
}
/// Returns true if the wrapped pointer is nullptr.
inline bool operator!() const
{
- return (this->pointer_ == 0);
+ return (this->pointer_ == nullptr);
}
/// Swaps the contents of two strong pointers.
Modified: code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -99,25 +99,25 @@
{
public:
/// Constructor: Initializes the weak pointer with a null pointer.
- inline WeakPtr() : pointer_(0), base_(0), callback_(0)
+ inline WeakPtr() : pointer_(nullptr), base_(nullptr), callback_(nullptr)
{
}
/// Constructor: Initializes the weak pointer with a pointer to an object.
- inline WeakPtr(T* pointer) : pointer_(pointer), base_(pointer), callback_(0)
+ inline WeakPtr(T* pointer) : pointer_(pointer), base_(pointer), callback_(nullptr)
{
this->registerAsDestructionListener(this->base_);
}
/// Copy-constructor
- inline WeakPtr(const WeakPtr& other) : pointer_(other.pointer_), base_(other.base_), callback_(0)
+ inline WeakPtr(const WeakPtr& other) : pointer_(other.pointer_), base_(other.base_), callback_(nullptr)
{
this->registerAsDestructionListener(this->base_);
}
/// Copy-constructor for weak pointers to objects of another class.
template <class O>
- inline WeakPtr(const WeakPtr<O>& other) : pointer_(other.get()), base_(other.getBase()), callback_(0)
+ inline WeakPtr(const WeakPtr<O>& other) : pointer_(other.get()), base_(other.getBase()), callback_(nullptr)
{
this->registerAsDestructionListener(this->base_);
}
@@ -171,21 +171,21 @@
/// Overloaded operator, returns a pointer to the stored object.
inline T* operator->() const
{
- assert(this->pointer_ != 0);
+ assert(this->pointer_ != nullptr);
return this->pointer_;
}
/// Overloaded operator, returns a reference to the stored object.
inline T& operator*() const
{
- assert(this->pointer_ != 0);
+ assert(this->pointer_ != nullptr);
return *this->pointer_;
}
/// Returns true if the wrapped pointer is nullptr.
inline bool operator!() const
{
- return (this->pointer_ == 0);
+ return (this->pointer_ == nullptr);
}
/// Swaps the contents of two weak pointers.
@@ -231,8 +231,8 @@
/// Will be called by Destroyable::~Destroyable() if the stored object is deleted. Resets the wrapped pointer and executes the callback.
inline void objectDeleted()
{
- this->base_ = 0;
- this->pointer_ = 0;
+ this->base_ = nullptr;
+ this->pointer_ = nullptr;
if (this->callback_)
(*this->callback_)();
}
Modified: code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/core/singleton/ScopeManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -37,7 +37,7 @@
namespace orxonox
{
- ScopeManager* ScopeManager::singletonPtr_s = 0;
+ ScopeManager* ScopeManager::singletonPtr_s = nullptr;
void ScopeManager::addScope(ScopeID::Value scope)
{
Modified: code/branches/cpp11_v2/src/libraries/network/Connection.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/Connection.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/Connection.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -45,7 +45,7 @@
const unsigned int NETWORK_DISCONNECT_TIMEOUT = 500;
Connection::Connection(uint32_t firstPeerID):
- host_(0), bCommunicationThreadRunning_(false), nextPeerID_(firstPeerID)
+ host_(nullptr), bCommunicationThreadRunning_(false), nextPeerID_(firstPeerID)
{
enet_initialize();
atexit(enet_deinitialize);
@@ -80,7 +80,7 @@
void Connection::disconnectPeer(uint32_t peerID)
{
// this->overallMutex_->lock();
- outgoingEvent outEvent = { peerID, outgoingEventType::disconnectPeer, 0, 0 };
+ outgoingEvent outEvent = { peerID, outgoingEventType::disconnectPeer, nullptr, 0 };
this->outgoingEventsMutex_->lock();
this->outgoingEvents_.push_back(outEvent);
@@ -90,7 +90,7 @@
void Connection::disconnectPeers()
{
- outgoingEvent outEvent = { 0, outgoingEventType::disconnectPeers, 0, 0 };
+ outgoingEvent outEvent = { 0, outgoingEventType::disconnectPeers, nullptr, 0 };
this->outgoingEventsMutex_->lock();
this->outgoingEvents_.push_back(outEvent);
@@ -322,7 +322,7 @@
this->peerIDMap_[event.peer] = peerID;
// create new peerEvent and return it
- incomingEvent inEvent = { peerID, incomingEventType::peerConnect, 0 };
+ incomingEvent inEvent = { peerID, incomingEventType::peerConnect, nullptr };
return inEvent;
}
@@ -337,7 +337,7 @@
this->peerMap_.erase(this->peerMap_.find(peerID));
// create new peerEvent and return it
- incomingEvent inEvent = { peerID, incomingEventType::peerDisconnect, 0 };
+ incomingEvent inEvent = { peerID, incomingEventType::peerDisconnect, nullptr };
return inEvent;
}
Modified: code/branches/cpp11_v2/src/libraries/network/GamestateHandler.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/GamestateHandler.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/GamestateHandler.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -31,7 +31,7 @@
namespace orxonox {
-// GamestateHandler *GamestateHandler::instance_=0;
+// GamestateHandler *GamestateHandler::instance_=nullptr;
GamestateHandler::GamestateHandler()
{
Modified: code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/GamestateManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -59,7 +59,7 @@
namespace orxonox
{
GamestateManager::GamestateManager() :
- currentGamestate_(0), id_(0)
+ currentGamestate_(nullptr), id_(0)
{
// trafficControl_ = new TrafficControl();
// threadMutex_ = new boost::mutex();
@@ -139,7 +139,7 @@
bool GamestateManager::getSnapshot(){
- if ( currentGamestate_ != 0 )
+ if ( currentGamestate_ != nullptr )
delete currentGamestate_;
uint8_t gsMode;
if( GameMode::isMaster() )
@@ -164,7 +164,7 @@
if(!currentGamestate_->collectData(newID, gsMode))
{ //we have no data to send
delete currentGamestate_;
- currentGamestate_=0;
+ currentGamestate_=nullptr;
return false;
}
return true;
@@ -190,7 +190,7 @@
unsigned int lastAckedGamestateID = peerIt->second.lastAckedGamestateID;
- packet::Gamestate* baseGamestate=0;
+ packet::Gamestate* baseGamestate=nullptr;
if(lastAckedGamestateID != GAMESTATEID_INITIAL)
{
assert(peerMap_.find(peerID)!=peerMap_.end());
@@ -199,9 +199,9 @@
baseGamestate = it->second;
}
- peerGamestates.push_back(0); // insert an empty gamestate* to be changed
+ peerGamestates.push_back(nullptr); // insert an empty gamestate* to be changed
finishGamestate( peerID, peerGamestates.back(), baseGamestate, currentGamestate_ );
- if( peerGamestates.back()==0 )
+ if( peerGamestates.back()==nullptr )
// nothing to send to remove pointer from vector
peerGamestates.pop_back();
//FunctorMember<GamestateManager>* functor =
@@ -242,7 +242,7 @@
if( diffed1->getDataSize() == 0 )
{
delete diffed1;
- destgamestate = 0;
+ destgamestate = nullptr;
return;
}
gs = diffed1;
Modified: code/branches/cpp11_v2/src/libraries/network/Host.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/Host.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/Host.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -43,7 +43,7 @@
SetConsoleCommand(__CC_printRTT_group, __CC_printRTT_name, &Host::printRTT);
- // Host* Host::instance_=0;
+ // Host* Host::instance_=nullptr;
uint32_t Host::clientID_s=0;
// uint32_t Host::shipID_s=-1;
std::vector<Host*> Host::instances_s;
@@ -53,7 +53,7 @@
*/
Host::Host()
{
- // assert(instance_==0);
+ // assert(instance_==nullptr);
instances_s.push_back(this);
ModifyConsoleCommand(__CC_printRTT_group, __CC_printRTT_name).setObject(this);
this->bIsActive_ = false;
@@ -61,13 +61,13 @@
/**
- * @brief Destructor: resets the instance pointer to 0
+ * @brief Destructor: resets the instance pointer to nullptr
*/
Host::~Host()
{
assert( std::find( instances_s.begin(), instances_s.end(), this )!=instances_s.end() );
instances_s.erase(std::find( instances_s.begin(), instances_s.end(), this ));
- ModifyConsoleCommand(__CC_printRTT_group, __CC_printRTT_name).setObject(0);
+ ModifyConsoleCommand(__CC_printRTT_group, __CC_printRTT_name).setObject(nullptr);
}
/**
@@ -134,7 +134,7 @@
else
++it;
}
- return 0;
+ return nullptr;
}
Modified: code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -50,7 +50,7 @@
this->setConfigValues();
// this->setActivity(true);
- this->host_ = 0;
+ this->host_ = nullptr;
this->bActive_ = false;
}
@@ -82,7 +82,7 @@
memset(& bindAddress, 0, sizeof(ENetAddress));
bindAddress.host = ENET_HOST_ANY;
bindAddress.port = LAN_DISCOVERY_PORT;
- assert( this->host_ == 0 );
+ assert( this->host_ == nullptr );
this->host_ = enet_host_create( &bindAddress, 10, 0, 0, 0 );
if ( this->host_ == nullptr )
orxout(internal_error, context::network) << "LANDiscoverable: host_ == nullptr" << endl;
@@ -90,7 +90,7 @@
else
{
enet_host_destroy( this->host_ );
- this->host_ = 0;
+ this->host_ = nullptr;
}
this->bActive_ = bActive;
}
Modified: code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -143,7 +143,7 @@
inline bool call(uint32_t objectID)
{
- if ( Synchronisable::getSynchronisable(objectID)!=0 )
+ if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
{
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)));
return true;
@@ -153,7 +153,7 @@
}
inline bool call(uint32_t objectID, const MultiType& mt1)
{
- if ( Synchronisable::getSynchronisable(objectID)!=0 )
+ if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
{
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1);
return true;
@@ -163,7 +163,7 @@
}
inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2)
{
- if ( Synchronisable::getSynchronisable(objectID)!=0 )
+ if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
{
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2);
return true;
@@ -173,7 +173,7 @@
}
inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
{
- if ( Synchronisable::getSynchronisable(objectID)!=0 )
+ if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
{
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3);
return true;
@@ -183,7 +183,7 @@
}
inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
{
- if ( Synchronisable::getSynchronisable(objectID)!=0 )
+ if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
{
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4);
return true;
@@ -193,7 +193,7 @@
}
inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
{
- if ( Synchronisable::getSynchronisable(objectID)!=0 )
+ if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
{
(*this->functor_)(orxonox_cast<T*>(Synchronisable::getSynchronisable(objectID)), mt1, mt2, mt3, mt4, mt5);
return true;
Modified: code/branches/cpp11_v2/src/libraries/network/NetworkFunctionManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/NetworkFunctionManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/NetworkFunctionManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -31,7 +31,7 @@
namespace orxonox
{
- NetworkFunctionManager* NetworkFunctionManager::singletonPtr_s = 0;
+ NetworkFunctionManager* NetworkFunctionManager::singletonPtr_s = nullptr;
void NetworkFunctionManager::registerFunction(NetworkFunctionBase* function)
{
Modified: code/branches/cpp11_v2/src/libraries/network/Server.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/Server.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/Server.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -193,7 +193,7 @@
void Server::printRTT()
{
-// for( ClientInformation* temp=ClientInformation::getBegin(); temp!=0; temp=temp->next() )
+// for( ClientInformation* temp=ClientInformation::getBegin(); temp!=nullptr; temp=temp->next() )
// orxout(message) << "Round trip time to client with ID: " << temp->getID() << " is " << temp->getRTT() << " ms" << endl;
}
Modified: code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/TrafficControl.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -63,7 +63,7 @@
/**
*Initializing protected members
*/
- TrafficControl *TrafficControl::instance_=0;
+ TrafficControl *TrafficControl::instance_=nullptr;
/**
* @brief Constructor: assures that only one reference will be created and sets the pointer
@@ -71,17 +71,17 @@
TrafficControl::TrafficControl()
{
RegisterObject(TrafficControl);
- assert(instance_==0);
+ assert(instance_==nullptr);
instance_=this;
this->setConfigValues();
}
/**
- * @brief Destructor: resets the instance pointer to 0
+ * @brief Destructor: resets the instance pointer to nullptr
*/
TrafficControl::~TrafficControl()
{
- instance_=0;
+ instance_=nullptr;
}
/**
Modified: code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -105,7 +105,7 @@
bool Gamestate::collectData(int id, uint8_t mode)
{
uint32_t tempsize=0, currentsize=0;
- assert(data_==0);
+ assert(data_==nullptr);
uint32_t size = calcGamestateSize(id, mode);
orxout(verbose_more, context::packets) << "G.ST.Man: producing gamestate with id: " << id << endl;
Modified: code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -53,7 +53,7 @@
class _NetworkExport GamestateHeader
{
public:
- GamestateHeader(){ data_=0; }
+ GamestateHeader(){ data_=nullptr; }
GamestateHeader(uint8_t* data)
{ assert(data); data_ = data; *(uint32_t*)data_ = Type::Gamestate; }
/*GamestateHeader(uint8_t* data, GamestateHeader* h)
Modified: code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/packet/Packet.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -68,8 +68,8 @@
flags_ = PACKET_FLAG_DEFAULT;
packetDirection_ = Direction::Outgoing;
peerID_=0;
- data_=0;
- enetPacket_=0;
+ data_=nullptr;
+ enetPacket_=nullptr;
bDataENetAllocated_ = false;
}
@@ -79,7 +79,7 @@
packetDirection_ = Direction::Incoming;
peerID_=peerID;
data_=data;
- enetPacket_=0;
+ enetPacket_=nullptr;
bDataENetAllocated_ = false;
}
@@ -94,7 +94,7 @@
data_ = new uint8_t[p.getSize()];
memcpy(data_, p.data_, p.getSize());
}else
- data_=0;
+ data_=nullptr;
bDataENetAllocated_ = p.bDataENetAllocated_;
}
@@ -174,7 +174,7 @@
}
#endif
// ENetPacket *temp = enetPacket_;
-// enetPacket_ = 0; // otherwise we have a double free because enet already handles the deallocation of the packet
+// enetPacket_ = nullptr; // otherwise we have a double free because enet already handles the deallocation of the packet
if( this->flags_ & PacketFlag::Reliable )
host->addPacket( enetPacket_, peerID_, NETWORK_CHANNEL_DEFAULT);
else
@@ -190,7 +190,7 @@
// HACK
// if( peerID==static_cast<unsigned int>(-2))
// peerID = NETWORK_PEER_ID_SERVER;
- Packet *p = 0;
+ Packet *p = nullptr;
// orxout(verbose_ultra, context::packets) << "packet type: " << *(Type::Value *)&data[_PACKETID] << endl;
switch( *(Type::Value *)(data + _PACKETID) )
{
@@ -250,7 +250,7 @@
std::map<size_t, Packet*>::iterator it = packetMap_.find(reinterpret_cast<size_t>(enetPacket));
assert(it != packetMap_.end());
// Make sure we don't delete it again in the destructor
- it->second->enetPacket_ = 0;
+ it->second->enetPacket_ = nullptr;
delete it->second;
packetMap_.erase(it);
Packet::packetMapMutex_.unlock();
Modified: code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -139,7 +139,7 @@
if( header.isDiffed() )
{
mem += header.getDataSize() + header.getSize();
- return 0;
+ return nullptr;
}
// assert( !header.isDiffed() );
@@ -155,7 +155,7 @@
abort();
}
assert(id);
- Context* context = 0;
+ Context* context = nullptr;
if (header.getContextID() != OBJECTID_UNKNOWN)
{
Synchronisable* synchronisable_context = Synchronisable::getSynchronisable(header.getContextID());
@@ -163,7 +163,7 @@
{
mem += header.getDataSize()+SynchronisableHeader::getSize(); //.TODO: this suckz.... remove size from header
assert(0); // TODO: uncomment this if we have a clean objecthierarchy (with destruction of children of objects) ^^
- return 0;
+ return nullptr;
}
else
context = orxonox_cast<Context*>(synchronisable_context);
@@ -171,7 +171,7 @@
else
context = Context::getRootContext();
- assert(getSynchronisable(header.getObjectID())==0); //make sure no object with this id exists
+ assert(getSynchronisable(header.getObjectID())==nullptr); //make sure no object with this id exists
BaseObject *bo = orxonox_cast<BaseObject*>(id->fabricate(context));
assert(bo);
Synchronisable *no = orxonox_cast<Synchronisable*>(bo);
Modified: code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/synchronisable/Synchronisable.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -170,8 +170,8 @@
protected:
Synchronisable(Context* context);
- template <class T> void registerVariable(T& variable, uint8_t mode=0x1, NetworkCallbackBase *cb=0, bool bidirectional=false);
- template <class T> void registerVariable(std::set<T>& variable, uint8_t mode=0x1, NetworkCallbackBase *cb=0, bool bidirectional=false);
+ template <class T> void registerVariable(T& variable, uint8_t mode=0x1, NetworkCallbackBase *cb=nullptr, bool bidirectional=false);
+ template <class T> void registerVariable(std::set<T>& variable, uint8_t mode=0x1, NetworkCallbackBase *cb=nullptr, bool bidirectional=false);
template <class T> void unregisterVariable(T& var);
void setPriority(unsigned int freq){ objectFrequency_ = freq; }
Modified: code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -70,7 +70,7 @@
class SynchronisableVariable: public SynchronisableVariableBase
{
public:
- SynchronisableVariable(T& variable, uint8_t syncDirection=VariableDirection::ToClient, NetworkCallbackBase *cb=0);
+ SynchronisableVariable(T& variable, uint8_t syncDirection=VariableDirection::ToClient, NetworkCallbackBase *cb=nullptr);
virtual ~SynchronisableVariable();
virtual inline uint8_t getMode(){ return mode_; }
@@ -88,7 +88,7 @@
class SynchronisableVariableBidirectional: public SynchronisableVariable<T>
{
public:
- SynchronisableVariableBidirectional(T& variable, uint8_t master=Bidirectionality::ServerMaster, NetworkCallbackBase *cb=0);
+ SynchronisableVariableBidirectional(T& variable, uint8_t master=Bidirectionality::ServerMaster, NetworkCallbackBase *cb=nullptr);
virtual ~SynchronisableVariableBidirectional();
virtual inline uint8_t getMode(){ return 0x3; } //this basically is a hack ^^
Modified: code/branches/cpp11_v2/src/libraries/tools/BillboardSet.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/BillboardSet.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/tools/BillboardSet.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -45,7 +45,7 @@
BillboardSet::BillboardSet()
{
- this->billboardSet_ = 0;
+ this->billboardSet_ = nullptr;
}
BillboardSet::~BillboardSet()
@@ -80,7 +80,7 @@
catch (...)
{
orxout(internal_error) << "Couldn't load billboard \"" << file << '"' << endl;
- this->billboardSet_ = 0;
+ this->billboardSet_ = nullptr;
}
this->scenemanager_ = scenemanager;
@@ -103,7 +103,7 @@
catch (...)
{
orxout(internal_error) << "Couldn't load billboard \"" << file << '"' << endl;
- this->billboardSet_ = 0;
+ this->billboardSet_ = nullptr;
}
this->scenemanager_ = scenemanager;
@@ -113,7 +113,7 @@
{
if (this->billboardSet_ && this->scenemanager_)
this->scenemanager_->destroyBillboardSet(this->billboardSet_);
- this->billboardSet_ = 0;
+ this->billboardSet_ = nullptr;
}
const std::string& BillboardSet::getName() const
Modified: code/branches/cpp11_v2/src/libraries/tools/DebugDrawer.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/DebugDrawer.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/tools/DebugDrawer.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -20,7 +20,7 @@
namespace orxonox
{
DebugDrawer::DebugDrawer(Ogre::SceneManager *_sceneManager, float _fillAlpha) :
- sceneManager(_sceneManager), fillAlpha(_fillAlpha), manualObject(0), isEnabled(true), linesIndex(0), trianglesIndex(0)
+ sceneManager(_sceneManager), fillAlpha(_fillAlpha), manualObject(nullptr), isEnabled(true), linesIndex(0), trianglesIndex(0)
{
initialise();
}
Modified: code/branches/cpp11_v2/src/libraries/tools/Mesh.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/Mesh.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/tools/Mesh.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -43,7 +43,7 @@
Mesh::Mesh()
{
- this->entity_ = 0;
+ this->entity_ = nullptr;
this->bCastShadows_ = true;
}
@@ -72,7 +72,7 @@
catch (...)
{
orxout(internal_error) << "Couldn't load mesh \"" << meshsource << '"' << endl;
- this->entity_ = 0;
+ this->entity_ = nullptr;
}
}
}
Modified: code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -58,7 +58,7 @@
assert(scenemanager);
this->scenemanager_ = scenemanager;
- this->particleSystem_ = 0;
+ this->particleSystem_ = nullptr;
this->bEnabled_ = true;
this->bVisible_ = true;
@@ -79,7 +79,7 @@
catch (...)
{
orxout(internal_error) << "Couldn't load particle system \"" << templateName << '"' << endl;
- this->particleSystem_ = 0;
+ this->particleSystem_ = nullptr;
}
}
}
@@ -109,14 +109,14 @@
return newemitter;
}
else
- return 0;
+ return nullptr;
}
Ogre::ParticleEmitter* ParticleInterface::getEmitter(unsigned int emitterNr) const
{
if (this->particleSystem_ && (emitterNr < this->particleSystem_->getNumEmitters()))
return this->particleSystem_->getEmitter(emitterNr);
else
- return 0;
+ return nullptr;
}
void ParticleInterface::removeEmitter(unsigned int emitterNr)
{
@@ -141,14 +141,14 @@
if (this->particleSystem_)
return this->particleSystem_->addAffector(name);
else
- return 0;
+ return nullptr;
}
Ogre::ParticleAffector* ParticleInterface::getAffector(unsigned int affectorNr)
{
if (this->particleSystem_ && (affectorNr < this->particleSystem_->getNumAffectors()))
return this->particleSystem_->getAffector(affectorNr);
else
- return 0;
+ return nullptr;
}
void ParticleInterface::removeAffector(unsigned int affectorNr)
{
Modified: code/branches/cpp11_v2/src/libraries/tools/Shader.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/Shader.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/tools/Shader.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -43,7 +43,7 @@
/**
@brief Initializes the values and sets the scene manager.
*/
- Shader::Shader(Ogre::SceneManager* scenemanager) : compositorInstance_(0)
+ Shader::Shader(Ogre::SceneManager* scenemanager) : compositorInstance_(nullptr)
{
RegisterObject(Shader);
@@ -126,7 +126,7 @@
// remove the old compositor, remove the listener
Ogre::CompositorManager::getSingleton().removeCompositor(viewport, this->oldcompositorName_);
this->compositorInstance_->removeListener(this);
- this->compositorInstance_ = 0;
+ this->compositorInstance_ = nullptr;
}
if (!this->compositorName_.empty())
{
Modified: code/branches/cpp11_v2/src/libraries/tools/Shader.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/Shader.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/tools/Shader.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -47,7 +47,7 @@
class _ToolsExport Shader : public ViewportEventListener, public Ogre::CompositorInstance::Listener
{
public:
- Shader(Ogre::SceneManager* scenemanager = 0);
+ Shader(Ogre::SceneManager* scenemanager = nullptr);
virtual ~Shader();
/// Defines if the shader is visible or not.
Modified: code/branches/cpp11_v2/src/libraries/tools/Timer.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/tools/Timer.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/tools/Timer.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -162,7 +162,7 @@
*/
void Timer::init()
{
- this->executor_ = 0;
+ this->executor_ = nullptr;
this->interval_ = 0;
this->bLoop_ = false;
this->bActive_ = false;
Modified: code/branches/cpp11_v2/src/libraries/util/Math.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/Math.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/util/Math.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -199,7 +199,7 @@
template <> inline double zeroise<double>() { return 0; }
template <> inline long double zeroise<long double>() { return 0; }
template <> inline bool zeroise<bool>() { return 0; }
- template <> inline void* zeroise<void*>() { return 0; }
+ template <> inline void* zeroise<void*>() { return nullptr; }
template <> inline std::string zeroise<std::string>() { return std::string(); }
template <> inline orxonox::Radian zeroise<orxonox::Radian>() { return orxonox::Radian(0.0f); }
template <> inline orxonox::Degree zeroise<orxonox::Degree>() { return orxonox::Degree(0.0f); }
Modified: code/branches/cpp11_v2/src/libraries/util/MultiType.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/MultiType.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/util/MultiType.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -265,12 +265,12 @@
static const MultiType Null;
/// Default constructor: Assigns no value and no type. The type will be determined by the first assignment of a value.
- inline MultiType() : value_(0) { }
+ inline MultiType() : value_(nullptr) { }
/// Constructor: Assigns the given value and sets the type.
template <typename V>
- inline MultiType(const V& value) : value_(0) { this->set(value); }
+ inline MultiType(const V& value) : value_(nullptr) { this->set(value); }
/// Copyconstructor: Assigns value and type of the other MultiType.
- inline MultiType(const MultiType& other) : value_(0) { this->set(other); }
+ inline MultiType(const MultiType& other) : value_(nullptr) { this->set(other); }
/// Destructor: Deletes the MT_Value.
inline ~MultiType() { if (this->value_) { delete this->value_; } }
@@ -324,14 +324,14 @@
return;
if (this->value_)
delete this->value_;
- this->value_ = (other.value_) ? other.value_->clone() : 0;
+ this->value_ = (other.value_) ? other.value_->clone() : nullptr;
}
/// Converts the current value to type T.
template <typename T> inline bool convert() { return this->force<T>(MultiType(*this)); }
/// Resets value and type. Type will be void afterwards and null() returns true.
- inline void reset() { if (this->value_) delete this->value_; this->value_ = 0; }
+ inline void reset() { if (this->value_) delete this->value_; this->value_ = nullptr; }
/// Resets the value and changes the internal type to T.
template <typename T> inline void reset() { this->assignValue(typename Loki::TypeTraits<T>::UnqualifiedReferredType()); }
/// Current value gets overridden with default zero value
@@ -485,7 +485,7 @@
template <> inline double MultiType::get() const { return (this->value_ ? this->value_->get<double>() : 0); }
template <> inline long double MultiType::get() const { return (this->value_ ? this->value_->get<long double>() : 0); }
template <> inline bool MultiType::get() const { return (this->value_ ? this->value_->get<bool>() : 0); }
- template <> inline void* MultiType::get() const { return (this->value_ ? this->value_->get<void*>() : 0); }
+ template <> inline void* MultiType::get() const { return (this->value_ ? this->value_->get<void*>() : nullptr); }
template <> inline std::string MultiType::get() const { return (this->value_ ? this->value_->get<std::string>() : NilValue<std::string>()); }
template <> inline orxonox::Vector2 MultiType::get() const { return (this->value_ ? this->value_->get<orxonox::Vector2>() : NilValue<orxonox::Vector2>()); }
template <> inline orxonox::Vector3 MultiType::get() const { return (this->value_ ? this->value_->get<orxonox::Vector3>() : NilValue<orxonox::Vector3>()); }
Modified: code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -76,7 +76,7 @@
inline bool getValue(double* value) const { return convertValue<T, double >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
inline bool getValue(long double* value) const { return convertValue<T, long double >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
inline bool getValue(bool* value) const { return convertValue<T, bool >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
- inline bool getValue(void** value) const { return convertValue<T, void* >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
+ inline bool getValue(void** value) const { return convertValue<T, void* >(value, value_, nullptr); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
inline bool getValue(std::string* value) const { return convertValue<T, std::string >(value, value_, NilValue<std::string> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
inline bool getValue(orxonox::Vector2* value) const { return convertValue<T, orxonox::Vector2 >(value, value_, NilValue<orxonox::Vector2> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
inline bool getValue(orxonox::Vector3* value) const { return convertValue<T, orxonox::Vector3 >(value, value_, NilValue<orxonox::Vector3> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
Modified: code/branches/cpp11_v2/src/libraries/util/SharedPtr.h
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/SharedPtr.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/util/SharedPtr.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -215,12 +215,12 @@
public:
/// Default constructor, the pointer is set to nullptr.
- inline SharedPtr() : pointer_(0), counter_(0)
+ inline SharedPtr() : pointer_(nullptr), counter_(nullptr)
{
}
/// Constructor, creates a SharedPtr that points to @a pointer, increments the counter.
- inline SharedPtr(T* pointer) : pointer_(pointer), counter_(0)
+ inline SharedPtr(T* pointer) : pointer_(pointer), counter_(nullptr)
{
if (this->pointer_)
{
@@ -292,14 +292,14 @@
/// Overloaded -> operator, returns the pointer to the managed object.
inline T* operator->() const
{
- assert(this->pointer_ != 0);
+ assert(this->pointer_ != nullptr);
return this->pointer_;
}
/// Overloaded * operator, returns a reference ot the managed object.
inline T& operator*() const
{
- assert(this->pointer_ != 0);
+ assert(this->pointer_ != nullptr);
return *this->pointer_;
}
@@ -312,7 +312,7 @@
/// Returns true if the pointer is not nullptr.
inline operator bool() const
{
- return (this->pointer_ != 0);
+ return (this->pointer_ != nullptr);
}
/// Swaps the pointer and the counter of two instances of SharedPtr with the same template argument.
Modified: code/branches/cpp11_v2/src/libraries/util/SignalHandler.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/SignalHandler.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/util/SignalHandler.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -126,7 +126,7 @@
break;
}
// if the signalhandler has already been destroyed then don't do anything
- if( SignalHandler::singletonPtr_s == 0 )
+ if( SignalHandler::singletonPtr_s == nullptr )
{
orxout(user_error) << "Received signal " << sigName.c_str() << endl << "Can't write backtrace because SignalHandler is already destroyed" << endl;
exit(EXIT_FAILURE);
@@ -429,7 +429,7 @@
orxout(user_error) << endl;
// if the signalhandler has already been destroyed then don't do anything
- if (SignalHandler::singletonPtr_s == 0)
+ if (SignalHandler::singletonPtr_s == nullptr)
{
orxout(user_error) << "Caught an unhandled exception" << endl << "Can't write backtrace because SignalHandler is already destroyed" << endl;
exit(EXIT_FAILURE);
Modified: code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/util/SmallObjectAllocator.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -44,7 +44,7 @@
{
this->chunkSize_ = std::max(objectSize, sizeof(Chunk)); // the chunk's size will be the maximum of the object's size and the size of a Chunk object itself
this->numChunksPerBlock_ = numObjects;
- this->first_ = 0;
+ this->first_ = nullptr;
}
/**
@@ -97,7 +97,7 @@
setNext(block + i * this->chunkSize_, block + (i + 1) * this->chunkSize_);
// the next_ pointer of the last chunk must point to nullptr
- setNext(block + (this->numChunksPerBlock_ - 1) * this->chunkSize_, 0);
+ setNext(block + (this->numChunksPerBlock_ - 1) * this->chunkSize_, nullptr);
// The second chunk in the block is assigned to the first_ pointer
this->first_ = block + this->chunkSize_;
Modified: code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc
===================================================================
--- code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/libraries/util/output/OutputManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -56,9 +56,9 @@
this->subcontextCounter_ = 0;
this->isInitialized_ = false;
- this->memoryWriterInstance_ = 0;
- this->consoleWriterInstance_ = 0;
- this->logWriterInstance_ = 0;
+ this->memoryWriterInstance_ = nullptr;
+ this->consoleWriterInstance_ = nullptr;
+ this->logWriterInstance_ = nullptr;
// register 'undefined' context in order to give it always the first context-ID
this->registerContext("undefined");
Modified: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -58,7 +58,7 @@
//enemySpawnTimer.setTimer(3.5f, true, createExecutor(createFunctor(&DodgeRace::spawnEnemy, this)));
comboTimer.setTimer(3.0f, true, createExecutor(createFunctor(&DodgeRace::comboControll, this)));
this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
- this->center_ = 0;
+ this->center_ = nullptr;
this->setHUDTemplate("DodgeRaceHUD");
}
Modified: code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,7 +39,7 @@
{
RegisterObject(DodgeRaceHUDinfo);
- this->DodgeRaceGame = 0;
+ this->DodgeRaceGame = nullptr;
this->bShowPoints_ = true;
}
@@ -85,7 +85,7 @@
}
else
{
- this->DodgeRaceGame = 0;
+ this->DodgeRaceGame = nullptr;
}
}
}
Modified: code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -415,7 +415,7 @@
for (std::vector<StaticEntity*>::const_iterator it = allObjects.begin(); it != allObjects.end(); ++it)
{
- for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != 0; everyShape++)
+ for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != nullptr; everyShape++)
{
btCollisionShape* currentShape = (*it)->getAttachedCollisionShape(everyShape)->getCollisionShape();
if(currentShape == nullptr)
@@ -443,7 +443,7 @@
for (std::vector<StaticEntity*>::iterator it = allObjects.begin(); it != allObjects.end(); ++it)
{
- for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != 0; everyShape++)
+ for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape) != nullptr; everyShape++)
{
btCollisionShape* currentShape = (*it)->getAttachedCollisionShape(everyShape)->getCollisionShape();
if(currentShape == nullptr)
@@ -539,7 +539,7 @@
// if((*it)==nullptr)
// { orxout()<<"Problempoint 1.1"<<endl; continue;}
// //TODO: Probably it points on a wrong object
- // for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=0; everyShape++)
+ // for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=nullptr; everyShape++)
// {
// if((*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()==nullptr)
// { continue;}
@@ -571,7 +571,7 @@
// btScalar radiusObject;
// if((*it)==nullptr)
// { orxout()<<"Problempoint 1"<<endl; continue;}
- // for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=0; everyShape++)
+ // for (int everyShape=0; (*it)->getAttachedCollisionShape(everyShape)!=nullptr; everyShape++)
// {
// if((*it)->getAttachedCollisionShape(everyShape)->getCollisionShape()==nullptr)
// { orxout()<<"Problempoint 2.2"<<endl; continue;}
Modified: code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -99,7 +99,7 @@
if (index < this->checkpoints_.size())
return this->checkpoints_[index];
else
- return 0;
+ return nullptr;
}
std::vector<RaceCheckPoint*> SpaceRaceManager::getAllCheckpoints()
@@ -115,7 +115,7 @@
for (size_t i = 0; i < this->checkpoints_.size(); ++i)
if (this->checkpoints_[i]->getCheckpointIndex() == index)
return this->checkpoints_[i];
- return 0;
+ return nullptr;
}
bool SpaceRaceManager::reachedValidCheckpoint(RaceCheckPoint* oldCheckpoint, RaceCheckPoint* newCheckpoint, PlayerInfo* player) const
Modified: code/branches/cpp11_v2/src/modules/invader/Invader.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/Invader.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/invader/Invader.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -60,7 +60,7 @@
{
RegisterObject(Invader);
this->numberOfBots_ = 0; //sets number of default bots temporarly to 0
- this->center_ = 0;
+ this->center_ = nullptr;
bEndGame = false;
lives = 3;
level = 1;
Modified: code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,7 +39,7 @@
{
RegisterObject(InvaderHUDinfo);
- this->InvaderGame = 0;
+ this->InvaderGame = nullptr;
this->bShowLives_ = false;
this->bShowLevel_ = false;
this->bShowPoints_ = false;
@@ -131,7 +131,7 @@
}
else
{
- this->InvaderGame = 0;
+ this->InvaderGame = nullptr;
}
}
}
Modified: code/branches/cpp11_v2/src/modules/jump/Jump.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/Jump.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/jump/Jump.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -64,9 +64,9 @@
{
RegisterObject(Jump);
- center_ = 0;
- figure_ = 0;
- camera = 0;
+ center_ = nullptr;
+ figure_ = nullptr;
+ camera = nullptr;
setHUDTemplate("JumpHUD");
}
@@ -269,7 +269,7 @@
void Jump::cleanup()
{
- camera = 0;
+ camera = nullptr;
}
void Jump::start()
@@ -339,7 +339,7 @@
}
else
{
- return 0;
+ return nullptr;
}
}
Modified: code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/jump/JumpEnemy.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -50,7 +50,7 @@
RegisterObject(JumpEnemy);
dead_ = false;
- figure_ = 0;
+ figure_ = nullptr;
width_ = 0.0;
height_ = 0.0;
setPosition(Vector3(0,0,0));
Modified: code/branches/cpp11_v2/src/modules/jump/JumpItem.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpItem.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/jump/JumpItem.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -47,7 +47,7 @@
attachedToFigure_ = false;
- figure_ = 0;
+ figure_ = nullptr;
height_ = 0.0;
width_ = 0.0;
setPosition(Vector3(0,0,0));
Modified: code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/jump/JumpPlatform.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -47,7 +47,7 @@
{
RegisterObject(JumpPlatform);
- figure_ = 0;
+ figure_ = nullptr;
setPosition(Vector3(0,0,0));
setVelocity(Vector3(0,0,0));
Modified: code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/jump/JumpProjectile.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -46,7 +46,7 @@
{
RegisterObject(JumpProjectile);
- figure_ = 0;
+ figure_ = nullptr;
setPosition(Vector3(0,0,0));
setVelocity(Vector3(0,0,250.0));
setAcceleration(Vector3(0,0,0));
Modified: code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/jump/JumpSpring.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -99,7 +99,7 @@
void JumpSpring::accelerateFigure()
{
- if (figure_ != 0)
+ if (figure_ != nullptr)
{
figure_->JumpFromSpring(this);
}
Modified: code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -65,7 +65,7 @@
{
RegisterObject(Mini4Dgame);
- this->board_ = 0;
+ this->board_ = nullptr;
// Set the type of Bots for this particular Gametype.
//this->botclass_ = Class(Mini4DgameBot);
@@ -90,7 +90,7 @@
if(this->board_ != nullptr)// Destroy the board, if present.
{
//this->board_->destroy();
- this->board_ = 0;
+ this->board_ = nullptr;
}
}
Modified: code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameAI.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -59,7 +59,7 @@
RegisterObject(Mini4DgameAI);
this->setConfigValues();
- this->center_ = 0;
+ this->center_ = nullptr;
}
/**
Modified: code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -63,7 +63,7 @@
for(int k=0;k<4;k++){
for(int l=0;l<4;l++){
this->board[i][j][k][l]=mini4DgamePlayerColor::none;
- this->blinkingBillboards[i][j][k][l] = 0;
+ this->blinkingBillboards[i][j][k][l] = nullptr;
}
}
}
@@ -96,7 +96,7 @@
moves.pop_back();
this->board[move.x][move.y][move.z][move.w] = mini4DgamePlayerColor::none;
this->blinkingBillboards[move.x][move.y][move.z][move.w]->destroy();
- this->blinkingBillboards[move.x][move.y][move.z][move.w] = 0;
+ this->blinkingBillboards[move.x][move.y][move.z][move.w] = nullptr;
if(player_toggle_){
this->player_toggle_ = false;
}else{
Modified: code/branches/cpp11_v2/src/modules/objects/Attacher.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/Attacher.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/objects/Attacher.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,7 +39,7 @@
{
RegisterObject(Attacher);
- this->target_ = 0;
+ this->target_ = nullptr;
}
void Attacher::XMLPort(Element& xmlelement, XMLPort::Mode mode)
@@ -89,13 +89,13 @@
++i;
}
- return 0;
+ return nullptr;
}
void Attacher::setTarget(const std::string& target)
{
this->targetname_ = target;
- this->target_ = 0;
+ this->target_ = nullptr;
if (this->targetname_.empty())
return;
Modified: code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/objects/controllers/TurretController.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -80,7 +80,7 @@
else
{
this->forgetTarget();
- turret->setTarget(0);
+ turret->setTarget(nullptr);
}
@@ -98,7 +98,7 @@
float minScore = FLT_MAX;
float tempScore;
- Pawn* minScorePawn = 0;
+ Pawn* minScorePawn = nullptr;
for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
{
Modified: code/branches/cpp11_v2/src/modules/objects/eventsystem/EventDispatcher.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/eventsystem/EventDispatcher.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/objects/eventsystem/EventDispatcher.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -78,6 +78,6 @@
return (*it);
++i;
}
- return 0;
+ return nullptr;
}
}
Modified: code/branches/cpp11_v2/src/modules/objects/eventsystem/EventFilter.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/objects/eventsystem/EventFilter.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/objects/eventsystem/EventFilter.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -101,7 +101,7 @@
return (*it);
++i;
}
- return 0;
+ return nullptr;
}
void EventFilter::addEventName(EventName* eventname)
@@ -118,6 +118,6 @@
return (*it);
++i;
}
- return 0;
+ return nullptr;
}
}
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,7 +39,7 @@
{
RegisterObject(AnnounceMessage);
- this->owner_ = 0;
+ this->owner_ = nullptr;
this->setDelay(3.0f);
this->setFadeouttime(1.0f);
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -70,7 +70,7 @@
{
RegisterObject(CountDown);
- this->owner_ = 0;
+ this->owner_ = nullptr;
this->hasStopped_ = false;
}
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,7 +39,7 @@
{
RegisterObject(DeathMessage);
- this->owner_ = 0;
+ this->owner_ = nullptr;
this->setDelay(2.0f);
this->setFadeouttime(0.5f);
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,7 +39,7 @@
{
RegisterObject(GametypeFadingMessage);
- this->owner_ = 0;
+ this->owner_ = nullptr;
this->setDelay(2.0f);
this->setFadeouttime(0.5f);
}
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -41,7 +41,7 @@
GametypeStaticMessage::GametypeStaticMessage(Context* context) : OverlayText(context)
{
RegisterObject(GametypeStaticMessage);
- this->owner_ = 0;
+ this->owner_ = nullptr;
}
GametypeStaticMessage::~GametypeStaticMessage()
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -190,7 +190,7 @@
if (index < this->barColours_.size())
return barColours_[index];
else
- return 0;
+ return nullptr;
}
void HUDBar::clearColours()
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -41,7 +41,7 @@
{
RegisterObject(HUDBoostBar);
- this->owner_ = 0;
+ this->owner_ = nullptr;
this->flashInterval_ = 0.25f;
this->flashDt_ = 0.0f;
}
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -40,7 +40,7 @@
RegisterObject(HUDEnemyHealthBar);
this->setConfigValues();
- this->owner_ = 0;
+ this->owner_ = nullptr;
}
HUDEnemyHealthBar::~HUDEnemyHealthBar()
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -42,7 +42,7 @@
{
RegisterObject(HUDHealthBar);
- this->owner_ = 0;
+ this->owner_ = nullptr;
this->bUseBarColour_ = false;
this->textoverlay_ = new OverlayText(this->getContext());
@@ -57,7 +57,7 @@
if (this->isInitialized())
{
this->textoverlay_->destroy();
- this->textoverlay_ = 0;
+ this->textoverlay_ = nullptr;
}
}
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -68,7 +68,7 @@
}
RegisterClass ( HUDNavigation );
- HUDNavigation* HUDNavigation::localHUD_s = 0;
+ HUDNavigation* HUDNavigation::localHUD_s = nullptr;
HUDNavigation::HUDNavigation(Context* context) :
OrxonoxOverlay(context)
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -67,7 +67,7 @@
this->shapeMaterials_[RadarViewable::Dot] = "RadarDot.png";
this->shapeMaterials_[RadarViewable::Triangle] = "RadarTriangle.png";
this->shapeMaterials_[RadarViewable::Square] = "RadarSquare.png";
- this->owner_ = 0;
+ this->owner_ = nullptr;
this->map3DFront_ = static_cast<Ogre::PanelOverlayElement*>(Ogre::OverlayManager::getSingleton()
.createOverlayElement("Panel", "HUDRadar_mapDreiDFront_" + getUniqueNumberString()));
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -42,7 +42,7 @@
{
RegisterObject(HUDSpeedBar);
- this->owner_ = 0;
+ this->owner_ = nullptr;
}
HUDSpeedBar::~HUDSpeedBar()
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -41,7 +41,7 @@
{
RegisterObject(HUDTimer);
- this->owner_ = 0;
+ this->owner_ = nullptr;
}
HUDTimer::~HUDTimer()
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,7 +39,7 @@
{
RegisterObject(KillMessage);
- this->owner_ = 0;
+ this->owner_ = nullptr;
this->setDelay(2.0f);
this->setFadeouttime(0.5f);
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -42,8 +42,8 @@
{
RegisterObject(LastManStandingInfos);
- this->lms_ = 0;
- this->player_ = 0;
+ this->lms_ = nullptr;
+ this->player_ = nullptr;
this->bShowLives_ = false;
this->bShowPlayers_ = false;
}
@@ -90,8 +90,8 @@
}
else
{
- this->player_ = 0;
- this->lms_ = 0;
+ this->player_ = nullptr;
+ this->lms_ = nullptr;
}
}
}
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -42,8 +42,8 @@
{
RegisterObject(LastTeamStandingInfos);
- this->lts_ = 0;
- this->player_ = 0;
+ this->lts_ = nullptr;
+ this->player_ = nullptr;
this->bShowLives_ = false;
this->bShowTeams_ = false;
}
@@ -90,8 +90,8 @@
}
else
{
- this->player_ = 0;
- this->lts_ = 0;
+ this->player_ = nullptr;
+ this->lts_ = nullptr;
}
}
}
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,7 +39,7 @@
{
RegisterObject(PauseNotice);
- this->owner_ = 0;
+ this->owner_ = nullptr;
}
void PauseNotice::changedOwner()
Modified: code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -42,7 +42,7 @@
{
RegisterObject(TeamBaseMatchScore);
- this->owner_ = 0;
+ this->owner_ = nullptr;
this->bShowBases_ = false;
this->bShowScore_ = false;
@@ -119,6 +119,6 @@
if (this->getOwner() && this->getOwner()->getGametype())
this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype());
else
- this->owner_ = 0;
+ this->owner_ = nullptr;
}
}
Modified: code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/stats/CreateLines.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -36,22 +36,22 @@
*/
CreateLines::CreateLines(float leftOffset, float topOffset, float width, float height)
{
- playerNameText_ = new OverlayText(0);
+ playerNameText_ = new OverlayText(nullptr);
playerNameText_->setTextSize(0.04f);
playerNameText_->setColour(ColourValue(0.0f, 0.75f, 0.2f, 1.0f));
playerNameText_->setPosition(Vector2(0.1f, topOffset + 0.01f));
- scoreText_ = new OverlayText(0);
+ scoreText_ = new OverlayText(nullptr);
scoreText_->setTextSize(0.04f);
scoreText_->setColour(ColourValue(0.0f, 0.75f, 0.2f, 1.0f));
scoreText_->setPosition(Vector2(0.6f, topOffset + 0.01f));
- deathsText_ = new OverlayText(0);
+ deathsText_ = new OverlayText(nullptr);
deathsText_->setTextSize(0.04f);
deathsText_->setColour(ColourValue(0, 0.75f, 0.2f, 1.0f));
deathsText_->setPosition(Vector2(0.8f, topOffset + 0.01f));
- background_ = new Stats(0);
+ background_ = new Stats(nullptr);
background_->setPosition(Vector2(leftOffset, topOffset));
background_->setSize(Vector2(width, height));
}
Modified: code/branches/cpp11_v2/src/modules/overlays/stats/Stats.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/overlays/stats/Stats.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/overlays/stats/Stats.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -45,8 +45,8 @@
*/
Stats::Stats(Context* context)
: OrxonoxOverlay(context)
- , statsOverlayNoise_(0)
- , statsOverlayBorder_(0)
+ , statsOverlayNoise_(nullptr)
+ , statsOverlayBorder_(nullptr)
{
RegisterObject(Stats);
Modified: code/branches/cpp11_v2/src/modules/pong/Pong.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/Pong.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/pong/Pong.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -63,10 +63,10 @@
{
RegisterObject(Pong);
- this->center_ = 0;
- this->ball_ = 0;
- this->bat_[0] = 0;
- this->bat_[1] = 0;
+ this->center_ = nullptr;
+ this->ball_ = nullptr;
+ this->bat_[0] = nullptr;
+ this->bat_[1] = nullptr;
this->setHUDTemplate("PongHUD");
@@ -105,7 +105,7 @@
if (this->ball_ != nullptr) // Destroy the ball, if present.
{
this->ball_->destroy();
- this->ball_ = 0;
+ this->ball_ = nullptr;
}
// Destroy both bats, if present.
@@ -114,7 +114,7 @@
if (this->bat_[0] != nullptr)
{
this->bat_[0]->destroy();
- this->bat_[0] = 0;
+ this->bat_[0] = nullptr;
}
}
@@ -328,7 +328,7 @@
if (this->bat_ != nullptr && this->bat_[0] != nullptr)
return this->bat_[0]->getPlayer();
else
- return 0;
+ return nullptr;
}
/**
@@ -342,6 +342,6 @@
if (this->bat_ != nullptr && this->bat_[1] != nullptr)
return this->bat_[1]->getPlayer();
else
- return 0;
+ return nullptr;
}
}
Modified: code/branches/cpp11_v2/src/modules/pong/PongAI.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongAI.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/pong/PongAI.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -56,7 +56,7 @@
{
RegisterObject(PongAI);
- this->ball_ = 0;
+ this->ball_ = nullptr;
this->ballDirection_ = Vector2::ZERO;
this->ballEndPosition_ = 0;
this->randomOffset_ = 0;
Modified: code/branches/cpp11_v2/src/modules/pong/PongBall.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongBall.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/pong/PongBall.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -60,7 +60,7 @@
this->speed_ = 0;
this->accelerationFactor_ = 1.0f;
- this->bat_ = 0;
+ this->bat_ = nullptr;
this->bDeleteBats_ = false;
this->batID_ = new unsigned int[2];
this->batID_[0] = OBJECTID_UNKNOWN;
@@ -81,9 +81,9 @@
}
else
{
- this->defScoreSound_ = 0;
- this->defBatSound_ = 0;
- this->defBoundarySound_ = 0;
+ this->defScoreSound_ = nullptr;
+ this->defBatSound_ = nullptr;
+ this->defBoundarySound_ = nullptr;
}
}
Modified: code/branches/cpp11_v2/src/modules/pong/PongScore.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/pong/PongScore.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/pong/PongScore.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -54,7 +54,7 @@
{
RegisterObject(PongScore);
- this->owner_ = 0;
+ this->owner_ = nullptr;
this->bShowName_ = false;
this->bShowScore_ = false;
@@ -171,6 +171,6 @@
if (this->getOwner() != nullptr && this->getOwner()->getGametype())
this->owner_ = orxonox_cast<Pong*>(this->getOwner()->getGametype());
else
- this->owner_ = 0;
+ this->owner_ = nullptr;
}
}
Modified: code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -105,17 +105,17 @@
return true;
MultiTriggerContainer * cont = orxonox_cast<MultiTriggerContainer *>(trigger);
- if(cont == 0)
+ if(cont == nullptr)
return true;
DistanceMultiTrigger * originatingTrigger = orxonox_cast<DistanceMultiTrigger *>(cont->getOriginator());
- if(originatingTrigger == 0)
+ if(originatingTrigger == nullptr)
{
return true;
}
MobileEntity * entity = orxonox_cast<MobileEntity *>(cont->getData());
- if(entity == 0)
+ if(entity == nullptr)
return true;
if(bTriggered)
Modified: code/branches/cpp11_v2/src/modules/portals/PortalLink.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/portals/PortalLink.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/portals/PortalLink.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,7 +39,7 @@
std::map<PortalEndPoint *, PortalEndPoint *> PortalLink::links_s;
- PortalLink::PortalLink(Context* context) : BaseObject(context), fromID_(0), toID_(0), from_(0), to_(0)
+ PortalLink::PortalLink(Context* context) : BaseObject(context), fromID_(0), toID_(0), from_(nullptr), to_(nullptr)
{
RegisterObject(PortalLink);
}
@@ -66,7 +66,7 @@
void PortalLink::use(MobileEntity* entity, PortalEndPoint * entrance)
{
- if(entrance == 0)
+ if(entrance == nullptr)
return;
std::map<PortalEndPoint *, PortalEndPoint *>::iterator endpoints = PortalLink::links_s.find(entrance);
Modified: code/branches/cpp11_v2/src/modules/tetris/Tetris.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/tetris/Tetris.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/tetris/Tetris.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -65,7 +65,7 @@
{
RegisterObject(Tetris);
- this->activeBrick_ = 0;
+ this->activeBrick_ = nullptr;
// Pre-set the timer, but don't start it yet.
this->starttimer_.setTimer(1.0, false, createExecutor(createFunctor(&Tetris::startBrick, this)));
@@ -73,7 +73,7 @@
this->player_ = nullptr;
this->setHUDTemplate("TetrisHUD");
- this->futureBrick_ = 0;
+ this->futureBrick_ = nullptr;
}
/**
@@ -95,12 +95,12 @@
if (this->activeBrick_)
{
this->activeBrick_->destroy();
- this->activeBrick_ = 0;
+ this->activeBrick_ = nullptr;
}
if (this->futureBrick_)
{
this->futureBrick_->destroy();
- this->futureBrick_ = 0;
+ this->futureBrick_ = nullptr;
}
for (std::list<StrongPtr<TetrisStone> >::iterator it = this->stones_.begin(); it != this->stones_.end(); ++it)
@@ -395,7 +395,7 @@
// Make the last brick to be created the active brick.
this->activeBrick_ = this->futureBrick_;
- this->futureBrick_ = 0;
+ this->futureBrick_ = nullptr;
// set its position
this->player_->startControl(this->activeBrick_);
Modified: code/branches/cpp11_v2/src/modules/tetris/TetrisScore.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/tetris/TetrisScore.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/tetris/TetrisScore.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -55,7 +55,7 @@
{
RegisterObject(TetrisScore);
- this->owner_ = 0;
+ this->owner_ = nullptr;
this->player_ = nullptr;
}
@@ -119,6 +119,6 @@
if (this->getOwner() != nullptr && this->getOwner()->getGametype())
this->owner_ = orxonox_cast<Tetris*>(this->getOwner()->getGametype());
else
- this->owner_ = 0;
+ this->owner_ = nullptr;
}
}
Modified: code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -38,7 +38,7 @@
TowerDefenseHUDController::TowerDefenseHUDController(Context* context) : OverlayText(context)
{
RegisterObject(TowerDefenseHUDController);
- this->td = 0;
+ this->td = nullptr;
}
TowerDefenseHUDController::~TowerDefenseHUDController()
@@ -88,7 +88,7 @@
}
else
{
- this->td = 0;
+ this->td = nullptr;
}
}
}
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -57,7 +57,7 @@
this->particles_->getEmitter(i)->setDirection(-WorldEntity::FRONT);
}
else
- this->particles_ = 0;
+ this->particles_ = nullptr;
}
ParticleProjectile::~ParticleProjectile()
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -116,8 +116,8 @@
}
else
{
- this->defSndWpnEngine_ = 0;
- this->defSndWpnLaunch_ = 0;
+ this->defSndWpnEngine_ = nullptr;
+ this->defSndWpnLaunch_ = nullptr;
}
// Add camera
Modified: code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc
===================================================================
--- code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -116,8 +116,8 @@
}
else
{
- this->defSndWpnEngine_ = 0;
- this->defSndWpnLaunch_ = 0;
+ this->defSndWpnEngine_ = nullptr;
+ this->defSndWpnLaunch_ = nullptr;
}
// Add camera
Modified: code/branches/cpp11_v2/src/orxonox/CameraManager.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/CameraManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/CameraManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -59,7 +59,7 @@
if (!this->cameraList_.empty())
return this->cameraList_.front();
else
- return 0;
+ return nullptr;
}
void CameraManager::requestFocus(Camera* camera)
Modified: code/branches/cpp11_v2/src/orxonox/Level.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Level.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/Level.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -53,7 +53,7 @@
this->registerVariables();
this->xmlfilename_ = this->getFilename();
- this->xmlfile_ = 0;
+ this->xmlfile_ = nullptr;
}
Level::~Level()
@@ -177,7 +177,7 @@
return (*it);
++i;
}
- return 0;
+ return nullptr;
}
void Level::addLodInfo(MeshLodInformation* lodInformation)
@@ -194,7 +194,7 @@
if(this->lodInformation_.find(meshName)!=this->lodInformation_.end())
return this->lodInformation_.find(meshName)->second;
- return 0;
+ return nullptr;
}
void Level::playerEntered(PlayerInfo* player)
@@ -206,6 +206,6 @@
void Level::playerLeft(PlayerInfo* player)
{
orxout(internal_info) << "player left level (id: " << player->getClientID() << ", name: " << player->getName() << ')' << endl;
- player->switchGametype(0);
+ player->switchGametype(nullptr);
}
}
Modified: code/branches/cpp11_v2/src/orxonox/LevelManager.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/LevelManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/LevelManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -160,7 +160,7 @@
if (this->levels_.size() > 0)
return this->levels_.front();
else
- return 0;
+ return nullptr;
}
/**
Modified: code/branches/cpp11_v2/src/orxonox/PlayerManager.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/PlayerManager.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/PlayerManager.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -61,7 +61,7 @@
orxout(internal_info) << "client connected" << endl;
// create new HumanPlayer instance
- HumanPlayer* player = new HumanPlayer(0);
+ HumanPlayer* player = new HumanPlayer(nullptr);
player->setClientID(clientID);
// add to clients-map
@@ -114,6 +114,6 @@
if (it->getClientID() == clientID)
return (*it);
}
- return 0;
+ return nullptr;
}
}
Modified: code/branches/cpp11_v2/src/orxonox/Radar.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Radar.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/Radar.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -48,8 +48,8 @@
RegisterAbstractClass(Radar).inheritsFrom<Tickable>();
Radar::Radar()
- : itFocus_(0)
- , focus_(0)
+ : itFocus_(nullptr)
+ , focus_(nullptr)
, objectTypeCounter_(0)
{
// TODO: make this mapping configurable. Maybe there's a possibility with self configured
@@ -105,7 +105,7 @@
if (this->itFocus_)
return *(this->itFocus_);
else
- return 0;
+ return nullptr;
}
RadarViewable::Shape Radar::addObjectDescription(const std::string& name)
@@ -125,8 +125,8 @@
if (this->itFocus_ && (this->focus_ != *(this->itFocus_)))
{
// focus object was deleted, release focus
- this->focus_ = 0;
- this->itFocus_ = 0;
+ this->focus_ = nullptr;
+ this->itFocus_ = nullptr;
}
for (ObjectList<RadarListener>::iterator itListener = ObjectList<RadarListener>::begin(); itListener; ++itListener)
@@ -140,8 +140,8 @@
if (ObjectList<RadarViewable>::begin() == ObjectList<RadarViewable>::end())
{
// list is empty
- this->itFocus_ = 0;
- this->focus_ = 0;
+ this->itFocus_ = nullptr;
+ this->focus_ = nullptr;
}
else if (HumanController::getLocalControllerEntityAsPawn())
@@ -155,7 +155,7 @@
float currentDistance = localPosition.squaredDistance(targetPosition);
float nextDistance = FLT_MAX;
float minimumDistance = FLT_MAX;
- ObjectList<RadarViewable>::iterator itFallback = 0;
+ ObjectList<RadarViewable>::iterator itFallback = nullptr;
for (ObjectList<RadarViewable>::iterator it = ObjectList<RadarViewable>::begin(); it; ++it)
{
@@ -190,8 +190,8 @@
void Radar::releaseFocus()
{
- this->itFocus_ = 0;
- this->focus_ = 0;
+ this->itFocus_ = nullptr;
+ this->focus_ = nullptr;
}
void Radar::listObjects() const
Modified: code/branches/cpp11_v2/src/orxonox/Scene.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Scene.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/Scene.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -83,7 +83,7 @@
this->sceneManager_ = new Ogre::DefaultSceneManager("");
this->rootSceneNode_ = this->sceneManager_->getRootSceneNode();
- this->radar_ = 0;
+ this->radar_ = nullptr;
}
// No physics yet, XMLPort will do that.
@@ -91,11 +91,11 @@
this->negativeWorldRange_ = Vector3::UNIT_SCALE * -defaultMaxWorldSize;
this->positiveWorldRange_ = Vector3::UNIT_SCALE * defaultMaxWorldSize;
this->gravity_ = Vector3::ZERO;
- this->physicalWorld_ = 0;
- this->solver_ = 0;
- this->dispatcher_ = 0;
- this->collisionConfig_ = 0;
- this->broadphase_ = 0;
+ this->physicalWorld_ = nullptr;
+ this->solver_ = nullptr;
+ this->dispatcher_ = nullptr;
+ this->collisionConfig_ = nullptr;
+ this->broadphase_ = nullptr;
this->registerVariables();
}
@@ -233,11 +233,11 @@
delete this->dispatcher_;
delete this->collisionConfig_;
delete this->broadphase_;
- this->physicalWorld_ = 0;
- this->solver_ = 0;
- this->dispatcher_ = 0;
- this->collisionConfig_ = 0;
- this->broadphase_ = 0;
+ this->physicalWorld_ = nullptr;
+ this->solver_ = nullptr;
+ this->dispatcher_ = nullptr;
+ this->collisionConfig_ = nullptr;
+ this->broadphase_ = nullptr;
}
}
@@ -326,7 +326,7 @@
return (*it);
++i;
}
- return 0;
+ return nullptr;
}
void Scene::addPhysicalObject(WorldEntity* object)
Modified: code/branches/cpp11_v2/src/orxonox/Scene.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Scene.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/Scene.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -110,7 +110,7 @@
public:
inline bool hasPhysics() const
- { return this->physicalWorld_ != 0; }
+ { return this->physicalWorld_ != nullptr; }
void setPhysicalWorld(bool wantsPhysics);
void setNegativeWorldRange(const Vector3& range);
Modified: code/branches/cpp11_v2/src/orxonox/Test.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/Test.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/Test.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -53,22 +53,22 @@
registerMemberNetworkFunction( Test, checkU1 );
registerMemberNetworkFunction( Test, printBlaBla );
- Test* Test::instance_ = 0;
+ Test* Test::instance_ = nullptr;
Test::Test(Context* context) : BaseObject(context), Synchronisable(context)
{
- assert(instance_==0);
+ assert(instance_==nullptr);
instance_=this;
RegisterObject ( Test );
setConfigValues();
registerVariables();
setSyncMode(0x3);
- this->pointer_ = 0;
+ this->pointer_ = nullptr;
}
Test::~Test()
{
- instance_=0;
+ instance_=nullptr;
}
void Test::setConfigValues()
Modified: code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -56,9 +56,9 @@
{
RegisterObject(CollisionShape);
- this->parent_ = 0;
+ this->parent_ = nullptr;
this->parentID_ = OBJECTID_UNKNOWN;
- this->collisionShape_ = 0;
+ this->collisionShape_ = nullptr;
this->position_ = Vector3::ZERO;
this->orientation_ = Quaternion::IDENTITY;
this->scale_ = Vector3::UNIT_SCALE;
@@ -153,7 +153,7 @@
*/
void CollisionShape::notifyDetached()
{
- this->parent_ = 0;
+ this->parent_ = nullptr;
this->parentID_ = OBJECTID_UNKNOWN;
}
Modified: code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -196,7 +196,7 @@
*/
void CompoundCollisionShape::updatePublicShape()
{
- btCollisionShape* primitive = 0; // The primitive shape, if there is one.
+ btCollisionShape* primitive = nullptr; // The primitive shape, if there is one.
bool bPrimitive = true; // Whether the CompoundCollisionShape has just one non-empty CollisionShape. And that shape also has no transformation.
bool bEmpty = true; // Whether the CompoundCollisionShape is empty.
// Iterate over all CollisionShapes that belong to this CompoundCollisionShape.
@@ -220,9 +220,9 @@
if (bEmpty)
{
// If there was none all along, nothing needs to be changed.
- if (this->collisionShape_ == 0)
+ if (this->collisionShape_ == nullptr)
return;
- this->collisionShape_ = 0;
+ this->collisionShape_ = nullptr;
}
// If the CompoundCollisionShape is just a primitive.
// Only one shape to be added, no transform; return it directly.
@@ -252,7 +252,7 @@
return it->first;
++i;
}
- return 0;
+ return nullptr;
}
/**
Modified: code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -74,7 +74,7 @@
private:
void updatePublicShape();
inline virtual btCollisionShape* createNewShape() const
- { assert(false); return 0; }
+ { assert(false); return nullptr; }
btCompoundShape* compoundShape_;
std::map<CollisionShape*, btCollisionShape*> attachedShapes_;
Modified: code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -53,7 +53,7 @@
// WorldEntity has been attached to another one.
CollisionShape::updateParent();
- assert(this->worldEntityOwner_ != 0);
+ assert(this->worldEntityOwner_ != nullptr);
this->worldEntityOwner_->notifyCollisionShapeChanged();
}
Modified: code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -176,10 +176,10 @@
if(pawn && pawn->isA(Class(SpaceShip))) //fix for First Person Mode: check for SpaceShip
{
this->weaponModes_.clear(); // reset previous weapon information
- WeaponSlot* wSlot = 0;
+ WeaponSlot* wSlot = nullptr;
for(int l=0; (wSlot = pawn->getWeaponSlot(l)) ; l++)
{
- WeaponMode* wMode = 0;
+ WeaponMode* wMode = nullptr;
for(int i=0; (wMode = wSlot->getWeapon()->getWeaponmode(i)) ; i++)
{
std::string wName = wMode->getIdentifier()->getName();
@@ -248,7 +248,7 @@
if (index < this->waypoints_.size())
return this->waypoints_[index];
else
- return 0;
+ return nullptr;
}
/**
Modified: code/branches/cpp11_v2/src/orxonox/controllers/Controller.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/Controller.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/controllers/Controller.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -39,8 +39,8 @@
{
RegisterObject(Controller);
- this->player_ = 0;
- this->controllableEntity_ = 0;
+ this->player_ = nullptr;
+ this->controllableEntity_ = nullptr;
this->bGodMode_ = false;
this->team_=-1;
}
Modified: code/branches/cpp11_v2/src/orxonox/controllers/DroneController.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/DroneController.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/controllers/DroneController.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -48,8 +48,8 @@
{
RegisterObject(DroneController);
- this->owner_ = 0;
- this->drone_ = 0;
+ this->owner_ = nullptr;
+ this->drone_ = nullptr;
this->isShooting_ = false;
this->setAccuracy(10);
Modified: code/branches/cpp11_v2/src/orxonox/controllers/FormationController.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/FormationController.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/controllers/FormationController.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -71,11 +71,11 @@
{
RegisterObject(FormationController);
- this->target_ = 0;
+ this->target_ = nullptr;
this->formationFlight_ = false;
this->passive_ = false;
this->maxFormationSize_ = STANDARD_MAX_FORMATION_SIZE;
- this->myMaster_ = 0;
+ this->myMaster_ = nullptr;
this->freedomCount_ = 0;
this->state_ = FREE;
@@ -103,7 +103,7 @@
if (it->myMaster_ == this)
{
orxout(internal_error) << this << " is still master in " << (*it) << endl;
- it->myMaster_ = 0;
+ it->myMaster_ = nullptr;
}
while (true)
@@ -141,7 +141,7 @@
{
for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
{
- Controller* controller = 0;
+ Controller* controller = nullptr;
if (it->getController())
controller = it->getController();
@@ -172,7 +172,7 @@
{
for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
{
- Controller* controller = 0;
+ Controller* controller = nullptr;
if (it->getController())
controller = it->getController();
@@ -202,7 +202,7 @@
{
for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
{
- Controller* controller = 0;
+ Controller* controller = nullptr;
if (it->getController())
controller = it->getController();
@@ -229,7 +229,7 @@
{
for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
{
- Controller* controller = 0;
+ Controller* controller = nullptr;
if (it->getController())
controller = it->getController();
@@ -382,7 +382,7 @@
this->myMaster_->slaves_.erase(it);
}
- this->myMaster_ = 0;
+ this->myMaster_ = nullptr;
this->state_ = FREE;
}
@@ -410,7 +410,7 @@
continue;
//has it an FormationController?
- Controller* controller = 0;
+ Controller* controller = nullptr;
if (it->getController())
controller = it->getController();
@@ -457,7 +457,7 @@
if (this->state_ != SLAVE && teamSize != 0)
{
this->state_ = MASTER;
- this->myMaster_ = 0;
+ this->myMaster_ = nullptr;
}
}
@@ -517,7 +517,7 @@
newMaster->state_ = MASTER;
newMaster->slaves_ = this->slaves_;
- newMaster->myMaster_ = 0;
+ newMaster->myMaster_ = nullptr;
for(std::vector<FormationController*>::iterator it = newMaster->slaves_.begin(); it != newMaster->slaves_.end(); it++)
{
@@ -546,7 +546,7 @@
newMaster->state_ = MASTER;
newMaster->slaves_ = this->slaves_;
- newMaster->myMaster_ = 0;
+ newMaster->myMaster_ = nullptr;
for(std::vector<FormationController*>::iterator it = newMaster->slaves_.begin(); it != newMaster->slaves_.end(); it++)
{
@@ -571,7 +571,7 @@
for(std::vector<FormationController*>::iterator it = slaves_.begin(); it != slaves_.end(); it++)
{
(*it)->state_ = FREE;
- (*it)->myMaster_ = 0;
+ (*it)->myMaster_ = nullptr;
}
this->slaves_.clear();
}
@@ -628,7 +628,7 @@
return;
//search new Master, then take lead
- if (this->state_==FREE && this->myMaster_==0)
+ if (this->state_==FREE && this->myMaster_==nullptr)
{
searchNewMaster();
}
@@ -653,7 +653,7 @@
{
(*it)->myMaster_=this;
}
- this->myMaster_=0;
+ this->myMaster_=nullptr;
this->state_=MASTER;
}
/*/debug
@@ -778,7 +778,7 @@
for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
{
- Controller* controller = 0;
+ Controller* controller = nullptr;
if (it->getController())
controller = it->getController();
@@ -942,7 +942,7 @@
void FormationController::forgetTarget()
{
- this->target_ = 0;
+ this->target_ = nullptr;
this->bShooting_ = false;
}
@@ -962,7 +962,7 @@
int team1 = entity1->getTeam();
int team2 = entity2->getTeam();
- Controller* controller = 0;
+ Controller* controller = nullptr;
if (entity1->getController())
controller = entity1->getController();
else
@@ -995,7 +995,7 @@
team2 = tdm->getTeam(entity2->getPlayer());
}
- TeamBaseMatchBase* base = 0;
+ TeamBaseMatchBase* base = nullptr;
base = orxonox_cast<TeamBaseMatchBase*>(entity1);
if (base)
{
@@ -1029,7 +1029,7 @@
}
}
- DroneController* droneController = 0;
+ DroneController* droneController = nullptr;
droneController = orxonox_cast<DroneController*>(entity1->getController());
if (droneController && static_cast<ControllableEntity*>(droneController->getOwner()) == entity2)
return true;
Modified: code/branches/cpp11_v2/src/orxonox/controllers/HumanController.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/HumanController.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/controllers/HumanController.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -64,7 +64,7 @@
RegisterUnloadableClass(HumanController);
- HumanController* HumanController::localController_s = 0;
+ HumanController* HumanController::localController_s = nullptr;
HumanController::HumanController(Context* context) : FormationController(context)
{
@@ -80,7 +80,7 @@
{
HumanController::localController_s->removeFromFormation();
}
- HumanController::localController_s = 0;
+ HumanController::localController_s = nullptr;
}
void HumanController::tick(float dt)
Modified: code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -57,7 +57,7 @@
RegisterUnloadableClass(NewHumanController);
- NewHumanController* NewHumanController::localController_s = 0;
+ NewHumanController* NewHumanController::localController_s = nullptr;
NewHumanController::NewHumanController(Context* context)
: HumanController(context)
@@ -444,8 +444,8 @@
if (pawn)
pawn->setAimPosition( mouseRay.getOrigin() + mouseRay.getDirection() * 3000 );
- if( this->getControllableEntity() && this->getControllableEntity()->getTarget() != 0 )
- this->getControllableEntity()->setTarget( 0 );
+ if( this->getControllableEntity() && this->getControllableEntity()->getTarget() != nullptr )
+ this->getControllableEntity()->setTarget( nullptr );
//return this->controllableEntity_->getWorldPosition() + (this->controllableEntity_->getWorldOrientation() * Vector3::NEGATIVE_UNIT_Z * 2000);
//return this->controllableEntity_->getWorldPosition() + (this->controllableEntity_->getCamera()->getOgreCamera()->getOrientation() * Vector3::NEGATIVE_UNIT_Z);
Modified: code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -100,6 +100,6 @@
}
if (shortestsqdistance > (this->alertnessradius_ * this->alertnessradius_))
- this->target_ = 0;
+ this->target_ = nullptr;
}
}
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -64,10 +64,10 @@
GSLevel::GSLevel(const GameStateInfo& info)
: GameState(info)
- , gameInputState_(0)
- , guiMouseOnlyInputState_(0)
- , guiKeysOnlyInputState_(0)
- , startFile_(0)
+ , gameInputState_(nullptr)
+ , guiMouseOnlyInputState_(nullptr)
+ , guiKeysOnlyInputState_(nullptr)
+ , startFile_(nullptr)
, bShowIngameGUI_(false)
{
}
@@ -142,9 +142,9 @@
Ogre::CompositorManager::getSingleton().removeAll();
#endif
- gameInputState_->setHandler(0);
- guiMouseOnlyInputState_->setHandler(0);
- guiKeysOnlyInputState_->setHandler(0);
+ gameInputState_->setHandler(nullptr);
+ guiMouseOnlyInputState_->setHandler(nullptr);
+ guiKeysOnlyInputState_->setHandler(nullptr);
InputManager::getInstance().destroyState("game");
InputManager::getInstance().destroyState("guiKeysOnly");
InputManager::getInstance().destroyState("guiMouseOnly");
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -131,7 +131,7 @@
InputManager::getInstance().leaveState("MainMenuHackery");
- GraphicsManager::getInstance().setCamera(0);
+ GraphicsManager::getInstance().setCamera(nullptr);
GUIManager::getInstance().setBackgroundImage("");
GUIManager::hideGUI("MainMenu");
@@ -139,7 +139,7 @@
ModifyConsoleCommand(__CC_startServer_name ).deactivate();
ModifyConsoleCommand(__CC_startClient_name ).deactivate();
ModifyConsoleCommand(__CC_startDedicated_name ).deactivate();
- ModifyConsoleCommand(__CC_setMainMenuSoundPath_name).setObject(0);
+ ModifyConsoleCommand(__CC_setMainMenuSoundPath_name).setObject(nullptr);
}
void GSMainMenu::update(const Clock& time)
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -97,10 +97,10 @@
void GSRoot::deactivate()
{
- ModifyConsoleCommand(__CC_setTimeFactor_name).setObject(0);
- ModifyConsoleCommand(__CC_getTimeFactor_name).setObject(0);
- ModifyConsoleCommand(__CC_setPause_name).setObject(0);
- ModifyConsoleCommand(__CC_pause_name).setObject(0);
+ ModifyConsoleCommand(__CC_setTimeFactor_name).setObject(nullptr);
+ ModifyConsoleCommand(__CC_getTimeFactor_name).setObject(nullptr);
+ ModifyConsoleCommand(__CC_setPause_name).setObject(nullptr);
+ ModifyConsoleCommand(__CC_pause_name).setObject(nullptr);
}
void GSRoot::update(const Clock& time)
Modified: code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -43,7 +43,7 @@
GSServer::GSServer(const GameStateInfo& info)
: GameState(info)
- , server_(0)
+ , server_(nullptr)
{
}
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -49,7 +49,7 @@
{ this->firstCheckpointReached_ = reached; }
protected:
- virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
+ virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
private:
bool firstCheckpointReached_;
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -46,7 +46,7 @@
virtual bool playerLeft(PlayerInfo* player);
virtual bool playerChangedName(PlayerInfo* player);
- virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
+ virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
virtual void playerScored(PlayerInfo* player, int score = 1);
};
}
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -684,7 +684,7 @@
}
}
- return 0;
+ return nullptr;
}
}
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -63,8 +63,8 @@
bool friendlyfire; //goal: player can switch it on/off
bool tutorial; //goal: new players receive messages how the new gametype works - later it can be switched off.
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0); //ok - score function and management of parties
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0); //ok - simple
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); //ok - score function and management of parties
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); //ok - simple
virtual void start();
virtual void end(); //Wie geht das mit der Punkteausgabe aendern? Z.B: Persoenliche Nachricht?
virtual void playerEntered(PlayerInfo* player);
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -65,7 +65,7 @@
this->gtinfo_ = new GametypeInfo(context);
this->defaultControllableEntity_ = Class(Spectator);
- this->scoreboard_ = 0;
+ this->scoreboard_ = nullptr;
this->bAutoStart_ = false;
this->bForceSpawn_ = false;
@@ -360,7 +360,7 @@
orxout(internal_warning) << "Fallback SpawnPoint was used because there were no active SpawnPoints." << endl;
return fallbackSpawnPoint;
}
- return 0;
+ return nullptr;
}
void Gametype::assignDefaultPawnsIfNeeded()
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -95,11 +95,11 @@
virtual void playerScored(PlayerInfo* player, int score = 1);
- virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0);
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
+ virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr);
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr);
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
- virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
+ virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
virtual void pawnPreSpawn(Pawn* pawn);
virtual void pawnPostSpawn(Pawn* pawn);
virtual void playerPreSpawn(PlayerInfo* player);
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -68,8 +68,8 @@
virtual ~LastManStanding() {} //!< Default Destructor.
void setConfigValues(); //!< Makes values configurable.
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0); //!< If a player shoot's an opponent, his punishment countdown will be resetted.
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0); //!< Manages each players lives.
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); //!< If a player shoot's an opponent, his punishment countdown will be resetted.
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); //!< Manages each players lives.
virtual void end(); //!< Sends an end message.
int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -76,8 +76,8 @@
virtual void playerEntered(PlayerInfo* player); //!< Initializes values.
virtual bool playerLeft(PlayerInfo* player); //!< Manages all local variables.
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0); //!< Manages each player's lost lives.
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0); //!< If a player shoot's an opponent, his punishment countdown will be resetted.
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); //!< Manages each player's lost lives.
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); //!< If a player shoot's an opponent, his punishment countdown will be resetted.
virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn); //!< Resets punishment time and respawn delay.
void tick (float dt); //!< used to end the game
virtual void end(); //!< Sends an end message.
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -57,7 +57,7 @@
static void setLivesWrapper(unsigned int amount);
protected:
- virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
+ virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
bool missionAccomplished_; //<! indicates if player successfully finsihed the mission;
int lives_; //<! amount of player's lives <-> nr. of retries
//<! If the lives_ are set negative -> unlimited lives.
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -263,7 +263,7 @@
if (i > index)
return (*it);
}
- return 0;
+ return nullptr;
}
}
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -43,7 +43,7 @@
TeamBaseMatch(Context* context);
virtual ~TeamBaseMatch() {}
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
virtual bool allowPawnDamage(Pawn* victim, Pawn* originator);
virtual void playerScored(PlayerInfo* player, int score = 1);
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -47,7 +47,7 @@
virtual bool playerLeft(PlayerInfo* player);
virtual bool playerChangedName(PlayerInfo* player);
- virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
+ virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
virtual void playerScored(PlayerInfo* player, int score = 1);
protected:
int maxScore_;
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -276,7 +276,7 @@
return fallbackSpawnPoint;
}
- return 0;
+ return nullptr;
}
void TeamGametype::playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn)
@@ -339,7 +339,7 @@
//get Pawn's controller
ControllableEntity* entity = orxonox_cast<ControllableEntity*>(pawn);
- Controller* controller = 0;
+ Controller* controller = nullptr;
if (entity->getController())
controller = entity->getController();
else if (entity->getXMLController())
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -50,9 +50,9 @@
virtual bool playerLeft(PlayerInfo* player);
virtual void spawnDeadPlayersIfRequested(); //!< Prevents players to respawn.
- virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0);
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
+ virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr);
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr);
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -47,7 +47,7 @@
RegisterObject(UnderAttack);
this->gameTime_ = 180;
this->teams_ = 2;
- this->destroyer_ = 0;
+ this->destroyer_ = nullptr;
this->destroyer_.setCallback(createFunctor(&UnderAttack::killedDestroyer, this));
this->gameEnded_ = false;
@@ -201,7 +201,7 @@
void UnderAttack::setTransporterHealth()
{
- if (this->destroyer_ != 0)
+ if (this->destroyer_ != nullptr)
{
//Calculation: Each attacker deals about 3500 damage. A human attacker deals 1500 damage additionally.
//Each defender prevents 500 damage. If human 2000 damage will be additionally be prevented.
Modified: code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -47,9 +47,9 @@
inline Destroyer* getDestroyer() const
{ return this->destroyer_; }
- virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);
- virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0);
- virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
+ virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr);
+ virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr);
+ virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
virtual void playerEntered(PlayerInfo* player);
protected:
Modified: code/branches/cpp11_v2/src/orxonox/graphics/Backlight.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/Backlight.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/graphics/Backlight.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -50,8 +50,8 @@
{
RegisterObject(Backlight);
- this->ribbonTrail_ = 0;
- this->ribbonTrailNode_ = 0;
+ this->ribbonTrail_ = nullptr;
+ this->ribbonTrailNode_ = nullptr;
this->width_ = 0;
this->length_ = 1.0f;
Modified: code/branches/cpp11_v2/src/orxonox/graphics/Light.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/Light.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/graphics/Light.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -52,7 +52,7 @@
{
RegisterObject(Light);
- this->light_ = 0;
+ this->light_ = nullptr;
this->diffuse_ = ColourValue::White;
this->specular_ = ColourValue::White;
this->type_ = Light::Point;
Modified: code/branches/cpp11_v2/src/orxonox/graphics/Model.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/Model.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/graphics/Model.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -133,7 +133,7 @@
{
Level* level = this->getLevel();
- assert( level != 0 );
+ assert( level != nullptr );
MeshLodInformation* lodInfo = level->getLodInfo(this->meshSrc_);
if( lodInfo )
Modified: code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -51,7 +51,7 @@
if (GameMode::showsGraphics() && (!this->getScene() || !this->getScene()->getSceneManager()))
ThrowException(AbortLoading, "Can't create ParticleEmitter, no scene or no scene manager given.");
- this->particles_ = 0;
+ this->particles_ = nullptr;
this->LOD_ = LODParticle::Normal;
this->registerVariables();
@@ -101,7 +101,7 @@
if (this->particles_)
{
delete this->particles_;
- this->particles_ = 0;
+ this->particles_ = nullptr;
}
if (GameMode::showsGraphics() && this->getScene() && this->getScene()->getSceneManager())
Modified: code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -52,8 +52,8 @@
this->bHumanPlayer_ = true;
this->defaultController_ = Class(NewHumanController);
- this->humanHud_ = 0;
- this->gametypeHud_ = 0;
+ this->humanHud_ = nullptr;
+ this->gametypeHud_ = nullptr;
this->setConfigValues();
this->registerVariables();
@@ -177,7 +177,7 @@
if (this->humanHud_)
{
this->humanHud_->destroy();
- this->humanHud_ = 0;
+ this->humanHud_ = nullptr;
}
if (this->isLocalPlayer() && !this->humanHudTemplate_.empty() && GameMode::showsGraphics())
@@ -193,7 +193,7 @@
if (this->gametypeHud_)
{
this->gametypeHud_->destroy();
- this->gametypeHud_ = 0;
+ this->gametypeHud_ = nullptr;
}
if (this->isLocalPlayer() && !this->gametypeHudTemplate_.empty())
Modified: code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -50,11 +50,11 @@
this->bLocalPlayer_ = false;
this->bReadyToSpawn_ = false;
this->bSetUnreadyAfterSpawn_ = true;
- this->controller_ = 0;
- this->controllableEntity_ = 0;
+ this->controller_ = nullptr;
+ this->controllableEntity_ = nullptr;
this->controllableEntityID_ = OBJECTID_UNKNOWN;
- this->gtinfo_ = 0;
+ this->gtinfo_ = nullptr;
this->gtinfoID_ = OBJECTID_UNKNOWN;
this->updateGametypeInfo(this->getGametype());
@@ -71,7 +71,7 @@
if (this->controller_)
{
this->controller_->destroy();
- this->controller_ = 0;
+ this->controller_ = nullptr;
}
if (this->getGametype())
@@ -125,7 +125,7 @@
void PlayerInfo::updateGametypeInfo(Gametype* gametype)
{
- this->gtinfo_ = 0;
+ this->gtinfo_ = nullptr;
this->gtinfoID_ = OBJECTID_UNKNOWN;
if (gametype && gametype->getGametypeInfo())
@@ -140,7 +140,7 @@
if (this->controller_)
{
this->controller_->destroy();
- this->controller_ = 0;
+ this->controller_ = nullptr;
}
this->controller_ = this->defaultController_.fabricate(this->getContext());
assert(this->controller_);
@@ -213,12 +213,12 @@
if (!entity)
return;
- this->controllableEntity_->setController(0);
- this->controllableEntity_ = 0;
+ this->controllableEntity_->setController(nullptr);
+ this->controllableEntity_ = nullptr;
this->controllableEntityID_ = OBJECTID_UNKNOWN;
if (this->controller_)
- this->controller_->setControllableEntity(0);
+ this->controller_->setControllableEntity(nullptr);
if ( GameMode::isMaster() )
entity->removePlayer();
@@ -241,7 +241,7 @@
}
tmp->setActive(false);
//this->controllableEntity_->getController()->setControllableEntity(nullptr);
- this->controllableEntity_->setController(0);
+ this->controllableEntity_->setController(nullptr);
}
void PlayerInfo::stopTemporaryControl()
@@ -252,7 +252,7 @@
if( !entity || this->previousControllableEntity_.size() == 0 )
return;
- this->controllableEntity_->setController(0);
+ this->controllableEntity_->setController(nullptr);
if(this->isHumanPlayer()) // TODO: Multiplayer?
this->controllableEntity_->destroyHud(); // HACK-ish
Modified: code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/interfaces/RadarViewable.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -65,7 +65,7 @@
// The following if-clause hides objects with radarname "HIDDEN"
if (name == "HIDDEN")
{
- this->bVisibility_ = 0;
+ this->bVisibility_ = false;
this->settingsChanged();
}
if (this->radarName_ != name)
Modified: code/branches/cpp11_v2/src/orxonox/items/Engine.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/items/Engine.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/items/Engine.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -49,7 +49,7 @@
{
RegisterObject(Engine);
- this->ship_ = 0;
+ this->ship_ = nullptr;
this->shipID_ = OBJECTID_UNKNOWN;
this->relativePosition_ = Vector3::ZERO;
@@ -135,7 +135,7 @@
void Engine::networkcallback_shipID()
{
- this->ship_ = 0;
+ this->ship_ = nullptr;
if (this->shipID_ != OBJECTID_UNKNOWN)
{
Modified: code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -66,9 +66,9 @@
}
else
{
- this->defEngineSndBoost_ = 0;
- this->defEngineSndNormal_ = 0;
- this->lua_ = 0;
+ this->defEngineSndBoost_ = nullptr;
+ this->defEngineSndNormal_ = nullptr;
+ this->lua_ = nullptr;
}
this->state_ = 0;
this->oldState_ = 0;
Modified: code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -74,13 +74,13 @@
InGameConsole::InGameConsole()
: shell_(new Shell("InGameConsole", true))
, bShowCursor_(false)
- , consoleOverlay_(0)
- , consoleOverlayContainer_(0)
- , consoleOverlayNoise_(0)
- , consoleOverlayCursor_(0)
- , consoleOverlayBorder_(0)
- , consoleOverlayTextAreas_(0)
- , inputState_(0)
+ , consoleOverlay_(nullptr)
+ , consoleOverlayContainer_(nullptr)
+ , consoleOverlayNoise_(nullptr)
+ , consoleOverlayCursor_(nullptr)
+ , consoleOverlayBorder_(nullptr)
+ , consoleOverlayTextAreas_(nullptr)
+ , inputState_(nullptr)
{
RegisterObject(InGameConsole);
@@ -129,7 +129,7 @@
{
if (this->consoleOverlayTextAreas_[i])
Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->consoleOverlayTextAreas_[i]);
- this->consoleOverlayTextAreas_[i] = 0;
+ this->consoleOverlayTextAreas_[i] = nullptr;
}
}
@@ -139,7 +139,7 @@
if (this->consoleOverlayTextAreas_)
{
delete[] this->consoleOverlayTextAreas_;
- this->consoleOverlayTextAreas_ = 0;
+ this->consoleOverlayTextAreas_ = nullptr;
}
if (this->consoleOverlay_)
@@ -174,8 +174,8 @@
}
else
{
- inputState_->setMouseHandler(0);
- inputState_->setJoyStickHandler(0);
+ inputState_->setMouseHandler(nullptr);
+ inputState_->setJoyStickHandler(nullptr);
}
}
}
Modified: code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -69,8 +69,8 @@
{
RegisterObject(OrxonoxOverlay);
- this->owner_ = 0;
- this->group_ = 0;
+ this->owner_ = nullptr;
+ this->group_ = nullptr;
if (!GameMode::showsGraphics())
ThrowException(NoGraphics, "Can't create OrxonoxOverlay, graphics engine not initialized");
Modified: code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -53,7 +53,7 @@
{
RegisterObject(OverlayGroup);
- this->owner_ = 0;
+ this->owner_ = nullptr;
setScale(Vector2(1.0, 1.0));
setScroll(Vector2(0.0, 0.0));
@@ -138,7 +138,7 @@
return *it;
}
else
- return 0;
+ return nullptr;
}
//! Changes the visibility of all elements
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/Munition.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -64,7 +64,7 @@
{
// For separated magazines we definitively need a given user
if (!user)
- return 0;
+ return nullptr;
// Use the map to get the magazine assigned to the given user
std::map<WeaponMode*, Magazine*>::const_iterator it = this->currentMagazines_.find(user);
@@ -78,7 +78,7 @@
return this->currentMagazines_.begin()->second;
}
- return 0;
+ return nullptr;
}
unsigned int Munition::getNumMunition(WeaponMode* user) const
@@ -235,7 +235,7 @@
// If we don't use separate magazines, set user to 0
if (!this->bUseSeparateMagazines_)
- user = 0;
+ user = nullptr;
// Remove the current magazine for the given user
std::map<WeaponMode*, Magazine*>::iterator it = this->currentMagazines_.find(user);
@@ -441,7 +441,7 @@
// If we don't use separate magazines, set user to 0
if (!this->bUseSeparateMagazines_)
- user = 0;
+ user = nullptr;
// Remove the current magazine for the given user
std::map<WeaponMode*, Magazine*>::iterator it = this->currentMagazines_.find(user);
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -44,8 +44,8 @@
{
RegisterObject(Weapon);
- this->weaponPack_ = 0;
- this->weaponSlot_ = 0;
+ this->weaponPack_ = nullptr;
+ this->weaponSlot_ = nullptr;
this->bReloading_ = false;
this->reloadingWeaponmode_ = WeaponSystem::WEAPON_MODE_UNASSIGNED;
@@ -91,7 +91,7 @@
++i;
}
- return 0;
+ return nullptr;
}
/**
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -50,10 +50,10 @@
{
RegisterObject(WeaponMode);
- this->weapon_ = 0;
+ this->weapon_ = nullptr;
this->mode_ = WeaponSystem::WEAPON_MODE_UNASSIGNED;
- this->munition_ = 0;
+ this->munition_ = nullptr;
this->initialMunition_ = 0;
this->initialMagazines_ = 0;
this->munitionPerShot_ = 1;
@@ -231,7 +231,7 @@
}
}
else
- this->munition_ = 0;
+ this->munition_ = nullptr;
}
void WeaponMode::reloaded()
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -43,7 +43,7 @@
{
RegisterObject(WeaponPack);
- this->weaponSystem_ = 0;
+ this->weaponSystem_ = nullptr;
}
WeaponPack::~WeaponPack()
@@ -106,7 +106,7 @@
std::vector<Weapon*>::iterator it = std::find(this->weapons_.begin(), this->weapons_.end(), weapon);
assert(it != this->weapons_.end());
this->weapons_.erase(it);
- weapon->setWeaponPack(0);
+ weapon->setWeaponPack(nullptr);
}
Weapon * WeaponPack::getWeapon(unsigned int index) const
@@ -120,7 +120,7 @@
++i;
}
- return 0;
+ return nullptr;
}
void WeaponPack::addDefaultWeaponmodeLink(DefaultWeaponmodeLink* link)
@@ -138,7 +138,7 @@
++i;
}
- return 0;
+ return nullptr;
}
unsigned int WeaponPack::getDesiredWeaponmode(unsigned int firemode) const
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -42,7 +42,7 @@
{
RegisterObject(WeaponSet);
- this->weaponSystem_ = 0;
+ this->weaponSystem_ = nullptr;
this->desiredFiremode_ = WeaponSystem::FIRE_MODE_UNASSIGNED;
}
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -42,8 +42,8 @@
{
RegisterObject(WeaponSlot);
- this->weaponSystem_ = 0;
- this->weapon_ = 0;
+ this->weaponSystem_ = nullptr;
+ this->weapon_ = nullptr;
this->setSyncMode(ObjectDirection::None);
}
@@ -87,8 +87,8 @@
{
if (this->weapon_)
{
- this->weapon_->setWeaponSlot(0);
- this->weapon_ = 0;
+ this->weapon_->setWeaponSlot(nullptr);
+ this->weapon_ = nullptr;
}
}
}
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -73,7 +73,7 @@
Checks whether there is a Weapon attached to this WeaponSlot.
*/
inline bool isOccupied() const
- { return (this->weapon_ != 0); }
+ { return (this->weapon_ != nullptr); }
inline void setWeaponSystem(WeaponSystem * weaponSystem)
{ this->weaponSystem_ = weaponSystem; }
Modified: code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSystem.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -51,7 +51,7 @@
{
RegisterObject(WeaponSystem);
- this->pawn_ = 0;
+ this->pawn_ = nullptr;
}
WeaponSystem::~WeaponSystem()
@@ -59,7 +59,7 @@
if (this->isInitialized())
{
if (this->pawn_)
- this->pawn_->setWeaponSystem(0);
+ this->pawn_->setWeaponSystem(nullptr);
while (!this->weaponSets_.empty())
this->weaponSets_.begin()->second->destroy();
@@ -111,7 +111,7 @@
if (i > index)
return (*it);
}
- return 0;
+ return nullptr;
}
bool WeaponSystem::addWeaponSet(WeaponSet * wSet)
@@ -158,7 +158,7 @@
if (i > index)
return it->second;
}
- return 0;
+ return nullptr;
}
bool WeaponSystem::canAddWeaponPack(WeaponPack * wPack)
@@ -212,7 +212,7 @@
{
// Remove all weapons from their WeaponSlot
unsigned int i = 0;
- Weapon* weapon = 0;
+ Weapon* weapon = nullptr;
while ((weapon = wPack->getWeapon(i++)))
if (weapon->getWeaponSlot())
weapon->getWeaponSlot()->removeWeapon();
@@ -236,7 +236,7 @@
if (i > index)
return (*it);
}
- return 0;
+ return nullptr;
}
bool WeaponSystem::swapWeaponSlots(WeaponSlot * wSlot1, WeaponSlot * wSlot2)
@@ -302,7 +302,7 @@
Munition * WeaponSystem::getMunition(SubclassIdentifier<Munition> * identifier)
{
if (!identifier || !identifier->getIdentifier())
- return 0;
+ return nullptr;
std::map<Identifier *, Munition *>::iterator it = this->munitions_.find(identifier->getIdentifier());
if (it != this->munitions_.end())
@@ -317,7 +317,7 @@
}
else
{
- return 0;
+ return nullptr;
}
}
}
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/BigExplosion.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/BigExplosion.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/BigExplosion.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -203,18 +203,18 @@
void BigExplosion::initZero()
{
- this->debrisFire1_ = 0;
- this->debrisFire2_ = 0;
- this->debrisFire3_ = 0;
- this->debrisFire4_ = 0;
+ this->debrisFire1_ = nullptr;
+ this->debrisFire2_ = nullptr;
+ this->debrisFire3_ = nullptr;
+ this->debrisFire4_ = nullptr;
- this->debrisSmoke1_ = 0;
- this->debrisSmoke2_ = 0;
- this->debrisSmoke3_ = 0;
- this->debrisSmoke4_ = 0;
+ this->debrisSmoke1_ = nullptr;
+ this->debrisSmoke2_ = nullptr;
+ this->debrisSmoke3_ = nullptr;
+ this->debrisSmoke4_ = nullptr;
- this->explosionSmoke_=0;
- this->explosionFire_=0;
+ this->explosionSmoke_=nullptr;
+ this->explosionFire_=nullptr;
}
BigExplosion::~BigExplosion()
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -60,17 +60,17 @@
this->server_overwrite_ = 0;
this->client_overwrite_ = 0;
- this->player_ = 0;
+ this->player_ = nullptr;
this->formerPlayer_ = nullptr;
this->playerID_ = OBJECTID_UNKNOWN;
- this->hud_ = 0;
- this->camera_ = 0;
- this->xmlcontroller_ = 0;
- //this->controller_ = 0;
- this->reverseCamera_ = 0;
+ this->hud_ = nullptr;
+ this->camera_ = nullptr;
+ this->xmlcontroller_ = nullptr;
+ //this->controller_ = nullptr;
+ this->reverseCamera_ = nullptr;
this->bDestroyWhenPlayerLeft_ = false;
this->cameraPositionRootNode_ = this->node_->createChildSceneNode();
- this->currentCameraPosition_ = 0;
+ this->currentCameraPosition_ = nullptr;
this->bMouseLook_ = false;
this->mouseLookSpeed_ = 200;
@@ -170,7 +170,7 @@
return (*it);
++i;
}
- return 0;
+ return nullptr;
}
unsigned int ControllableEntity::getCurrentCameraIndex() const
@@ -240,7 +240,7 @@
else
{
this->camera_->attachToNode(this->cameraPositionRootNode_);
- this->currentCameraPosition_ = 0;
+ this->currentCameraPosition_ = nullptr;
}
// disable mouse look if the new camera position doesn't allow it
@@ -320,7 +320,7 @@
this->target_ = target;
if ( !GameMode::isMaster() )
{
- if ( target != 0 )
+ if ( target != nullptr )
{
callMemberNetworkFunction(&ControllableEntity::setTargetInternal, this->getObjectID(), 0, target->getObjectID() );
}
@@ -371,7 +371,7 @@
if (this->bHasLocalController_ && this->bHasHumanController_)
this->stopLocalHumanControl();
- this->player_ = 0;
+ this->player_ = nullptr;
this->playerID_ = OBJECTID_UNKNOWN;
this->bHasLocalController_ = false;
this->bHasHumanController_ = false;
@@ -410,7 +410,7 @@
else
{
this->camera_->attachToNode(this->cameraPositionRootNode_);
- this->currentCameraPosition_ = 0;
+ this->currentCameraPosition_ = nullptr;
}
}
@@ -446,13 +446,13 @@
{
this->camera_->detachFromParent();
this->camera_->destroy();
- this->camera_ = 0;
+ this->camera_ = nullptr;
}
if (this->hud_)
{
this->hud_->destroy();
- this->hud_ = 0;
+ this->hud_ = nullptr;
}
}
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/Drone.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -42,7 +42,7 @@
{
RegisterObject(Drone);
- this->myController_ = 0;
+ this->myController_ = nullptr;
this->localLinearAcceleration_.setValue(0, 0, 0);
this->localAngularAcceleration_.setValue(0, 0, 0);
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -61,14 +61,14 @@
catch (const std::exception& ex)
{
orxout(internal_error) << "Couldn't load particle effect in ExplosionChunk: " << ex.what() << endl;
- this->fire_ = 0;
- this->smoke_ = 0;
+ this->fire_ = nullptr;
+ this->smoke_ = nullptr;
}
}
else
{
- this->fire_ = 0;
- this->smoke_ = 0;
+ this->fire_ = nullptr;
+ this->smoke_ = nullptr;
}
if (GameMode::isMaster())
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -49,7 +49,7 @@
this->overwrite_position_ = Vector3::ZERO;
this->overwrite_orientation_ = Quaternion::IDENTITY;
- this->continuousResynchroTimer_ = 0;
+ this->continuousResynchroTimer_ = nullptr;
this->setPriority(Priority::Low);
@@ -79,7 +79,7 @@
if (victim)
{
float damage = this->collisionDamage_ * (victim->getVelocity() - this->getVelocity()).length();
- victim->hit(0, contactPoint, ownCollisionShape, damage);
+ victim->hit(nullptr, contactPoint, ownCollisionShape, damage);
}
}
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -42,7 +42,7 @@
{
RegisterObject(SpawnPoint);
- this->template_ = 0;
+ this->template_ = nullptr;
if (this->getGametype())
this->getGametype()->registerSpawnPoint(this);
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -76,7 +76,7 @@
this->node_ = this->getScene()->getRootSceneNode()->createChildSceneNode();
- this->parent_ = 0;
+ this->parent_ = nullptr;
this->parentID_ = OBJECTID_UNKNOWN;
this->bDeleteWithParent_ = true;
@@ -89,7 +89,7 @@
// Default behaviour does not include physics
- this->physicalBody_ = 0;
+ this->physicalBody_ = nullptr;
this->bPhysicsActive_ = false;
this->bPhysicsActiveSynchronised_ = false;
this->bPhysicsActiveBeforeAttaching_ = false;
@@ -497,7 +497,7 @@
*/
void WorldEntity::notifyDetached()
{
- this->parent_ = 0;
+ this->parent_ = nullptr;
this->parentID_ = OBJECTID_UNKNOWN;
this->parentChanged();
@@ -524,7 +524,7 @@
return (*it);
++i;
}
- return 0;
+ return nullptr;
}
//! Attaches an Ogre::SceneNode to this WorldEntity.
@@ -855,7 +855,7 @@
assert(this->physicalBody_);
deactivatePhysics();
delete this->physicalBody_;
- this->physicalBody_ = 0;
+ this->physicalBody_ = nullptr;
this->collisionType_ = None;
this->collisionTypeSynchronised_ = None;
return;
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/pawns/ModularSpaceShip.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/pawns/ModularSpaceShip.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/pawns/ModularSpaceShip.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -52,7 +52,7 @@
RegisterClass(ModularSpaceShip);
- std::map<StaticEntity*, ShipPart*>* ModularSpaceShip::partMap_s = 0;
+ std::map<StaticEntity*, ShipPart*>* ModularSpaceShip::partMap_s = nullptr;
ModularSpaceShip::ModularSpaceShip(Context* context) : SpaceShip(context)
{
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -75,7 +75,7 @@
this->reloadWaitTime_ = 1.0f;
this->reloadWaitCountdown_ = 0;
- this->lastHitOriginator_ = 0;
+ this->lastHitOriginator_ = nullptr;
// set damage multiplier to default value 1, meaning nominal damage
this->damageMultiplier_ = 1;
@@ -90,7 +90,7 @@
this->weaponSystem_->setPawn(this);
}
else
- this->weaponSystem_ = 0;
+ this->weaponSystem_ = nullptr;
this->setRadarObjectColour(ColourValue::Red);
this->setRadarObjectShape(RadarViewable::Dot);
@@ -108,7 +108,7 @@
}
else
{
- this->explosionSound_ = 0;
+ this->explosionSound_ = nullptr;
}
}
@@ -344,7 +344,7 @@
if(!entity->hasHumanController())
{
// delete the AIController // <-- TODO: delete? nothing is deleted here... should we delete the controller?
- slave->setControllableEntity(0);
+ slave->setControllableEntity(nullptr);
// set a new master within the formation
orxonox_cast<FormationController*>(this->getController())->setNewMasterWithinFormation(orxonox_cast<FormationController*>(slave));
@@ -508,7 +508,7 @@
if (this->weaponSystem_)
return this->weaponSystem_->getWeaponSlot(index);
else
- return 0;
+ return nullptr;
}
void Pawn::addWeaponSet(WeaponSet * wSet)
@@ -522,7 +522,7 @@
if (this->weaponSystem_)
return this->weaponSystem_->getWeaponSet(index);
else
- return 0;
+ return nullptr;
}
void Pawn::addWeaponPack(WeaponPack * wPack)
@@ -550,7 +550,7 @@
if (this->weaponSystem_)
return this->weaponSystem_->getWeaponPack(index);
else
- return 0;
+ return nullptr;
}
//Tell the Map (RadarViewable), if this is a playership
@@ -593,7 +593,7 @@
if (this->hasHumanController() && it->getMaster() == this->getPlayer()->getController())
return it->getController();
}
- return 0;
+ return nullptr;
}
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h 2015-11-06 21:54:34 UTC (rev 10768)
@@ -206,7 +206,7 @@
virtual void deatheffect();
virtual void spawneffect();
- //virtual void damage(float damage, Pawn* originator = 0);
+ //virtual void damage(float damage, Pawn* originator = nullptr);
virtual void damage(float damage, float healthdamage = 0.0f, float shielddamage = 0.0f, Pawn* originator = nullptr, const btCollisionShape* cs = nullptr);
bool bAlive_;
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/pawns/SpaceShip.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -493,7 +493,7 @@
Camera* camera = this->getCamera();
//Shaking Camera effect
- if (camera != 0)
+ if (camera != nullptr)
camera->setOrientation(Vector3::UNIT_X, angle);
}
@@ -525,7 +525,7 @@
if(this->hasLocalController() && this->hasHumanController())
{
Camera *camera = this->getCamera();
- if (camera == 0)
+ if (camera == nullptr)
{
orxout(internal_warning) << "Failed to reset camera!" << endl;
return;
Modified: code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Spectator.cc
===================================================================
--- code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Spectator.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Spectator.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -57,7 +57,7 @@
this->roll_ = 0;
this->localVelocity_ = Vector3::ZERO;
this->setHudTemplate("spectatorhud");
- this->greetingFlare_ = 0;
+ this->greetingFlare_ = nullptr;
this->setDestroyWhenPlayerLeft(true);
Modified: code/branches/cpp11_v2/test/core/command/CommandTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/command/CommandTest.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/test/core/command/CommandTest.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -128,7 +128,7 @@
else if (a == -2)
ModifyConsoleCommand("test").popObject();
else if (a == 1)
- ModifyConsoleCommand("test").setFunction(FunctorPtr(0));
+ ModifyConsoleCommand("test").setFunction(FunctorPtr(nullptr));
else if (a == -1)
ModifyConsoleCommand("test").popFunction();
}
Modified: code/branches/cpp11_v2/test/core/object/StrongPtrTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/object/StrongPtrTest.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/test/core/object/StrongPtrTest.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -111,10 +111,10 @@
void isNull(const StrongPtr<DestroyableTest> strongPtr)
{
EXPECT_TRUE(strongPtr == nullptr);
- EXPECT_TRUE(strongPtr == 0);
+ EXPECT_TRUE(strongPtr == nullptr);
EXPECT_TRUE(!strongPtr);
EXPECT_FALSE(strongPtr != nullptr);
- EXPECT_FALSE(strongPtr != 0);
+ EXPECT_FALSE(strongPtr != nullptr);
EXPECT_FALSE(strongPtr);
}
@@ -134,12 +134,12 @@
isNull(strongPtr);
}
{
- StrongPtr<DestroyableTest> strongPtr = 0;
+ StrongPtr<DestroyableTest> strongPtr = nullptr;
isNull(strongPtr);
}
{
StrongPtr<DestroyableTest> strongPtr;
- strongPtr = 0;
+ strongPtr = nullptr;
isNull(strongPtr);
}
}
@@ -150,10 +150,10 @@
DestroyableTest* test = new DestroyableTest(destroyed);
StrongPtr<DestroyableTest> strongPtr = test;
EXPECT_FALSE(strongPtr == nullptr);
- EXPECT_FALSE(strongPtr == 0);
+ EXPECT_FALSE(strongPtr == nullptr);
EXPECT_FALSE(!strongPtr);
EXPECT_TRUE(strongPtr != nullptr);
- EXPECT_TRUE(strongPtr != 0);
+ EXPECT_TRUE(strongPtr != nullptr);
EXPECT_TRUE(strongPtr);
test->destroy();
}
Modified: code/branches/cpp11_v2/test/core/object/WeakPtrTest.cc
===================================================================
--- code/branches/cpp11_v2/test/core/object/WeakPtrTest.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/test/core/object/WeakPtrTest.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -66,10 +66,10 @@
void isNull(const WeakPtr<DestroyableTest> weakPtr)
{
EXPECT_TRUE(weakPtr == nullptr);
- EXPECT_TRUE(weakPtr == 0);
+ EXPECT_TRUE(weakPtr == nullptr);
EXPECT_TRUE(!weakPtr);
EXPECT_FALSE(weakPtr != nullptr);
- EXPECT_FALSE(weakPtr != 0);
+ EXPECT_FALSE(weakPtr != nullptr);
EXPECT_FALSE(weakPtr);
}
@@ -89,12 +89,12 @@
isNull(weakPtr);
}
{
- WeakPtr<DestroyableTest> weakPtr = 0;
+ WeakPtr<DestroyableTest> weakPtr = nullptr;
isNull(weakPtr);
}
{
WeakPtr<DestroyableTest> weakPtr;
- weakPtr = 0;
+ weakPtr = nullptr;
isNull(weakPtr);
}
}
@@ -104,10 +104,10 @@
DestroyableTest* test = new DestroyableTest();
WeakPtr<DestroyableTest> weakPtr = test;
EXPECT_FALSE(weakPtr == nullptr);
- EXPECT_FALSE(weakPtr == 0);
+ EXPECT_FALSE(weakPtr == nullptr);
EXPECT_FALSE(!weakPtr);
EXPECT_TRUE(weakPtr != nullptr);
- EXPECT_TRUE(weakPtr != 0);
+ EXPECT_TRUE(weakPtr != nullptr);
EXPECT_TRUE(weakPtr);
test->destroy();
}
Modified: code/branches/cpp11_v2/test/util/SharedPtrTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/SharedPtrTest.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/test/util/SharedPtrTest.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -40,7 +40,7 @@
TEST(SharedPtr, ConstructorDefault)
{
SharedPtr<TestClass> test;
- EXPECT_EQ(0, test.get());
+ EXPECT_EQ(nullptr, test.get());
}
TEST(SharedPtr, ConstructorPointer)
@@ -90,7 +90,7 @@
EXPECT_EQ(pointer, other.get());
SharedPtr<TestClass> test;
- EXPECT_EQ(0, test.get());
+ EXPECT_EQ(nullptr, test.get());
test = other;
EXPECT_EQ(pointer, test.get());
@@ -104,7 +104,7 @@
EXPECT_EQ(pointer, other.get());
SharedPtr<TestClass> test;
- EXPECT_EQ(0, test.get());
+ EXPECT_EQ(nullptr, test.get());
test = other;
EXPECT_EQ(pointer, test.get());
@@ -137,7 +137,7 @@
TEST(SharedPtr, Boolean)
{
SharedPtr<TestClass> test;
- EXPECT_EQ(0, test.get());
+ EXPECT_EQ(nullptr, test.get());
EXPECT_FALSE(test);
TestClass* pointer = new TestClass();
Modified: code/branches/cpp11_v2/test/util/SmallObjectAllocatorTest.cc
===================================================================
--- code/branches/cpp11_v2/test/util/SmallObjectAllocatorTest.cc 2015-11-05 20:48:41 UTC (rev 10767)
+++ code/branches/cpp11_v2/test/util/SmallObjectAllocatorTest.cc 2015-11-06 21:54:34 UTC (rev 10768)
@@ -46,7 +46,7 @@
{
// create an integer
size_t* pointer = this->create(5);
- ASSERT_NE((void*)0, pointer);
+ ASSERT_NE((void*)nullptr, pointer);
EXPECT_EQ(5u, *pointer);
}
@@ -54,7 +54,7 @@
{
// create an integer
size_t* pointer = this->create(5);
- ASSERT_NE((void*)0, pointer);
+ ASSERT_NE((void*)nullptr, pointer);
EXPECT_EQ(5u, *pointer);
// destroy it again
@@ -227,7 +227,7 @@
// create an object
SmallObject* pointer = this->create(5);
- ASSERT_NE((void*)0, pointer);
+ ASSERT_NE((void*)nullptr, pointer);
EXPECT_EQ(5u, pointer->getValue());
EXPECT_EQ(5u, SmallObject::total_s);
}
@@ -238,7 +238,7 @@
// create an object
SmallObject* pointer = this->create(5);
- ASSERT_NE((void*)0, pointer);
+ ASSERT_NE((void*)nullptr, pointer);
EXPECT_EQ(5u, pointer->getValue());
EXPECT_EQ(5u, SmallObject::total_s);
More information about the Orxonox-commit
mailing list