Changeset 887

Timestamp:

07/11/07 09:42:18 (1 year ago)

Author:

timdewhirst

Message:

jahwidgets
- fixup for string work in olibs
- add missing thread_util files to vcproj

Location:

trunk/jahwidgets/src/qt3

Files:

• widgets/scribbler.cpp (modified) (2 diffs)
• widgets/scribbler.h (modified) (1 diff)
• wrapper/wrapper_vc80.vcproj (modified) (2 diffs)

trunk/jahwidgets/src/qt3/widgets/scribbler.cpp

@@ -82 +82 @@
         if ( image != 0 )
         {
-                opl::wstring format = image->pf( );
+                pl::wstring format = image->pf( );
                 if ( format == L"r8g8b8a8" || format == L"b8g8r8a8" )
                 {
@@ -251 +251 @@
                 image = il::convert( image, pf_ );
 
+<<<<<<< scribbler.cpp
+                pl::wstring format = image->pf( );
+=======
                 opl::wstring format = image->pf( );
+>>>>>>> 1.21
                 int width = image->width( );
                 int height = image->height( );

trunk/jahwidgets/src/qt3/widgets/scribbler.h

@@ -88 +88 @@
                 QImage render_text_qimage( const pl::wstring& text, const pl::wstring& font_name, int pointSize, int alignment ) const;
 
-                const opl::wstring pf_;
+                const pl::wstring pf_;
                 il::image_type_ptr glyphs_;
                 const int glyph_w_;

trunk/jahwidgets/src/qt3/wrapper/wrapper_vc80.vcproj

@@ -235 +235 @@
                         </File>
                         <File
+                                RelativePath="..\utils\thread_util.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath=".\settings.cpp"
                                 >
@@ -352 +356 @@
                         <File
                                 RelativePath="..\utils\qapp_locker.hpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\utils\thread_util.hpp"
                                 >
                         </File>