summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/libpreload/preload.cpp25
1 files changed, 11 insertions, 14 deletions
diff --git a/core/launcher/libpreload/preload.cpp b/core/launcher/libpreload/preload.cpp
index 4505428..10d8313 100644
--- a/core/launcher/libpreload/preload.cpp
+++ b/core/launcher/libpreload/preload.cpp
@@ -7,2 +7,3 @@
7#include <qcommonstyle.h> 7#include <qcommonstyle.h>
8
8//#include <qapplication.h> 9//#include <qapplication.h>
@@ -22,3 +23,3 @@ class QFont;
22typedef void ( *qapp_setstyle_t ) ( QStyle * ); 23typedef void ( *qapp_setstyle_t ) ( QStyle * );
23typedef void ( *qapp_setdeco_t ) ( QApplication *, QWSDecoration * ); 24typedef void ( *qapp_setdeco_t ) ( QWSDecoration * );
24typedef void ( *qapp_setfont_t ) ( const QFont &, bool, const char * ); 25typedef void ( *qapp_setfont_t ) ( const QFont &, bool, const char * );
@@ -26,3 +27,3 @@ typedef void ( *qapp_setfont_t ) ( const QFont &, bool, const char * );
26 27
27static bool *opie_block_style_p = 0; 28static int *opie_block_style_p = 0;
28 29
@@ -48,8 +49,6 @@ extern void setStyle__12QApplicationP6QStyle ( QStyle *style )
48 if ( !opie_block_style_p ) 49 if ( !opie_block_style_p )
49 opie_block_style_p = (bool *) resolve_symbol ( "opie_block_style" ); 50 opie_block_style_p = (int *) resolve_symbol ( "opie_block_style" );
50 51
51 if ( !qsetstyle || ( opie_block_style_p && *opie_block_style_p )) { 52 if ( !qsetstyle || ( opie_block_style_p && ( *opie_block_style_p & 0x01 )))
52 delete style; 53 delete style;
53 return;
54 }
55 else 54 else
@@ -66,5 +65,5 @@ extern void setFont__12QApplicationRC5QFontbPCc ( const QFont &fnt, bool informW
66 if ( !opie_block_style_p ) 65 if ( !opie_block_style_p )
67 opie_block_style_p = (bool *) resolve_symbol ( "opie_block_style" ); 66 opie_block_style_p = (int *) resolve_symbol ( "opie_block_style" );
68 67
69 if ( qsetfont && !( opie_block_style_p && *opie_block_style_p )) 68 if ( qsetfont && !( opie_block_style_p && ( *opie_block_style_p & 0x02 )))
70 ( *qsetfont ) ( fnt, informWidgets, className ); 69 ( *qsetfont ) ( fnt, informWidgets, className );
@@ -73,3 +72,3 @@ extern void setFont__12QApplicationRC5QFontbPCc ( const QFont &fnt, bool informW
73 72
74extern void qwsSetDecoration__12QApplicationP13QWSDecoration ( QApplication *app, QWSDecoration *deco ) 73extern void qwsSetDecoration__12QApplicationP13QWSDecoration ( QWSDecoration *deco )
75{ 74{
@@ -81,10 +80,8 @@ extern void qwsSetDecoration__12QApplicationP13QWSDecoration ( QApplication *app
81 if ( !opie_block_style_p ) 80 if ( !opie_block_style_p )
82 opie_block_style_p = (bool *) resolve_symbol ( "opie_block_style" ); 81 opie_block_style_p = (int *) resolve_symbol ( "opie_block_style" );
83 82
84 if ( !qsetdeco || ( opie_block_style_p && *opie_block_style_p )) { 83 if ( !qsetdeco || ( opie_block_style_p && ( *opie_block_style_p & 0x04 )))
85 delete deco; 84 delete deco;
86 return;
87 }
88 else 85 else
89 ( *qsetdeco ) ( app, deco ); 86 ( *qsetdeco ) ( deco );
90} 87}