Fixes: make sure that function parameters are not hidden

Task:     http://code.google.com/p/qtscriptgenerator/issues/detail?id=21

3 files changed, 23 insertions, 23 deletions

diff --git a/generator/abstractmetabuilder.cpp b/generator/abstractmetabuilder.cpp
index 03aa5d7..e2ea460 100644
--- a/generator/abstractmetabuilder.cpp
+++ b/generator/abstractmetabuilder.cpp
@@ -1633,9 +1633,9 @@ AbstractMetaType *AbstractMetaBuilder::translateType(const TypeInfo &_typei, boo
     //    type system
     TypeInfo typei;
     if (resolveType) {
-        bool ok;
-        AbstractMetaType *t = translateType(_typei, &ok, false, resolveScope);
-        if (t != 0 && ok)
+        bool isok;
+        AbstractMetaType *t = translateType(_typei, &isok, false, resolveScope);
+        if (t != 0 && isok)
             return t;
     }
 
@@ -1690,10 +1690,10 @@ AbstractMetaType *AbstractMetaBuilder::translateType(const TypeInfo &_typei, boo
 
             for (int i=typeInfo.arrays.size()-1; i>=0; --i) {
                 QString s = typeInfo.arrays.at(i);
-                bool ok;
+                bool isok;
 
-                int elems = s.toInt(&ok);
-                if (!ok)
+                int elems = s.toInt(&isok);
+                if (!isok)
                     return 0;
 
                 AbstractMetaType *arrayType = createMetaType();
@@ -1764,10 +1764,10 @@ AbstractMetaType *AbstractMetaBuilder::translateType(const TypeInfo &_typei, boo
         while (!contexts.isEmpty() && type == 0) {
             //type = TypeDatabase::instance()->findType(contexts.at(0) + "::" + qualified_name);
 
-            bool ok;
+            bool isok;
             info.setQualifiedName(QStringList() << contexts.at(0) << qualified_name);
-            AbstractMetaType *t = translateType(info, &ok, true, false);
-            if (t != 0 && ok)
+            AbstractMetaType *t = translateType(info, &isok, true, false);
+            if (t != 0 && isok)
                 return t;
 
             ClassModelItem item = m_dom->findClass(contexts.at(0));
diff --git a/generator/asttoxml.cpp b/generator/asttoxml.cpp
index f972b81..c4b00c3 100644
--- a/generator/asttoxml.cpp
+++ b/generator/asttoxml.cpp
@@ -82,18 +82,18 @@ void writeOutNamespace(QXmlStreamWriter &s, NamespaceModelItem &item) {
     s.writeAttribute("name", item->name());
 
     QHash<QString, NamespaceModelItem> namespaceMap = item->namespaceMap();
-    foreach (NamespaceModelItem item, namespaceMap.values()) {
-        writeOutNamespace(s, item);
+    foreach (NamespaceModelItem namespaceItem, namespaceMap.values()) {
+        writeOutNamespace(s, namespaceItem);
     }
 
     QHash<QString, ClassModelItem> typeMap = item->classMap();
-    foreach (ClassModelItem item, typeMap.values()) {
-        writeOutClass(s, item);
+    foreach (ClassModelItem classItem, typeMap.values()) {
+        writeOutClass(s, classItem);
     }
 
     QHash<QString, EnumModelItem> enumMap = item->enumMap();
-    foreach (EnumModelItem item, enumMap.values()) {
-        writeOutEnum(s, item);
+    foreach (EnumModelItem enumItem, enumMap.values()) {
+        writeOutEnum(s, enumItem);
     }
 
     s.writeEndElement();
@@ -136,18 +136,18 @@ void writeOutClass(QXmlStreamWriter &s, ClassModelItem &item) {
     s.writeAttribute("name", qualified_name);
 
     QHash<QString, EnumModelItem> enumMap = item->enumMap();
-    foreach (EnumModelItem item, enumMap.values()) {
-        writeOutEnum(s, item);
+    foreach (EnumModelItem enumItem, enumMap.values()) {
+        writeOutEnum(s, enumItem);
     }
 
     QHash<QString, FunctionModelItem> functionMap = item->functionMap();
-    foreach (FunctionModelItem item, functionMap.values()) {
-        writeOutFunction(s, item);
+    foreach (FunctionModelItem funcItem, functionMap.values()) {
+        writeOutFunction(s, funcItem);
     }
 
     QHash<QString, ClassModelItem> typeMap = item->classMap();
-    foreach (ClassModelItem item, typeMap.values()) {
-        writeOutClass(s, item);
+    foreach (ClassModelItem classItem, typeMap.values()) {
+        writeOutClass(s, classItem);
     }
     s.writeEndElement();
 }
diff --git a/generator/typesystem.cpp b/generator/typesystem.cpp
index dcbdcbf..ec96d96 100644
--- a/generator/typesystem.cpp
+++ b/generator/typesystem.cpp
@@ -550,9 +550,9 @@ bool Handler::startElement(const QString &, const QString &n,
                 ftype->setOriginator(m_current_enum);
                 ftype->setOriginalName(attributes["flags"]);
                 ftype->setCodeGeneration(m_generate);
-                QString n = ftype->originalName();
+                QString origname = ftype->originalName();
 
-                QStringList lst = n.split("::");
+                QStringList lst = origname.split("::");
                 if (QStringList(lst.mid(0, lst.size() - 1)).join("::") != m_current_enum->javaQualifier()) {
                     ReportHandler::warning(QString("enum %1 and flags %2 differ in qualifiers")
                                            .arg(m_current_enum->javaQualifier())