X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/42389ac7c31d1bc536cc5e45cc587a4a9be7897f..e396018defb4bb0c5726c5cd533c22f15755845b:/utils/HelpGen/src/srcparser.cpp?ds=sidebyside

diff --git a/utils/HelpGen/src/srcparser.cpp b/utils/HelpGen/src/srcparser.cpp
index f98154c822..b5e1268213 100644
--- a/utils/HelpGen/src/srcparser.cpp
+++ b/utils/HelpGen/src/srcparser.cpp
@@ -6,13 +6,9 @@
 // Created:     22/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleskandars Gluchovas
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#  pragma implementation "srcparser.h"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -109,21 +105,21 @@ 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 *****/
 
 spContext::spContext()
 
-    : mpParent        ( NULL ),
+    : m_pParent        ( NULL ),
       mpFirstOccurence( NULL ),
       mAlreadySorted  ( false ),
 
@@ -231,14 +227,14 @@ bool spContext::VitualContextHasChildren()
     return mVirtualContextHasChildren;
 }
 
-string spContext::GetVirtualContextBody()
+wxString spContext::GetVirtualContextBody()
 {
     wxASSERT( mIsVirtualContext );
 
     return mVirtualContextBody;
 }
 
-string spContext::GetFooterOfVirtualContextBody()
+wxString spContext::GetFooterOfVirtualContextBody()
 {
     wxASSERT( mIsVirtualContext );
 
@@ -246,9 +242,9 @@ string spContext::GetFooterOfVirtualContextBody()
 }
 
 
-void spContext::SetVirtualContextBody( const string& body,
-                                       bool          hasChildren,
-                                       const string& footer )
+void spContext::SetVirtualContextBody( const wxString& body,
+                                       bool            hasChildren,
+                                       const wxString& footer )
 {
     mVirtualContextHasChildren = hasChildren;
 
@@ -260,26 +256,23 @@ void spContext::SetVirtualContextBody( const string& body,
     mIsVirtualContext   = true;
 }
 
-string spContext::GetBody( spContext* pCtx )
+wxString spContext::GetBody( spContext* pCtx )
 {
     if ( ( pCtx == NULL || pCtx == this ) && mIsVirtualContext )
-
         return mVirtualContextBody;
 
     if ( GetParent() )
-
         return GetParent()->GetBody( ( pCtx != NULL ) ? pCtx : this );
     else
-        return ""; // source-fragment cannot be found
+        return wxEmptyString; // source-fragment cannot be found
 }
 
-string spContext::GetHeader( spContext* pCtx )
+wxString spContext::GetHeader( spContext* pCtx )
 {
     if ( GetParent() )
-
         return GetParent()->GetHeader( ( pCtx != NULL ) ? pCtx : this );
     else
-        return ""; // source-fragment cannot be found
+        return wxEmptyString; // source-fragment cannot be found
 }
 
 bool spContext::IsFirstOccurence()
@@ -300,7 +293,7 @@ void spContext::AddMember( spContext* pMember )
 {
     mMembers.push_back( pMember );
 
-    pMember->mpParent = this;
+    pMember->m_pParent = this;
 }
 
 void spContext::AddComment( spComment* pComment )
@@ -313,7 +306,7 @@ MMemberListT& spContext::GetMembers()
     return mMembers;
 }
 
