[Kde-bindings] KDE/kdebindings

[Thomas Moenicke]

SVN commit 878240 by moenicke:

* made it compiling on MacOS

CCMAIL: kde-bindings at kde.org



 M  +1 -0      cmake/modules/FindPHP5.cmake  
 M  +1 -0      php/phpqt/src/EmitSignal.h  
 M  +2 -1      php/phpqt/src/MethodReturnValueBase.h  
 M  +1 -2      php/phpqt/src/VirtualMethodReturnValue.cpp  
 M  +1 -1      php/phpqt/src/VirtualMethodReturnValue.h  
 M  +1 -0      php/phpqt/src/context.cpp  
 M  +0 -1      php/phpqt/src/context.h  
 M  +1 -1      php/phpqt/src/marshall.h  
 M  +0 -1      php/phpqt/src/marshall_types.h  
 M  +5 -4      php/phpqt/src/php_qt.cpp  
 M  +6 -4      php/phpqt/src/unittests.cpp  
 M  +1 -1      php/phpqt/src/unittests.h  
 M  +1 -1      php/phpqt/src/zend_extension.h  
 M  +3 -0      php/phpqt/src/zend_handlers.cpp  
 M  +1 -1      php/phpqt/src/zend_handlers.h  


--- trunk/KDE/kdebindings/cmake/modules/FindPHP5.cmake #878239:878240
@@ -57,6 +57,7 @@
     __estrdup
     __object_init_ex
     __zend_get_parameters_array_ex
+    __zend_get_parameters_array
     __zend_list_find
     __zval_copy_ctor
     _add_property_zval_ex
--- trunk/KDE/kdebindings/php/phpqt/src/EmitSignal.h #878239:878240
@@ -3,6 +3,7 @@
 
 #include "marshall.h"
 #include "zend.h"
+
 class MocArgument;
 class QObject;
 
--- trunk/KDE/kdebindings/php/phpqt/src/MethodReturnValueBase.h #878239:878240
@@ -1,9 +1,10 @@
 #ifndef METHODRETURNVALUEBASE_H_
 #define METHODRETURNVALUEBASE_H_
 
-#include "marshall.h"
+
 #include "smoke.h"
 #include "smokephp.h"
