From c69a7d10e570f96c47082e9ef1cea5d33712cf21 Mon Sep 17 00:00:00 2001 From: =?utf8?q?W=C5=82odzimierz=20Skiba?= Date: Mon, 30 May 2005 13:06:16 +0000 Subject: [PATCH] More warning and error fixes (work in progress with Tinderbox). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/HelpGen/src/HelpGen.cpp | 15 +++++++++------ utils/HelpGen/src/cjparser.cpp | 32 ++++++++++++++++---------------- utils/HelpGen/src/docripper.cpp | 10 +++++----- utils/HelpGen/src/srcparser.cpp | 10 +++++----- utils/HelpGen/src/srcparser.h | 6 +++--- 5 files changed, 38 insertions(+), 35 deletions(-) diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp index b32b313cdb..d26af0382a 100644 --- a/utils/HelpGen/src/HelpGen.cpp +++ b/utils/HelpGen/src/HelpGen.cpp @@ -1163,9 +1163,9 @@ void HelpGenVisitor::VisitEnumeration( spEnumeration& en ) wxString enumeration = GetAllComments(en), enumerationVerb; - enumerationVerb << "\\begin{verbatim}\n" - << en.mEnumContent - << "\n\\end{verbatim}\n"; + enumerationVerb << _T("\\begin{verbatim}\n") + << en.m_EnumContent + << _T("\n\\end{verbatim}\n"); // remember for later use if we're not inside a class yet if ( !m_inClass ) { @@ -1194,9 +1194,9 @@ void HelpGenVisitor::VisitTypeDef( spTypeDef& td ) } wxString typedefdoc; - typedefdoc << "{\\small \\begin{verbatim}\n" - << "typedef " << td.mOriginalType << ' ' << td.GetName() - << "\n\\end{verbatim}}\n" + typedefdoc << _T("{\\small \\begin{verbatim}\n") + << _T("typedef ") << td.m_OriginalType << _T(' ') << td.GetName() + << _T("\n\\end{verbatim}}\n") << GetAllComments(td); // remember for later use if we're not inside a class yet @@ -2197,6 +2197,9 @@ static const wxString GetVersionString() /* $Log$ + Revision 1.41 2005/05/30 13:06:15 ABX + More warning and error fixes (work in progress with Tinderbox). + Revision 1.40 2005/05/30 11:49:32 ABX More warning and error fixes (work in progress with Tinderbox). diff --git a/utils/HelpGen/src/cjparser.cpp b/utils/HelpGen/src/cjparser.cpp index aa45109266..9577db9fea 100644 --- a/utils/HelpGen/src/cjparser.cpp +++ b/utils/HelpGen/src/cjparser.cpp @@ -1267,9 +1267,9 @@ void CJSourceParser::AttachComments( spContext& ctx, wxChar* cur ) clear_commets_queue(); } -void CJSourceParser::AddMacroNode( char*& cur ) +void CJSourceParser::AddMacroNode( wxChar*& cur ) { - char* start = cur; + wxChar* start = cur; int lineNo = get_line_no(); @@ -1285,7 +1285,7 @@ void CJSourceParser::AddMacroNode( char*& cur ) AttachComments( *pPL, cur ); - get_string_between( start, cur, &pPL->mLine ); + get_string_between( start, cur, &pPL->m_Line ); ++start; // skip '#' get_next_token( start ); @@ -1296,9 +1296,9 @@ void CJSourceParser::AddMacroNode( char*& cur ) // determine the type exactly and assign // a name to the context - if ( *start == 'd' ) + if ( *start == _T('d') ) { - if ( cmp_tokens_fast( start, "define", 6 ) ) + if ( cmp_tokens_fast( start, _T("define"), 6 ) ) { char* tok = start+6; @@ -1316,13 +1316,13 @@ void CJSourceParser::AddMacroNode( char*& cur ) pPL->mDefType = SP_PREP_DEF_REDEFINE_SYMBOL; } } - else if ( *start == 'i' ) + else if ( *start == _T('i') ) { - if ( cmp_tokens_fast( start, "include", 7 ) ) + if ( cmp_tokens_fast( start, _T("include"), 7 ) ) { pPL->mDefType = SP_PREP_DEF_INCLUDE_FILE; } - else if ( *++start == 'f' ) + else if ( *++start == _T('f') ) { // either "#if" or "#ifdef" cur = start; @@ -1332,14 +1332,14 @@ void CJSourceParser::AddMacroNode( char*& cur ) string condition = get_token_str( cur ); // currently, everything except '0' is true - if ( condition == "0" ) { + if ( condition == _T("0") ) { // skip until the following else or enif while ( cur < _gSrcEnd ) { skip_to_eol( cur ); skip_eol( cur ); get_next_token( cur ); - if ( *cur++ == '#' && *cur == 'e' ) + if ( *cur++ == _T('#') && *cur == _T('e') ) break; } } @@ -1347,7 +1347,7 @@ void CJSourceParser::AddMacroNode( char*& cur ) // TODO parse the condition... } } - else if ( cmp_tokens_fast( start, "else", 4 ) ) + else if ( cmp_tokens_fast( start, _T("else"), 4 ) ) { // skip until "#endif" while ( cur < _gSrcEnd ) { @@ -1355,7 +1355,7 @@ void CJSourceParser::AddMacroNode( char*& cur ) skip_eol( cur ); get_next_token( cur ); - if ( *cur++ == '#' && cmp_tokens_fast( cur, "endif", 5 ) ) + if ( *cur++ == _T('#') && cmp_tokens_fast( cur, "endif", 5 ) ) break; } } @@ -1988,9 +1988,9 @@ void CJSourceParser::SkipFunctionBody( char*& cur ) { if ( op.m_Name[i] == ':' && op.m_Name[i+1] == ':' ) { - string unscoped( op.m_Name, i+2, op.m_Name.length() - ( i + 2 ) ); + wxString unscoped( op.m_Name, i+2, op.m_Name.length() - ( i + 2 ) ); - op.mScope = string( op.m_Name, 0, i ); + op.mScope = wxString( op.m_Name, 0, i ); op.m_Name = unscoped; @@ -2220,7 +2220,7 @@ void CJSourceParser::AddEnumNode( char*& cur ) if ( !skip_imp_block( cur ) ) return; - get_string_between( start, cur, &pEnum->mEnumContent ); + get_string_between( start, cur, &pEnum->m_EnumContent ); if ( get_next_token(cur) ) { @@ -2286,7 +2286,7 @@ void CJSourceParser::AddTypeDefNode( char*& cur ) if ( *nameStart == '*' ) ++nameStart; } - get_string_between( start, typeEnd, &pTDef->mOriginalType ); + get_string_between( start, typeEnd, &pTDef->m_OriginalType ); get_string_between( nameStart, nameEnd, &pTDef->m_Name ); diff --git a/utils/HelpGen/src/docripper.cpp b/utils/HelpGen/src/docripper.cpp index fe2c44dff8..68fffdcefc 100644 --- a/utils/HelpGen/src/docripper.cpp +++ b/utils/HelpGen/src/docripper.cpp @@ -374,7 +374,7 @@ void RipperDocGen::VisitEnumeration( spEnumeration& en ) string body; body += mTags[TAG_BOLD].start; - AppendMulitilineStr( body, en.mEnumContent ); + AppendMulitilineStr( body, en.m_EnumContent ); body += mTags[TAG_BOLD].end; @@ -399,8 +399,8 @@ void RipperDocGen::VisitTypeDef( spTypeDef& td ) body += "typdef "; body += mTags[TAG_BOLD].end; - AppendMulitilineStr( body, td.mOriginalType ); - body += td.mOriginalType; + AppendMulitilineStr( body, td.m_OriginalType ); + body += td.m_OriginalType; body += ' '; body += mTags[TAG_BOLD].start; @@ -429,8 +429,8 @@ void RipperDocGen::VisitPreprocessorLine( spPreprocessorLine& pd ) string body; body += mTags[TAG_FIXED_FONT].start; - string coloredLine = pd.mLine; - AppendHighlightedSource( coloredLine, pd.mLine ); + string coloredLine = pd.m_Line; + AppendHighlightedSource( coloredLine, pd.m_Line ); AppendMulitilineStr( body, coloredLine ); diff --git a/utils/HelpGen/src/srcparser.cpp b/utils/HelpGen/src/srcparser.cpp index de9e54183e..166fc6ca7e 100644 --- a/utils/HelpGen/src/srcparser.cpp +++ b/utils/HelpGen/src/srcparser.cpp @@ -479,7 +479,7 @@ string spPreprocessorLine::CPP_GetIncludedFileNeme() const size_t i = 0; - while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '<' ) + while( i < m_Line.length() && m_Line[i] != '"' && m_Line[i] != '<' ) ++i; @@ -487,14 +487,14 @@ string spPreprocessorLine::CPP_GetIncludedFileNeme() const size_t start = i; - while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '>' ) + while( i < m_Line.length() && m_Line[i] != '"' && m_Line[i] != '>' ) ++i; - if ( start < mLine.length() ) + if ( start < m_Line.length() ) { string fname; - fname.append( mLine, start, ( i - start ) ); + fname.append( m_Line, start, ( i - start ) ); return fname; } @@ -697,7 +697,7 @@ void spEnumeration::DumpThis(const wxString& indent) const void spTypeDef::DumpThis(const wxString& indent) const { wxLogDebug("%stypedef %s = %s", - indent.c_str(), m_Name.c_str(), mOriginalType.c_str()); + indent.c_str(), m_Name.c_str(), m_OriginalType.c_str()); } void spFile::DumpThis(const wxString& indent) const diff --git a/utils/HelpGen/src/srcparser.h b/utils/HelpGen/src/srcparser.h index 77cfbe2a60..a22557eda2 100644 --- a/utils/HelpGen/src/srcparser.h +++ b/utils/HelpGen/src/srcparser.h @@ -599,7 +599,7 @@ public: // prepocessor statement including '#' and // attached multiple lines with '\' character - string mLine; + wxString m_Line; int mDefType; // see SP_PREP_DEFINITION_TYPES enumeration @@ -665,7 +665,7 @@ public: class spEnumeration : public spContext { public: - string mEnumContent; // full-text content of enumeration + wxString m_EnumContent; // full-text content of enumeration public: virtual int GetContextType() const { return SP_CTX_ENUMERATION; } @@ -681,7 +681,7 @@ class spTypeDef : public spContext public: // the original type which is redefined // by this type definition - string mOriginalType; + wxString m_OriginalType; public: virtual int GetContextType() const { return SP_CTX_TYPEDEF; } -- 2.47.2