Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11908/python
Modified Files:
char.cpp item.cpp
Log Message:
Linux compile fixes
Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** char.cpp 28 Jan 2004 02:18:14 -0000 1.117
--- char.cpp 28 Jan 2004 20:08:41 -0000 1.118
***************
*** 685,689 ****
self->pChar->setTag(key, cVariant(PyString_AsString(object)));
} else if (PyUnicode_Check(object)) {
! self->pChar->setTag(key, cVariant(QString::fromUcs2(PyUnicode_AsUnicode(object))));
} else if (PyInt_Check(object)) {
self->pChar->setTag(key, cVariant((int)PyInt_AsLong(object)));
--- 685,689 ----
self->pChar->setTag(key, cVariant(PyString_AsString(object)));
} else if (PyUnicode_Check(object)) {
! self->pChar->setTag(key, cVariant(QString::fromUcs2((ushort*)PyUnicode_AsUnicode(object))));
} else if (PyInt_Check(object)) {
self->pChar->setTag(key, cVariant((int)PyInt_AsLong(object)));
***************
*** 1960,1964 ****
val = cVariant( PyString_AsString( value ) );
else if( PyUnicode_Check( value ) )
! val = cVariant(QString::fromUcs2(PyUnicode_AsUnicode(value)));
else if( PyInt_Check( value ) )
val = cVariant( PyInt_AsLong( value ) );
--- 1960,1964 ----
val = cVariant( PyString_AsString( value ) );
else if( PyUnicode_Check( value ) )
! val = cVariant(QString::fromUcs2((ushort*)PyUnicode_AsUnicode(value)));
else if( PyInt_Check( value ) )
val = cVariant( PyInt_AsLong( value ) );
Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -C2 -d -r1.81 -r1.82
*** item.cpp 28 Jan 2004 02:12:20 -0000 1.81
--- item.cpp 28 Jan 2004 20:08:41 -0000 1.82
***************
*** 378,382 ****
self->pItem->setTag(key, cVariant(PyString_AsString(object)));
} else if (PyUnicode_Check(object)) {
! self->pItem->setTag(key, cVariant(QString::fromUcs2(PyUnicode_AsUnicode(object))));
} else if (PyInt_Check(object)) {
self->pItem->setTag(key, cVariant((int)PyInt_AsLong(object)));
--- 378,382 ----
self->pItem->setTag(key, cVariant(PyString_AsString(object)));
} else if (PyUnicode_Check(object)) {
! self->pItem->setTag(key, cVariant(QString::fromUcs2((ushort*)PyUnicode_AsUnicode(object))));
} else if (PyInt_Check(object)) {
self->pItem->setTag(key, cVariant((int)PyInt_AsLong(object)));
***************
*** 813,817 ****
val = cVariant( PyString_AsString( value ) );
else if( PyUnicode_Check( value ) )
! val = cVariant(QString::fromUcs2(PyUnicode_AsUnicode(value)));
else if( PyInt_Check( value ) )
val = cVariant( PyInt_AsLong( value ) );
--- 813,817 ----
val = cVariant( PyString_AsString( value ) );
else if( PyUnicode_Check( value ) )
! val = cVariant(QString::fromUcs2((ushort*)PyUnicode_AsUnicode(value)));
else if( PyInt_Check( value ) )
val = cVariant( PyInt_AsLong( value ) );
|
