summaryrefslogtreecommitdiff
path: root/src/gui/npc_text.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-15 21:55:32 +0100
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-02-15 21:55:32 +0100
commit08c9cde4726f94698ea938d464cd1de95b7be587 (patch)
treef75128313418756395683398342cf808387ed390 /src/gui/npc_text.cpp
parenta6623430aa11b02f93761d27c25db9bb4157ec6f (diff)
downloadmana-08c9cde4726f94698ea938d464cd1de95b7be587.tar.gz
mana-08c9cde4726f94698ea938d464cd1de95b7be587.tar.bz2
mana-08c9cde4726f94698ea938d464cd1de95b7be587.tar.xz
mana-08c9cde4726f94698ea938d464cd1de95b7be587.zip
Fixes some variable names to conform to naming convention
Please do remember that member variables are prefixes with 'm', so that they are easily distinguishable.
Diffstat (limited to 'src/gui/npc_text.cpp')
-rw-r--r--src/gui/npc_text.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index b4313b70..3e40d1bb 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -44,13 +44,13 @@ NpcTextDialog::NpcTextDialog():
mTextBox->setEditable(false);
mTextBox->setOpaque(false);
- scrollArea = new ScrollArea(mTextBox);
- okButton = new Button(_("OK"), "ok", this);
+ mScrollArea = new ScrollArea(mTextBox);
+ gcn::Button *okButton = new Button(_("OK"), "ok", this);
- scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
- scrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+ mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
+ mScrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
- place(0, 0, scrollArea, 5).setPadding(3);
+ place(0, 0, mScrollArea, 5).setPadding(3);
place(4, 1, okButton);
Layout &layout = getLayout();
@@ -63,7 +63,7 @@ NpcTextDialog::NpcTextDialog():
void NpcTextDialog::setText(const std::string &text)
{
mText = text;
- mTextBox->setTextWrapped(mText, scrollArea->getWidth() - 15);
+ mTextBox->setTextWrapped(mText, mScrollArea->getWidth() - 15);
}
void NpcTextDialog::addText(const std::string &text)