Skip to content

[#5155] Cleaned up unnecessary fake bool usage where appropriate #5156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akleshchev merged 1 commit into from
Dec 15, 2025
+31 −31
Merged

[#5155] Cleaned up unnecessary fake bool usage where appropriate #5156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion indra/integration_tests/llimage_libtest/llimage_libtest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ int main(int argc, char** argv)
}
else
{
LLFastTimer::sMetricLog = TRUE;
LLFastTimer::sMetricLog = true;
LLFastTimer::sLogName = test_name;
arg += 1; // Skip that arg now we know it's a valid test name
if ((arg + 1) == argc) // Break out of the loop if we reach the end of the arg list
Expand Down
2 changes: 1 addition & 1 deletion indra/integration_tests/llui_libtest/llui_libtest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ void export_test_floaters()
LLXMLNodePtr output_node = new LLXMLNode();
LLFloater* floater = new LLFloater(LLSD());
floater->buildFromFile( filename,
// FALSE, // don't open floater
// false, // don't open floater
output_node);
std::string out_filename = gDirUtilp->add(xui_dir, filename);
std::string::size_type extension_pos = out_filename.rfind(".xml");
Expand Down
2 changes: 1 addition & 1 deletion indra/llcommon/StackWalker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,7 @@ bool StackWalker::LoadModules()
SetLastError(ERROR_DLL_INIT_FAILED);
return false;
}
if (m_modulesLoaded != FALSE)
if (m_modulesLoaded)
return true;

// Build the sym-path:
Expand Down
2 changes: 1 addition & 1 deletion indra/llrender/llrendertarget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
...

//allocate a 256x256 RGBA render target with depth buffer
target.allocate(256,256,GL_RGBA,TRUE);
target.allocate(256,256,GL_RGBA,true);

//render to contents of offscreen buffer
target.bindTarget();
Expand Down
8 changes: 4 additions & 4 deletions indra/llui/tests/llurlentry_stub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,16 @@ LLAvatarNameCache::callback_connection_t LLAvatarNameCache::get(const LLUUID& ag
//
// Stub implementation for LLCacheName
//
BOOL LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
bool LLCacheName::getFullName(const LLUUID& id, std::string& fullname)
{
fullname = "Lynx Linden";
return TRUE;
return true;
}

BOOL LLCacheName::getGroupName(const LLUUID& id, std::string& group)
bool LLCacheName::getGroupName(const LLUUID& id, std::string& group)
{
group = "My Group";
return TRUE;
return true;
}

boost::signals2::connection LLCacheName::get(const LLUUID& id, bool is_group, const LLCacheNameCallback& callback)
Expand Down
12 changes: 6 additions & 6 deletions indra/newview/llcallbacklist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,33 +70,33 @@ void LLCallbackList::addFunction( callback_t func, void *data)
}


BOOL LLCallbackList::containsFunction( callback_t func, void *data)
bool LLCallbackList::containsFunction( callback_t func, void *data)
{
callback_pair_t t(func, data);
callback_list_t::iterator iter = std::find(mCallbackList.begin(), mCallbackList.end(), t);
if (iter != mCallbackList.end())
{
return TRUE;
return true;
}
else
{
return FALSE;
return false;
}
}


BOOL LLCallbackList::deleteFunction( callback_t func, void *data)
bool LLCallbackList::deleteFunction( callback_t func, void *data)
{
callback_pair_t t(func, data);
callback_list_t::iterator iter = std::find(mCallbackList.begin(), mCallbackList.end(), t);
if (iter != mCallbackList.end())
{
mCallbackList.erase(iter);
return TRUE;
return true;
}
else
{
return FALSE;
return false;
}
}

Expand Down
2 changes: 1 addition & 1 deletion indra/newview/lleventnotifier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ struct LLEventInfo
std::string mSimName;
LLVector3d mPosGlobal;
F64 mUnixTime; // seconds from 1970
BOOL mHasCover;
bool mHasCover;
U32 mCover;
U32 mEventFlags;
};
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/llfloaterdirectory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ class LLFloaterDirectory : public LLFloater
static LLFloaterDirectory *sInstance;
};

//extern BOOL gDisplayEventHack;
//extern bool gDisplayEventHack;

#endif // LL_LLDIRECTORYFLOATER_H
2 changes: 1 addition & 1 deletion indra/newview/lllookshistorypanel.h
View file
Open in desktop
Copy link
Contributor

@Ansariel Ansariel Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This header seems to be unused.

Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class LLLooksHistoryPanel : public LLPanelAppearanceTab
LLLooksHistoryPanel();
virtual ~LLLooksHistoryPanel();

