aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute
diff options
context:
space:
mode:
authorTobia Tesan2013-09-20 23:03:16 +0200
committerTobia Tesan2013-09-21 23:22:46 +0200
commit5b8a6885c67fe2e1af3dab0e634da1938f8e544c (patch)
tree3a525f0adecced96b5339a6264663f2121260cc1 /engines/wintermute
parent2a977dec8c180c297c000b3c09b068f76344c313 (diff)
downloadscummvm-rg350-5b8a6885c67fe2e1af3dab0e634da1938f8e544c.tar.gz
scummvm-rg350-5b8a6885c67fe2e1af3dab0e634da1938f8e544c.tar.bz2
scummvm-rg350-5b8a6885c67fe2e1af3dab0e634da1938f8e544c.zip
WINTERMUTE: s/put/set/ in setters
Diffstat (limited to 'engines/wintermute')
-rw-r--r--engines/wintermute/ad/ad_response_box.cpp26
-rw-r--r--engines/wintermute/ui/ui_button.cpp8
-rw-r--r--engines/wintermute/ui/ui_button.h8
-rw-r--r--engines/wintermute/ui/ui_object.cpp4
-rw-r--r--engines/wintermute/ui/ui_object.h4
5 files changed, 25 insertions, 25 deletions
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index 267a207eaa..9fcc33e2d1 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -121,12 +121,12 @@ void AdResponseBox::clearButtons() {
//////////////////////////////////////////////////////////////////////////
bool AdResponseBox::invalidateButtons() {
for (uint32 i = 0; i < _respButtons.size(); i++) {
- _respButtons[i]->putImage(nullptr);
- _respButtons[i]->putFont(nullptr);
+ _respButtons[i]->setImage(nullptr);
+ _respButtons[i]->setFont(nullptr);
_respButtons[i]->setText("");
_respButtons[i]->_cursor = nullptr;
- _respButtons[i]->putFontHover(nullptr);
- _respButtons[i]->putFontPress(nullptr);
+ _respButtons[i]->setFontHover(nullptr);
+ _respButtons[i]->setFontPress(nullptr);
}
return STATUS_OK;
}
@@ -146,12 +146,12 @@ bool AdResponseBox::createButtons() {
btn->_sharedCursors = true;
// iconic
if (_responses[i]->getIcon()) {
- btn->putImage(_responses[i]->getIcon());
+ btn->setImage(_responses[i]->getIcon());
if (_responses[i]->getIconHover()) {
- btn->putImageHover(_responses[i]->getIconHover());
+ btn->setImageHover(_responses[i]->getIconHover());
}
if (_responses[i]->getIconPressed()) {
- btn->putImagePress(_responses[i]->getIconPressed());
+ btn->setImagePress(_responses[i]->getIconPressed());
}
btn->setCaption(_responses[i]->getText());
@@ -165,21 +165,21 @@ bool AdResponseBox::createButtons() {
else {
btn->setText(_responses[i]->getText());
if (_font == nullptr) {
- btn->putFont(_gameRef->getSystemFont());
+ btn->setFont(_gameRef->getSystemFont());
} else {
- btn->putFont(_font);
+ btn->setFont(_font);
}
- btn->putFontHover((_fontHover == nullptr) ? _gameRef->getSystemFont() : _fontHover);
- btn->putFontPress(btn->getFontHover());
+ btn->setFontHover((_fontHover == nullptr) ? _gameRef->getSystemFont() : _fontHover);
+ btn->setFontPress(btn->getFontHover());
btn->setTextAlign(_align);
if (_gameRef->_touchInterface) {
- btn->putFontHover(btn->getFont());
+ btn->setFontHover(btn->getFont());
}
if (_responses[i]->getFont()) {
- btn->putFont(_responses[i]->getFont());
+ btn->setFont(_responses[i]->getFont());
}
int width = _responseArea.right - _responseArea.left;
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index a299603b25..a3f0069541 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -1206,7 +1206,7 @@ bool UIButton::persist(BasePersistenceManager *persistMgr) {
return STATUS_OK;
}
-void UIButton::putFontHover(BaseFont *font) {
+void UIButton::setFontHover(BaseFont *font) {
_fontHover = font;
}
@@ -1214,15 +1214,15 @@ BaseFont *UIButton::getFontHover() {
return _fontHover;
}
-void UIButton::putFontPress(BaseFont *font) {
+void UIButton::setFontPress(BaseFont *font) {
_fontPress = font;
}
-void UIButton::putImageHover(BaseSprite *sprite) {
+void UIButton::setImageHover(BaseSprite *sprite) {
_imageHover = sprite;
}
-void UIButton::putImagePress(BaseSprite *sprite) {
+void UIButton::setImagePress(BaseSprite *sprite) {
_imagePress = sprite;
}
diff --git a/engines/wintermute/ui/ui_button.h b/engines/wintermute/ui/ui_button.h
index ea41435a6b..e5dc25bdf0 100644
--- a/engines/wintermute/ui/ui_button.h
+++ b/engines/wintermute/ui/ui_button.h
@@ -58,14 +58,14 @@ public:
virtual const char *scToString() override;
- void putFontHover(BaseFont *font);
+ void setFontHover(BaseFont *font);
BaseFont *getFontHover();
- void putFontPress(BaseFont *font);
+ void setFontPress(BaseFont *font);
void setTextAlign(TTextAlign align);
- void putImageHover(BaseSprite *sprite);
- void putImagePress(BaseSprite *sprite);
+ void setImageHover(BaseSprite *sprite);
+ void setImagePress(BaseSprite *sprite);
private:
bool _pixelPerfect;
diff --git a/engines/wintermute/ui/ui_object.cpp b/engines/wintermute/ui/ui_object.cpp
index 0824f1f9bd..73d7d0f2e6 100644
--- a/engines/wintermute/ui/ui_object.cpp
+++ b/engines/wintermute/ui/ui_object.cpp
@@ -702,7 +702,7 @@ BaseSprite *UIObject::getImage() {
return _image;
}
-void UIObject::putImage(BaseSprite *image) {
+void UIObject::setImage(BaseSprite *image) {
_image = image;
}
@@ -710,7 +710,7 @@ bool UIObject::canFocus() {
return _canFocus;
}
-void UIObject::putFont(BaseFont *font) {
+void UIObject::setFont(BaseFont *font) {
_font = font;
}
diff --git a/engines/wintermute/ui/ui_object.h b/engines/wintermute/ui/ui_object.h
index 6eaade4b4b..8451479455 100644
--- a/engines/wintermute/ui/ui_object.h
+++ b/engines/wintermute/ui/ui_object.h
@@ -81,8 +81,8 @@ public:
bool hasSharedImages();
void setSharedImages(bool shared);
BaseSprite *getImage();
- void putImage(BaseSprite *image);
- void putFont(BaseFont *font);
+ void setImage(BaseSprite *image);
+ void setFont(BaseFont *font);
BaseFont *getFont();
bool canFocus();