diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2015-02-01 17:59:23 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-02-05 03:24:22 -0500 |
| commit | 9e2a9b55e185b92074b32d3df336920f33b29e5a (patch) | |
| tree | 0ec7b908b01ef62db67a27cfcfba413a3adf6748 /src/guiPasswordChange.cpp | |
| parent | 84c367bb468441efe428478d3918f07a9b6c2d72 (diff) | |
| download | minetest-9e2a9b55e185b92074b32d3df336920f33b29e5a.tar.gz minetest-9e2a9b55e185b92074b32d3df336920f33b29e5a.tar.bz2 minetest-9e2a9b55e185b92074b32d3df336920f33b29e5a.zip | |
Reduce gettext wide/narrow and string/char* conversions
Diffstat (limited to 'src/guiPasswordChange.cpp')
| -rw-r--r-- | src/guiPasswordChange.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp index c8a2214b6..d9a5cc48b 100644 --- a/src/guiPasswordChange.cpp +++ b/src/guiPasswordChange.cpp @@ -96,6 +96,8 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize) v2s32 size = rect.getSize(); v2s32 topleft_client(40, 0); + const wchar_t *text; + /* Add stuff */ @@ -103,7 +105,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize) { core::rect<s32> rect(0, 0, 110, 20); rect += topleft_client + v2s32(35, ypos+6); - wchar_t* text = wgettext("Old Password"); + text = wgettext("Old Password"); Environment->addStaticText(text, rect, false, true, this, -1); delete[] text; } @@ -119,7 +121,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize) { core::rect<s32> rect(0, 0, 110, 20); rect += topleft_client + v2s32(35, ypos+6); - wchar_t* text = wgettext("New Password"); + text = wgettext("New Password"); Environment->addStaticText(text, rect, false, true, this, -1); delete[] text; } @@ -134,7 +136,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize) { core::rect<s32> rect(0, 0, 110, 20); rect += topleft_client + v2s32(35, ypos+6); - wchar_t* text = wgettext("Confirm Password"); + text = wgettext("Confirm Password"); Environment->addStaticText(text, rect, false, true, this, -1); delete[] text; } @@ -150,7 +152,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize) { core::rect<s32> rect(0, 0, 140, 30); rect = rect + v2s32(size.X/2-140/2, ypos); - wchar_t* text = wgettext("Change"); + text = wgettext("Change"); Environment->addButton(rect, this, ID_change, text); delete[] text; } @@ -159,7 +161,7 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize) { core::rect<s32> rect(0, 0, 300, 20); rect += topleft_client + v2s32(35, ypos); - wchar_t* text = wgettext("Passwords do not match!"); + text = wgettext("Passwords do not match!"); IGUIElement *e = Environment->addStaticText( text, |