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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34459 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp
index 5410e243daacc7d40f8a883e05705d3636e0b1fe..e2f7fa10099f9527926d953427454a20fee2c7cf 100644 (file)
--- a/utils/HelpGen/src/HelpGen.cpp
+++ b/utils/HelpGen/src/HelpGen.cpp
@@ -1105,7 +1105,7 @@ void HelpGenVisitor::VisitClass( spClass& cl )
     // derived from section
     wxString derived = "\\wxheading{Derived from}\n\n";
 
-    const StrListT& baseClasses = cl.mSuperClassNames;
+    const StrListT& baseClasses = cl.m_SuperClassNames;
     if ( baseClasses.size() == 0 ) {
         derived << "No base class";
     }
@@ -2197,6 +2197,9 @@ static const wxString GetVersionString()
 
 /*
    $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
    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 db12882ae2d8d32a415fae512daae5f3e71d4703..c50341574977c972866026218ca5f8c5d2eb2405 100644 (file)
--- a/utils/HelpGen/src/cjparser.cpp
+++ b/utils/HelpGen/src/cjparser.cpp
@@ -2156,7 +2156,7 @@ void CJSourceParser::AddClassNode( char*& cur )
 
         if ( *tok != ':' && *cur != ':' )
 
-            pClass->mSuperClassNames.push_back( string( cur, len ) );
+            pClass->m_SuperClassNames.push_back( string( cur, len ) );
 
     } while(1);
 
@@ -2165,9 +2165,9 @@ void CJSourceParser::AddClassNode( char*& cur )
         int 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;
 

diff --git a/utils/HelpGen/src/docripper.cpp b/utils/HelpGen/src/docripper.cpp
index 2c89e74655e68c1d2be3c96670c7ed7b8f775fae..afc6aefd36c42783b98077e17139ff31980f1320 100644 (file)
--- a/utils/HelpGen/src/docripper.cpp
+++ b/utils/HelpGen/src/docripper.cpp
@@ -312,9 +312,9 @@ void RipperDocGen::LinkSuperClassRefs()
         ScriptSection* pClSect = (ScriptSection*)cl.GetUserData();
         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;
 

diff --git a/utils/HelpGen/src/srcparser.cpp b/utils/HelpGen/src/srcparser.cpp
index 639c4f013c60cad743f82de59bdaea377e657b3c..21e6ebd888ee8b33749d51d5846296e559cfdcc1 100644 (file)
--- a/utils/HelpGen/src/srcparser.cpp
+++ b/utils/HelpGen/src/srcparser.cpp
@@ -643,8 +643,8 @@ void spPreprocessorLine::DumpThis(const wxString& indent) const
 void spClass::DumpThis(const wxString& indent) const
 {
     wxString base;
-    for ( StrListT::const_iterator i = mSuperClassNames.begin();
-          i != mSuperClassNames.end();
+    for ( StrListT::const_iterator i = m_SuperClassNames.begin();
+          i != m_SuperClassNames.end();
           i++ ) {
         if ( !base.empty() )
             base += ", ";

diff --git a/utils/HelpGen/src/srcparser.h b/utils/HelpGen/src/srcparser.h
index 3758eed9a3f60246ce566dda1394128087d99e28..ed14eb9342ff04c28e8ed0617b2a4c1b524c6019 100644 (file)
--- a/utils/HelpGen/src/srcparser.h
+++ b/utils/HelpGen/src/srcparser.h
@@ -133,7 +133,7 @@ class spComment;
     // list of parameters
     typedef vector<spParameter*> MParamListT;
     // string list
-    typedef vector<string>     StrListT;
+    typedef vector<wxString>   StrListT;
 
 #else
 
@@ -143,7 +143,7 @@ class spComment;
     typedef WXSTL_VECTOR_SHALLOW_COPY(spContextPtrT)   MMemberListT;
     typedef WXSTL_VECTOR_SHALLOW_COPY(spCommentPtrT)   MCommentListT;
     typedef WXSTL_VECTOR_SHALLOW_COPY(spParameterPtrT) MParamListT;
-    typedef WXSTL_VECTOR_SHALLOW_COPY(string)          StrListT;
+    typedef WXSTL_VECTOR_SHALLOW_COPY(wxString)        StrListT;
 
 #endif
 // base class for all visitors of source code contents
@@ -623,7 +623,7 @@ class spClass : public spContext
 {
 public:
     // list of superclasses/interfaces
-    StrListT     mSuperClassNames;
+    StrListT     m_SuperClassNames;
 
     // see SP_CLASS_TYPES enumeration
     int          mClassSubType;