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

[wxWidgets.git] / utils / HelpGen / src / docripper.cpp

diff --git a/utils/HelpGen/src/docripper.cpp b/utils/HelpGen/src/docripper.cpp
index fe2c44dff8a14a9a412ee577c0ab37b176823436..c479fcb8f9e48eb0a89ab9fae69e7a573b85fff5 100644 (file)
--- a/utils/HelpGen/src/docripper.cpp
+++ b/utils/HelpGen/src/docripper.cpp
@@ -257,13 +257,13 @@ ScriptTemplate* RipperDocGen::GetRefTemplFor( spContext& ctx )
         return &mDeadRefTempl;
 }
 
         return &mDeadRefTempl;
 }
 

-string RipperDocGen::GetScopedName( spContext& ofCtx )
+wxString RipperDocGen::GetScopedName( spContext& ofCtx )

 {
     if ( ofCtx.IsInFile() )
         return ofCtx.GetName();
     else
         return ofCtx.GetOutterContext()->GetName() +
 {
     if ( ofCtx.IsInFile() )
         return ofCtx.GetName();
     else
         return ofCtx.GetOutterContext()->GetName() +

-               "::" + ofCtx.GetName();
+               _T("::") + ofCtx.GetName();

 }
 
 void RipperDocGen::AddToCurrentClass( ScriptSection* pSection, spContext& ctx,
 }
 
 void RipperDocGen::AddToCurrentClass( ScriptSection* pSection, spContext& ctx,


@@ -371,14 +371,14 @@ void RipperDocGen::VisitEnumeration( spEnumeration& en )
     if ( CheckIfUncommented( en, *mpEnumIdx ) )
         return;
 
     if ( CheckIfUncommented( en, *mpEnumIdx ) )
         return;
 

-    string body;
+    wxString 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;
 

-    string line;
+    wxString line;

     AppendHighlightedSource( line, body );
     AppendComments( en, line );
 
     AppendHighlightedSource( line, body );
     AppendComments( en, line );
 


@@ -394,20 +394,20 @@ void RipperDocGen::VisitTypeDef( spTypeDef& td )
     if ( CheckIfUncommented( td, *mpTypeDefIdx ) )
         return;
 
     if ( CheckIfUncommented( td, *mpTypeDefIdx ) )
         return;
 

-    string body;
+    wxString body;

     body += mTags[TAG_BOLD].start;
     body += "typdef ";
     body += mTags[TAG_BOLD].end;
 
     body += mTags[TAG_BOLD].start;
     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;
     body += td.GetName();
     body += mTags[TAG_BOLD].end;
 
     body += ' ';
 
     body += mTags[TAG_BOLD].start;
     body += td.GetName();
     body += mTags[TAG_BOLD].end;
 

-    string line;
+    wxString line;

     AppendHighlightedSource( line, body );
     AppendComments( td, line );
 
     AppendHighlightedSource( line, body );
     AppendComments( td, line );
 


@@ -426,11 +426,11 @@ void RipperDocGen::VisitPreprocessorLine( spPreprocessorLine& pd )
     if ( CheckIfUncommented( pd, *mpMacroIdx ) )
         return;
 
     if ( CheckIfUncommented( pd, *mpMacroIdx ) )
         return;
 

-    string body;
+    wxString body;

     body += mTags[TAG_FIXED_FONT].start;
 
     body += mTags[TAG_FIXED_FONT].start;
 

-    string coloredLine = pd.mLine;
-    AppendHighlightedSource( coloredLine, pd.mLine );
+    wxString coloredLine = pd.m_Line;
+    AppendHighlightedSource( coloredLine, pd.m_Line );

 
     AppendMulitilineStr( body, coloredLine );
 
 
     AppendMulitilineStr( body, coloredLine );
 


@@ -456,7 +456,7 @@ void RipperDocGen::VisitClass( spClass& cl )
         return;
     }
 
         return;
     }
 

-    string body;
+    wxString body;

     AppendComments( cl, body );
 
     mpCurClassSect =
     AppendComments( cl, body );
 
     mpCurClassSect =


@@ -491,7 +491,7 @@ void RipperDocGen::VisitClass( spClass& cl )
 
 void RipperDocGen::VisitAttribute( spAttribute& attr )
 {
 
 void RipperDocGen::VisitAttribute( spAttribute& attr )
 {

-    string body;
+    wxString body;

     body += mTags[TAG_BOLD].start;
     body += attr.m_Type;
     body += mTags[TAG_BOLD].end;
     body += mTags[TAG_BOLD].start;
     body += attr.m_Type;
     body += mTags[TAG_BOLD].end;


@@ -501,7 +501,7 @@ void RipperDocGen::VisitAttribute( spAttribute& attr )
     body += attr.GetName();
     body += mTags[TAG_ITALIC].end;
 
     body += attr.GetName();
     body += mTags[TAG_ITALIC].end;
 

-    string line;
+    wxString line;

     AppendHighlightedSource( line, body );
     AppendComments( attr, line );
 
     AppendHighlightedSource( line, body );
     AppendComments( attr, line );
 


@@ -525,7 +525,7 @@ void RipperDocGen::VisitAttribute( spAttribute& attr )
 
 void RipperDocGen::VisitOperation( spOperation& op )
 {
 
 void RipperDocGen::VisitOperation( spOperation& op )
 {

-    string body;
+    wxString body;

 
     AppendHighlightedSource( body, op.GetFullName(mTags) );
 
 
     AppendHighlightedSource( body, op.GetFullName(mTags) );