summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2010-10-28 15:03:38 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2010-10-28 16:02:12 -0200
commit6b4655799df991b784979d9974680208a8766a8c (patch)
tree35dc768f34c3712a075910bd510d22fc620fc2f0
parent6de649a4f272bb98048602738af511d102cd5209 (diff)
downloadshiboken-6b4655799df991b784979d9974680208a8766a8c.tar.gz
shiboken-6b4655799df991b784979d9974680208a8766a8c.tar.xz
shiboken-6b4655799df991b784979d9974680208a8766a8c.zip
Uses CPP_SELF_VAR macro and replaces cpp_other by cppOther.
Reviewer: Renato Ara├║jo <renato.filho@openbossa.org> Marcelo Lira <marcelo.lira@openbossa.org>
-rw-r--r--generator/cppgenerator.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index 77c75187..f5043faf 100644
--- a/generator/cppgenerator.cpp
+++ b/generator/cppgenerator.cpp
@@ -2759,7 +2759,7 @@ void CppGenerator::writeRichCompareFunction(QTextStream& s, const AbstractMetaCl
s << '{' << endl;
QList<AbstractMetaFunctionList> cmpOverloads = filterGroupedOperatorFunctions(metaClass, AbstractMetaClass::ComparisonOp);
s << INDENT << "bool result = false;" << endl;
- s << INDENT << metaClass->qualifiedCppName() << "& cpp_self = *" << cpythonWrapperCPtr(metaClass) << ';' << endl;
+ s << INDENT << metaClass->qualifiedCppName() << "& " CPP_SELF_VAR " = *" << cpythonWrapperCPtr(metaClass) << ';' << endl;
s << endl;
s << INDENT << "switch (op) {" << endl;
@@ -2808,10 +2808,10 @@ void CppGenerator::writeRichCompareFunction(QTextStream& s, const AbstractMetaCl
s << INDENT << "// " << func->signature() << endl;
s << INDENT;
s << translateTypeForWrapperMethod(type, metaClass, ExcludeReference | ExcludeConst);
- s << " cpp_other = ";
+ s << " cppOther = ";
writeToCppConversion(s, type, metaClass, "other", ExcludeReference | ExcludeConst);
s << ';' << endl;
- s << INDENT << "result = (cpp_self " << op << " cpp_other);" << endl;
+ s << INDENT << "result = (" CPP_SELF_VAR " " << op << " cppOther);" << endl;
}
s << INDENT << '}';
}
@@ -2827,8 +2827,8 @@ void CppGenerator::writeRichCompareFunction(QTextStream& s, const AbstractMetaCl
s << "(other)) {" << endl;
{
Indentation indent(INDENT);
- writeArgumentConversion(s, &temporaryType, "cpp_other", "other", metaClass);
- s << INDENT << "result = (cpp_self " << op << " cpp_other);" << endl;
+ writeArgumentConversion(s, &temporaryType, "cppOther", "other", metaClass);
+ s << INDENT << "result = (" CPP_SELF_VAR " " << op << " cppOther);" << endl;
}
s << INDENT << '}';
}