X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c69a7d10e570f96c47082e9ef1cea5d33712cf21..e396018defb4bb0c5726c5cd533c22f15755845b:/utils/HelpGen/src/HelpGen.cpp diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp index d26af0382a..47b9ae8726 100644 --- a/utils/HelpGen/src/HelpGen.cpp +++ b/utils/HelpGen/src/HelpGen.cpp @@ -241,7 +241,7 @@ public: // return true if we ignore this class entirely bool IgnoreClass(const wxString& classname) const { - IgnoreListEntry ignore(classname, _T("")); + IgnoreListEntry ignore(classname, wxEmptyString); return m_ignore.Index(&ignore) != wxNOT_FOUND; } @@ -750,14 +750,14 @@ int main(int argc, char **argv) header.c_str()); } else if ( mode == Mode_Dump ) { - ((spFile *)ctxTop)->mFileName = header; + ((spFile *)ctxTop)->m_FileName = header; visitor.VisitAll(*ctxTop); visitor.EndVisit(); } #ifdef __WXDEBUG__ if ( 0 && ctxTop ) - ctxTop->Dump(""); + ctxTop->Dump(wxEmptyString); #endif // __WXDEBUG__ } @@ -813,7 +813,7 @@ void HelpGenVisitor::Reset() m_funcName = m_textFunc = m_textStoredTypedefs = - m_textStoredFunctionComment = ""; + m_textStoredFunctionComment = wxEmptyString; m_arrayFuncDocs.Empty(); @@ -902,7 +902,7 @@ void HelpGenVisitor::CloseClass() wxString section(m_arrayFuncDocs[n].text); // Strip leading whitespace - int pos = section.Find("\\membersection"); + int pos = section.Find(_T("\\membersection")); if (pos > -1) { section = section.Mid(pos); @@ -953,7 +953,7 @@ void HelpGenVisitor::EndVisit() void HelpGenVisitor::VisitFile( spFile& file ) { - m_fileHeader = file.mFileName; + m_fileHeader = file.m_FileName; wxLogVerbose("%s: started generating docs for classes from file '%s'...", GetCurrentTimeFormatted("%H:%M:%S"), m_fileHeader.c_str()); } @@ -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"; } @@ -1295,13 +1295,19 @@ void HelpGenVisitor::VisitOperation( spOperation& op ) m_classname.c_str(), funcname.c_str(), MakeLabel(m_classname, funcname).c_str()); + wxString constStr; + if(op.mIsConstant) constStr = _T("const"); + + wxString virtualStr; + if(op.mIsVirtual) virtualStr = _T("virtual "); + wxString func; - func.Printf("\n" - "\\%sfunc{%s%s}{%s}{", - op.mIsConstant ? "const" : "", - op.mIsVirtual ? "virtual " : "", - op.m_RetType.c_str(), - funcname.c_str()); + func.Printf(_T("\n") + _T("\\%sfunc{%s%s}{%s}{"), + constStr.c_str(), + virtualStr.c_str(), + op.m_RetType.c_str(), + funcname.c_str()); m_textFunc += func; } @@ -1318,7 +1324,7 @@ void HelpGenVisitor::VisitParameter( spParameter& param ) } m_textFunc << "\\param{" << param.m_Type << " }{" << param.GetName(); - wxString defvalue = param.mInitVal; + wxString defvalue = param.m_InitVal; if ( !defvalue.empty() ) { m_textFunc << " = " << defvalue; } @@ -1829,21 +1835,29 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const const MethodInfo& method = *(methods[index]); bool isVirtual = ctxMethod->mIsVirtual; - if ( isVirtual != method.HasFlag(MethodInfo::Virtual) ) { + if ( isVirtual != method.HasFlag(MethodInfo::Virtual) ) + { + wxString virtualStr; + if(isVirtual)virtualStr = _T("not "); + wxLogWarning("'%s::%s' is incorrectly documented as %s" "virtual.", nameClass.c_str(), nameMethod.c_str(), - isVirtual ? "not " : ""); + virtualStr.c_str()); } bool isConst = ctxMethod->mIsConstant; - if ( isConst != method.HasFlag(MethodInfo::Const) ) { + if ( isConst != method.HasFlag(MethodInfo::Const) ) + { + wxString constStr; + if(isConst)constStr = _T("not "); + wxLogWarning("'%s::%s' is incorrectly documented as %s" "constant.", nameClass.c_str(), nameMethod.c_str(), - isConst ? "not " : ""); + constStr.c_str()); } // check that the params match @@ -1897,14 +1911,14 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const continue; } - if ( param.GetDefValue() != ctxParam->mInitVal.c_str() ) { + if ( param.GetDefValue() != ctxParam->m_InitVal.c_str() ) { wxLogWarning("Default value of parameter '%s' of " "'%s::%s' should be '%s' and not " "'%s'.", ctxParam->m_Name.c_str(), nameClass.c_str(), nameMethod.c_str(), - ctxParam->mInitVal.c_str(), + ctxParam->m_InitVal.c_str(), param.GetDefValue().c_str()); } } @@ -2022,7 +2036,7 @@ bool IgnoreNamesHandler::AddNamesFromFile(const wxString& filename) } else { // entire class - m_ignore.Add(new IgnoreListEntry(line, "")); + m_ignore.Add(new IgnoreListEntry(line, wxEmptyString)); } } //else: comment @@ -2197,6 +2211,15 @@ static const wxString GetVersionString() /* $Log$ + Revision 1.44 2005/05/31 17:47:45 ABX + More warning and error fixes (work in progress with Tinderbox). + + 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). + Revision 1.41 2005/05/30 13:06:15 ABX More warning and error fixes (work in progress with Tinderbox).