[Kde-bindings] KDE/kdebindings/php/phpqt/src

[Thomas Moenicke]

SVN commit 871590 by moenicke:

* no need anymore to set the active class entry in regular method calls
* remove ce from context stack after invoking the call

CCMAIL: kde-bindings at kde.org



 M  +7 -6      php_qt.cpp  


--- trunk/KDE/kdebindings/php/phpqt/src/php_qt.cpp #871589:871590
@@ -261,12 +261,11 @@
     Q_UNUSED(return_value_used);
     Context::setCallType( Context::MethodCall );
     zend_class_entry *ce;
-    // nonstaticphp_qt_generic_class_proxyMethod
-    if(getThis()){
-            ce = Z_OBJCE_P(getThis());
-            Context::setActiveCe( ce );
-    // static
-    } else ce = Context::activeCe();
+    
+    if( getThis() ) // nonstatic
+      ce = Z_OBJCE_P( getThis() );
+    else // static 
+      ce = Context::activeCe();
 
     // find parents
     while (PQ::smoke()->idClass(ce->name).index <= 0) {
@@ -344,6 +343,8 @@
     // cleanup
     efree(args);
     Context::removeMethodName();
+    if( !getThis() )
+      Context::removeActiveCe();
 
     return;
 } // proxyMethod