aboutsummaryrefslogtreecommitdiffstats
path: root/PySide/QtCore
diff options
context:
space:
mode:
authorrenatofilho <renato.filho@openbossa.org>2010-10-29 18:53:42 -0300
committerrenatofilho <renato.filho@openbossa.org>2010-11-03 10:29:31 -0300
commit4cd7a240d8db7de44b471a8ef0ed2f956addb743 (patch)
tree511ef8e13a689e73b788d6a1afc72578ccdbf9db /PySide/QtCore
parentc7945787c556d2e3e40a1b9ef93147c640ee8ff6 (diff)
Renamed qsignal, qslot, qproperty files to pyside*.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org> Lauro Neto <lauro.neto@openbossa.org>
Diffstat (limited to 'PySide/QtCore')
-rw-r--r--PySide/QtCore/glue/qobject_connect.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/PySide/QtCore/glue/qobject_connect.cpp b/PySide/QtCore/glue/qobject_connect.cpp
index b98a4114a..770265557 100644
--- a/PySide/QtCore/glue/qobject_connect.cpp
+++ b/PySide/QtCore/glue/qobject_connect.cpp
@@ -28,14 +28,14 @@ static bool qobjectConnect(QObject* source, const char* signal, QObject* receive
if (!signal || !slot)
return false;
- if (!PySide::checkSignal(signal))
+ if (!PySide::Signal::checkQtSignal(signal))
return false;
signal++;
if (!PySide::SignalManager::registerMetaMethod(source, signal, QMetaMethod::Signal))
return false;
- bool isSignal = PySide::isSignal(slot);
+ bool isSignal = PySide::Signal::isQtSignal(slot);
slot++;
PySide::SignalManager::registerMetaMethod(receiver, slot, isSignal ? QMetaMethod::Signal : QMetaMethod::Slot);
return QObject::connect(source, signal - 1, receiver, slot - 1, type);
@@ -43,7 +43,7 @@ static bool qobjectConnect(QObject* source, const char* signal, QObject* receive
static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject* callback, Qt::ConnectionType type)
{
- if (!signal || !PySide::checkSignal(signal))
+ if (!signal || !PySide::Signal::checkQtSignal(signal))
return false;
signal++;
@@ -62,7 +62,7 @@ static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject
return false;
const QMetaObject* metaObject = receiver->metaObject();
- const QByteArray callbackSig = PySide::getCallbackSignature(signal, receiver, callback, usingGlobalReceiver).toAscii();
+ const QByteArray callbackSig = PySide::Signal::getCallbackSignature(signal, receiver, callback, usingGlobalReceiver).toAscii();
const char* slot = callbackSig.constData();
int slotIndex = metaObject->indexOfSlot(slot);
if (slotIndex == -1) {
@@ -97,7 +97,7 @@ static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject
static bool qobjectDisconnectCallback(QObject* source, const char* signal, PyObject* callback)
{
- if (!PySide::checkSignal(signal))
+ if (!PySide::Signal::checkQtSignal(signal))
return false;
PySide::SignalManager& signalManager = PySide::SignalManager::instance();
@@ -110,7 +110,7 @@ static bool qobjectDisconnectCallback(QObject* source, const char* signal, PyObj
return false;
const QMetaObject* metaObject = receiver->metaObject();
- const QByteArray callbackSig = PySide::getCallbackSignature(signal, receiver, callback, usingGlobalReceiver).toAscii();
+ const QByteArray callbackSig = PySide::Signal::getCallbackSignature(signal, receiver, callback, usingGlobalReceiver).toAscii();
QByteArray qtSlotName(callbackSig);
qtSlotName = qtSlotName.prepend('1');