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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34410 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba 2005-05-30 11:49:33 +00:00
parent 306302e12a
commit e49cde67e6
5 changed files with 20 additions and 16 deletions

View File

@ -1685,7 +1685,8 @@ bool DocManager::ParseTeXFile(const wxString& filename)
constStr = _T(" const");
wxLogVerbose("file %s(%d): found '%s %s::%s(%s)%s'",
m_filename.c_str(), m_line,
m_filename.c_str(),
(int)m_line,
returnType.c_str(),
classname.c_str(),
funcName.c_str(),
@ -2196,6 +2197,9 @@ static const wxString GetVersionString()
/*
$Log$
Revision 1.40 2005/05/30 11:49:32 ABX
More warning and error fixes (work in progress with Tinderbox).
Revision 1.39 2005/05/30 09:26:42 ABX
More warning and error fixes (work in progress with Tinderbox).

View File

@ -1190,7 +1190,7 @@ spFile* CJSourceParser::Parse( char* start, char* end )
} while( 1 );
}
void CJSourceParser::AttachComments( spContext& ctx, char* cur )
void CJSourceParser::AttachComments( spContext& ctx, wxChar* cur )
{
if ( !mCommentsOn ) return;
@ -1240,7 +1240,7 @@ void CJSourceParser::AttachComments( spContext& ctx, char* cur )
pComment->mStartsPar = false;
}
prevComEnd = set_comment_text( pComment->mText, start );
prevComEnd = set_comment_text( pComment->m_Text, start );
}
@ -1252,7 +1252,7 @@ void CJSourceParser::AttachComments( spContext& ctx, char* cur )
spComment* pComment = new spComment();
lst.push_back( pComment );
set_comment_text( pComment->mText, cur );
set_comment_text( pComment->m_Text, cur );
pComment->mStartsPar = 1;
pComment->mIsMultiline = ( *(cur+1) == '*' );

View File

@ -185,7 +185,7 @@ void RipperDocGen::AppendComments( spContext& fromContext, string& str )
str += mTags[TAG_PARAGRAPH].start;
}
str += lst[i]->mText;
str += lst[i]->m_Text;
}
// remove new lines, and insert paragraph breaks

View File

@ -109,14 +109,14 @@ bool spComment::StartsParagraph() const
return mStartsPar;
}
string& spComment::GetText()
wxString& spComment::GetText()
{
return mText;
return m_Text;
}
string spComment::GetText() const
wxString spComment::GetText() const
{
return mText;
return m_Text;
}
/***** Implementation for class spContext *****/

View File

@ -233,23 +233,23 @@ public:
class spComment
{
public:
string mText;
bool mIsMultiline; // multiline comments ar those with /**/'s
wxString m_Text;
bool mIsMultiline; // multiline comments ar those with /**/'s
// true, if these was an empty empty
// line above single line comment
bool mStartsPar;
bool mStartsPar;
public:
bool IsMultiline() const;
bool StartsParagraph() const;
bool IsMultiline() const;
bool StartsParagraph() const;
string& GetText();
string& GetText();
// contstant version of GetText()
string GetText() const;
string GetText() const;
};
// abstract base class for common (to most languages) code