offset version by 1 to avoid having compatibility_version of 0.0.0 under Darwin:...

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

diff --git a/utils/HelpGen/src/HelpGen.cpp b/utils/HelpGen/src/HelpGen.cpp
index 1dccac576943c9cbc0114a0e51bed86eba8af5b5..47b9ae872603c36ea0cd4fd63b40d63a61613f49 100644 (file)
--- 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
     {
     // 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;
     }
 
         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 ) {
                          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 )
             visitor.VisitAll(*ctxTop);
             visitor.EndVisit();
         }
 
 #ifdef __WXDEBUG__
         if ( 0 && ctxTop )

-            ctxTop->Dump("");
+            ctxTop->Dump(wxEmptyString);

 #endif // __WXDEBUG__
     }
 
 #endif // __WXDEBUG__
     }
 


@@ -813,7 +813,7 @@ void HelpGenVisitor::Reset()
     m_funcName =
     m_textFunc =
     m_textStoredTypedefs =
     m_funcName =
     m_textFunc =
     m_textStoredTypedefs =

-    m_textStoredFunctionComment = "";
+    m_textStoredFunctionComment = wxEmptyString;

 
     m_arrayFuncDocs.Empty();
 
 
     m_arrayFuncDocs.Empty();
 


@@ -902,7 +902,7 @@ void HelpGenVisitor::CloseClass()
                 wxString section(m_arrayFuncDocs[n].text);
 
                 // Strip leading whitespace
                 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);
                 if (pos > -1)
                 {
                     section = section.Mid(pos);


@@ -915,7 +915,7 @@ void HelpGenVisitor::CloseClass()
                 }
                 else
                 {
                 }
                 else
                 {

-                    membersections.Put(ms, & membersections);
+                    membersections.Put(ms.c_str(), & membersections);

                 }
             }
 
                 }
             }
 


@@ -953,7 +953,7 @@ void HelpGenVisitor::EndVisit()
 
 void HelpGenVisitor::VisitFile( spFile& file )
 {
 
 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());
 }
     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";
 
     // 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";
     }
     if ( baseClasses.size() == 0 ) {
         derived << "No base class";
     }


@@ -1163,9 +1163,9 @@ void HelpGenVisitor::VisitEnumeration( spEnumeration& en )
     wxString enumeration = GetAllComments(en),
              enumerationVerb;
 
     wxString enumeration = GetAllComments(en),
              enumerationVerb;
 

-    enumerationVerb << "\\begin{verbatim}\n"
-                    << en.mEnumContent
-                    << "\n\\end{verbatim}\n";
+    enumerationVerb << _T("\\begin{verbatim}\n")
+                    << en.m_EnumContent
+                    << _T("\n\\end{verbatim}\n");

 
     // remember for later use if we're not inside a class yet
     if ( !m_inClass ) {
 
     // remember for later use if we're not inside a class yet
     if ( !m_inClass ) {


@@ -1194,9 +1194,9 @@ void HelpGenVisitor::VisitTypeDef( spTypeDef& td )
     }
 
     wxString typedefdoc;
     }
 
     wxString typedefdoc;

-    typedefdoc << "{\\small \\begin{verbatim}\n"
-               << "typedef " << td.mOriginalType << ' ' << td.GetName()
-               << "\n\\end{verbatim}}\n"
+    typedefdoc << _T("{\\small \\begin{verbatim}\n")
+               << _T("typedef ") << td.m_OriginalType << _T(' ') << td.GetName()
+               << _T("\n\\end{verbatim}}\n")

                << GetAllComments(td);
 
     // remember for later use if we're not inside a class yet
                << GetAllComments(td);
 
     // remember for later use if we're not inside a class yet


@@ -1295,13 +1295,19 @@ void HelpGenVisitor::VisitOperation( spOperation& op )
         m_classname.c_str(), funcname.c_str(),
         MakeLabel(m_classname, funcname).c_str());
 
         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;
     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;
 }
 
     m_textFunc += func;
 }
 


@@ -1318,7 +1324,7 @@ void HelpGenVisitor::VisitParameter( spParameter& param )
     }
 
     m_textFunc << "\\param{" << param.m_Type << " }{" << param.GetName();
     }
 
     m_textFunc << "\\param{" << param.m_Type << " }{" << param.GetName();

-    wxString defvalue = param.mInitVal;
+    wxString defvalue = param.m_InitVal;

     if ( !defvalue.empty() ) {
         m_textFunc << " = " << defvalue;
     }
     if ( !defvalue.empty() ) {
         m_textFunc << " = " << defvalue;
     }


