renamed template variable %SELF to %PYSELF and %CPPOBJ to %CPPSELF

to improve code readability; also fixed usage of template variables
on type system for the test bindings

2 files changed, 5 insertions, 5 deletions

diff --git a/tests/samplebinding/simplefile_glue.cpp b/tests/samplebinding/simplefile_glue.cpp
index b055ce267..0e32acde7 100644
--- a/tests/samplebinding/simplefile_glue.cpp
+++ b/tests/samplebinding/simplefile_glue.cpp
@@ -1,7 +1,7 @@
 // native ending
-if (%0 == Py_False) {
+if (!%CPPSELF.open()) {
     PyObject* error_msg = PyString_FromFormat(
-            "Could not open file: \"%s\"", %CPPOBJ->filename());
+            "Could not open file: \"%s\"", %CPPSELF->filename());
     PyErr_SetObject(PyExc_IOError, error_msg);
     return 0;
 }
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index f932d7c23..6055f9c48 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -57,14 +57,14 @@
     <template name="boolptr_at_end_fix_beginning">
         bool __ok__;
         %0 = Shiboken::Converter&lt; %RETURN_TYPE &gt;::toPython(
-                %SELF.%TYPE::%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;__ok__)
+                %CPPSELF.%TYPE::%FUNCTION_NAME(%ARGUMENT_NAMES, &amp;__ok__)
             );
     </template>
 
     <template name="boolptr_at_start_fix_beginning">
         bool __ok__;
         %0 = Shiboken::Converter&lt; %RETURN_TYPE &gt;::toPython(
-                %SELF.%TYPE::%FUNCTION_NAME(&amp;__ok__, %ARGUMENT_NAMES)
+                %CPPSELF.%TYPE::%FUNCTION_NAME(&amp;__ok__, %ARGUMENT_NAMES)
             );
     </template>
 
@@ -85,7 +85,7 @@
             </modify-argument>
             <inject-code class="native" position="beginning">
                 %0 = Shiboken::Converter&lt; %RETURN_TYPE &gt;::toPython(
-                        %SELF.%TYPE::%FUNCTION_NAME(%1, true, %3, %4)
+                        %CPPSELF.%TYPE::%FUNCTION_NAME(%1, true, %3, %4)
                     );
             </inject-code>
         </modify-function>