Skip to content

Commit 87e20bd

Browse files
Nicky-Drohvani
authored andcommitted
Replace TRUE with true, FALSE with false and NULL with nullptr
1 parent 7a0b6cf commit 87e20bd

14 files changed

+51
-51
lines changed

indra/llappearanceutility/llappappearanceutility.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,11 @@ LLAppAppearanceUtility::LLAppAppearanceUtility(int argc, char** argv) :
201201
LLApp(),
202202
mArgc(argc),
203203
mArgv(argv),
204-
mProcess(NULL),
205-
mInput(NULL),
206-
mOutput(NULL),
204+
mProcess(nullptr),
205+
mInput(nullptr),
206+
mOutput(nullptr),
207207
mAppName(argv[0]),
208-
mDebugMode(FALSE),
208+
mDebugMode(false),
209209
mTreeMapThreshold(1),
210210
mBakeTextureSize(512)
211211
{
@@ -237,9 +237,9 @@ void LLAppAppearanceUtility::parseArguments()
237237
}
238238

239239
apr_status_t apr_err;
240-
const char* opt_arg = NULL;
240+
const char* opt_arg = nullptr;
241241
int opt_id = 0;
242-
apr_getopt_t* os = NULL;
242+
apr_getopt_t* os = nullptr;
243243
if(APR_SUCCESS != apr_getopt_init(&os, gAPRPoolp, mArgc, mArgv))
244244
{
245245
std::cerr << "Unable to initialize apr" << std::endl;
@@ -297,7 +297,7 @@ void LLAppAppearanceUtility::parseArguments()
297297
// grid = opt_arg;
298298
// break;
299299
case 'd':
300-
mDebugMode = TRUE;
300+
mDebugMode = true;
301301
break;
302302
case 'm':
303303
mTreeMapFilename.assign(opt_arg);
@@ -471,10 +471,10 @@ bool LLAppAppearanceUtility::init()
471471

472472
// Initialize classes.
473473
// Values taken from settings.xml.
474-
const bool USE_TEXTURE_NEW_BYTE_RANGE=TRUE;
474+
const bool USE_TEXTURE_NEW_BYTE_RANGE=true;
475475
const S32 TEXTURE_REVERSE_BYTE_RANGE=50;
476476
LLImage::initClass(USE_TEXTURE_NEW_BYTE_RANGE, TEXTURE_REVERSE_BYTE_RANGE);
477-
const bool SKIP_ANALYZE_ALPHA=TRUE;
477+
const bool SKIP_ANALYZE_ALPHA=true;
478478

479479
LLTranslationBridge::ptr_t trans = std::make_shared<LLPassthroughTranslationBridge>();
480480
LLWearableType::initParamSingleton(trans);
@@ -655,7 +655,7 @@ bool LLAppAppearanceUtility::cleanup()
655655
if (mProcess)
656656
{
657657
delete mProcess;
658-
mProcess = NULL;
658+
mProcess = nullptr;
659659
}
660660
if ("-" != mInputFilename && mInput)
661661
{
@@ -665,10 +665,10 @@ bool LLAppAppearanceUtility::cleanup()
665665
{
666666
static_cast<std::ofstream*>(mOutput)->close();
667667
delete mOutput;
668-
mOutput = NULL;
668+
mOutput = nullptr;
669669
}
670670
delete mInput;
671-
mInput = NULL;
671+
mInput = nullptr;
672672
return true;
673673
}
674674

indra/llappearanceutility/llbakingavatar.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void LLBakingAvatar::onGlobalColorChanged(const LLTexGlobalColor* global_color)
101101

102102
bool LLBakingAvatar::isTextureDefined(LLAvatarAppearanceDefines::ETextureIndex type, U32 index) const
103103
{
104-
return TRUE;
104+
return true;
105105
}
106106

107107

indra/llappearanceutility/llbakingavatar.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ class LLBakingAvatar : public LLAvatarAppearance
9090
void dirtyMesh() override; // Dirty the avatar mesh
9191
void onGlobalColorChanged(const LLTexGlobalColor* global_color) override;
9292
bool isTextureDefined(LLAvatarAppearanceDefines::ETextureIndex type, U32 index = 0) const override;
93-
bool isUsingLocalAppearance() const override { return FALSE; }
94-
bool isEditingAppearance() const override { return FALSE; }
93+
bool isUsingLocalAppearance() const override { return false; }
94+
bool isEditingAppearance() const override { return false; }
9595
private:
9696
void dirtyMesh(S32 priority) override; // Dirty the avatar mesh, with priority
9797

@@ -113,7 +113,7 @@ class LLBakingAvatar : public LLAvatarAppearance
113113
**/
114114
public:
115115
bool isSelf() const override { return true; }
116-
bool isValid() const override { return TRUE; }
116+
bool isValid() const override { return true; }
117117

118118
/** State
119119
** **

indra/llappearanceutility/llbakingjoint.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class LLBakingJoint : public virtual LLAvatarJoint
3737
virtual ~LLBakingJoint();
3838

3939
// LLViewerJoint interface
40-
virtual U32 render( F32 pixelArea, bool first_pass = TRUE, bool is_dummy = FALSE );
40+
virtual U32 render( F32 pixelArea, bool first_pass = true, bool is_dummy = false );
4141
};
4242

4343
#endif /* LL_LLBAKINGJOINT_H */

indra/llappearanceutility/llbakingjointmesh.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class LLBakingJointMesh : public LLAvatarJointMesh, public LLBakingJoint
3737
LLBakingJointMesh(S32 joint_num);
3838
virtual ~LLBakingJointMesh();
3939

40-
U32 render( F32 pixelArea, bool first_pass = TRUE, bool is_dummy = FALSE )
40+
U32 render( F32 pixelArea, bool first_pass = true, bool is_dummy = false )
4141
{ return LLBakingJoint::render(pixelArea,first_pass,is_dummy); }
4242
};
4343

