diff options
| author | Thomas Berg <merlin66b@gmail.com> | 2010-03-21 07:35:56 +0100 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.lima@openbossa.org> | 2010-04-12 14:50:44 -0300 |
| commit | 9ca3e6148aafc852c72302a2d3401a2dff56abd2 (patch) | |
| tree | b9b2bbef1cd344d85e8bb2395f7788d72c47ff68 /PySide/QtCore | |
| parent | 7127770c641cbfa5b9d3b72276d949e300089707 (diff) | |
Use '&&' instead of 'and'.
The 'and' keyword is not supported by msvc.
Reviewer: Anderson Lizardo <anderson.lizardo@openbossa.org>
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'PySide/QtCore')
| -rw-r--r-- | PySide/QtCore/glue/qobject_connect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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(); |