/*virtual*/ BOOL postBuild();
/*virtual*/ bool postBuild();
/*virtual*/ void onSearchEdit(const std::string& string);
/*virtual*/ void onShowOnMap();
/*virtual*/ void onLooks();
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/llpaneldirland.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ void LLPanelDirLand::performQuery()
if (list)
{
std::string sort_name = list->getSortColumnName();
BOOL sort_asc = list->getSortAscending();
bool sort_asc = list->getSortAscending();

if (sort_name == "name")
{
Expand Down
6 changes: 3 additions & 3 deletions indra/newview/llpanelimcontrolpanel.h
View file
Open in desktop
Copy link
Contributor

@Ansariel Ansariel Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This header seems to be unused, too.

Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class LLPanelChatControlPanel
mSessionId(LLUUID()) {};
~LLPanelChatControlPanel();

virtual BOOL postBuild();
virtual bool postBuild();

virtual void setSessionId(const LLUUID& session_id);
const LLUUID& getSessionId() { return mSessionId; }
Expand All @@ -58,7 +58,7 @@ class LLPanelGroupControlPanel : public LLPanelChatControlPanel
LLPanelGroupControlPanel(const LLUUID& session_id);
~LLPanelGroupControlPanel();

BOOL postBuild();
bool postBuild();

void setSessionId(const LLUUID& session_id);
/*virtual*/ void draw();
Expand All @@ -77,7 +77,7 @@ class LLPanelAdHocControlPanel : public LLPanelGroupControlPanel
public:
LLPanelAdHocControlPanel(const LLUUID& session_id);

BOOL postBuild();
bool postBuild();

};

Expand Down
6 changes: 3 additions & 3 deletions indra/newview/lltoolview.cpp
View file
Open in desktop
Copy link
Contributor

@Ansariel Ansariel Dec 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file also seems to be unused.

Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ LLToolView::~LLToolView()
// // Can optionally ignore panel
// if (contain->mPanel)
// {
// contain->mPanel->setBackgroundVisible( FALSE );
// contain->mPanel->setBorderVisible( FALSE );
// contain->mPanel->setBackgroundVisible( false );
// contain->mPanel->setBorderVisible( false );
// addChild(contain->mPanel);
// }

Expand Down Expand Up @@ -153,7 +153,7 @@ void LLToolView::draw()
iter != mContainList.end(); ++iter)
{
LLToolContainer* contain = *iter;
BOOL state = (contain->mTool == selected);
bool state = (contain->mTool == selected);
contain->mButton->setToggleState( state );
if (contain->mPanel)
{
Expand Down
8 changes: 4 additions & 4 deletions indra/newview/llviewermedia.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3623,7 +3623,7 @@ LLViewerMediaImpl::canUndo() const
if (mMediaSource)
return mMediaSource->canUndo();
else
return FALSE;
return false;
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -3643,7 +3643,7 @@ LLViewerMediaImpl::canRedo() const
if (mMediaSource)
return mMediaSource->canRedo();
else
return FALSE;
return false;
}

////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -3723,7 +3723,7 @@ LLViewerMediaImpl::canDoDelete() const
if (mMediaSource)
return mMediaSource->canDoDelete();
else
return FALSE;
return false;
}

////////////////////////////////////////////////////////////////////////////////
Expand All @@ -3743,7 +3743,7 @@ LLViewerMediaImpl::canSelectAll() const
if (mMediaSource)
return mMediaSource->canSelectAll();
else
return FALSE;
return false;
}

void LLViewerMediaImpl::setUpdated(bool updated)
Expand Down
2 changes: 1 addition & 1 deletion indra/newview/tests/lldir_stub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

LLDir::LLDir() {}
LLDir::~LLDir() {}
BOOL LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask) { return true; }
S32 LLDir::deleteFilesInDir(const std::string &dirname, const std::string &mask) { return 1; }
void LLDir::setChatLogsDir(const std::string &path) {}
void LLDir::setPerAccountChatLogsDir(const std::string &) {}
void LLDir::updatePerAccountChatLogsDir() {}
Expand Down
4 changes: 2 additions & 2 deletions indra/newview/tests/llxmlrpclistener_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ namespace tut
// These variables are required by machinery used by
// LLXMLRPCTransaction. The values reflect reality for this test
// executable; hopefully these values are correct.
gSavedSettings.declareBOOL("BrowserProxyEnabled", FALSE, "", LLControlVariable::PERSIST_NO); // don't persist
gSavedSettings.declareBOOL("NoVerifySSLCert", TRUE, "", LLControlVariable::PERSIST_NO); // don't persist
gSavedSettings.declareBOOL("BrowserProxyEnabled", false, "", LLControlVariable::PERSIST_NO); // don't persist
gSavedSettings.declareBOOL("NoVerifySSLCert", true, "", LLControlVariable::PERSIST_NO); // don't persist
}

// LLEventPump listener signature
Expand Down