Win32: Simplify Change Nickname code and slightly change InputBox_Get…

…String to take a const default value. We don't modify it.
hrydgard · Aug 23, 2013 · e97def9 · e97def9
1 parent 09dc4ac
commit e97def9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 15 deletions.
diff --git a/Core/Host.h b/Core/Host.h
@@ -67,7 +67,7 @@ class Host
 
 #ifdef _WIN32
 	// Implement this on your platform to grab text input from the user for whatever purpose.
-	virtual bool InputBoxGetString(char *title, char *defaultValue, char *outValue, size_t outlength) { return false; }
+	virtual bool InputBoxGetString(char *title, const char *defaultValue, char *outValue, size_t outlength) { return false; }
 #endif
 
 	// Used for headless.

diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
@@ -477,19 +477,10 @@ UI::EventReturn GameSettingsScreen::OnChangeNickname(UI::EventParams &e) {
 	char name[name_len];
 	memset(name, 0, sizeof(name));
 
-	size_t default_len = strlen(g_Config.sNickName.c_str());
-
-	char *defaultVal = new char[default_len];
-	memset(defaultVal, 0, sizeof(default_len));
-	strcat(defaultVal, g_Config.sNickName.c_str());
-
-	if (host->InputBoxGetString("Enter a new PSP nickname", defaultVal, name, name_len)) {
+	if (host->InputBoxGetString("Enter a new PSP nickname", g_Config.sNickName.c_str(), name, name_len)) {
 		g_Config.sNickName = name;
 	}
 
-	delete [] defaultVal;
-	defaultVal = NULL;
-
 	#endif
 	return UI::EVENT_DONE;
 }

diff --git a/Windows/InputBox.cpp b/Windows/InputBox.cpp
@@ -59,7 +59,7 @@ bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, TCHAR *defa
 		return false;
 }
 
-bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, TCHAR *defaultvalue, TCHAR *outvalue, size_t outlength)
+bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, const TCHAR *defaultvalue, TCHAR *outvalue, size_t outlength)
 {
 	const char *defaultTitle = "Input value";
 	defaultSelected = true;

diff --git a/Windows/InputBox.h b/Windows/InputBox.h
@@ -4,5 +4,5 @@
 
 #include "Common/CommonWindows.h"
 bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, TCHAR *defaultvalue, TCHAR *outvalue, bool selected = true);
-bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, TCHAR *defaultvalue, TCHAR *outvalue, size_t outlength);
+bool InputBox_GetString(HINSTANCE hInst, HWND hParent, TCHAR *title, const TCHAR *defaultvalue, TCHAR *outvalue, size_t outlength);
 bool InputBox_GetHex(HINSTANCE hInst, HWND hParent, TCHAR *title, u32 defaultvalue, u32 &outvalue);
diff --git a/Windows/WindowsHost.cpp b/Windows/WindowsHost.cpp
@@ -287,7 +287,7 @@ void WindowsHost::UpdateConsolePosition()
 	}
 }
 
-bool WindowsHost::InputBoxGetString(char *title, char *defaultValue, char *outValue, size_t outLength)
+bool WindowsHost::InputBoxGetString(char *title, const char *defaultValue, char *outValue, size_t outLength)
 {
 	return InputBox_GetString(MainWindow::GetHInstance(), MainWindow::GetHWND(), title, defaultValue, outValue, outLength);
 }
diff --git a/Windows/WindowsHost.h b/Windows/WindowsHost.h
@@ -55,7 +55,7 @@ class WindowsHost : public Host
 	void SaveSymbolMap();
 	void SetWindowTitle(const char *message);
 
-	bool InputBoxGetString(char *title, char *defaultValue, char *outValue, size_t outlength);
+	bool InputBoxGetString(char *title, const char *defaultValue, char *outValue, size_t outlength);
 
 	std::shared_ptr<KeyboardDevice> keyboard;