-spContext* spContext::FindContext( const string& identifier,
+spContext* spContext::FindContext( const wxString& identifier,
                                    int   contextType,
                                    bool  searchSubMembers
                                  )
@@ -342,8 +335,8 @@ spContext* spContext::FindContext( const string& identifier,
 
 void spContext::RemoveThisContext()
 {
-    if ( mpParent )
-        mpParent->RemoveChild( this );
+    if ( m_pParent )
+        m_pParent->RemoveChild( this );
     else
         // context should have a parent
         wxFAIL_MSG("Context should have a parent");
@@ -351,12 +344,12 @@ void spContext::RemoveThisContext()
 
 spContext* spContext::GetOutterContext()
 {
-    return mpParent;
+    return m_pParent;
 }
 
 bool spContext::HasOutterContext()
 {
-    return ( mpParent != 0 );
+    return ( m_pParent != 0 );
 }
 
 bool spContext::IsInFile()
@@ -382,25 +375,25 @@ bool spContext::IsInOperation()
 spClass& spContext::GetClass()
 {
     wxASSERT( GetOutterContext()->GetType() == SP_CTX_CLASS );
-    return *((spClass*)mpParent );
+    return *((spClass*)m_pParent );
 }
 
 spFile& spContext::GetFile()
 {
     wxASSERT( GetOutterContext()->GetType() == SP_CTX_FILE );
-    return *((spFile*)mpParent );
+    return *((spFile*)m_pParent );
 }
 
 spNameSpace& spContext::GetNameSpace()
 {
     wxASSERT( GetOutterContext()->GetType() == SP_CTX_NAMESPACE );
-    return *((spNameSpace*)mpParent );
+    return *((spNameSpace*)m_pParent );
 }
 
 spOperation& spContext::GetOperation()
 {
     wxASSERT( GetOutterContext()->GetType() == SP_CTX_OPERATION );
-    return *((spOperation*)mpParent );
+    return *((spOperation*)m_pParent );
 }
 
 /***** Implementation for class spClass *****/
@@ -421,12 +414,12 @@ spOperation::spOperation()
     mHasDefinition = false;
 }
 
-string spOperation::GetFullName(MarkupTagsT tags)
+wxString spOperation::GetFullName(MarkupTagsT tags)
 {
-    string txt = tags[TAG_BOLD].start + mRetType;
-    txt += " ";
-    txt += mName;
-    txt += "( ";
+    wxString txt = tags[TAG_BOLD].start + m_RetType;
+    txt += _T(" ");
+    txt += m_Name;
+    txt += _T("( ");
     txt += tags[TAG_BOLD].end;
 
     for( size_t i = 0; i != mMembers.size(); ++i )
@@ -437,24 +430,24 @@ string spOperation::GetFullName(MarkupTagsT tags)
         spParameter& param = *((spParameter*)mMembers[i]);
 
         if ( i != 0 )
-            txt += ", ";
+            txt += _T(", ");
 
         txt += tags[TAG_BOLD].start;
 
-        txt += param.mType;
+        txt += param.m_Type;
 
         txt += tags[TAG_BOLD].end;
         txt += tags[TAG_ITALIC].start;
 
-        txt += " ";
-        txt += param.mName;
+        txt += _T(" ");
+        txt += param.m_Name;
 
-        if ( param.mInitVal != "" )
+        if ( !param.m_InitVal.empty() )
         {
-            txt += " = ";
+            txt += _T(" = ");
             txt += tags[TAG_BOLD].start;
 
-            txt += param.mInitVal;
+            txt += param.m_InitVal;
 
             txt += tags[TAG_BOLD].end;
         }
@@ -473,13 +466,13 @@ string spOperation::GetFullName(MarkupTagsT tags)
 
 /***** Implemenentation for class spPreprocessorLine *****/
 
-string spPreprocessorLine::CPP_GetIncludedFileNeme() const
+wxString spPreprocessorLine::CPP_GetIncludedFileNeme() const
 {
     wxASSERT( GetStatementType() == SP_PREP_DEF_INCLUDE_FILE );
 
     size_t i = 0;
 
-    while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '<' )
+    while( i < m_Line.length() && m_Line[i] != _T('"') && m_Line[i] != _T('<') )
 
         ++i;
 
@@ -487,19 +480,19 @@ string spPreprocessorLine::CPP_GetIncludedFileNeme() const
 
     size_t start = i;
 
-    while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '>' )
+    while( i < m_Line.length() && m_Line[i] != _T('"') && m_Line[i] != _T('>') )
 
         ++i;
 
-    if ( start < mLine.length() )
+    if ( start < m_Line.length() )
     {
-        string fname;
-        fname.append( mLine, start, ( i - start ) );
+        wxString fname;
+        fname.append( m_Line, start, ( i - start ) );
 
         return fname;
     }
     else
-        return ""; // syntax error probably
+        return wxEmptyString; // syntax error probably
 }
 
 
@@ -575,13 +568,13 @@ void spContext::DumpThis(const wxString& WXUNUSED(indent)) const
 void spParameter::DumpThis(const wxString& indent) const
 {
     wxLogDebug("%sparam named '%s' of type '%s'",
-               indent.c_str(), mName.c_str(), mType.c_str());
+               indent.c_str(), m_Name.c_str(), m_Type.c_str());
 }
 
 void spAttribute::DumpThis(const wxString& indent) const
 {
     wxLogDebug("%svariable named '%s' of type '%s'",
-               indent.c_str(), mName.c_str(), mType.c_str());
+               indent.c_str(), m_Name.c_str(), m_Type.c_str());
 }
 
 void spOperation::DumpThis(const wxString& indent) const
@@ -609,12 +602,16 @@ void spOperation::DumpThis(const wxString& indent) const
         protection = "global";
     }
 
+    wxString constStr,virtualStr;
+    if(mIsConstant) constStr = _T("const ");
+    if(mIsVirtual) virtualStr = _T("virtual ");
+
     wxLogDebug("%s%s%s%s function named '%s::%s' of type '%s'",
                indent.c_str(),
-               mIsConstant ? "const " : "",
-               mIsVirtual ? "virtual " : "",
+               constStr.c_str(),
+               virtualStr.c_str(),
                protection.c_str(),
-               mScope.c_str(), mName.c_str(), mRetType.c_str());
+               mScope.c_str(), m_Name.c_str(), m_RetType.c_str());
 }
 
 void spPreprocessorLine::DumpThis(const wxString& indent) const
@@ -646,10 +643,10 @@ 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 )
+        if ( !base.empty() )
             base += ", ";
         base += *i;
     }
@@ -685,25 +682,25 @@ void spClass::DumpThis(const wxString& indent) const
 
     wxLogDebug("%s%s named '%s' (base classes: %s)",
                indent.c_str(), kind.c_str(),
-               mName.c_str(), base.c_str());
+               m_Name.c_str(), base.c_str());
 }
 
 void spEnumeration::DumpThis(const wxString& indent) const
 {
     wxLogDebug("%senum named '%s'",
-               indent.c_str(), mName.c_str());
+               indent.c_str(), m_Name.c_str());
 }
 
 void spTypeDef::DumpThis(const wxString& indent) const
 {
     wxLogDebug("%stypedef %s = %s",
-               indent.c_str(), mName.c_str(), mOriginalType.c_str());
+               indent.c_str(), m_Name.c_str(), m_OriginalType.c_str());
 }
 
 void spFile::DumpThis(const wxString& indent) const
 {
     wxLogDebug("%sfile '%s'",
-               indent.c_str(), mFileName.c_str());
+               indent.c_str(), m_FileName.c_str());
 }
 
 #endif // __WXDEBUG__