make libpyside compile

10 files changed, 20 insertions, 20 deletions

diff --git a/PySide/QtCore/glue/qobject_connect.cpp b/PySide/QtCore/glue/qobject_connect.cpp
index f7bb5faaf..184961ad5 100644
--- a/PySide/QtCore/glue/qobject_connect.cpp
+++ b/PySide/QtCore/glue/qobject_connect.cpp
@@ -30,7 +30,7 @@ static bool getReceiver(QObject *source, const char* signal, PyObject* callback,
 
     // Check if this callback is a overwrite of a non-virtual Qt slot.
     if (!usingGlobalReceiver && receiver && self) {
-        *callbackSig = PySide::Signal::getCallbackSignature(signal, *receiver, callback, usingGlobalReceiver).toAscii();
+        *callbackSig = PySide::Signal::getCallbackSignature(signal, *receiver, callback, usingGlobalReceiver).toUtf8();
         const QMetaObject* metaObject = (*receiver)->metaObject();
         int slotIndex = metaObject->indexOfSlot(callbackSig->constData());
         if (slotIndex != -1 && slotIndex < metaObject->methodOffset() && PyMethod_Check(callback))
@@ -40,7 +40,7 @@ static bool getReceiver(QObject *source, const char* signal, PyObject* callback,
     if (usingGlobalReceiver) {
         PySide::SignalManager& signalManager = PySide::SignalManager::instance();
         *receiver = signalManager.globalReceiver(source, callback);
-        *callbackSig = PySide::Signal::getCallbackSignature(signal, *receiver, callback, usingGlobalReceiver).toAscii();
+        *callbackSig = PySide::Signal::getCallbackSignature(signal, *receiver, callback, usingGlobalReceiver).toUtf8();
     }
 
     return usingGlobalReceiver;
diff --git a/libpyside/CMakeLists.txt b/libpyside/CMakeLists.txt
index 294d5c5d3..1594d1b72 100644
--- a/libpyside/CMakeLists.txt
+++ b/libpyside/CMakeLists.txt
@@ -23,12 +23,12 @@ set(libpyside_SRC
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${SHIBOKEN_INCLUDE_DIR}
                     ${SHIBOKEN_PYTHON_INCLUDE_DIR}
-                    ${QT_QTCORE_INCLUDE_DIR})
+                    ${Qt5Core_INCLUDE_DIRS})
 add_library(pyside SHARED ${libpyside_SRC})
 target_link_libraries(pyside
                       ${SHIBOKEN_PYTHON_LIBRARIES}
                       ${SHIBOKEN_LIBRARY}
-                      ${QT_QTCORE_LIBRARY})
+                      ${Qt5Core_LIBRARIES})
 
 set_target_properties(pyside PROPERTIES
                       VERSION ${BINDING_API_VERSION}
diff --git a/libpyside/dynamicqmetaobject.cpp b/libpyside/dynamicqmetaobject.cpp
index e88e3dfdf..19afa0638 100644
--- a/libpyside/dynamicqmetaobject.cpp
+++ b/libpyside/dynamicqmetaobject.cpp
@@ -313,7 +313,7 @@ DynamicQMetaObject::DynamicQMetaObject(const char* className, const QMetaObject*
 
 DynamicQMetaObject::~DynamicQMetaObject()
 {
-    free(const_cast<char*>(d.stringdata));
+    free(const_cast<QByteArrayData*>(d.stringdata));
     free(const_cast<uint*>(d.data));
     delete m_d;
 }
@@ -349,7 +349,7 @@ int DynamicQMetaObject::addMethod(QMetaMethod::MethodType mtype, const char* sig
 
 void DynamicQMetaObject::removeMethod(QMetaMethod::MethodType mtype, uint index)
 {
-    const char* methodSig = method(index).signature();
+    const char* methodSig = method(index).methodSignature();
     QList<MethodData>::iterator it = m_d->m_methods.begin();
     for (; it != m_d->m_methods.end(); ++it) {
         if ((it->signature() == methodSig) && (it->methodType() == mtype)){
@@ -657,13 +657,13 @@ void DynamicQMetaObject::DynamicQMetaObjectPrivate::updateMetaObject(QMetaObject
     }
 
     int newSize = (m_stringDataSize + str.count()) * sizeof(char);
-    char *stringdata = reinterpret_cast<char*>(realloc(const_cast<char*>(metaObj->d.stringdata), newSize));
+    QByteArrayData *stringdata = reinterpret_cast<QByteArrayData*>(realloc(const_cast<QByteArrayData*>(metaObj->d.stringdata), newSize));
     Q_ASSERT(stringdata);
 
     metaObj->d.stringdata = stringdata;
 
     stringdata += m_stringDataSize; //shift to the end of old position
-    std::copy(str.begin(), str.end(), stringdata);
+    std::copy(str.begin(), str.end(), reinterpret_cast<char*>(stringdata));
 
     m_stringDataSize = newSize;
     metaObj->d.data = data;
diff --git a/libpyside/globalreceiver.cpp b/libpyside/globalreceiver.cpp
index 24f46872d..5e735b83f 100644
--- a/libpyside/globalreceiver.cpp
+++ b/libpyside/globalreceiver.cpp
@@ -163,7 +163,7 @@ void DynamicSlotData::onCallbackDestroyed(void *data)
 
     //Disconnect all sources
     QMetaMethod m = self->m_parent->metaObject()->method(self->m_id);
-    QByteArray methodName = QByteArray::number(m.methodType()).append(m.signature());
+    QByteArray methodName = QByteArray::number(m.methodType()).append(m.methodSignature());
     QLinkedList<const QObject*> sources = self->m_refs;
     foreach(const QObject* src, sources)
         const_cast<QObject*>(src)->disconnect(self->m_parent, methodName);
@@ -265,7 +265,7 @@ int GlobalReceiver::qt_metacall(QMetaObject::Call call, int id, void** args)
     QMetaMethod slot = metaObject()->method(id);
     Q_ASSERT(slot.methodType() == QMetaMethod::Slot);
 
-    if (strcmp(slot.signature(), RECEIVER_DESTROYED_SLOT_NAME) == 0) {
+    if (strcmp(slot.methodSignature(), RECEIVER_DESTROYED_SLOT_NAME) == 0) {
         QObject *arg = *(QObject**)args[1];
 
         //avoid hash changes during the destruction
diff --git a/libpyside/globalreceiverv2.cpp b/libpyside/globalreceiverv2.cpp
index a0fd9acec..47fbc9f58 100644
--- a/libpyside/globalreceiverv2.cpp
+++ b/libpyside/globalreceiverv2.cpp
@@ -288,7 +288,7 @@ int GlobalReceiverV2::qt_metacall(QMetaObject::Call call, int id, void** args)
         m_refs.removeAll(obj); // remove all refs to this object
         decRef(); //remove the safe ref
     } else {
-        bool isShortCuit = (strstr(slot.signature(), "(") == 0);
+        bool isShortCuit = (strstr(slot.methodSignature(), "(") == 0);
         Shiboken::AutoDecRef callback(m_data->callback());
         SignalManager::callPythonMetaMethod(slot, args, callback, isShortCuit);
     }
diff --git a/libpyside/pyside.cpp b/libpyside/pyside.cpp
index 3d47b8691..b27cb7662 100644
--- a/libpyside/pyside.cpp
+++ b/libpyside/pyside.cpp
@@ -254,7 +254,7 @@ PyObject* getMetaDataFromQObject(QObject* cppSelf, PyObject* self, PyObject* nam
             QList<QMetaMethod> signalList;
             for(int i=0, i_max = metaObject->methodCount(); i < i_max; i++) {
                 QMetaMethod method = metaObject->method(i);
-                const char* methSig = method.signature();
+                const char* methSig = method.methodSignature();
                 bool methMacth = !std::strncmp(cname, methSig, cnameLen) && methSig[cnameLen] == '(';
                 if (methMacth) {
                     if (method.methodType() == QMetaMethod::Signal) {
diff --git a/libpyside/pysidemetafunction.cpp b/libpyside/pysidemetafunction.cpp
index 98ce9366c..470a002ce 100644
--- a/libpyside/pysidemetafunction.cpp
+++ b/libpyside/pysidemetafunction.cpp
@@ -146,7 +146,7 @@ bool call(QObject* self, int methodIndex, PyObject* args, PyObject** retVal)
     int numArgs = PySequence_Fast_GET_SIZE(sequence.object()) + 1;
 
     if (numArgs - 1 != argTypes.count()) {
-        PyErr_Format(PyExc_TypeError, "%s only accepts %d arguments, %d given!", method.signature(), argTypes.count(), numArgs);
+        PyErr_Format(PyExc_TypeError, "%s only accepts %d arguments, %d given!", method.methodSignature().data(), argTypes.count(), numArgs);
         return false;
     }
 
diff --git a/libpyside/pysidesignal.cpp b/libpyside/pysidesignal.cpp
index 40a18cd12..69f034cb4 100644
--- a/libpyside/pysidesignal.cpp
+++ b/libpyside/pysidesignal.cpp
@@ -705,11 +705,11 @@ PySideSignalInstance* newObjectFromMethod(PyObject* source, const QList<QMetaMet
         item->d = new PySideSignalInstancePrivate;
         PySideSignalInstancePrivate* selfPvt = item->d;
         selfPvt->source = source;
-        QByteArray cppName(m.signature());
+        QByteArray cppName(m.methodSignature());
         cppName = cppName.mid(0, cppName.indexOf('('));
         // separe SignalName
         selfPvt->signalName = strdup(cppName.data());
-        selfPvt->signature = strdup(m.signature());
+        selfPvt->signature = strdup(m.methodSignature());
         selfPvt->homonymousMethod = 0;
         selfPvt->next = 0;
     }
@@ -789,7 +789,7 @@ void registerSignals(SbkObjectType* pyObj, const QMetaObject* metaObject)
         QMetaMethod method = metaObject->method(i);
 
         if (method.methodType() == QMetaMethod::Signal) {
-            QByteArray methodName(method.signature());
+            QByteArray methodName(method.methodSignature());
             methodName.chop(methodName.size() - methodName.indexOf('('));
             signalsFound[methodName] << join(method.parameterTypes(), ",");
         }
@@ -894,8 +894,8 @@ QString getCallbackSignature(const char* signal, QObject* receiver, PyObject* ca
             prefix += '(';
             for (int i = 0; i < mo->methodCount(); i++) {
                 QMetaMethod me = mo->method(i);
-                if ((strncmp(me.signature(), prefix, prefix.size()) == 0) &&
-                    QMetaObject::checkConnectArgs(signal, me.signature())) {
+                if ((strncmp(me.methodSignature(), prefix, prefix.size()) == 0) &&
+                    QMetaObject::checkConnectArgs(signal, me.methodSignature())) {
                     numArgs = me.parameterTypes().size() + useSelf;
                     break;
                 }
diff --git a/libpyside/pysideslot.cpp b/libpyside/pysideslot.cpp
index 97aa60dbe..223d37ec9 100644
--- a/libpyside/pysideslot.cpp
+++ b/libpyside/pysideslot.cpp
@@ -154,7 +154,7 @@ PyObject* slotCall(PyObject* self, PyObject* args, PyObject* kw)
 
 
         QByteArray returnType = QMetaObject::normalizedType(data->resultType);
-        QByteArray signature = QString().sprintf("%s(%s)", data->slotName, data->args).toAscii();
+        QByteArray signature = QString().sprintf("%s(%s)", data->slotName, data->args).toUtf8();
         signature = returnType + " " + signature;
 
         if (!pySlotName)
diff --git a/libpyside/signalmanager.cpp b/libpyside/signalmanager.cpp
index ac1a00e7f..2fb148588 100644
--- a/libpyside/signalmanager.cpp
+++ b/libpyside/signalmanager.cpp
@@ -580,7 +580,7 @@ static int callMethod(QObject* object, int id, void** args)
     } else {
         Shiboken::GilState gil;
         PyObject* self = (PyObject*)Shiboken::BindingManager::instance().retrieveWrapper(object);
-        QByteArray methodName = method.signature();
+        QByteArray methodName = method.methodSignature();
         methodName = methodName.left(methodName.indexOf('('));
         Shiboken::AutoDecRef pyMethod(PyObject_GetAttrString(self, methodName));
         SignalManager::callPythonMetaMethod(method, args, pyMethod, false);