wxCocoa build fix. Use XPM everywhere.

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

diff --git a/utils/HelpGen/src/srcparser.cpp b/utils/HelpGen/src/srcparser.cpp
index 54068894019c1cf59a8e9885b9a9d3baf9d5fa05..8f541c7a775d17aa0480106525b89ce10073c970 100644 (file)
--- a/utils/HelpGen/src/srcparser.cpp
+++ b/utils/HelpGen/src/srcparser.cpp
@@ -6,7 +6,7 @@
 // Created:     22/09/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Aleskandars Gluchovas
-// Licence:       wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -37,8 +37,8 @@ void spVisitor::VisitAll( spContext& atContext,
                           bool sortContent
                         )
 {
-    mSiblingSkipped = FALSE;
-    mChildSkipped   = FALSE;
+    mSiblingSkipped = false;
+    mChildSkipped   = false;
     mContextMask    = SP_CTX_ANY; // FIXME:: should be an arg.
 
     if ( sortContent && !atContext.IsSorted() )
@@ -56,7 +56,7 @@ void spVisitor::VisitAll( spContext& atContext,
     for( size_t i = 0; i != members.size(); ++i )
     {
         if ( mSiblingSkipped )
-        
+
             return;
 
         if ( !mChildSkipped )
@@ -84,12 +84,12 @@ void spVisitor::RemoveCurrentContext()
 
 void spVisitor::SkipSiblings()
 {
-    mSiblingSkipped = TRUE;
+    mSiblingSkipped = true;
 }
 
 void spVisitor::SkipChildren()
 {
-    mChildSkipped = TRUE;
+    mChildSkipped = true;
 }
 
 void spVisitor::SetFilter( int contextMask )
@@ -125,7 +125,7 @@ spContext::spContext()
 
     : mpParent        ( NULL ),
       mpFirstOccurence( NULL ),
-      mAlreadySorted  ( FALSE ),
+      mAlreadySorted  ( false ),
 
       mSrcLineNo    (-1),
       mSrcOffset    (-1),
@@ -140,8 +140,8 @@ spContext::spContext()
 
       mVisibility( SP_VIS_PRIVATE ),
 
-      mIsVirtualContext         ( FALSE ),
-      mVirtualContextHasChildren( FALSE ),
+      mIsVirtualContext         ( false ),
+      mVirtualContextHasChildren( false ),
 
       mpUserData( NULL )
 {}
@@ -149,7 +149,7 @@ spContext::spContext()
 void spContext::RemoveChildren()
 {
     for( size_t i = 0; i != mMembers.size(); ++i )
-    
+
         delete mMembers[i];
 
     mMembers.erase( mMembers.begin(), mMembers.end() );
@@ -160,7 +160,7 @@ spContext::~spContext()
     RemoveChildren();
 
     for( size_t i = 0; i != mComments.size(); ++i )
-    
+
         delete mComments[i];
 }
 
@@ -201,7 +201,7 @@ void spContext::RemoveChild( spContext* pChild )
             return;
         }
 
-    // the given child should exist on the parent's list 
+    // the given child should exist on the parent's list
     wxASSERT( 0 );
 }
 
@@ -209,8 +209,8 @@ spContext* spContext::GetEnclosingContext( int mask )
 {
     spContext* cur = this->GetParent();
 
-    while ( cur && !(cur->GetContextType() & mask) ) 
-        
+    while ( cur && !(cur->GetContextType() & mask) )
+
         cur = cur->GetParent();
 
     return cur;
@@ -246,7 +246,7 @@ string spContext::GetFooterOfVirtualContextBody()
 }
 
 
-void spContext::SetVirtualContextBody( const string& body, 
+void spContext::SetVirtualContextBody( const string& body,
                                        bool          hasChildren,
                                        const string& footer )
 {
@@ -257,13 +257,13 @@ void spContext::SetVirtualContextBody( const string& body,
 
     // atuomaticllay becomes virtual context
 
-    mIsVirtualContext   = TRUE;
+    mIsVirtualContext   = true;
 }
 
 string spContext::GetBody( spContext* pCtx )
 {
-    if ( ( pCtx == NULL || pCtx == this ) && mIsVirtualContext ) 
-        
+    if ( ( pCtx == NULL || pCtx == this ) && mIsVirtualContext )
+
         return mVirtualContextBody;
 
     if ( GetParent() )
@@ -289,7 +289,7 @@ bool spContext::IsFirstOccurence()
 
 spContext* spContext::GetFirstOccurence()
 {
-    // this object should not itself be 
+    // this object should not itself be
     // the first occurence of the context
     wxASSERT( mpFirstOccurence != 0 );
 
@@ -322,7 +322,7 @@ spContext* spContext::FindContext( const string& identifier,
     {
         spContext& member = *mMembers[i];
 
-        if ( member.GetName() == identifier && 
+        if ( member.GetName() == identifier &&
              ( contextType & member.GetContextType() )
            )
 
@@ -330,7 +330,7 @@ spContext* spContext::FindContext( const string& identifier,
 
         if ( searchSubMembers )
         {
-            spContext* result = 
+            spContext* result =
                 member.FindContext( identifier, contextType, 1 );
 
             if ( result ) return result;
@@ -346,7 +346,7 @@ void spContext::RemoveThisContext()
         mpParent->RemoveChild( this );
     else
         // context should have a parent
-        wxASSERT(0);
+        wxFAIL_MSG("Context should have a parent");
 }
 
 spContext* spContext::GetOutterContext()
@@ -414,7 +414,7 @@ void spClass::SortMembers()
 
 spOperation::spOperation()
 
-    : mHasDefinition( FALSE )
+    : mHasDefinition( false )
 {
     mIsConstant =
     mIsVirtual =
@@ -425,10 +425,10 @@ string spOperation::GetFullName(MarkupTagsT tags)
 {
     string txt = tags[TAG_BOLD].start + mRetType;
     txt += " ";
-    txt += mName;
+    txt += m_Name;
     txt += "( ";
     txt += tags[TAG_BOLD].end;
-    
+
     for( size_t i = 0; i != mMembers.size(); ++i )
     {
         // DBG::
@@ -438,16 +438,16 @@ string spOperation::GetFullName(MarkupTagsT tags)
 
         if ( i != 0 )
             txt += ", ";
-        
+
         txt += tags[TAG_BOLD].start;
-        
+
         txt += param.mType;
 
         txt += tags[TAG_BOLD].end;
         txt += tags[TAG_ITALIC].start;
 
         txt += " ";
-        txt += param.mName;
+        txt += param.m_Name;
 
         if ( param.mInitVal != "" )
         {
@@ -479,15 +479,15 @@ string spPreprocessorLine::CPP_GetIncludedFileNeme() const
 
     size_t i = 0;
 
-    while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '<' ) 
-        
+    while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '<' )
+
         ++i;
 
     ++i;
 
     size_t start = i;
 
-    while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '>' ) 
+    while( i < mLine.length() && mLine[i] != '"' && mLine[i] != '>' )
 
         ++i;
 
@@ -533,7 +533,7 @@ spFile* SourceParserBase::ParseFile( const char* fname )
 
     FILE* fp = fopen( fname, "rt" );
 
-    if ( (int)fp == -1 || !fp ) return NULL;
+    if ( !fp ) return NULL;
 
     int sz = fread( mpFileBuf, 1, mFileBufSz, fp );
 
@@ -567,7 +567,7 @@ void spContext::Dump(const wxString& indent) const
     }
 }
 
-void spContext::DumpThis(const wxString& indent) const
+void spContext::DumpThis(const wxString& WXUNUSED(indent)) const
 {
     wxFAIL_MSG("abstract base class can't be found in parser tree!");
 }
@@ -575,19 +575,19 @@ void spContext::DumpThis(const wxString& 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(), mType.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(), mType.c_str());
 }
 
 void spOperation::DumpThis(const wxString& indent) const
 {
     wxString protection;
-    if ( !!mScope ) {
+    if ( !mScope.empty() ) {
         switch ( mVisibility ) {
             case SP_VIS_PUBLIC:
                 protection = "public";
@@ -614,7 +614,7 @@ void spOperation::DumpThis(const wxString& indent) const
                mIsConstant ? "const " : "",
                mIsVirtual ? "virtual " : "",
                protection.c_str(),
-               mScope.c_str(), mName.c_str(), mRetType.c_str());
+               mScope.c_str(), m_Name.c_str(), mRetType.c_str());
 }
 
 void spPreprocessorLine::DumpThis(const wxString& indent) const
@@ -649,7 +649,7 @@ void spClass::DumpThis(const wxString& indent) const
     for ( StrListT::const_iterator i = mSuperClassNames.begin();
           i != mSuperClassNames.end();
           i++ ) {
-        if ( !!base )
+        if ( !base.empty() )
             base += ", ";
         base += *i;
     }
@@ -685,19 +685,19 @@ 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(), mOriginalType.c_str());
 }
 
 void spFile::DumpThis(const wxString& indent) const