From 9ca3e6148aafc852c72302a2d3401a2dff56abd2 Mon Sep 17 00:00:00 2001 From: Thomas Berg Date: Sun, 21 Mar 2010 07:35:56 +0100 Subject: Use '&&' instead of 'and'. The 'and' keyword is not supported by msvc. Reviewer: Anderson Lizardo Reviewer: Luciano Wolf --- PySide/QtCore/glue/qobject_connect.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'PySide/QtCore/glue') diff --git a/PySide/QtCore/glue/qobject_connect.cpp b/PySide/QtCore/glue/qobject_connect.cpp index deeaa6a56..698b3c8dd 100644 --- a/PySide/QtCore/glue/qobject_connect.cpp +++ b/PySide/QtCore/glue/qobject_connect.cpp @@ -52,7 +52,7 @@ static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject QObject* receiver = 0; PyObject* self = 0; bool usingGlobalReceiver = getReceiver(callback, &receiver, &self); - if (receiver == 0 and self == 0) + if (receiver == 0 && self == 0) return false; const QMetaObject* metaObject = receiver->metaObject(); @@ -60,7 +60,7 @@ static bool qobjectConnectCallback(QObject* source, const char* signal, PyObject const char* slot = callbackSig.constData(); int slotIndex = metaObject->indexOfSlot(slot); 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++."; return false; } @@ -99,7 +99,7 @@ static bool qobjectDisconnectCallback(QObject* source, const char* signal, PyObj QObject* receiver = 0; PyObject* self = 0; bool usingGlobalReceiver = getReceiver(callback, &receiver, &self); - if (receiver == 0 and self == 0) + if (receiver == 0 && self == 0) return false; const QMetaObject* metaObject = receiver->metaObject(); -- cgit v1.2.3