From a35c7951659fb973460a9f96eea5c5ea63fea8fc Mon Sep 17 00:00:00 2001
From: Hugo Parente Lima <hugo.pl@gmail.com>
Date: Thu, 28 Oct 2010 15:00:59 -0200
Subject: Uses a constant to define the cpp_arg variable, now called cppArg.

---
 generator/cppgenerator.cpp      | 8 ++++----
 generator/shibokengenerator.cpp | 4 ++--
 generator/shibokengenerator.h   | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'generator')

diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index 32ee06d8d..77c751871 100644
--- a/generator/cppgenerator.cpp
+++ b/generator/cppgenerator.cpp
@@ -1738,7 +1738,7 @@ void CppGenerator::writeSingleFunctionCall(QTextStream& s, const OverloadData& o
             argType = buildAbstractMetaTypeFromString(typeReplaced);
 
         if (argType) {
-            QString argName = QString("cpp_arg%1").arg(i - removedArgs);
+            QString argName = QString(CPP_ARG"%1").arg(i - removedArgs);
             QString pyArgName = usePyArgs ? QString("pyargs[%1]").arg(i - removedArgs) : "arg";
             QString defaultValue = guessScopeForDefaultValue(func, arg);
 
@@ -1930,7 +1930,7 @@ void CppGenerator::writeMethodCall(QTextStream& s, const AbstractMetaFunction* f
                     if (hasConversionRule) {
                         argName = arg->name() + "_out";
                     } else {
-                        argName = QString("cpp_arg%1").arg(idx);
+                        argName = QString(CPP_ARG"%1").arg(idx);
                     }
                     userArgs << argName;
                 }
@@ -1980,7 +1980,7 @@ void CppGenerator::writeMethodCall(QTextStream& s, const AbstractMetaFunction* f
             }
         } else if (func->isOperatorOverload()) {
             QString firstArg("(*" CPP_SELF_VAR ")");
-            QString secondArg("cpp_arg0");
+            QString secondArg(CPP_ARG0);
             if (!func->isUnaryOperator() && shouldDereferenceArgumentPointer(func->arguments().first())) {
                 secondArg.prepend('(');
                 secondArg.append(')');
@@ -2005,7 +2005,7 @@ void CppGenerator::writeMethodCall(QTextStream& s, const AbstractMetaFunction* f
                 QString className = wrapperName(func->ownerClass());
                 mc << "new " << className << '(';
                 if (func->isCopyConstructor() && maxArgs == 1) {
-                    mc << "cpp_arg0";
+                    mc << CPP_ARG0;
                 } else {
                     mc << userArgs.join(", ");
                 }
diff --git a/generator/shibokengenerator.cpp b/generator/shibokengenerator.cpp
index aafa3c50c..b93009e5e 100644
--- a/generator/shibokengenerator.cpp
+++ b/generator/shibokengenerator.cpp
@@ -1208,7 +1208,7 @@ void ShibokenGenerator::writeCodeSnips(QTextStream& s,
                         if (arg->type()->typeEntry()->isCustom()) {
                             argReplacement = usePyArgs ? QString("pyargs[%1]").arg(i - removed) : "arg";
                         } else {
-                            argReplacement = QString("cpp_arg%1").arg(i - removed);
+                            argReplacement = QString(CPP_ARG"%1").arg(i - removed);
                         }
                     }
                 } else {
@@ -1233,7 +1233,7 @@ void ShibokenGenerator::writeCodeSnips(QTextStream& s,
                     if (lastArg && arg->argumentIndex() > lastArg->argumentIndex()) {
                         argName = arg->defaultValueExpression();
                     } else {
-                        argName = QString("cpp_arg%1").arg(arg->argumentIndex() - removed);
+                        argName = QString(CPP_ARG"%1").arg(arg->argumentIndex() - removed);
                     }
                     argumentNames << argName;
                 } else {
diff --git a/generator/shibokengenerator.h b/generator/shibokengenerator.h
index 1a7c5a63f..7695d1120 100644
--- a/generator/shibokengenerator.h
+++ b/generator/shibokengenerator.h
@@ -28,6 +28,8 @@
 #define CPP_RETURN_VAR            "cppResult"
 #define THREAD_STATE_SAVER_VAR    "threadStateSaver"
 #define CPP_SELF_VAR              "cppSelf"
+#define CPP_ARG                   "cppArg"
+#define CPP_ARG0                  (CPP_ARG "0")
 
 #include <generator.h>
 #include <QtCore/QTextStream>
-- 
cgit v1.2.3