From bc87fd68e39395dc3e8beb17cf8af7b38b903322 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Sat, 17 Nov 2001 23:18:43 +0000 Subject: [PATCH] added const for constant char pointer function parameters git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12466 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/utils.h | 12 ++++++------ src/common/utilscmn.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/wx/utils.h b/include/wx/utils.h index a60616f433..f99f033246 100644 --- a/include/wx/utils.h +++ b/include/wx/utils.h @@ -63,7 +63,7 @@ WXDLLEXPORT_DATA(extern wxChar*) wxBuffer; WXDLLEXPORT wxChar* copystring(const wxChar *s); // Matches string one within string two regardless of case -WXDLLEXPORT bool StringMatch(wxChar *one, wxChar *two, bool subString = TRUE, bool exact = FALSE); +WXDLLEXPORT bool StringMatch(const wxChar *one, const wxChar *two, bool subString = TRUE, bool exact = FALSE); // A shorter way of using strcmp #define wxStringEq(s1, s2) (s1 && s2 && (wxStrcmp(s1, s2) == 0)) @@ -123,12 +123,12 @@ WXDLLEXPORT long wxGetCurrentId(); WXDLLEXPORT_DATA(extern const wxChar*) wxFloatToStringStr; WXDLLEXPORT_DATA(extern const wxChar*) wxDoubleToStringStr; -WXDLLEXPORT void StringToFloat(wxChar *s, float *number); +WXDLLEXPORT void StringToFloat(const wxChar *s, float *number); WXDLLEXPORT wxChar* FloatToString(float number, const wxChar *fmt = wxFloatToStringStr); -WXDLLEXPORT void StringToDouble(wxChar *s, double *number); +WXDLLEXPORT void StringToDouble(const wxChar *s, double *number); WXDLLEXPORT wxChar* DoubleToString(double number, const wxChar *fmt = wxDoubleToStringStr); -WXDLLEXPORT void StringToInt(wxChar *s, int *number); -WXDLLEXPORT void StringToLong(wxChar *s, long *number); +WXDLLEXPORT void StringToInt(const wxChar *s, int *number); +WXDLLEXPORT void StringToLong(const wxChar *s, long *number); WXDLLEXPORT wxChar* IntToString(int number); WXDLLEXPORT wxChar* LongToString(long number); @@ -287,7 +287,7 @@ WXDLLEXPORT bool wxGetDiskSpace(const wxString& path, // Menu accelerators related things // ---------------------------------------------------------------------------- -WXDLLEXPORT wxChar* wxStripMenuCodes(wxChar *in, wxChar *out = (wxChar *) NULL); +WXDLLEXPORT wxChar* wxStripMenuCodes(const wxChar *in, wxChar *out = (wxChar *) NULL); WXDLLEXPORT wxString wxStripMenuCodes(const wxString& str); #if wxUSE_ACCEL diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp index 724f54de2a..9d0d3b771c 100644 --- a/src/common/utilscmn.cpp +++ b/src/common/utilscmn.cpp @@ -249,14 +249,14 @@ wxRegisterId (long id) } void -StringToFloat (wxChar *s, float *number) +StringToFloat (const wxChar *s, float *number) { if (s && *s && number) *number = (float) wxStrtod (s, (wxChar **) NULL); } void -StringToDouble (wxChar *s, double *number) +StringToDouble (const wxChar *s, double *number) { if (s && *s && number) *number = wxStrtod (s, (wxChar **) NULL); @@ -281,14 +281,14 @@ DoubleToString (double number, const wxChar *fmt) } void -StringToInt (wxChar *s, int *number) +StringToInt (const wxChar *s, int *number) { if (s && *s && number) *number = (int) wxStrtol (s, (wxChar **) NULL, 10); } void -StringToLong (wxChar *s, long *number) +StringToLong (const wxChar *s, long *number) { if (s && *s && number) *number = wxStrtol (s, (wxChar **) NULL, 10); @@ -353,7 +353,7 @@ wxString wxDecToHex(int dec) // Match a string INDEPENDENT OF CASE bool -StringMatch (char *str1, char *str2, bool subString, bool exact) +StringMatch (const char *str1, const char *str2, bool subString, bool exact) { if (str1 == NULL || str2 == NULL) return FALSE; @@ -409,7 +409,7 @@ wxString wxNow() // Menu accelerators related functions // ---------------------------------------------------------------------------- -wxChar *wxStripMenuCodes(wxChar *in, wxChar *out) +wxChar *wxStripMenuCodes(const wxChar *in, wxChar *out) { wxString s = wxMenuItem::GetLabelFromText(in); if ( out ) -- 2.45.2