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

Fix bug#320 - "OR'ing Qt alignments doesn't work; adding them does"

Browse source 
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
          Renato Araújo <renato.filho@openbossa.org>
This commit is contained in:
Hugo Parente Lima 2010-09-02 20:33:00 -03:00
commit 823eec81c2
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libpyside/pysideconversions.h
View file

@ -237,19 +237,24 @@ struct QFlagsConverter
|| PyObject_TypeCheck(pyObj, Shiboken::SbkType<typename T::enum_type>());
}
static inline PyObject* toPython(void* cppobj)
static inline PyObject* toPython(void* cppObj)
{
return toPython(*reinterpret_cast<T*>(cppobj));
return toPython(*reinterpret_cast<T*>(cppObj));
}
static inline PyObject* toPython(T cppenum)
static inline PyObject* toPython(const T& cppObj)
{
return Shiboken::SbkEnumObject_New(Shiboken::SbkType<T>(), (long) cppenum);
PyObject* qflags = Shiboken::SbkType<T>()->tp_alloc(Shiboken::SbkType<T>(), 0);
reinterpret_cast<PyIntObject*>(qflags)->ob_ival = cppObj;
return qflags;
}
static inline T toCpp(PyObject* pyobj)
static inline T toCpp(PyObject* pyObj)
{
return T(QFlag(reinterpret_cast<Shiboken::SbkEnumObject*>(pyobj)->ob_ival));
if (Shiboken::isShibokenEnum(pyObj))
return T(QFlag(reinterpret_cast<Shiboken::SbkEnumObject*>(pyObj)->ob_ival));
else
return T(QFlag(reinterpret_cast<PyIntObject*>(pyObj)->ob_ival));
}
};