GIT_REPOSITORIES/LPP/PythonQt Commit - r59:a2cbf55b6b26

256

257

void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& info, PyObject* obj, bool strict, PythonQtClassInfo* /*classInfo*/, void* alreadyAllocatedCPPObject)

257

void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& info, PyObject* obj, bool strict, PythonQtClassInfo* /*classInfo*/, void* alreadyAllocatedCPPObject)

258

{

258

{

259

bool ok;

259

bool ok = false;

260

void* ptr = NULL;

260

void* ptr = NULL;

261

if (PyObject_TypeCheck(obj, &PythonQtInstanceWrapper_Type) && info.typeId != PythonQtMethodInfo::Variant) {

261

if (PyObject_TypeCheck(obj, &PythonQtInstanceWrapper_Type) && info.typeId != PythonQtMethodInfo::Variant) {

262

// if we have a Qt wrapper object and if we do not need a QVariant, we do the following:

262

// if we have a Qt wrapper object and if we do not need a QVariant, we do the following:

264

265

// a C++ wrapper (can be passed as pointer or reference)

265

// a C++ wrapper (can be passed as pointer or reference)

266

PythonQtInstanceWrapper* wrap = (PythonQtInstanceWrapper*)obj;

266

PythonQtInstanceWrapper* wrap = (PythonQtInstanceWrapper*)obj;

267

bool ok;

268

void* object = castWrapperTo(wrap, info.name, ok);

267

void* object = castWrapperTo(wrap, info.name, ok);

269

if (ok) {

268

if (ok) {

270

if (info.isPointer) {

269

if (info.isPointer) {

460

// check for enum case

459

// check for enum case

461

if (info.enumWrapper) {

460

if (info.enumWrapper) {

462

unsigned int val;

461

unsigned int val;

462

ok = false;

463

if ((PyObject*)obj->ob_type == info.enumWrapper) {

463

if ((PyObject*)obj->ob_type == info.enumWrapper) {

464

// we have a exact enum type match:

464

// we have a exact enum type match:

465

val = PyInt_AS_LONG(obj);

465

val = PyInt_AS_LONG(obj);

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

              void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& info, PyObject* obj, bool strict, PythonQtClassInfo* /*classInfo*/, void* alreadyAllocatedCPPObject)
              {
-               bool ok;
+               bool ok = false;
                void* ptr = NULL;
                if (PyObject_TypeCheck(obj, &PythonQtInstanceWrapper_Type) && info.typeId != PythonQtMethodInfo::Variant) {
                  // if we have a Qt wrapper object and if we do not need a QVariant, we do the following:
                  // a C++ wrapper (can be passed as pointer or reference)
                  PythonQtInstanceWrapper* wrap = (PythonQtInstanceWrapper*)obj;
-                 bool ok;
                  void* object = castWrapperTo(wrap, info.name, ok);
                  if (ok) {
                    if (info.isPointer) {
                      // check for enum case
                      if (info.enumWrapper) {
                        unsigned int val;
+                       ok = false;
                        if ((PyObject*)obj->ob_type == info.enumWrapper) {
                          // we have a exact enum type match:
                          val = PyInt_AS_LONG(obj);