jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use '&&' instead of 'and'.

Browse source 
The 'and' keyword is not supported by msvc.

Reviewer: Anderson Lizardo <anderson.lizardo@openbossa.org>
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
This commit is contained in:
Thomas Berg 2010-03-21 07:35:56 +01:00 • committed by Hugo Parente Lima
commit 9ca3e6148a
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
PySide/QtCore/glue/qobject_connect.cpp
View file

@ -52,7 +52,7 @@ static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject
QObject* receiver = 0; QObject* receiver = 0;
PyObject* self = 0; PyObject* self = 0;
bool usingGlobalReceiver = getReceiver(callback, &receiver, &self); bool usingGlobalReceiver = getReceiver(callback, &receiver, &self);
if (receiver == 0 and self == 0) if (receiver == 0 && self == 0)
return false; return false;
const QMetaObject* metaObject = receiver->metaObject(); const QMetaObject* metaObject = receiver->metaObject();
@ -60,7 +60,7 @@ static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject
const char* slot = callbackSig.constData(); const char* slot = callbackSig.constData();
int slotIndex = metaObject->indexOfSlot(slot); int slotIndex = metaObject->indexOfSlot(slot);
if (slotIndex == -1) { if (slotIndex == -1) {
if (!usingGlobalReceiver and self and !((SbkBaseWrapper*)self)->containsCppWrapper) { if (!usingGlobalReceiver && self && !((SbkBaseWrapper*)self)->containsCppWrapper) {
qWarning() << "You can't add dynamic slots on an object originated from C++."; qWarning() << "You can't add dynamic slots on an object originated from C++.";
return false; return false;
} }
@ -99,7 +99,7 @@ static bool qobjectDisconnectCallback(QObject* source, const char* signal, PyObj
QObject* receiver = 0; QObject* receiver = 0;
PyObject* self = 0; PyObject* self = 0;
bool usingGlobalReceiver = getReceiver(callback, &receiver, &self); bool usingGlobalReceiver = getReceiver(callback, &receiver, &self);
if (receiver == 0 and self == 0) if (receiver == 0 && self == 0)
return false; return false;
const QMetaObject* metaObject = receiver->metaObject(); const QMetaObject* metaObject = receiver->metaObject();