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

More warning and error fixes (work in progress with Tinderbox).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34413 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-05-30 13:06:16 +00:00
parent e484a5f8c2
commit c69a7d10e5
5 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
utils/HelpGen/src/HelpGen.cpp
View File

@@ -1163,9 +1163,9 @@ void HelpGenVisitor::VisitEnumeration( spEnumeration& en )
wxString enumeration = GetAllComments(en), wxString enumeration = GetAllComments(en),
enumerationVerb; enumerationVerb;
enumerationVerb << "\\begin{verbatim}\n" enumerationVerb << _T("\\begin{verbatim}\n")
<< en.mEnumContent << en.m_EnumContent
<< "\n\\end{verbatim}\n"; << _T("\n\\end{verbatim}\n");
// remember for later use if we're not inside a class yet // remember for later use if we're not inside a class yet
if ( !m_inClass ) { if ( !m_inClass ) {
@@ -1194,9 +1194,9 @@ void HelpGenVisitor::VisitTypeDef( spTypeDef& td )
} }
wxString typedefdoc; wxString typedefdoc;
typedefdoc << "{\\small \\begin{verbatim}\n" typedefdoc << _T("{\\small \\begin{verbatim}\n")
<< "typedef " << td.mOriginalType << ' ' << td.GetName() << _T("typedef ") << td.m_OriginalType << _T(' ') << td.GetName()
<< "\n\\end{verbatim}}\n" << _T("\n\\end{verbatim}}\n")
<< GetAllComments(td); << GetAllComments(td);
// remember for later use if we're not inside a class yet // remember for later use if we're not inside a class yet
@@ -2197,6 +2197,9 @@ static const wxString GetVersionString()
/* /*
$Log$ $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 Revision 1.40 2005/05/30 11:49:32 ABX
More warning and error fixes (work in progress with Tinderbox). More warning and error fixes (work in progress with Tinderbox).

32
utils/HelpGen/src/cjparser.cpp
View File

@@ -1267,9 +1267,9 @@ void CJSourceParser::AttachComments( spContext& ctx, wxChar* cur )
clear_commets_queue(); clear_commets_queue();
} }
void CJSourceParser::AddMacroNode( char*& cur ) void CJSourceParser::AddMacroNode( wxChar*& cur )
{ {
char* start = cur; wxChar* start = cur;
int lineNo = get_line_no(); int lineNo = get_line_no();
@@ -1285,7 +1285,7 @@ void CJSourceParser::AddMacroNode( char*& cur )
AttachComments( *pPL, cur ); AttachComments( *pPL, cur );
get_string_between( start, cur, &pPL->mLine ); get_string_between( start, cur, &pPL->m_Line );
++start; // skip '#' ++start; // skip '#'
get_next_token( start ); get_next_token( start );
@@ -1296,9 +1296,9 @@ void CJSourceParser::AddMacroNode( char*& cur )
// determine the type exactly and assign // determine the type exactly and assign
// a name to the context // 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; char* tok = start+6;
@@ -1316,13 +1316,13 @@ void CJSourceParser::AddMacroNode( char*& cur )
pPL->mDefType = SP_PREP_DEF_REDEFINE_SYMBOL; 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; pPL->mDefType = SP_PREP_DEF_INCLUDE_FILE;
} }
else if ( *++start == 'f' ) else if ( *++start == _T('f') )
{ {
// either "#if" or "#ifdef" // either "#if" or "#ifdef"
cur = start; cur = start;
@@ -1332,14 +1332,14 @@ void CJSourceParser::AddMacroNode( char*& cur )
string condition = get_token_str( cur ); string condition = get_token_str( cur );
// currently, everything except '0' is true // currently, everything except '0' is true
if ( condition == "0" ) { if ( condition == _T("0") ) {
// skip until the following else or enif // skip until the following else or enif
while ( cur < _gSrcEnd ) { while ( cur < _gSrcEnd ) {
skip_to_eol( cur ); skip_to_eol( cur );
skip_eol( cur ); skip_eol( cur );
get_next_token( cur ); get_next_token( cur );
if ( *cur++ == '#' && *cur == 'e' ) if ( *cur++ == _T('#') && *cur == _T('e') )
break; break;
} }
} }
@@ -1347,7 +1347,7 @@ void CJSourceParser::AddMacroNode( char*& cur )
// TODO parse the condition... // TODO parse the condition...
} }
} }
else if ( cmp_tokens_fast( start, "else", 4 ) ) else if ( cmp_tokens_fast( start, _T("else"), 4 ) )
{ {
// skip until "#endif" // skip until "#endif"
while ( cur < _gSrcEnd ) { while ( cur < _gSrcEnd ) {
@@ -1355,7 +1355,7 @@ void CJSourceParser::AddMacroNode( char*& cur )
skip_eol( cur ); skip_eol( cur );
get_next_token( cur ); get_next_token( cur );
if ( *cur++ == '#' && cmp_tokens_fast( cur, "endif", 5 ) ) if ( *cur++ == _T('#') && cmp_tokens_fast( cur, "endif", 5 ) )
break; break;
} }
} }
@@ -1988,9 +1988,9 @@ void CJSourceParser::SkipFunctionBody( char*& cur )
{ {
if ( op.m_Name[i] == ':' && op.m_Name[i+1] == ':' ) 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; op.m_Name = unscoped;
@@ -2220,7 +2220,7 @@ void CJSourceParser::AddEnumNode( char*& cur )
if ( !skip_imp_block( cur ) ) return; 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) ) if ( get_next_token(cur) )
{ {
@@ -2286,7 +2286,7 @@ void CJSourceParser::AddTypeDefNode( char*& cur )
if ( *nameStart == '*' ) ++nameStart; 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 ); get_string_between( nameStart, nameEnd, &pTDef->m_Name );

10
utils/HelpGen/src/docripper.cpp
View File

@@ -374,7 +374,7 @@ void RipperDocGen::VisitEnumeration( spEnumeration& en )
string body; string body;
body += mTags[TAG_BOLD].start; body += mTags[TAG_BOLD].start;
AppendMulitilineStr( body, en.mEnumContent ); AppendMulitilineStr( body, en.m_EnumContent );
body += mTags[TAG_BOLD].end; body += mTags[TAG_BOLD].end;
@@ -399,8 +399,8 @@ void RipperDocGen::VisitTypeDef( spTypeDef& td )
body += "typdef "; body += "typdef ";
body += mTags[TAG_BOLD].end; body += mTags[TAG_BOLD].end;
AppendMulitilineStr( body, td.mOriginalType ); AppendMulitilineStr( body, td.m_OriginalType );
body += td.mOriginalType; body += td.m_OriginalType;
body += ' '; body += ' ';
body += mTags[TAG_BOLD].start; body += mTags[TAG_BOLD].start;
@@ -429,8 +429,8 @@ void RipperDocGen::VisitPreprocessorLine( spPreprocessorLine& pd )
string body; string body;
body += mTags[TAG_FIXED_FONT].start; body += mTags[TAG_FIXED_FONT].start;
string coloredLine = pd.mLine; string coloredLine = pd.m_Line;
AppendHighlightedSource( coloredLine, pd.mLine ); AppendHighlightedSource( coloredLine, pd.m_Line );
AppendMulitilineStr( body, coloredLine ); AppendMulitilineStr( body, coloredLine );

10
utils/HelpGen/src/srcparser.cpp
View File

@@ -479,7 +479,7 @@ string spPreprocessorLine::CPP_GetIncludedFileNeme() const
size_t i = 0; size_t i = 0;
while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '<' ) while( i < m_Line.length() && m_Line[i] != '"' && m_Line[i] != '<' )
++i; ++i;
@@ -487,14 +487,14 @@ string spPreprocessorLine::CPP_GetIncludedFileNeme() const
size_t start = i; size_t start = i;
while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '>' ) while( i < m_Line.length() && m_Line[i] != '"' && m_Line[i] != '>' )
++i; ++i;
if ( start < mLine.length() ) if ( start < m_Line.length() )
{ {
string fname; string fname;
fname.append( mLine, start, ( i - start ) ); fname.append( m_Line, start, ( i - start ) );
return fname; return fname;
} }
@@ -697,7 +697,7 @@ void spEnumeration::DumpThis(const wxString& indent) const
void spTypeDef::DumpThis(const wxString& indent) const void spTypeDef::DumpThis(const wxString& indent) const
{ {
wxLogDebug("%stypedef %s = %s", 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 void spFile::DumpThis(const wxString& indent) const

6
utils/HelpGen/src/srcparser.h
View File

@@ -599,7 +599,7 @@ public:
// prepocessor statement including '#' and // prepocessor statement including '#' and
// attached multiple lines with '\' character // attached multiple lines with '\' character
string mLine; wxString m_Line;
int mDefType; // see SP_PREP_DEFINITION_TYPES enumeration int mDefType; // see SP_PREP_DEFINITION_TYPES enumeration
@@ -665,7 +665,7 @@ public:
class spEnumeration : public spContext class spEnumeration : public spContext
{ {
public: public:
string mEnumContent; // full-text content of enumeration wxString m_EnumContent; // full-text content of enumeration
public: public:
virtual int GetContextType() const { return SP_CTX_ENUMERATION; } virtual int GetContextType() const { return SP_CTX_ENUMERATION; }
@@ -681,7 +681,7 @@ class spTypeDef : public spContext
public: public:
// the original type which is redefined // the original type which is redefined
// by this type definition // by this type definition
string mOriginalType; wxString m_OriginalType;
public: public:
virtual int GetContextType() const { return SP_CTX_TYPEDEF; } virtual int GetContextType() const { return SP_CTX_TYPEDEF; }