[wpdev-commits] wolfpack maps.cpp,1.22,1.23 maps.h,1.6,1.7 persistentbroker.cpp,1.17,1.18 persistentbroker.h,1.20,1.21

[<thi...@us...>]

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

Modified Files:
	maps.cpp maps.h persistentbroker.cpp persistentbroker.h 
Log Message:
no message

Index: maps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/maps.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** maps.cpp	21 Aug 2003 05:04:35 -0000	1.22
--- maps.cpp	29 Aug 2003 17:58:57 -0000	1.23
***************
*** 162,165 ****
--- 162,173 ----
  
  /*!
+ 	Returns true if the \a id map is present, false otherwise
+ */
+ bool Maps::hasMap( uint id ) const
+ {
+ 	return d.contains( id );
+ }
+ 
+ /*!
  	Seeks for a map record (map_st) in the given map \a id, at the given \a x, \a y 
  	coordinates.

Index: maps.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/maps.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** maps.h	27 Mar 2003 15:47:19 -0000	1.6
--- maps.h	29 Aug 2003 17:58:58 -0000	1.7
***************
*** 116,119 ****
--- 116,120 ----
  	map_st seekMap( uint id, ushort x, ushort y ) const;
  	map_st seekMap( const Coord_cl& ) const;
+ 	bool hasMap( uint id ) const;
  	signed char mapElevation( const Coord_cl& p ) const;
  	signed char mapAverageElevation( const Coord_cl& p ) const;

Index: persistentbroker.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** persistentbroker.cpp	28 Aug 2003 04:05:42 -0000	1.17
--- persistentbroker.cpp	29 Aug 2003 17:58:58 -0000	1.18
***************
*** 91,95 ****
  
  	// Disable fsynch for sqlite
! 	if( sqlite )
  	{
  		connection->exec( "PRAGMA synchronous = OFF;" );
--- 91,95 ----
  
  	// Disable fsynch for sqlite
! 	if( this->sqlite )
  	{
  		connection->exec( "PRAGMA synchronous = OFF;" );

Index: persistentbroker.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** persistentbroker.h	27 Aug 2003 16:06:12 -0000	1.20
--- persistentbroker.h	29 Aug 2003 17:58:58 -0000	1.21
***************
*** 67,76 ****
  	void clearDeleteQueue();
  	void addToDeleteQueue( const QString &tables, const QString &conditions );
! 	QString quoteString( const QString &d )
  	{
  		if( sqlite )
! 			return QString(d).replace( QRegExp("'"), "''" );
  		else
! 			return QString(d).replace( QRegExp("'"), "\\'" );
  	}
  
--- 67,77 ----
  	void clearDeleteQueue();
  	void addToDeleteQueue( const QString &tables, const QString &conditions );
! 	
! 	QString& quoteString( QString &d )
  	{
  		if( sqlite )
! 			return d.replace( QRegExp("'"), "''" );
  		else
! 			return d.replace( QRegExp("'"), "\\'" );
  	}