[Jahshaka-cvs] jah/jahwidgets/src/qt3/widgets scribbler.cpp, 1.20, 1.21 scribbler.h, 1.12, 1.13

[jpn <non...@us...>]

Update of /cvsroot/jahshaka/jah/jahwidgets/src/qt3/widgets
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31820/jahwidgets/src/qt3/widgets

Modified Files:
	scribbler.cpp scribbler.h 
Log Message:
Windows build fix

Index: scribbler.cpp
===================================================================
RCS file: /cvsroot/jahshaka/jah/jahwidgets/src/qt3/widgets/scribbler.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- scribbler.cpp	2 May 2007 11:04:45 -0000	1.20
+++ scribbler.cpp	11 Jul 2007 14:31:03 -0000	1.21
@@ -81,7 +81,7 @@
 
 	if ( image != 0 )
 	{
-		std::wstring format = image->pf( );
+		opl::wstring format = image->pf( );
 		if ( format == L"r8g8b8a8" || format == L"b8g8r8a8" )
 		{
 			bpp = 4;
@@ -250,7 +250,7 @@
 	{
 		image = il::convert( image, pf_ );
 
-		std::wstring format = image->pf( );
+		opl::wstring format = image->pf( );
 		int width = image->width( );
 		int height = image->height( );
 		unsigned char *dest = image->data( );

Index: scribbler.h
===================================================================
RCS file: /cvsroot/jahshaka/jah/jahwidgets/src/qt3/widgets/scribbler.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- scribbler.h	2 May 2007 11:04:45 -0000	1.12
+++ scribbler.h	11 Jul 2007 14:31:03 -0000	1.13
@@ -87,7 +87,7 @@
 		TimecodeValueFormatter formatter_;
 		QImage render_text_qimage( const pl::wstring& text, const pl::wstring& font_name, int pointSize, int alignment ) const;
 
-		const std::wstring pf_;
+		const opl::wstring pf_;
 		il::image_type_ptr glyphs_;
 		const int glyph_w_;
 		const int glyph_h_;