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

fix VC6 broken for variable scope handling

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56721 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-11-09 16:49:52 +00:00
parent a44f3b5a89
commit 0a1bce698f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -434,6 +434,7 @@ bool IfaceCheckApp::StringContainsMethodName(const wxString& str, const wxMethod
bool IfaceCheckApp::FixMethod(const wxString& header, const wxMethod* iface, const wxMethod* api) bool IfaceCheckApp::FixMethod(const wxString& header, const wxMethod* iface, const wxMethod* api)
{ {
unsigned int i,j;
wxASSERT(iface && api); wxASSERT(iface && api);
wxTextFile file; wxTextFile file;
@@ -521,7 +522,7 @@ bool IfaceCheckApp::FixMethod(const wxString& header, const wxMethod* iface, con
const wxArgumentTypeArray& realargs = api->GetArgumentTypes(); const wxArgumentTypeArray& realargs = api->GetArgumentTypes();
if (realargs.GetCount() == doxygenargs.GetCount()) 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]) if (doxygenargs[j]==realargs[j])
{ {
realargs[j].SetArgumentName(doxygenargs[j].GetArgumentName()); realargs[j].SetArgumentName(doxygenargs[j].GetArgumentName());
@@ -543,7 +544,7 @@ bool IfaceCheckApp::FixMethod(const wxString& header, const wxMethod* iface, con
wxASSERT(nStartColumn != wxNOT_FOUND); wxASSERT(nStartColumn != wxNOT_FOUND);
// wrap lines too long at comma boundaries // 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(); size_t len = toinsert[i].Len();
if (len > WRAP_COLUMN) if (len > WRAP_COLUMN)
@@ -563,7 +564,7 @@ bool IfaceCheckApp::FixMethod(const wxString& header, const wxMethod* iface, con
} }
// insert the new lines // 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); file.InsertLine(toinsert[i], start+i);
// now save the modification // now save the modification
@@ -583,9 +584,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 // update the other method's locations for those methods which belong to the modified header
// and are placed _below_ the modified method // and are placed _below_ the modified method
wxClassPtrArray cToUpdate = m_doxyInterface.FindClassesDefinedIn(header); 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); wxMethod& m = cToUpdate[i]->GetMethod(j);
if (m.GetLocation() > iface->GetLocation()) if (m.GetLocation() > iface->GetLocation())