indra/llappearanceutility/llbakingshadermgr.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ using std::pair;
5151
using std::make_pair;
5252
using std::string;
5353

54-
bool LLBakingShaderMgr::sInitialized = FALSE;
54+
bool LLBakingShaderMgr::sInitialized = false;
5555
bool LLBakingShaderMgr::sSkipReload = false;
5656

5757
//utility shaders
@@ -73,7 +73,7 @@ LLBakingShaderMgr::~LLBakingShaderMgr()
7373
// static
7474
LLBakingShaderMgr * LLBakingShaderMgr::instance()
7575
{
76-
if(NULL == sInstance)
76+
if(nullptr == sInstance)
7777
{
7878
sInstance = new LLBakingShaderMgr();
7979
}
@@ -137,7 +137,7 @@ void LLBakingShaderMgr::setShaders()
137137
mMaxAvatarShaderLevel = 0;
138138

139139
LLVertexBuffer::unbind();
140-
bool loaded = FALSE;
140+
bool loaded = false;
141141
if (gGLManager.mGLSLVersionMajor > 1 || gGLManager.mGLSLVersionMinor >= 10)
142142
{
143143
S32 light_class = 2;
@@ -151,14 +151,14 @@ void LLBakingShaderMgr::setShaders()
151151
}
152152
shaders.push_back( make_pair( "objects/nonindexedTextureV.glsl", 1 ) );
153153
shaders.push_back( make_pair( "deferred/textureUtilV.glsl", 1 ) );
154-
loaded = TRUE;
154+
loaded = true;
155155
for (U32 i = 0; i < shaders.size(); i++)
156156
{
157157
// Note usage of GL_VERTEX_SHADER_ARB
158158
if (loadShaderFile(shaders[i].first, shaders[i].second, GL_VERTEX_SHADER_ARB) == 0)
159159
{
160160
LL_WARNS("Shader") << "Failed to load vertex shader " << shaders[i].first << LL_ENDL;
161-
loaded = FALSE;
161+
loaded = false;
162162
break;
163163
}
164164
}
@@ -174,7 +174,7 @@ void LLBakingShaderMgr::setShaders()
174174
if (loadShaderFile(shaders[i].first, shaders[i].second, GL_FRAGMENT_SHADER_ARB) == 0)
175175
{
176176
LL_WARNS("Shader") << "Failed to load fragment shader " << shaders[i].first << LL_ENDL;
177-
loaded = FALSE;
177+
loaded = false;
178178
break;
179179
}
180180
}
@@ -187,7 +187,7 @@ void LLBakingShaderMgr::setShaders()
187187

