diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-19 17:28:33 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-19 17:28:33 +0000 |
commit | 1a9320fafb23940d0463e6f384713d0f99fc0c61 (patch) | |
tree | d152680dbdc8febf0b5a445ba760255068d72f04 /src/gui/char_select.cpp | |
parent | 2f027ebcf8f0ad78f7edf58af7dda94d89034c85 (diff) | |
download | mana-client-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.gz mana-client-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.bz2 mana-client-1a9320fafb23940d0463e6f384713d0f99fc0c61.tar.xz mana-client-1a9320fafb23940d0463e6f384713d0f99fc0c61.zip |
Merged 0.0 changes from revision 3362 to 3580 to trunk.
Diffstat (limited to 'src/gui/char_select.cpp')
-rw-r--r-- | src/gui/char_select.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index d752cdb3..e8381bef 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -48,6 +48,7 @@ #include "../utils/gettext.h" #include "../utils/strprintf.h" #include "../utils/tostring.h" +#include "../utils/trim.h" // Defined in main.cpp, used here for setting the char create dialog extern CharServerHandler charServerHandler; @@ -255,11 +256,6 @@ bool CharSelectDialog::selectByName(const std::string &name) return false; } -std::string CharSelectDialog::getName() -{ - return mNameLabel->getCaption(); -} - CharCreateDialog::CharCreateDialog(Window *parent, int slot): Window(_("Create Character"), true, parent), mSlot(slot) { @@ -410,10 +406,12 @@ CharCreateDialog::action(const gcn::ActionEvent &event) } } -const std::string& +std::string CharCreateDialog::getName() { - return mNameField->getText(); + std::string name = mNameField->getText(); + trim(name); + return name; } void CharCreateDialog::UpdateSliders() |