writes correct full qualified C++ names for classes and other components

and also fixes the generated source code file names to follow changes
on API Extractor

2 files changed, 3 insertions, 3 deletions

diff --git a/boostpythongenerator.cpp b/boostpythongenerator.cpp
index 70ce4a5ed..732ef3b65 100644
--- a/boostpythongenerator.cpp
+++ b/boostpythongenerator.cpp
@@ -99,9 +99,9 @@ QString BoostPythonGenerator::translateType(const AbstractMetaType *cType,
     return s;
 }
 
-QString BoostPythonGenerator::getWrapperName(const AbstractMetaClass* clazz)
+QString BoostPythonGenerator::getWrapperName(const AbstractMetaClass* metaClass)
 {
-    QString result = clazz->name().toLower();
+    QString result = metaClass->typeEntry()->qualifiedCppName().toLower();
     result.replace("::", "_");
     result += "_wrapper";
     return result;
diff --git a/cppgenerator.cpp b/cppgenerator.cpp
index ae1f625a8..d99815776 100644
--- a/cppgenerator.cpp
+++ b/cppgenerator.cpp
@@ -949,7 +949,7 @@ void CppGenerator::writeBoostDeclaration(QTextStream& s, const AbstractMetaClass
             s << INDENT << "python_cls."
               << strAccess
               << "(\"" << field->name() << "\", &"
-              << field->enclosingClass()->name() << "::" << field->name() << ");" << endl;
+              << field->enclosingClass()->typeEntry()->qualifiedCppName() << "::" << field->name() << ");" << endl;
         }
     }