Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxJSScriptWrapper methods const

Browse Source 
Do not mark as const their returned values, which is useless, and seems
to have been a result of some confusion about how "const" works in C++.
This commit is contained in:
Vadim Zeitlin
2017-10-22 17:36:27 +02:00
parent 836c874c88
commit 6563f38496
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/private/jsscriptwrapper.h
View File

@@ -19,7 +19,7 @@
class wxJSScriptWrapper class wxJSScriptWrapper
{ {
public: public:
wxJSScriptWrapper(const wxString& js, int* runScriptCount) : m_jsscript(js) wxJSScriptWrapper(const wxString& js, int* runScriptCount)
: m_escapedCode(js) : m_escapedCode(js)
{ {
// We assign the return value of JavaScript snippet we execute to the // We assign the return value of JavaScript snippet we execute to the
@@ -39,13 +39,13 @@ public:
// This method is used to add a double quote level into a JavaScript code // This method is used to add a double quote level into a JavaScript code
// in order to get it working when eval is called programmatically. // in order to get it working when eval is called programmatically.
const wxString GetWrappedCode() wxString GetWrappedCode() const
{ {
return wxString::Format("try { var %s = eval(\"%s\"); true; } \ return wxString::Format("try { var %s = eval(\"%s\"); true; } \
catch (e) { e.name + \": \" + e.message; }", m_outputVarName, m_escapedCode); catch (e) { e.name + \": \" + e.message; }", m_outputVarName, m_escapedCode);
} }
const wxString GetOutputCode() wxString GetOutputCode() const
{ {
#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX__) #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX__)
return wxString::Format("if (typeof %s == 'object') \ return wxString::Format("if (typeof %s == 'object') \
@@ -131,12 +131,12 @@ public:
#endif #endif
} }
const wxString GetCleanUpCode() wxString GetCleanUpCode() const
{ {
return wxString::Format("%s = undefined;", m_outputVarName); return wxString::Format("%s = undefined;", m_outputVarName);
} }
const wxString GetOutputJSVariable() wxString GetOutputJSVariable() const
{ {
return m_outputVarName; return m_outputVarName;
} }