diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-06-23 17:56:48 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-06-25 16:29:32 -0300 |
| commit | 4ca6e3d79ac57419d0c89286964445a01f8c2278 (patch) | |
| tree | 5397bd4a59db6e69c068c69659cdd3bcbf66a5b9 | |
| parent | 9d11979a31f55f91086373764508faaaf15ad73c (diff) | |
Do not export init_CLASSNAME functions.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Renato Araújo <renato.filho@openbossa.org>
| -rw-r--r-- | cppgenerator.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/cppgenerator.cpp b/cppgenerator.cpp index 200615261..3623ccee5 100644 --- a/cppgenerator.cpp +++ b/cppgenerator.cpp @@ -215,9 +215,6 @@ void CppGenerator::generateClass(QTextStream &s, const AbstractMetaClass *metaCl #ifdef AVOID_PROTECTED_HACK } #endif - - s << endl << "// Target ---------------------------------------------------------" << endl; - s << endl; } Indentation indentation(INDENT); @@ -230,6 +227,8 @@ void CppGenerator::generateClass(QTextStream &s, const AbstractMetaClass *metaCl bool hasComparisonOperator = metaClass->hasComparisonOperatorOverload(); bool typeAsNumber = metaClass->hasArithmeticOperatorOverload() || metaClass->hasLogicalOperatorOverload() || metaClass->hasBitwiseOperatorOverload(); + s << endl << "// Target ---------------------------------------------------------" << endl << endl; + s << "extern \"C\" {" << endl; foreach (AbstractMetaFunctionList allOverloads, getFunctionGroups(metaClass).values()) { AbstractMetaFunctionList overloads; foreach (AbstractMetaFunction* func, allOverloads) { @@ -335,7 +334,8 @@ void CppGenerator::generateClass(QTextStream &s, const AbstractMetaClass *metaCl s << "};" << endl << endl; } - s << "extern \"C\"" << endl << '{' << endl << endl; + s << "} // extern \"C\"" << endl << endl; + if (!metaClass->typeEntry()->hashFunction().isEmpty()) writeHashFunction(s, metaClass); writeObjCopierFunction(s, metaClass); @@ -366,8 +366,6 @@ void CppGenerator::generateClass(QTextStream &s, const AbstractMetaClass *metaCl writeClassRegister(s, metaClass); - s << endl << "} // extern \"C\"" << endl << endl; - // class inject-code native/end if (!metaClass->typeEntry()->codeSnips().isEmpty()) { writeCodeSnips(s, metaClass->typeEntry()->codeSnips(), CodeSnip::End, TypeSystem::NativeCode, 0, 0, metaClass); @@ -3326,8 +3324,7 @@ void CppGenerator::finishGeneration() if (!shouldGenerate(cls)) continue; - s_classInitDecl << "extern \"C\" PyAPI_FUNC(void) init_" - << cls->qualifiedCppName().replace("::", "_") << "(PyObject* module);" << endl; + s_classInitDecl << "void init_" << cls->qualifiedCppName().replace("::", "_") << "(PyObject* module);" << endl; QString defineStr = "init_" + cls->qualifiedCppName().replace("::", "_"); |