From 49ad7fd4b57cec635c557070be02556094e90ff6 Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Wed, 17 Oct 2012 17:52:10 -0700
Subject: [PATCH] CHUI-410: Post code review submit, changed useLabel() to
return bool instead of BOOL. Adjusted code accordingly.
---
indra/llui/llchatentry.cpp | 3 ++-
indra/llui/llchatentry.h | 2 +-
indra/llui/lltextbase.cpp | 6 +++---
indra/llui/lltextbase.h | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/indra/llui/llchatentry.cpp b/indra/llui/llchatentry.cpp
index 38e2a8106a2..8e9c6555c32 100644
--- a/indra/llui/llchatentry.cpp
+++ b/indra/llui/llchatentry.cpp
@@ -146,10 +146,11 @@ void LLChatEntry::beforeValueChange()
void LLChatEntry::onValueChange(S32 start, S32 end)
{
+ //Internally resetLabel() must meet a condition before it can reset the label
resetLabel();
}
-BOOL LLChatEntry::useLabel()
+bool LLChatEntry::useLabel()
{
return !getLength() && !mLabel.empty();
}
diff --git a/indra/llui/llchatentry.h b/indra/llui/llchatentry.h
index 1f3fcf89455..49181c8d78d 100644
--- a/indra/llui/llchatentry.h
+++ b/indra/llui/llchatentry.h
@@ -56,7 +56,7 @@ class LLChatEntry : public LLTextEditor
LLChatEntry(const Params& p);
/*virtual*/ void beforeValueChange();
/*virtual*/ void onValueChange(S32 start, S32 end);
- /*virtual*/ BOOL useLabel();
+ /*virtual*/ bool useLabel();
public:
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp
index 15856ae4efb..b827acb185a 100644
--- a/indra/llui/lltextbase.cpp
+++ b/indra/llui/lltextbase.cpp
@@ -535,7 +535,7 @@ void LLTextBase::drawText()
{
return;
}
- else if (useLabel() == TRUE)
+ else if (useLabel())
{
text_len = mLabel.getWString().length();
}
@@ -2059,7 +2059,7 @@ BOOL LLTextBase::setLabelArg(const std::string& key, const LLStringExplicit& tex
void LLTextBase::resetLabel()
{
- if (useLabel() == TRUE)
+ if (useLabel())
{
clearSegments();
@@ -2072,7 +2072,7 @@ void LLTextBase::resetLabel()
}
}
-BOOL LLTextBase::useLabel()
+bool LLTextBase::useLabel()
{
return !getLength() && !mLabel.empty() && !hasFocus();
}
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h
index 44b149d2640..629b304b25d 100644
--- a/indra/llui/lltextbase.h
+++ b/indra/llui/lltextbase.h
@@ -503,7 +503,7 @@ class LLTextBase
void initFromParams(const Params& p);
virtual void beforeValueChange();
virtual void onValueChange(S32 start, S32 end);
- virtual BOOL useLabel();
+ virtual bool useLabel();
// draw methods
void drawSelectionBackground(); // draws the black box behind the selected text
--
GitLab