diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/llui/llcheckboxctrl.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llui/llcheckboxctrl.h')
| -rw-r--r-- | indra/llui/llcheckboxctrl.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/llui/llcheckboxctrl.h b/indra/llui/llcheckboxctrl.h index 6e1ab322af..b78bf135f7 100644 --- a/indra/llui/llcheckboxctrl.h +++ b/indra/llui/llcheckboxctrl.h @@ -65,13 +65,13 @@ class LLCheckBoxCtrl : public LLUICtrl { public: - LLCheckBoxCtrl(const LLString& name, const LLRect& rect, const LLString& label, + LLCheckBoxCtrl(const std::string& name, const LLRect& rect, const std::string& label, const LLFontGL* font = NULL, void (*commit_callback)(LLUICtrl*, void*) = NULL, void* callback_userdata = NULL, BOOL initial_value = FALSE, BOOL use_radio_style = FALSE, // if true, draw radio button style icons - const LLString& control_which = LLString::null); + const std::string& control_which = LLStringUtil::null); virtual ~LLCheckBoxCtrl(); // LLView interface @@ -93,7 +93,7 @@ public: virtual void setTentative(BOOL b) { mButton->setTentative(b); } virtual BOOL getTentative() const { return mButton->getTentative(); } - virtual BOOL setLabelArg( const LLString& key, const LLStringExplicit& text ); + virtual BOOL setLabelArg( const std::string& key, const LLStringExplicit& text ); virtual void clear(); virtual void onCommit(); @@ -105,10 +105,10 @@ public: void setDisabledColor( const LLColor4 &color ) { mTextDisabledColor = color; } void setLabel( const LLStringExplicit& label ); - LLString getLabel() const; + std::string getLabel() const; - virtual void setControlName(const LLString& control_name, LLView* context); - virtual LLString getControlName() const; + virtual void setControlName(const std::string& control_name, LLView* context); + virtual std::string getControlName() const; static void onButtonPress(void *userdata); |