[wpdev-commits] wolfpack/python char.cpp,1.106,1.107 item.cpp,1.75,1.76 multi.cpp,1.19,1.20 socket.cpp,1.43,1.44

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

Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1:/tmp/cvs-serv10621/python

Modified Files:
	char.cpp item.cpp multi.cpp socket.cpp 
Log Message:
Fixed a saving issue of uobject tags.

Index: char.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** char.cpp	23 Sep 2003 12:40:19 -0000	1.106
--- char.cpp	23 Sep 2003 23:55:25 -0000	1.107
***************
*** 643,647 ****
  
  	QString key = getArgStr( 0 );
! 	cVariant value = self->pChar->tags().get( key );
  
  	if( value.type() == cVariant::String )
--- 643,647 ----
  
  	QString key = getArgStr( 0 );
! 	cVariant value = self->pChar->getTag( key );
  
  	if( value.type() == cVariant::String )
***************
*** 672,687 ****
  	if( PyString_Check( object ) )
  	{
! 		self->pChar->tags().remove( key );
! 		self->pChar->tags().set( key, cVariant( PyString_AsString( object ) ) );
  	}
  	else if( PyInt_Check( object ) )
  	{
! 		self->pChar->tags().remove( key );
! 		self->pChar->tags().set( key, cVariant( (int)PyInt_AsLong( object ) ) );
  	}
  	else if( PyFloat_Check( object ) )
  	{
! 		self->pChar->tags().remove( key );
! 		self->pChar->tags().set( key, cVariant( (double)PyFloat_AsDouble( object ) ) );
  	}
  
--- 672,687 ----
  	if( PyString_Check( object ) )
  	{
! 		self->pChar->removeTag( key );
! 		self->pChar->setTag( key, cVariant( PyString_AsString( object ) ) );
  	}
  	else if( PyInt_Check( object ) )
  	{
! 		self->pChar->removeTag( key );
! 		self->pChar->setTag( key, cVariant( (int)PyInt_AsLong( object ) ) );
  	}
  	else if( PyFloat_Check( object ) )
  	{
! 		self->pChar->removeTag( key );
! 		self->pChar->setTag( key, cVariant( (double)PyFloat_AsDouble( object ) ) );
  	}
  
***************
*** 705,709 ****
  	QString key = getArgStr( 0 );
  	
! 	return self->pChar->tags().get( key ).isValid() ? PyTrue : PyFalse;
  }
  
--- 705,709 ----
  	QString key = getArgStr( 0 );
  	
! 	return self->pChar->getTag( key ).isValid() ? PyTrue : PyFalse;
  }
  
***************
*** 723,727 ****
  
  	QString key = getArgStr( 0 );
! 	self->pChar->tags().remove( key );
  
  	return PyTrue;
--- 723,727 ----
  
  	QString key = getArgStr( 0 );
! 	self->pChar->removeTag( key );
  
  	return PyTrue;

Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** item.cpp	23 Sep 2003 12:40:19 -0000	1.75
--- item.cpp	23 Sep 2003 23:55:25 -0000	1.76
***************
*** 343,347 ****
  
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! 	cVariant value = self->pItem->tags().get( key );
  
  	if( value.type() == cVariant::String )
--- 343,347 ----
  
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! 	cVariant value = self->pItem->getTag( key );
  
  	if( value.type() == cVariant::String )
***************
*** 377,386 ****
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
  
! 	self->pItem->tags().remove( key );
  
  	if( checkArgStr( 1 ) )
! 		self->pItem->tags().set( key, cVariant( QString( getArgStr( 1 ) ) ) );
  	else if( checkArgInt( 1 ) )
! 		self->pItem->tags().set( key, cVariant( (int)getArgInt( 1 ) ) );
  
  	return PyTrue;
--- 377,386 ----
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
  
! 	self->pItem->removeTag( key );
  
  	if( checkArgStr( 1 ) )
! 		self->pItem->setTag( key, cVariant( QString( getArgStr( 1 ) ) ) );
  	else if( checkArgInt( 1 ) )
! 		self->pItem->setTag( key, cVariant( (int)getArgInt( 1 ) ) );
  
  	return PyTrue;
***************
*** 403,407 ****
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
  	
! 	return self->pItem->tags().get( key ).isValid() ? PyTrue : PyFalse;
  }
  
--- 403,407 ----
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
  	
! 	return self->pItem->getTag( key ).isValid() ? PyTrue : PyFalse;
  }
  
***************
*** 421,425 ****
  
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! 	self->pItem->tags().remove( key );
  
  	return PyTrue;
--- 421,425 ----
  
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! 	self->pItem->removeTag( key );
  
  	return PyTrue;

Index: multi.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/multi.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** multi.cpp	23 Sep 2003 12:40:20 -0000	1.19
--- multi.cpp	23 Sep 2003 23:55:25 -0000	1.20
***************
*** 299,303 ****
  
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! 	cVariant value = self->pMulti->tags().get( key );
  
  	if( value.type() == cVariant::String )
--- 299,303 ----
  
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! 	cVariant value = self->pMulti->getTag( key );
  
  	if( value.type() == cVariant::String )
***************
*** 333,342 ****
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
  
! 	self->pMulti->tags().remove( key );
  
  	if( checkArgStr( 1 ) )
! 		self->pMulti->tags().set( key, cVariant( QString( getArgStr( 1 ) ) ) );
  	else if( checkArgInt( 1 ) )
! 		self->pMulti->tags().set( key, cVariant( (int)getArgInt( 1 ) ) );
  
  	return PyTrue;
--- 333,342 ----
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
  
! 	self->pMulti->removeTag( key );
  
  	if( checkArgStr( 1 ) )
! 		self->pMulti->setTag( key, cVariant( QString( getArgStr( 1 ) ) ) );
  	else if( checkArgInt( 1 ) )
! 		self->pMulti->setTag( key, cVariant( (int)getArgInt( 1 ) ) );
  
  	return PyTrue;
***************
*** 359,363 ****
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
  	
! 	return self->pMulti->tags().get( key ).isValid() ? PyTrue : PyFalse;
  }
  
--- 359,363 ----
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
  	
! 	return self->pMulti->getTag( key ).isValid() ? PyTrue : PyFalse;
  }
  
***************
*** 377,381 ****
  
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! 	self->pMulti->tags().remove( key );
  
  	return PyTrue;
--- 377,381 ----
  
  	QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
! 	self->pMulti->removeTag( key );
  
  	return PyTrue;

Index: socket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/socket.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** socket.cpp	15 Sep 2003 12:49:05 -0000	1.43
--- socket.cpp	23 Sep 2003 23:55:25 -0000	1.44
***************
*** 344,348 ****
  
  	cUOTxStartCustomHouse custom;
! 	custom.setSerial( signpost->tags().get( "house" ).asInt() ); // Morex of signpost contain serial of house
  	self->pSock->send( &custom );
  	return PyTrue;
--- 344,348 ----
  
  	cUOTxStartCustomHouse custom;
! 	custom.setSerial( signpost->getTag( "house" ).toInt() ); // Morex of signpost contain serial of house
  	self->pSock->send( &custom );
  	return PyTrue;
***************
*** 588,592 ****
  	QString key = getArgStr( 0 );
  	
! 	return self->pSock->tags().get( key ).isValid() ? PyTrue : PyFalse;
  }
  
--- 588,592 ----
  	QString key = getArgStr( 0 );
  	
! 	return self->pSock->tags().has( key ) ? PyTrue : PyFalse;
  }