188188
if (!loaded)
189189
{
190-
//gPipeline.mVertexShadersEnabled = FALSE;
190+
//gPipeline.mVertexShadersEnabled = false;
191191
//gPipeline.mVertexShadersLoaded = 0;
192192
mVertexShaderLevel[SHADER_LIGHTING] = 0;
193193
mVertexShaderLevel[SHADER_INTERFACE] = 0;
@@ -224,10 +224,10 @@ bool LLBakingShaderMgr::loadShadersInterface()
224224
if( !gAlphaMaskProgram.createShader() )
225225
{
226226
mVertexShaderLevel[SHADER_INTERFACE] = 0;
227-
return FALSE;
227+
return false;
228228
}
229229

230-
return TRUE;
230+
return true;
231231
}
232232

233233
std::string LLBakingShaderMgr::getShaderDirPrefix(void)

indra/llappearanceutility/llbakingtexlayer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ LLBakingTexLayerSetBuffer::~LLBakingTexLayerSetBuffer()
5757

5858
bool LLBakingTexLayerSetBuffer::render()
5959
{
60-
bool result = FALSE;
60+
bool result = false;
6161

6262
preRenderTexLayerSet();
6363
result = renderTexLayerSet(nullptr);
@@ -127,7 +127,7 @@ void LLBakingTexLayerSetBuffer::midRenderTexLayerSet(bool success)
127127
LL_RECORD_BLOCK_TIME(FTM_CREATE_J2C);
128128
LL_DEBUGS() << "Creating J2C..." << LL_ENDL;
129129
mCompressedImage = new LLImageJ2C;
130-
mCompressedImage->setReversible(TRUE);
130+
mCompressedImage->setReversible(true);
131131
const char* comment_text = LINDEN_J2C_COMMENT_PREFIX "RGBHM"; // writes into baked_color_data. 5 channels (rgb, heightfield/alpha, mask)
132132
if (!mCompressedImage->encode(baked_image, comment_text, 0.0f))
133133
{

indra/llappearanceutility/llbakingtexture.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "llgltexture.h"
3333
#include "llimage.h"
3434

35-
static const bool USE_MIP_MAPS = TRUE;
35+
static const bool USE_MIP_MAPS = true;
3636

3737
LLBakingTexture::LLBakingTexture(const LLUUID& id, const LLImageRaw* raw)
3838
: LLGLTexture(raw, USE_MIP_MAPS),

indra/llappearanceutility/llbakingtexture.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class LLBakingTexture : public LLGLTexture
4343
};
4444
LLBakingTexture(const LLUUID& id, const LLImageRaw* raw);
4545
LLBakingTexture(bool usemipmaps);
46-
LLBakingTexture(const U32 width, const U32 height, const U8 components, bool usemipmaps = TRUE);
46+
LLBakingTexture(const U32 width, const U32 height, const U8 components, bool usemipmaps = true);
4747
const LLUUID& getID() const override { return mID; }
4848
virtual S8 getType() const { return BAKING_TEXTURE; }
4949

indra/llappearanceutility/llbakingwearablesdata.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ void LLBakingWearablesData::setWearableOutfit(LLSD& sd)
9090
for (; wearable_iter != wearable_end; ++wearable_iter)
9191
{
9292
LLBakingWearable* wearable = (*wearable_iter);
93-
const bool removed = FALSE;
93+
const bool removed = false;
9494
wearableUpdated(wearable, removed);
9595
}
9696

0 commit comments

Comments
 (0)