[wpdev-commits] wolfpack dbdriver.cpp,1.45,1.46 guilds.cpp,1.23,1.24

[Sebastian H. <dar...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9345

Modified Files:
	dbdriver.cpp guilds.cpp 
Log Message:
UCS4 fixes

Index: dbdriver.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** dbdriver.cpp	22 Aug 2004 02:29:50 -0000	1.45
--- dbdriver.cpp	30 Sep 2004 19:58:51 -0000	1.46
***************
*** 264,268 ****
  	QString value = self->result->getString( pos );
  
! 	return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.ucs2(), value.length() );
  }
  
--- 264,268 ----
  	QString value = self->result->getString( pos );
  
! 	return QString2Python(value);
  }
  

Index: guilds.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/guilds.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** guilds.cpp	22 Aug 2004 02:29:50 -0000	1.23
--- guilds.cpp	30 Sep 2004 19:58:51 -0000	1.24
***************
*** 571,583 ****
  	PyDict_SetItemString( result, "showsign", PyInt_FromLong( info->showSign() ? 1 : 0 ) );
  	PyDict_SetItemString( result, "joined", PyInt_FromLong( info->joined() ) );
! 
! 	if ( info->guildTitle().isNull() )
! 	{
! 		PyDict_SetItemString( result, "guildtitle", PyUnicode_FromWideChar( L"", 0 ) );
! 	}
! 	else
! 	{
! 		PyDict_SetItemString( result, "guildtitle", PyUnicode_FromUnicode( ( Py_UNICODE * ) info->guildTitle().ucs2(), info->guildTitle().length() ) );
! 	}
  
  	return result;
--- 571,575 ----
  	PyDict_SetItemString( result, "showsign", PyInt_FromLong( info->showSign() ? 1 : 0 ) );
  	PyDict_SetItemString( result, "joined", PyInt_FromLong( info->joined() ) );
! 	PyDict_SetItemString( result, "guildtitle", QString2Python(info->guildTitle()) );
  
  	return result;
***************
*** 663,674 ****
  	{
  		const QString& value = self->guild->name();
! 		if ( value == QString::null )
! 		{
! 			return PyUnicode_FromWideChar( L"", 0 );
! 		}
! 		else
! 		{
! 			return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.ucs2(), value.length() );
! 		}
  	}
  	/*
--- 655,659 ----
  	{
  		const QString& value = self->guild->name();
! 		return QString2Python(value);
  	}
  	/*
***************
*** 678,689 ****
  	{
  		const QString& value = self->guild->abbreviation();
! 		if ( value == QString::null )
! 		{
! 			return PyUnicode_FromWideChar( L"", 0 );
! 		}
! 		else
! 		{
! 			return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.ucs2(), value.length() );
! 		}
  	}
  	/*
--- 663,667 ----
  	{
  		const QString& value = self->guild->abbreviation();
! 		return QString2Python(value);
  	}
  	/*
***************
*** 693,704 ****
  	{
  		const QString& value = self->guild->charta();
! 		if ( value == QString::null )
! 		{
! 			return PyUnicode_FromWideChar( L"", 0 );
! 		}
! 		else
! 		{
! 			return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.ucs2(), value.length() );
! 		}
  	}
  	/*
--- 671,675 ----
  	{
  		const QString& value = self->guild->charta();
! 		return QString2Python(value);
  	}
  	/*
***************
*** 708,719 ****
  	{
  		const QString& value = self->guild->website();
! 		if ( value == QString::null )
! 		{
! 			return PyUnicode_FromWideChar( L"", 0 );
! 		}
! 		else
! 		{
! 			return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.ucs2(), value.length() );
! 		}
  	}
  	/*
--- 679,683 ----
  	{
  		const QString& value = self->guild->website();
! 		return QString2Python(value);
  	}
  	/*