Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more intelligence to avoid false warnings

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56718 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-11-09 16:30:50 +00:00
parent 7f8fae980f
commit e2d1c0e72b
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
utils/ifacecheck/src/ifacecheck.cpp
View File

@@ -75,8 +75,9 @@ class IfaceCheckLog : public wxLog
public: public:
IfaceCheckLog() {} IfaceCheckLog() {}
void DoLog(wxLogLevel level, const wxString& msg, time_t stamp) void DoLog(wxLogLevel, const wxString& msg, time_t)
{ {
// send all messages to stdout (normal behaviour is to sent them to stderr)
wxPrintf(msg); wxPrintf(msg);
wxPrintf("\n"); wxPrintf("\n");
Flush(); Flush();

23
utils/ifacecheck/src/xmlparser.cpp
View File

@@ -82,7 +82,7 @@ void wxType::SetTypeFromString(const wxString& t)
m_strType.Replace(" ,", ","); m_strType.Replace(" ,", ",");
// ADHOC-FIX // ADHOC-FIX
m_strType.Replace("_wxArraywxArrayStringBase", "const wxString&"); m_strType.Replace("_wxArraywxArrayStringBase", "wxString");
m_strType = m_strType.Strip(wxString::both); m_strType = m_strType.Strip(wxString::both);
@@ -104,12 +104,12 @@ void wxType::SetTypeFromString(const wxString& t)
if (m_strTypeClean.EndsWith("Base")) if (m_strTypeClean.EndsWith("Base"))
m_strTypeClean = m_strTypeClean.Left(m_strTypeClean.Len()-4); m_strTypeClean = m_strTypeClean.Left(m_strTypeClean.Len()-4);
// remove the namespace from the types; there's no problem of conflicts
// (except for templates) and this avoids tons of false warnings
if (m_strTypeClean.Contains("::") && !m_strTypeClean.Contains("<"))
m_strTypeClean = m_strTypeClean.Mid(m_strTypeClean.Find("::")+2);
// ADHOC-FIX: // ADHOC-FIX:
// doxygen likes to put wxDateTime:: in front of all wxDateTime enums;
// fix this to avoid false positives
m_strTypeClean.Replace("wxDateTime::", "");
m_strTypeClean.Replace("wxStockGDI::", ""); // same story for some other classes
m_strTypeClean.Replace("wxHelpEvent::", "");
m_strTypeClean.Replace("wxWindowID", "int"); m_strTypeClean.Replace("wxWindowID", "int");
} }
@@ -174,6 +174,8 @@ void wxArgumentType::SetDefaultValue(const wxString& defval, const wxString& def
p->Replace("0x000000001", "1"); p->Replace("0x000000001", "1");
p->Replace("\\000\\000\\000", ""); // fix for unicode strings: p->Replace("\\000\\000\\000", ""); // fix for unicode strings:
p->Replace("\\011", "\\t"); p->Replace("\\011", "\\t");
p->Replace("e+0", "");
p->Replace("2147483647", "__INT_MAX__");
// ADHOC-FIX: for wxConv* default values // ADHOC-FIX: for wxConv* default values
p->Replace("wxConvAuto(wxFONTENCODING_DEFAULT)", "wxConvAuto()"); p->Replace("wxConvAuto(wxFONTENCODING_DEFAULT)", "wxConvAuto()");
@@ -211,6 +213,10 @@ bool wxArgumentType::operator==(const wxArgumentType& m) const
if ((const wxType&)(*this) != (const wxType&)m) if ((const wxType&)(*this) != (const wxType&)m)
return false; return false;
// check if the default values match
// ---------------------------------
// ADHOC-FIX: // ADHOC-FIX:
// default values for style attributes of wxWindow-derived classes in gccxml appear as raw // default values for style attributes of wxWindow-derived classes in gccxml appear as raw
// numbers; avoid false positives in this case! // numbers; avoid false positives in this case!
@@ -232,6 +238,11 @@ bool wxArgumentType::operator==(const wxArgumentType& m) const
return true; return true;
} }
} }
else if (m_strTypeClean == "float" || m_strTypeClean == "double")
// gccXML translates the default floating values in a hardly usable
// format; e.g. 25.2 => 2.51999999999999992894572642398998141288757324219e+1
// we avoid check on these...
return true;
if (m_strDefaultValueForCmp != m.m_strDefaultValueForCmp) if (m_strDefaultValueForCmp != m.m_strDefaultValueForCmp)
{ {