@@ -1390,7 +1396,7 @@ wxString DocManager::ExtractStringBetweenBraces(const char **pp)
 
     if ( !SkipSpaceUntil(pp, '{') ) {
         wxLogWarning("file %s(%d): '{' expected after '\\param'",
 
     if ( !SkipSpaceUntil(pp, '{') ) {
         wxLogWarning("file %s(%d): '{' expected after '\\param'",

-                     m_filename.c_str(), m_line);
+                     m_filename.c_str(), (int)m_line);

 
     }
     else {
 
     }
     else {


@@ -1398,7 +1404,7 @@ wxString DocManager::ExtractStringBetweenBraces(const char **pp)
 
         if ( !SkipUntil(pp, '}') ) {
             wxLogWarning("file %s(%d): '}' expected after '\\param'",
 
         if ( !SkipUntil(pp, '}') ) {
             wxLogWarning("file %s(%d): '}' expected after '\\param'",

-                         m_filename.c_str(), m_line);
+                         m_filename.c_str(), (int)m_line);

         }
         else {
             result = wxString(startParam, (*pp)++ - startParam);
         }
         else {
             result = wxString(startParam, (*pp)++ - startParam);


@@ -1496,7 +1502,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
         if ( !SkipSpaceUntil(&current, '{') ) {
             wxLogWarning("file %s(%d): '{' expected after \\func, "
                          "\\constfunc or \\membersection.",
         if ( !SkipSpaceUntil(&current, '{') ) {
             wxLogWarning("file %s(%d): '{' expected after \\func, "
                          "\\constfunc or \\membersection.",

-                         m_filename.c_str(), m_line);
+                         m_filename.c_str(), (int)m_line);

 
             continue;
         }
 
             continue;
         }


@@ -1508,7 +1514,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
             const char *startClass = current;
             if ( !SkipUntil(&current, ':') || *(current + 1) != ':' ) {
                 wxLogWarning("file %s(%d): '::' expected after "
             const char *startClass = current;
             if ( !SkipUntil(&current, ':') || *(current + 1) != ':' ) {
                 wxLogWarning("file %s(%d): '::' expected after "

-                             "\\membersection.", m_filename.c_str(), m_line);
+                             "\\membersection.", m_filename.c_str(), (int)m_line);

             }
             else {
                 classname = wxString(startClass, current - startClass);
             }
             else {
                 classname = wxString(startClass, current - startClass);


@@ -1523,7 +1529,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
 
         if ( !SkipUntil(&current, '}') ) {
             wxLogWarning("file %s(%d): '}' expected after return type",
 
         if ( !SkipUntil(&current, '}') ) {
             wxLogWarning("file %s(%d): '}' expected after return type",

-                         m_filename.c_str(), m_line);
+                         m_filename.c_str(), (int)m_line);

 
             continue;
         }
 
             continue;
         }


@@ -1534,7 +1540,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
         current++;
         if ( !SkipSpaceUntil(&current, '{') ) {
             wxLogWarning("file %s(%d): '{' expected after return type",
         current++;
         if ( !SkipSpaceUntil(&current, '{') ) {
             wxLogWarning("file %s(%d): '{' expected after return type",

-                         m_filename.c_str(), m_line);
+                         m_filename.c_str(), (int)m_line);

 
             continue;
         }
 
             continue;
         }


@@ -1543,7 +1549,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
         const char *funcEnd = current;
         if ( !SkipUntil(&funcEnd, '}') ) {
             wxLogWarning("file %s(%d): '}' expected after function name",
         const char *funcEnd = current;
         if ( !SkipUntil(&funcEnd, '}') ) {
             wxLogWarning("file %s(%d): '}' expected after function name",

-                         m_filename.c_str(), m_line);
+                         m_filename.c_str(), (int)m_line);

 
             continue;
         }
 
             continue;
         }


@@ -1572,7 +1578,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
             size_t len = strlen("\\destruct{");
             if ( funcName(0, len) != "\\destruct{" ) {
                 wxLogWarning("file %s(%d): \\destruct expected",
             size_t len = strlen("\\destruct{");
             if ( funcName(0, len) != "\\destruct{" ) {
                 wxLogWarning("file %s(%d): \\destruct expected",

-                             m_filename.c_str(), m_line);
+                             m_filename.c_str(), (int)m_line);

 
                 continue;
             }
 
                 continue;
             }


@@ -1582,7 +1588,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
 
             if ( !SkipSpaceUntil(&current, '}') ) {
                 wxLogWarning("file %s(%d): '}' expected after destructor",
 
             if ( !SkipSpaceUntil(&current, '}') ) {
                 wxLogWarning("file %s(%d): '}' expected after destructor",

-                             m_filename.c_str(), m_line);
+                             m_filename.c_str(), (int)m_line);

 
                 continue;
             }
 
                 continue;
             }


@@ -1597,7 +1603,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
         if ( !SkipSpaceUntil(&current, '{') ||
              (current++, !SkipSpaceUntil(&current, '\\')) ) {
             wxLogWarning("file %s(%d): '\\param' or '\\void' expected",
         if ( !SkipSpaceUntil(&current, '{') ||
              (current++, !SkipSpaceUntil(&current, '\\')) ) {
             wxLogWarning("file %s(%d): '\\param' or '\\void' expected",

-                         m_filename.c_str(), m_line);
+                         m_filename.c_str(), (int)m_line);

 
             continue;
         }
 
             continue;
         }


@@ -1654,7 +1660,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
                 }
                 else {
                     wxLogWarning("file %s(%d): ',' or '}' expected after "
                 }
                 else {
                     wxLogWarning("file %s(%d): ',' or '}' expected after "

-                                 "'\\param'", m_filename.c_str(), m_line);
+                                 "'\\param'", m_filename.c_str(), (int)m_line);

 
                     continue;
                 }
 
                     continue;
                 }


@@ -1663,7 +1669,7 @@ bool DocManager::ParseTeXFile(const wxString& filename)
             // if we got here there was no '\\void', so must have some params
             if ( paramNames.IsEmpty() ) {
                 wxLogWarning("file %s(%d): '\\param' or '\\void' expected",
             // if we got here there was no '\\void', so must have some params
             if ( paramNames.IsEmpty() ) {
                 wxLogWarning("file %s(%d): '\\param' or '\\void' expected",

-                        m_filename.c_str(), m_line);
+                        m_filename.c_str(), (int)m_line);

 
                 continue;
             }
 
                 continue;
             }


@@ -1680,13 +1686,18 @@ bool DocManager::ParseTeXFile(const wxString& filename)
             paramsAll << paramTypes[param] << ' ' << paramNames[param];
         }
 
             paramsAll << paramTypes[param] << ' ' << paramNames[param];
         }
 

+        wxString constStr;
+        if (foundCommand == ConstFunc)
+            constStr = _T(" const");
+

         wxLogVerbose("file %s(%d): found '%s %s::%s(%s)%s'",
         wxLogVerbose("file %s(%d): found '%s %s::%s(%s)%s'",

-                     m_filename.c_str(), m_line,
+                     m_filename.c_str(),
+                     (int)m_line,

                      returnType.c_str(),
                      classname.c_str(),
                      funcName.c_str(),
                      paramsAll.c_str(),
                      returnType.c_str(),
                      classname.c_str(),
                      funcName.c_str(),
                      paramsAll.c_str(),

-                     foundCommand == ConstFunc ? " const" : "");
+                     constStr.c_str());

 
         // store the info about the just found function
         ArrayMethodInfo *methods;
 
         // store the info about the just found function
         ArrayMethodInfo *methods;


@@ -1824,21 +1835,29 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const
                 const MethodInfo& method = *(methods[index]);
 
                 bool isVirtual = ctxMethod->mIsVirtual;
                 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(),
                     wxLogWarning("'%s::%s' is incorrectly documented as %s"
                                  "virtual.",
                                  nameClass.c_str(),
                                  nameMethod.c_str(),

-                                 isVirtual ? "not " : "");
+                                 virtualStr.c_str());

                 }
 
                 bool isConst = ctxMethod->mIsConstant;
                 }
 
                 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(),
                     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
                 }
 
                 // check that the params match


