added wxLog::IsLevelEnabled() helper; document it and a few related functions which...

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

diff --git a/utils/ifacecheck/src/ifacecheck.cpp b/utils/ifacecheck/src/ifacecheck.cpp
index df069501b26309bcfdfb01a21580e3dcc2009139..1ca155fc565b2b6f77978d6afc2a1b0dd452a714 100644 (file)
--- a/utils/ifacecheck/src/ifacecheck.cpp
+++ b/utils/ifacecheck/src/ifacecheck.cpp
@@ -75,12 +75,15 @@ class IfaceCheckLog : public wxLog
 public:
     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("\n");
         Flush();
     }
+
+    wxSUPPRESS_DOLOG_HIDE_WARNING()
 };
 
 class IfaceCheckApp : public wxAppConsole
@@ -153,16 +156,12 @@ int IfaceCheckApp::OnRun()
             // in any case set basic std preprocessor #defines:
             m_doxyInterface.AddPreprocessorValue("NULL", "0");
 
-            //g_bLogEnabled = false;
-
             // parse the two XML files which contain the real and the doxygen interfaces
             // for wxWidgets API:
             if (!m_gccInterface.Parse(parser.GetParam(0)) ||
                 !m_doxyInterface.Parse(parser.GetParam(1)))
                 return 1;
 
-//            g_bLogEnabled = true;
-
             if (parser.Found(DUMP_SWITCH))
             {
                 wxLogMessage("Dumping real API to '%s'...", API_DUMP_FILE);
@@ -393,7 +392,7 @@ int IfaceCheckApp::CompareClasses(const wxClass* iface, const wxClass* api)
                     for (unsigned int j=0; j<overloads.GetCount(); j++)
                         warning += "\n\treal header: " + overloads[j]->GetAsString(true, true, true, true);
 
-                    wxLogWarning(warning);
+                    wxLogWarning("%s", warning);
                     count++;
 
                     if (overloads.GetCount()>1)
@@ -433,6 +432,7 @@ bool IfaceCheckApp::StringContainsMethodName(const wxString& str, const wxMethod
 
 bool IfaceCheckApp::FixMethod(const wxString& header, const wxMethod* iface, const wxMethod* api)
 {
+    unsigned int i,j;
     wxASSERT(iface && api);
 
     wxTextFile file;
@@ -492,7 +492,7 @@ bool IfaceCheckApp::FixMethod(const wxString& header, const wxMethod* iface, con
     }
 
     // remove the old prototype
-    for (int i=start; i<=end; i++)
+    for (int k=start; k<=end; k++)
         file.RemoveLine(start);     // remove (end-start)-nth times the start-th line
 
 #define INDENTATION_STR  wxString("    ")
@@ -520,7 +520,7 @@ bool IfaceCheckApp::FixMethod(const wxString& header, const wxMethod* iface, con
     const wxArgumentTypeArray& realargs = api->GetArgumentTypes();
     if (realargs.GetCount() == doxygenargs.GetCount())
     {
-        for (unsigned int j=0; j<doxygenargs.GetCount(); j++)
+        for (j=0; j<doxygenargs.GetCount(); j++)
             if (doxygenargs[j]==realargs[j])
             {
                 realargs[j].SetArgumentName(doxygenargs[j].GetArgumentName());
@@ -542,7 +542,7 @@ bool IfaceCheckApp::FixMethod(const wxString& header, const wxMethod* iface, con
     wxASSERT(nStartColumn != wxNOT_FOUND);
 
     // wrap lines too long at comma boundaries
-    for (unsigned int i=0; i<toinsert.GetCount(); i++)
+    for (i=0; i<toinsert.GetCount(); i++)
     {
         size_t len = toinsert[i].Len();
         if (len > WRAP_COLUMN)
@@ -562,7 +562,7 @@ bool IfaceCheckApp::FixMethod(const wxString& header, const wxMethod* iface, con
     }
 
     // insert the new lines
-    for (unsigned int i=0; i<toinsert.GetCount(); i++)
+    for (i=0; i<toinsert.GetCount(); i++)
         file.InsertLine(toinsert[i], start+i);
 
     // now save the modification
@@ -582,9 +582,9 @@ bool IfaceCheckApp::FixMethod(const wxString& header, const wxMethod* iface, con
     // update the other method's locations for those methods which belong to the modified header
     // and are placed _below_ the modified method
     wxClassPtrArray cToUpdate = m_doxyInterface.FindClassesDefinedIn(header);
-    for (unsigned int i=0; i < cToUpdate.GetCount(); i++)
+    for (i=0; i < cToUpdate.GetCount(); i++)
     {
-        for (unsigned int j=0; j < cToUpdate[i]->GetMethodCount(); j++)
+        for (j=0; j < cToUpdate[i]->GetMethodCount(); j++)
         {
             wxMethod& m = cToUpdate[i]->GetMethod(j);
             if (m.GetLocation() > iface->GetLocation())