Remove namespace from header

Removing the "using namespace Torque" from header file to prevent issues
with certain engine addons conflicting with ::UUID defined by windows
and Torque::UUID defined by T3D.
This commit is contained in:
Robert Fritzen 2013-07-28 12:55:52 -05:00
parent c75d6feb20
commit 171a24459f
11 changed files with 14 additions and 3 deletions

View file

@ -41,6 +41,7 @@
#include "lighting/lightQuery.h" #include "lighting/lightQuery.h"
#include "console/engineAPI.h" #include "console/engineAPI.h"
using namespace Torque;
bool PhysicsShape::smNoCorrections = false; bool PhysicsShape::smNoCorrections = false;
bool PhysicsShape::smNoSmoothing = false; bool PhysicsShape::smNoSmoothing = false;
@ -240,7 +241,7 @@ void PhysicsShapeData::onRemove()
void PhysicsShapeData::_onResourceChanged( const Torque::Path &path ) void PhysicsShapeData::_onResourceChanged( const Torque::Path &path )
{ {
if ( path != Path( shapeName ) ) if ( path != Path( shapeName ) )
return; return;
// Reload the changed shape. // Reload the changed shape.

View file

@ -49,6 +49,8 @@
#include "materials/materialFeatureTypes.h" #include "materials/materialFeatureTypes.h"
#include "console/engineAPI.h" #include "console/engineAPI.h"
using namespace Torque;
extern bool gEditingMission; extern bool gEditingMission;
IMPLEMENT_CO_NETOBJECT_V1(TSStatic); IMPLEMENT_CO_NETOBJECT_V1(TSStatic);

View file

@ -29,6 +29,8 @@
#include "console/engineAPI.h" #include "console/engineAPI.h"
using namespace Torque;
static AutoPtr< ResourceManager > smInstance; static AutoPtr< ResourceManager > smInstance;
ResourceManager::ResourceManager() ResourceManager::ResourceManager()

View file

@ -31,8 +31,6 @@
#include "core/util/tDictionary.h" #include "core/util/tDictionary.h"
#endif #endif
using namespace Torque;
class ResourceManager class ResourceManager
{ {
public: public:

View file

@ -31,6 +31,7 @@
#include "materials/materialManager.h" #include "materials/materialManager.h"
#include "forest/windDeformation.h" #include "forest/windDeformation.h"
using namespace Torque;
IMPLEMENT_CO_DATABLOCK_V1(TSForestItemData); IMPLEMENT_CO_DATABLOCK_V1(TSForestItemData);

View file

@ -36,6 +36,8 @@
#include "core/util/safeDelete.h" #include "core/util/safeDelete.h"
#include "console/console.h" #include "console/console.h"
using namespace Torque;
extern bool gDisassembleAllShaders; extern bool gDisassembleAllShaders;
/// D3DXInclude plugin /// D3DXInclude plugin

View file

@ -33,6 +33,7 @@
#include "platform/profiler.h" #include "platform/profiler.h"
#include "console/engineAPI.h" #include "console/engineAPI.h"
using namespace Torque;
const U32 GBitmap::csFileVersion = 3; const U32 GBitmap::csFileVersion = 3;

View file

@ -35,6 +35,7 @@
#include "console/consoleTypes.h" #include "console/consoleTypes.h"
#include "console/engineAPI.h" #include "console/engineAPI.h"
using namespace Torque;
//#define DEBUG_SPEW //#define DEBUG_SPEW

View file

@ -45,6 +45,7 @@
#include "postFx/postEffectManager.h" #include "postFx/postEffectManager.h"
#include "postFx/postEffectVis.h" #include "postFx/postEffectVis.h"
using namespace Torque;
ConsoleDocClass( PostEffect, ConsoleDocClass( PostEffect,
"@brief A fullscreen shader effect.\n\n" "@brief A fullscreen shader effect.\n\n"

View file

@ -31,6 +31,7 @@
#include "core/resourceManager.h" #include "core/resourceManager.h"
#include "console/engineAPI.h" #include "console/engineAPI.h"
using namespace Torque;
IMPLEMENT_CO_DATABLOCK_V1( SFXProfile ); IMPLEMENT_CO_DATABLOCK_V1( SFXProfile );

View file

@ -31,6 +31,7 @@
#include "util/noise2d.h" #include "util/noise2d.h"
#include "core/volume.h" #include "core/volume.h"
using namespace Torque;
ConsoleStaticMethod( TerrainBlock, createNew, S32, 5, 5, ConsoleStaticMethod( TerrainBlock, createNew, S32, 5, 5,
"TerrainBlock.create( String terrainName, U32 resolution, String materialName, bool genNoise )\n" "TerrainBlock.create( String terrainName, U32 resolution, String materialName, bool genNoise )\n"