From: Gilles Depeyrot Date: Mon, 26 Nov 2001 07:33:30 +0000 (+0000) Subject: added missing const for char* arguments X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/bbd08c6a9549538e211eb6d78152482ca6d4a810 added missing const for char* arguments git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/utils/tex2rtf/src/tex2any.cpp b/utils/tex2rtf/src/tex2any.cpp index b86f28a724..7f6227b77b 100644 --- a/utils/tex2rtf/src/tex2any.cpp +++ b/utils/tex2rtf/src/tex2any.cpp @@ -218,7 +218,8 @@ TexMacroDef *VerbatimMacroDef = NULL; #define IncrementLineNumber() LineNumbers[CurrentInputIndex] ++ -TexRef::TexRef(char *label, char *file, char *section, char *sectionN) +TexRef::TexRef(const char *label, const char *file, + const char *section, const char *sectionN) { refLabel = copystring(label); refFile = file ? copystring(file) : (char*) NULL; @@ -1551,7 +1552,7 @@ int ParseArg(TexChunk *thisArg, wxList& children, char *buffer, int pos, char *e * */ -int ParseMacroBody(char *macro_name, TexChunk *parent, +int ParseMacroBody(const char *macro_name, TexChunk *parent, int no_args, char *buffer, int pos, char *environment, bool parseToBrace, TexChunk *customMacroArgs) diff --git a/utils/tex2rtf/src/tex2any.h b/utils/tex2rtf/src/tex2any.h index 0fc16cd94e..fb9a2eab15 100644 --- a/utils/tex2rtf/src/tex2any.h +++ b/utils/tex2rtf/src/tex2any.h @@ -147,7 +147,7 @@ bool read_a_line(char *buf); bool TexLoadFile(char *filename); int ParseArg(TexChunk *thisArg, wxList& children, char *buffer, int pos, char *environment = NULL, bool parseArgToBrace = TRUE, TexChunk *customMacroArgs = NULL); -int ParseMacroBody(char *macro_name, TexChunk *parent, int no_args, +int ParseMacroBody(const char *macro_name, TexChunk *parent, int no_args, char *buffer, int pos, char *environment = NULL, bool parseArgToBrace = TRUE, TexChunk *customMacroArgs = NULL); void TraverseDocument(void); void TraverseFromChunk(TexChunk *chunk, wxNode *thisNode = NULL, bool childrenOnly = FALSE); @@ -367,7 +367,7 @@ void Tex2RTFYield(bool force = FALSE); // make up a topic name otherwise. char *FindTopicName(TexChunk *chunk); // Force the current topic to be this (e.g. force 'references' label). -void ForceTopicName(char *name); +void ForceTopicName(const char *name); void ResetTopicCounter(void); // Parse unit eg. 14, 12pt, 34cm and return value in points. @@ -396,7 +396,7 @@ class TexRef: public wxObject char *refFile; // Reference filename (can be NULL) char *sectionNumber; // Section or figure number (as a string) char *sectionName; // name e.g. 'section' - TexRef(char *label, char *file, char *section, char *sectionN = NULL); + TexRef(const char *label, const char *file, const char *section, const char *sectionN = NULL); ~TexRef(void); }; @@ -530,12 +530,12 @@ class ColourTableEntry: public wxObject unsigned int green; unsigned int blue; - ColourTableEntry(char *theName, unsigned int r, unsigned int g, unsigned int b); + ColourTableEntry(const char *theName, unsigned int r, unsigned int g, unsigned int b); ~ColourTableEntry(void); }; extern wxList ColourTable; -extern void AddColour(char *theName, unsigned int r, unsigned int g, unsigned int b); +extern void AddColour(const char *theName, unsigned int r, unsigned int g, unsigned int b); extern int FindColourPosition(char *theName); // Converts e.g. "red" -> "#FF0000" extern bool FindColourHTMLString(char *theName, char *buf); diff --git a/utils/tex2rtf/src/texutils.cpp b/utils/tex2rtf/src/texutils.cpp index f4bb11a9a9..7aec24bfc4 100644 --- a/utils/tex2rtf/src/texutils.cpp +++ b/utils/tex2rtf/src/texutils.cpp @@ -150,7 +150,7 @@ void ResetTopicCounter(void) static char *forceTopicName = NULL; -void ForceTopicName(char *name) +void ForceTopicName(const char *name) { if (forceTopicName) delete[] forceTopicName; @@ -1463,7 +1463,7 @@ char *ParseMultifieldString(char *allFields, int *pos) * */ -ColourTableEntry::ColourTableEntry(char *theName, unsigned int r, unsigned int g, unsigned int b) +ColourTableEntry::ColourTableEntry(const char *theName, unsigned int r, unsigned int g, unsigned int b) { name = copystring(theName); red = r; @@ -1476,7 +1476,7 @@ ColourTableEntry::~ColourTableEntry(void) delete[] name; } -void AddColour(char *theName, unsigned int r, unsigned int g, unsigned int b) +void AddColour(const char *theName, unsigned int r, unsigned int g, unsigned int b) { wxNode *node = ColourTable.Find(theName); if (node)