+#include "marshall.h"
 
 class MethodReturnValueBase : public Marshall
 {
--- trunk/KDE/kdebindings/php/phpqt/src/VirtualMethodReturnValue.cpp #878239:878240
@@ -1,5 +1,5 @@
-#include "VirtualMethodReturnValue.h"
 
+#include "VirtualMethodReturnValue.h"
 #include "marshall_types.h"
 
 VirtualMethodReturnValue::VirtualMethodReturnValue(
@@ -9,7 +9,6 @@
 	zval* retval
 ) : MethodReturnValueBase( smoke, methodIndex, stack, retval )
 {
-//	_retval = retval;
 	Marshall::HandlerFn fn = getMarshallFn(type());
 	(*fn)(this);
 }
--- trunk/KDE/kdebindings/php/phpqt/src/VirtualMethodReturnValue.h #878239:878240
@@ -2,7 +2,7 @@
 #define VIRTUALMETHODRETURNVALUE_H_
 
 #include "MethodReturnValueBase.h"
-#include "smoke.h"
+class Smoke;
 
 class VirtualMethodReturnValue : public MethodReturnValueBase
 {
--- trunk/KDE/kdebindings/php/phpqt/src/context.cpp #878239:878240
@@ -22,6 +22,7 @@
 
 #include "context.h"
 #include "zend.h"
+
 #include <QByteArray>
 
 Context* Context::m_Context = 0;
--- trunk/KDE/kdebindings/php/phpqt/src/context.h #878239:878240
@@ -4,7 +4,6 @@
 
 #include <QStack>
 class QByteArray;
-
 #include "zend.h"
 
 /*!
--- trunk/KDE/kdebindings/php/phpqt/src/marshall.h #878239:878240
@@ -3,7 +3,7 @@
 
 #include "smoke.h"
 #include <php.h>
-
+    
 class SmokeType;
 
 class Marshall {
--- trunk/KDE/kdebindings/php/phpqt/src/marshall_types.h #878239:878240
@@ -20,7 +20,6 @@
 #define MARSHALL_TYPES_H
 
 #include "marshall.h"
-#include <QList>
 
 class MocArgument;
 
--- trunk/KDE/kdebindings/php/phpqt/src/php_qt.cpp #878239:878240
@@ -25,6 +25,7 @@
 
 #include "php_qt.h"
 #include "zend_extension.h"
+#include "zend_API.h"
 #include "context.h"
 #include "smokephp.h"
 #include "phpqt_internals.h"
@@ -208,7 +209,7 @@
 	} // is object
 }
 
-ZEND_METHOD(php_qt_generic_class, __construct)
+extern "C" ZEND_METHOD(php_qt_generic_class, __construct)
 {
     Q_UNUSED(return_value_ptr);
     Q_UNUSED(return_value_used);
@@ -228,7 +229,7 @@
     // get arguments
     const int argc = ZEND_NUM_ARGS();
     zval **args = (zval **) safe_emalloc(argc, sizeof(zval*), 0);
-    if(zend_get_parameters_array(ht,argc, args) == FAILURE) {
+    if(_zend_get_parameters_array(ht,argc, args) == FAILURE) {
         efree(args);   WRONG_PARAM_COUNT;
     }
 
@@ -257,7 +258,7 @@
     return;
 }
 
-ZEND_METHOD(php_qt_generic_class, proxyMethod)
+extern "C" ZEND_METHOD(php_qt_generic_class, proxyMethod)
 {
     Q_UNUSED(return_value_used);
     Context::setCallType( Context::MethodCall );
@@ -285,7 +286,7 @@
     const int argc = ZEND_NUM_ARGS();
     zval **args = (zval**) safe_emalloc(argc, sizeof( zval* ), 0);
 
-    if(zend_get_parameters_array(ht, argc, args) == FAILURE){
+    if(_zend_get_parameters_array(ht, argc, args) == FAILURE){
         efree(args);
         WRONG_PARAM_COUNT;
     }
--- trunk/KDE/kdebindings/php/phpqt/src/unittests.cpp #878239:878240
@@ -1,14 +1,16 @@
 
-#include "smokephp.h"
-#include "phpqt_internals.h"
-#include "unittests.h"
-
 #include <QtTest/QtTest>
 #include <QPaintEvent>
 #include <QSlider>
 #include <iostream>
+
+#include "phpqt_internals.h"
+#include "unittests.h"
+
 #include <zend.h>
+#include "smokephp.h"
 
+
 extern Smoke* qt_Smoke;
 
 TestPHPQt::TestPHPQt( SmokeBinding* binding, zval* z )
--- trunk/KDE/kdebindings/php/phpqt/src/unittests.h #878239:878240
@@ -3,7 +3,7 @@
 
 #include <QObject>
 #include <zend.h>
-
+    
 class SmokeBinding;
 class Smoke;
 
--- trunk/KDE/kdebindings/php/phpqt/src/zend_extension.h #878239:878240
@@ -5,7 +5,7 @@
 #include <zend_interfaces.h>
 #include <php.h>
 #include <php_ini.h>
-
+    
 #define PHP_QT_FETCH()  \
 	getQtObjectFromZval(getThis()) \
 
--- trunk/KDE/kdebindings/php/phpqt/src/zend_handlers.cpp #878239:878240
@@ -22,12 +22,15 @@
  */
 
 #include <QString>
+
 #include "php_qt.h"
 #include "zend_handlers.h"
 #include "context.h"
 #include "phpqt_internals.h"
 #include "smokephp.h"
+extern "C" {
 #include "ext/standard/php_string.h"
+}
 
 #include <QByteArray>
 
--- trunk/KDE/kdebindings/php/phpqt/src/zend_handlers.h #878239:878240
@@ -25,7 +25,7 @@
 #define ZEND_HANDLERS_H
 
 #include <zend_interfaces.h>
-
+    
 // for opcode handler
 #define PHPQT_OPHANDLER_COUNT				((25 * 151) + 1)
 #define EX__(element) execute_data->element