Commit 171a2445 authored by Robert Fritzen's avatar Robert Fritzen

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.
parent c75d6feb
......@@ -41,6 +41,7 @@
#include "lighting/lightQuery.h"
#include "console/engineAPI.h"
using namespace Torque;
bool PhysicsShape::smNoCorrections = false;
bool PhysicsShape::smNoSmoothing = false;
......@@ -240,7 +241,7 @@ void PhysicsShapeData::onRemove()
void PhysicsShapeData::_onResourceChanged( const Torque::Path &path )
{
if ( path != Path( shapeName ) )
if ( path != Path( shapeName ) )
return;
// Reload the changed shape.
......
......@@ -49,6 +49,8 @@
#include "materials/materialFeatureTypes.h"
#include "console/engineAPI.h"
using namespace Torque;
extern bool gEditingMission;
IMPLEMENT_CO_NETOBJECT_V1(TSStatic);
......
......@@ -29,6 +29,8 @@
#include "console/engineAPI.h"
using namespace Torque;
static AutoPtr< ResourceManager > smInstance;
ResourceManager::ResourceManager()
......
......@@ -31,8 +31,6 @@
#include "core/util/tDictionary.h"
#endif
using namespace Torque;
class ResourceManager
{
public:
......
......@@ -31,6 +31,7 @@
#include "materials/materialManager.h"
#include "forest/windDeformation.h"
using namespace Torque;
IMPLEMENT_CO_DATABLOCK_V1(TSForestItemData);
......
......@@ -36,6 +36,8 @@
#include "core/util/safeDelete.h"
#include "console/console.h"
using namespace Torque;
extern bool gDisassembleAllShaders;
/// D3DXInclude plugin
......
......@@ -33,6 +33,7 @@
#include "platform/profiler.h"
#include "console/engineAPI.h"
using namespace Torque;
const U32 GBitmap::csFileVersion = 3;
......
......@@ -35,6 +35,7 @@
#include "console/consoleTypes.h"
#include "console/engineAPI.h"
using namespace Torque;
//#define DEBUG_SPEW
......
......@@ -45,6 +45,7 @@
#include "postFx/postEffectManager.h"
#include "postFx/postEffectVis.h"
using namespace Torque;
ConsoleDocClass( PostEffect,
"@brief A fullscreen shader effect.\n\n"
......
......@@ -31,6 +31,7 @@
#include "core/resourceManager.h"
#include "console/engineAPI.h"
using namespace Torque;
IMPLEMENT_CO_DATABLOCK_V1( SFXProfile );
......
......@@ -31,6 +31,7 @@
#include "util/noise2d.h"
#include "core/volume.h"
using namespace Torque;
ConsoleStaticMethod( TerrainBlock, createNew, S32, 5, 5,
"TerrainBlock.create( String terrainName, U32 resolution, String materialName, bool genNoise )\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment