diff options
author | Einar Johan Trøan Sømåen | 2012-07-03 05:00:57 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-07-03 05:00:57 +0200 |
commit | 6c6c0bb0167cbf004cf300a81dda71a952d93626 (patch) | |
tree | 29f067cc1034c049a810c720e3b55f11c33f081f /engines/wintermute/UI | |
parent | 9b0fa0e9263d7d99d898321b125d7eea5c6cf23d (diff) | |
download | scummvm-rg350-6c6c0bb0167cbf004cf300a81dda71a952d93626.tar.gz scummvm-rg350-6c6c0bb0167cbf004cf300a81dda71a952d93626.tar.bz2 scummvm-rg350-6c6c0bb0167cbf004cf300a81dda71a952d93626.zip |
WINTERMUTE: Mass-rename "Value"->"value"
Diffstat (limited to 'engines/wintermute/UI')
-rw-r--r-- | engines/wintermute/UI/UIButton.cpp | 12 | ||||
-rw-r--r-- | engines/wintermute/UI/UIButton.h | 2 | ||||
-rw-r--r-- | engines/wintermute/UI/UIEdit.cpp | 20 | ||||
-rw-r--r-- | engines/wintermute/UI/UIEdit.h | 2 | ||||
-rw-r--r-- | engines/wintermute/UI/UIEntity.cpp | 6 | ||||
-rw-r--r-- | engines/wintermute/UI/UIEntity.h | 2 | ||||
-rw-r--r-- | engines/wintermute/UI/UIObject.cpp | 18 | ||||
-rw-r--r-- | engines/wintermute/UI/UIObject.h | 2 | ||||
-rw-r--r-- | engines/wintermute/UI/UIText.cpp | 8 | ||||
-rw-r--r-- | engines/wintermute/UI/UIText.h | 2 | ||||
-rw-r--r-- | engines/wintermute/UI/UIWindow.cpp | 22 | ||||
-rw-r--r-- | engines/wintermute/UI/UIWindow.h | 2 |
12 files changed, 49 insertions, 49 deletions
diff --git a/engines/wintermute/UI/UIButton.cpp b/engines/wintermute/UI/UIButton.cpp index ea20e29490..9829114d3a 100644 --- a/engines/wintermute/UI/UIButton.cpp +++ b/engines/wintermute/UI/UIButton.cpp @@ -967,12 +967,12 @@ CScValue *CUIButton::scGetProperty(const char *name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIButton::scSetProperty(const char *name, CScValue *Value) {
+HRESULT CUIButton::scSetProperty(const char *name, CScValue *value) {
//////////////////////////////////////////////////////////////////////////
// TextAlign
//////////////////////////////////////////////////////////////////////////
if (strcmp(name, "TextAlign") == 0) {
- int i = Value->GetInt();
+ int i = value->GetInt();
if (i < 0 || i >= NUM_TEXT_ALIGN) i = 0;
_align = (TTextAlign)i;
return S_OK;
@@ -982,25 +982,25 @@ HRESULT CUIButton::scSetProperty(const char *name, CScValue *Value) { // Focusable
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Focusable") == 0) {
- _canFocus = Value->GetBool();
+ _canFocus = value->GetBool();
return S_OK;
}
//////////////////////////////////////////////////////////////////////////
// Pressed
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Pressed") == 0) {
- _stayPressed = Value->GetBool();
+ _stayPressed = value->GetBool();
return S_OK;
}
//////////////////////////////////////////////////////////////////////////
// PixelPerfect
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "PixelPerfect") == 0) {
- _pixelPerfect = Value->GetBool();
+ _pixelPerfect = value->GetBool();
return S_OK;
}
- else return CUIObject::scSetProperty(name, Value);
+ else return CUIObject::scSetProperty(name, value);
}
diff --git a/engines/wintermute/UI/UIButton.h b/engines/wintermute/UI/UIButton.h index 07bc18bc65..e89c37aa0c 100644 --- a/engines/wintermute/UI/UIButton.h +++ b/engines/wintermute/UI/UIButton.h @@ -69,7 +69,7 @@ public: // scripting interface
virtual CScValue *scGetProperty(const char *name);
- virtual HRESULT scSetProperty(const char *name, CScValue *Value);
+ virtual HRESULT scSetProperty(const char *name, CScValue *value);
virtual HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);
virtual const char *scToString();
};
diff --git a/engines/wintermute/UI/UIEdit.cpp b/engines/wintermute/UI/UIEdit.cpp index 4678f81d9a..f0d4d62874 100644 --- a/engines/wintermute/UI/UIEdit.cpp +++ b/engines/wintermute/UI/UIEdit.cpp @@ -457,12 +457,12 @@ CScValue *CUIEdit::scGetProperty(const char *name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIEdit::scSetProperty(const char *name, CScValue *Value) {
+HRESULT CUIEdit::scSetProperty(const char *name, CScValue *value) {
//////////////////////////////////////////////////////////////////////////
// SelStart
//////////////////////////////////////////////////////////////////////////
if (strcmp(name, "SelStart") == 0) {
- _selStart = Value->GetInt();
+ _selStart = value->GetInt();
_selStart = MAX(_selStart, 0);
_selStart = MIN((size_t)_selStart, strlen(_text));
return S_OK;
@@ -472,7 +472,7 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *Value) { // SelEnd
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "SelEnd") == 0) {
- _selEnd = Value->GetInt();
+ _selEnd = value->GetInt();
_selEnd = MAX(_selEnd, 0);
_selEnd = MIN((size_t)_selEnd, strlen(_text));
return S_OK;
@@ -482,7 +482,7 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *Value) { // CursorBlinkRate
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "CursorBlinkRate") == 0) {
- _cursorBlinkRate = Value->GetInt();
+ _cursorBlinkRate = value->GetInt();
return S_OK;
}
@@ -490,7 +490,7 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *Value) { // CursorChar
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "CursorChar") == 0) {
- setCursorChar(Value->GetString());
+ setCursorChar(value->GetString());
return S_OK;
}
@@ -498,7 +498,7 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *Value) { // FrameWidth
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "FrameWidth") == 0) {
- _frameWidth = Value->GetInt();
+ _frameWidth = value->GetInt();
return S_OK;
}
@@ -506,7 +506,7 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *Value) { // MaxLength
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "MaxLength") == 0) {
- _maxLength = Value->GetInt();
+ _maxLength = value->GetInt();
return S_OK;
}
@@ -515,15 +515,15 @@ HRESULT CUIEdit::scSetProperty(const char *name, CScValue *Value) { //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Text") == 0) {
if (Game->_textEncoding == TEXT_UTF8) {
- WideString wstr = StringUtil::Utf8ToWide(Value->GetString());
+ WideString wstr = StringUtil::Utf8ToWide(value->GetString());
setText(StringUtil::WideToAnsi(wstr).c_str());
} else {
- setText(Value->GetString());
+ setText(value->GetString());
}
return S_OK;
}
- else return CUIObject::scSetProperty(name, Value);
+ else return CUIObject::scSetProperty(name, value);
}
diff --git a/engines/wintermute/UI/UIEdit.h b/engines/wintermute/UI/UIEdit.h index 8477e6f9d5..2ee2d3ea3a 100644 --- a/engines/wintermute/UI/UIEdit.h +++ b/engines/wintermute/UI/UIEdit.h @@ -62,7 +62,7 @@ public: // scripting interface
virtual CScValue *scGetProperty(const char *name);
- virtual HRESULT scSetProperty(const char *name, CScValue *Value);
+ virtual HRESULT scSetProperty(const char *name, CScValue *value);
virtual HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);
virtual const char *scToString();
};
diff --git a/engines/wintermute/UI/UIEntity.cpp b/engines/wintermute/UI/UIEntity.cpp index afba22cc49..2db966f89d 100644 --- a/engines/wintermute/UI/UIEntity.cpp +++ b/engines/wintermute/UI/UIEntity.cpp @@ -310,14 +310,14 @@ CScValue *CUIEntity::scGetProperty(const char *name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIEntity::scSetProperty(const char *name, CScValue *Value) {
+HRESULT CUIEntity::scSetProperty(const char *name, CScValue *value) {
//////////////////////////////////////////////////////////////////////////
// Freezable
//////////////////////////////////////////////////////////////////////////
if (strcmp(name, "Freezable") == 0) {
- if (_entity) _entity->makeFreezable(Value->GetBool());
+ if (_entity) _entity->makeFreezable(value->GetBool());
return S_OK;
- } else return CUIObject::scSetProperty(name, Value);
+ } else return CUIObject::scSetProperty(name, value);
}
diff --git a/engines/wintermute/UI/UIEntity.h b/engines/wintermute/UI/UIEntity.h index 55c5790ef5..670973fdeb 100644 --- a/engines/wintermute/UI/UIEntity.h +++ b/engines/wintermute/UI/UIEntity.h @@ -48,7 +48,7 @@ public: // scripting interface
virtual CScValue *scGetProperty(const char *name);
- virtual HRESULT scSetProperty(const char *name, CScValue *Value);
+ virtual HRESULT scSetProperty(const char *name, CScValue *value);
virtual HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);
virtual const char *scToString();
};
diff --git a/engines/wintermute/UI/UIObject.cpp b/engines/wintermute/UI/UIObject.cpp index c23415287c..45037ec490 100644 --- a/engines/wintermute/UI/UIObject.cpp +++ b/engines/wintermute/UI/UIObject.cpp @@ -418,12 +418,12 @@ CScValue *CUIObject::scGetProperty(const char *name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIObject::scSetProperty(const char *name, CScValue *Value) {
+HRESULT CUIObject::scSetProperty(const char *name, CScValue *value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
if (strcmp(name, "Name") == 0) {
- setName(Value->GetString());
+ setName(value->GetString());
return S_OK;
}
@@ -431,7 +431,7 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *Value) { // ParentNotify
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "ParentNotify") == 0) {
- _parentNotify = Value->GetBool();
+ _parentNotify = value->GetBool();
return S_OK;
}
@@ -439,7 +439,7 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *Value) { // Width
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Width") == 0) {
- _width = Value->GetInt();
+ _width = value->GetInt();
return S_OK;
}
@@ -447,7 +447,7 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *Value) { // Height
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Height") == 0) {
- _height = Value->GetInt();
+ _height = value->GetInt();
return S_OK;
}
@@ -455,7 +455,7 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *Value) { // Visible
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Visible") == 0) {
- _visible = Value->GetBool();
+ _visible = value->GetBool();
return S_OK;
}
@@ -463,7 +463,7 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *Value) { // Disabled
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Disabled") == 0) {
- _disable = Value->GetBool();
+ _disable = value->GetBool();
return S_OK;
}
@@ -471,11 +471,11 @@ HRESULT CUIObject::scSetProperty(const char *name, CScValue *Value) { // Text
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Text") == 0) {
- setText(Value->GetString());
+ setText(value->GetString());
return S_OK;
}
- else return CBObject::scSetProperty(name, Value);
+ else return CBObject::scSetProperty(name, value);
}
diff --git a/engines/wintermute/UI/UIObject.h b/engines/wintermute/UI/UIObject.h index bc49c01a2f..f1ebd81f8c 100644 --- a/engines/wintermute/UI/UIObject.h +++ b/engines/wintermute/UI/UIObject.h @@ -73,7 +73,7 @@ public: // scripting interface
virtual CScValue *scGetProperty(const char *name);
- virtual HRESULT scSetProperty(const char *name, CScValue *Value);
+ virtual HRESULT scSetProperty(const char *name, CScValue *value);
virtual HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);
virtual const char *scToString();
};
diff --git a/engines/wintermute/UI/UIText.cpp b/engines/wintermute/UI/UIText.cpp index e5b89e15df..e73006c28d 100644 --- a/engines/wintermute/UI/UIText.cpp +++ b/engines/wintermute/UI/UIText.cpp @@ -434,12 +434,12 @@ CScValue *CUIText::scGetProperty(const char *name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIText::scSetProperty(const char *name, CScValue *Value) {
+HRESULT CUIText::scSetProperty(const char *name, CScValue *value) {
//////////////////////////////////////////////////////////////////////////
// TextAlign
//////////////////////////////////////////////////////////////////////////
if (strcmp(name, "TextAlign") == 0) {
- int i = Value->GetInt();
+ int i = value->GetInt();
if (i < 0 || i >= NUM_TEXT_ALIGN) i = 0;
_textAlign = (TTextAlign)i;
return S_OK;
@@ -449,13 +449,13 @@ HRESULT CUIText::scSetProperty(const char *name, CScValue *Value) { // VerticalAlign
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "VerticalAlign") == 0) {
- int i = Value->GetInt();
+ int i = value->GetInt();
if (i < 0 || i >= NUM_VERTICAL_ALIGN) i = 0;
_verticalAlign = (TVerticalAlign)i;
return S_OK;
}
- else return CUIObject::scSetProperty(name, Value);
+ else return CUIObject::scSetProperty(name, value);
}
diff --git a/engines/wintermute/UI/UIText.h b/engines/wintermute/UI/UIText.h index bb0b6a4d84..1f5029e4a6 100644 --- a/engines/wintermute/UI/UIText.h +++ b/engines/wintermute/UI/UIText.h @@ -49,7 +49,7 @@ public: // scripting interface
virtual CScValue *scGetProperty(const char *name);
- virtual HRESULT scSetProperty(const char *name, CScValue *Value);
+ virtual HRESULT scSetProperty(const char *name, CScValue *value);
virtual HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);
virtual const char *scToString();
};
diff --git a/engines/wintermute/UI/UIWindow.cpp b/engines/wintermute/UI/UIWindow.cpp index 4e0590ab15..26c60702cb 100644 --- a/engines/wintermute/UI/UIWindow.cpp +++ b/engines/wintermute/UI/UIWindow.cpp @@ -1005,12 +1005,12 @@ CScValue *CUIWindow::scGetProperty(const char *name) { //////////////////////////////////////////////////////////////////////////
-HRESULT CUIWindow::scSetProperty(const char *name, CScValue *Value) {
+HRESULT CUIWindow::scSetProperty(const char *name, CScValue *value) {
//////////////////////////////////////////////////////////////////////////
// Name
//////////////////////////////////////////////////////////////////////////
if (strcmp(name, "Name") == 0) {
- setName(Value->GetString());
+ setName(value->GetString());
return S_OK;
}
@@ -1018,7 +1018,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *Value) { // Menu
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Menu") == 0) {
- _isMenu = Value->GetBool();
+ _isMenu = value->GetBool();
return S_OK;
}
@@ -1026,7 +1026,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *Value) { // InGame
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "InGame") == 0) {
- _inGame = Value->GetBool();
+ _inGame = value->GetBool();
return S_OK;
}
@@ -1034,7 +1034,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *Value) { // PauseMusic
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "PauseMusic") == 0) {
- _pauseMusic = Value->GetBool();
+ _pauseMusic = value->GetBool();
return S_OK;
}
@@ -1042,7 +1042,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *Value) { // ClipContents
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "ClipContents") == 0) {
- _clipContents = Value->GetBool();
+ _clipContents = value->GetBool();
return S_OK;
}
@@ -1050,7 +1050,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *Value) { // Transparent
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Transparent") == 0) {
- _transparent = Value->GetBool();
+ _transparent = value->GetBool();
return S_OK;
}
@@ -1058,7 +1058,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *Value) { // FadeColor
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "FadeColor") == 0) {
- _fadeColor = (uint32)Value->GetInt();
+ _fadeColor = (uint32)value->GetInt();
_fadeBackground = (_fadeColor != 0);
return S_OK;
}
@@ -1067,7 +1067,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *Value) { // Exclusive
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "Exclusive") == 0) {
- if (Value->GetBool())
+ if (value->GetBool())
goExclusive();
else {
close();
@@ -1080,7 +1080,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *Value) { // SystemExclusive
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "SystemExclusive") == 0) {
- if (Value->GetBool())
+ if (value->GetBool())
goSystemExclusive();
else {
close();
@@ -1089,7 +1089,7 @@ HRESULT CUIWindow::scSetProperty(const char *name, CScValue *Value) { return S_OK;
}
- else return CUIObject::scSetProperty(name, Value);
+ else return CUIObject::scSetProperty(name, value);
}
diff --git a/engines/wintermute/UI/UIWindow.h b/engines/wintermute/UI/UIWindow.h index e22a09027d..80dcda9333 100644 --- a/engines/wintermute/UI/UIWindow.h +++ b/engines/wintermute/UI/UIWindow.h @@ -83,7 +83,7 @@ public: // scripting interface
virtual CScValue *scGetProperty(const char *name);
- virtual HRESULT scSetProperty(const char *name, CScValue *Value);
+ virtual HRESULT scSetProperty(const char *name, CScValue *value);
virtual HRESULT scCallMethod(CScScript *script, CScStack *stack, CScStack *thisStack, const char *name);
virtual const char *scToString();
};
|