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@34459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-05-31 15:42:43 +00:00
parent 3c96417a09
commit 33882d153d
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1105,7 +1105,7 @@ void HelpGenVisitor::VisitClass( spClass& cl )
// derived from section // derived from section
wxString derived = "\\wxheading{Derived from}\n\n"; wxString derived = "\\wxheading{Derived from}\n\n";
const StrListT& baseClasses = cl.mSuperClassNames; const StrListT& baseClasses = cl.m_SuperClassNames;
if ( baseClasses.size() == 0 ) { if ( baseClasses.size() == 0 ) {
derived << "No base class"; derived << "No base class";
} }
@@ -2197,6 +2197,9 @@ static const wxString GetVersionString()
/* /*
$Log$ $Log$
Revision 1.43 2005/05/31 15:42:43 ABX
More warning and error fixes (work in progress with Tinderbox).
Revision 1.42 2005/05/31 15:32:49 ABX Revision 1.42 2005/05/31 15:32:49 ABX
More warning and error fixes (work in progress with Tinderbox). More warning and error fixes (work in progress with Tinderbox).

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

@@ -2156,7 +2156,7 @@ void CJSourceParser::AddClassNode( char*& cur )
if ( *tok != ':' && *cur != ':' ) if ( *tok != ':' && *cur != ':' )
pClass->mSuperClassNames.push_back( string( cur, len ) ); pClass->m_SuperClassNames.push_back( string( cur, len ) );
} while(1); } while(1);
@@ -2165,9 +2165,9 @@ void CJSourceParser::AddClassNode( char*& cur )
int tmpLn; int tmpLn;
store_line_no( tmpLn ); store_line_no( tmpLn );
while ( pClass->mSuperClassNames.size() ) while ( pClass->m_SuperClassNames.size() )
pClass->mSuperClassNames.erase( &pClass->mSuperClassNames[0] ); pClass->m_SuperClassNames.erase( &pClass->m_SuperClassNames[0] );
char* tok = cur; char* tok = cur;

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

@@ -312,9 +312,9 @@ void RipperDocGen::LinkSuperClassRefs()
ScriptSection* pClSect = (ScriptSection*)cl.GetUserData(); ScriptSection* pClSect = (ScriptSection*)cl.GetUserData();
ScriptSection* pSuperSect = pClSect->GetSubsection("Derived from"); ScriptSection* pSuperSect = pClSect->GetSubsection("Derived from");
for( size_t n = 0; n != cl.mSuperClassNames.size(); ++n ) for( size_t n = 0; n != cl.m_SuperClassNames.size(); ++n )
{ {
string& superClName = cl.mSuperClassNames[n]; wxString& superClName = cl.m_SuperClassNames[n];
spClass* pFound = NULL; spClass* pFound = NULL;

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

@@ -643,8 +643,8 @@ void spPreprocessorLine::DumpThis(const wxString& indent) const
void spClass::DumpThis(const wxString& indent) const void spClass::DumpThis(const wxString& indent) const
{ {
wxString base; wxString base;
for ( StrListT::const_iterator i = mSuperClassNames.begin(); for ( StrListT::const_iterator i = m_SuperClassNames.begin();
i != mSuperClassNames.end(); i != m_SuperClassNames.end();
i++ ) { i++ ) {
if ( !base.empty() ) if ( !base.empty() )
base += ", "; base += ", ";

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

@@ -133,7 +133,7 @@ class spComment;
// list of parameters // list of parameters
typedef vector<spParameter*> MParamListT; typedef vector<spParameter*> MParamListT;
// string list // string list
typedef vector<string> StrListT; typedef vector<wxString> StrListT;
#else #else
@@ -143,7 +143,7 @@ class spComment;
typedef WXSTL_VECTOR_SHALLOW_COPY(spContextPtrT) MMemberListT; typedef WXSTL_VECTOR_SHALLOW_COPY(spContextPtrT) MMemberListT;
typedef WXSTL_VECTOR_SHALLOW_COPY(spCommentPtrT) MCommentListT; typedef WXSTL_VECTOR_SHALLOW_COPY(spCommentPtrT) MCommentListT;
typedef WXSTL_VECTOR_SHALLOW_COPY(spParameterPtrT) MParamListT; typedef WXSTL_VECTOR_SHALLOW_COPY(spParameterPtrT) MParamListT;
typedef WXSTL_VECTOR_SHALLOW_COPY(string) StrListT; typedef WXSTL_VECTOR_SHALLOW_COPY(wxString) StrListT;
#endif #endif
// base class for all visitors of source code contents // base class for all visitors of source code contents
@@ -623,7 +623,7 @@ class spClass : public spContext
{ {
public: public:
// list of superclasses/interfaces // list of superclasses/interfaces
StrListT mSuperClassNames; StrListT m_SuperClassNames;
// see SP_CLASS_TYPES enumeration // see SP_CLASS_TYPES enumeration
int mClassSubType; int mClassSubType;