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

pysidesignal: trivial fixes

Browse source 
Fix typos and coding style

Signed-off-by: Paulo Alcantara <pcacjr@gmail.com>
Reviewed-by: Luciano Wolf <luciano.wolf@openbossa.org>
Reviewed-by: Hugo Parente Lima <hugo.pl@gmail.com>
This commit is contained in:
Paulo Alcantara 2011-12-08 17:41:27 +00:00 • committed by Hugo Parente Lima
commit 66f4ccbe5d
1 changed files with 61 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

22
libpyside/pysidesignal.cpp
View file

@ -19,6 +19,7 @@
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include <sbkpython.h> #include <sbkpython.h>
#include "pysidesignal.h" #include "pysidesignal.h"
#include "pysidesignal_p.h" #include "pysidesignal_p.h"
@ -31,8 +32,8 @@
#define SIGNAL_INSTANCE_NAME "SignalInstance" #define SIGNAL_INSTANCE_NAME "SignalInstance"
#define QT_SIGNAL_SENTINEL '2' #define QT_SIGNAL_SENTINEL '2'
namespace PySide {
namespace PySide { namespace Signal { namespace Signal {
//aux //aux
static char* buildSignature(const char*, const char*); static char* buildSignature(const char*, const char*);
static void appendSignature(PySideSignal*, char*); static void appendSignature(PySideSignal*, char*);
@ -377,7 +378,7 @@ PyObject* signalInstanceConnect(PyObject* self, PyObject* args, PyObject* kwds)
Py_XDECREF(result); Py_XDECREF(result);
} }
if (!PyErr_Occurred()) if (!PyErr_Occurred())
PyErr_Format(PyExc_RuntimeError, "Fail to connect signal %s.", source->d->signature); PyErr_Format(PyExc_RuntimeError, "Failed to connect signal %s.", source->d->signature);
return 0; return 0;
} }
@ -415,6 +416,7 @@ PyObject* signalInstanceGetItem(PyObject* self, PyObject* key)
} }
data = reinterpret_cast<PySideSignalInstance*>(data->d->next); data = reinterpret_cast<PySideSignalInstance*>(data->d->next);
} }
PyErr_Format(PyExc_IndexError, "Signature %s not found for signal: %s", sig, sigName); PyErr_Format(PyExc_IndexError, "Signature %s not found for signal: %s", sig, sigName);
free(sig); free(sig);
return 0; return 0;
@ -467,7 +469,7 @@ PyObject* signalInstanceDisconnect(PyObject* self, PyObject* args)
Py_DECREF(result); Py_DECREF(result);
} }
PyErr_Format(PyExc_RuntimeError, "Fail to disconnect signal %s.", source->d->signature); PyErr_Format(PyExc_RuntimeError, "Failed to disconnect signal %s.", source->d->signature);
return 0; return 0;
} }
@ -503,7 +505,6 @@ PyObject* signalInstanceCall(PyObject* self, PyObject* args, PyObject* kw)
return PyCFunction_Call(homonymousMethod, args, kw); return PyCFunction_Call(homonymousMethod, args, kw);
} }
static PyObject* metaSignalCheck(PyObject* klass, PyObject* args) static PyObject* metaSignalCheck(PyObject* klass, PyObject* args)
{ {
if (PyType_IsSubtype(args->ob_type, &PySideSignalInstanceType)) if (PyType_IsSubtype(args->ob_type, &PySideSignalInstanceType))
@ -514,7 +515,8 @@ static PyObject* metaSignalCheck(PyObject* klass, PyObject* args)
} // extern "C" } // extern "C"
namespace PySide { namespace Signal { namespace PySide {
namespace Signal {
void init(PyObject* module) void init(PyObject* module)
{ {
@ -681,7 +683,7 @@ bool connect(PyObject* source, const char* signal, PyObject* callback)
Shiboken::AutoDecRef pyArgs(PyTuple_Pack(3, source, pySignature.object(), callback)); Shiboken::AutoDecRef pyArgs(PyTuple_Pack(3, source, pySignature.object(), callback));
PyObject* result = PyObject_CallObject(pyMethod, pyArgs); PyObject* result = PyObject_CallObject(pyMethod, pyArgs);
if (result == Py_False) { if (result == Py_False) {
PyErr_Format(PyExc_RuntimeError, "Fail to connect signal %s, to python callable object.", signal); PyErr_Format(PyExc_RuntimeError, "Failed to connect signal %s, to python callable object.", signal);
Py_DECREF(result); Py_DECREF(result);
result = 0; result = 0;
} }
@ -809,12 +811,12 @@ void registerSignals(SbkObjectType* pyObj, const QMetaObject* metaObject)
SignalSigMap::mapped_type::const_iterator endJ = it.value().end(); SignalSigMap::mapped_type::const_iterator endJ = it.value().end();
for (; j != endJ; ++j) for (; j != endJ; ++j)
appendSignature(self, strdup(j->constData())); appendSignature(self, strdup(j->constData()));
_addSignalToWrapper(pyObj, it.key(), self); _addSignalToWrapper(pyObj, it.key(), self);
Py_DECREF((PyObject*) self); Py_DECREF((PyObject*) self);
} }
} }
PyObject* buildQtCompatible(const char* signature) PyObject* buildQtCompatible(const char* signature)
{ {
QByteArray ba; QByteArray ba;
@ -838,7 +840,6 @@ const char* getSignature(PySideSignalInstance* signal)
return signal->d->signature; return signal->d->signature;
} }
const char** getSignatures(PyObject* signal, int* size) const char** getSignatures(PyObject* signal, int* size)
{ {
PySideSignal* self = reinterpret_cast<PySideSignal*>(signal); PySideSignal* self = reinterpret_cast<PySideSignal*>(signal);
@ -955,9 +956,10 @@ QString codeCallbackName(PyObject* callback, const QString& funcName)
PyObject* self = PyMethod_GET_SELF(callback); PyObject* self = PyMethod_GET_SELF(callback);
PyObject* func = PyMethod_GET_FUNCTION(callback); PyObject* func = PyMethod_GET_FUNCTION(callback);
return funcName + QString::number(quint64(self), 16) + QString::number(quint64(func), 16); return funcName + QString::number(quint64(self), 16) + QString::number(quint64(func), 16);
} else } else {
return funcName + QString::number(quint64(callback), 16); return funcName + QString::number(quint64(callback), 16);
} }
}
} //namespace Signal } //namespace Signal
} //namespace PySide } //namespace PySide