@@ -1849,7 +1868,7 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const
                                "in the docs: should be %d instead of %d.",
                                nameClass.c_str(),
                                nameMethod.c_str(),
                                "in the docs: should be %d instead of %d.",
                                nameClass.c_str(),
                                nameMethod.c_str(),

-                               params.size(), method.GetParamCount());
+                               (int)params.size(), (int)method.GetParamCount());

                 }
                 else {
                     size_t nParam = 0;
                 }
                 else {
                     size_t nParam = 0;


@@ -1869,7 +1888,7 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const
 
                             wxLogError("Parameter #%d of '%s::%s' should be "
                                        "'%s' and not '%s'.",
 
                             wxLogError("Parameter #%d of '%s::%s' should be "
                                        "'%s' and not '%s'.",

-                                       nParam + 1,
+                                       (int)(nParam + 1),

                                        nameClass.c_str(),
                                        nameMethod.c_str(),
                                        ctxParam->m_Name.c_str(),
                                        nameClass.c_str(),
                                        nameMethod.c_str(),
                                        ctxParam->m_Name.c_str(),


@@ -1892,14 +1911,14 @@ bool DocManager::DumpDifferences(spContext *ctxTop) const
                             continue;
                         }
 
                             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(),
                             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());
                         }
                     }
                                          param.GetDefValue().c_str());
                         }
                     }


@@ -2017,7 +2036,7 @@ bool IgnoreNamesHandler::AddNamesFromFile(const wxString& filename)
                 }
                 else {
                     // entire class
                 }
                 else {
                     // entire class

-                    m_ignore.Add(new IgnoreListEntry(line, ""));
+                    m_ignore.Add(new IgnoreListEntry(line, wxEmptyString));

                 }
             }
             //else: comment
                 }
             }
             //else: comment


@@ -2192,6 +2211,24 @@ static const wxString GetVersionString()
 
 /*
    $Log$
 
 /*
    $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).
+
+   Revision 1.40  2005/05/30 11:49:32  ABX
+   More warning and error fixes (work in progress with Tinderbox).
+
+   Revision 1.39  2005/05/30 09:26:42  ABX
+   More warning and error fixes (work in progress with Tinderbox).
+

    Revision 1.38  2005/05/24 09:06:20  ABX
    More fixes and wxWidgets coding standards.
 
    Revision 1.38  2005/05/24 09:06:20  ABX
    More fixes and wxWidgets coding standards.