author | sandman <sandman> | 2002-11-25 22:03:12 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-11-25 22:03:12 (UTC) |
commit | 7bd8ef9197506897d3a5287a013934f89658d60a (patch) (side-by-side diff) | |
tree | 29f923e9d3c9ef28c4a34d6126e3ca9c2b0ae0fc /core | |
parent | 9307404cf3ef2edfea615a073bbc9db2d1eac8a5 (diff) | |
download | opie-7bd8ef9197506897d3a5287a013934f89658d60a.zip opie-7bd8ef9197506897d3a5287a013934f89658d60a.tar.gz opie-7bd8ef9197506897d3a5287a013934f89658d60a.tar.bz2 |
Unable to read man pages, part 2 ... qwsSetDecoration is also static
-rw-r--r-- | core/launcher/libpreload/preload.cpp | 25 |
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 @@ -2,12 +2,13 @@ #define _GNU_SOURCE //#define private public //#define protected public #include <qwsdecoration_qws.h> #include <qcommonstyle.h> + //#include <qapplication.h> //#include <qfont.h> //class QStyle; class QApplication; class QFont; @@ -17,17 +18,17 @@ class QFont; #include <unistd.h> #include <stdio.h> #include <stdlib.h> typedef void ( *qapp_setstyle_t ) ( QStyle * ); -typedef void ( *qapp_setdeco_t ) ( QApplication *, QWSDecoration * ); +typedef void ( *qapp_setdeco_t ) ( QWSDecoration * ); typedef void ( *qapp_setfont_t ) ( const QFont &, bool, const char * ); -static bool *opie_block_style_p = 0; +static int *opie_block_style_p = 0; extern "C" { static void *resolve_symbol ( const char *sym ) { void *adr = ::dlsym ( RTLD_NEXT, sym ); @@ -43,50 +44,46 @@ extern void setStyle__12QApplicationP6QStyle ( QStyle *style ) static qapp_setstyle_t qsetstyle = 0; if ( !qsetstyle ) qsetstyle = (qapp_setstyle_t) resolve_symbol ( "setStyle__12QApplicationP6QStyle" ); if ( !opie_block_style_p ) - opie_block_style_p = (bool *) resolve_symbol ( "opie_block_style" ); + opie_block_style_p = (int *) resolve_symbol ( "opie_block_style" ); - if ( !qsetstyle || ( opie_block_style_p && *opie_block_style_p )) { + if ( !qsetstyle || ( opie_block_style_p && ( *opie_block_style_p & 0x01 ))) delete style; - return; - } else ( *qsetstyle ) ( style ); } extern void setFont__12QApplicationRC5QFontbPCc ( const QFont &fnt, bool informWidgets, const char * className ) { static qapp_setfont_t qsetfont = 0; if ( !qsetfont ) qsetfont = (qapp_setfont_t) resolve_symbol ( "setFont__12QApplicationRC5QFontbPCc" ); if ( !opie_block_style_p ) - opie_block_style_p = (bool *) resolve_symbol ( "opie_block_style" ); + opie_block_style_p = (int *) resolve_symbol ( "opie_block_style" ); - if ( qsetfont && !( opie_block_style_p && *opie_block_style_p )) + if ( qsetfont && !( opie_block_style_p && ( *opie_block_style_p & 0x02 ))) ( *qsetfont ) ( fnt, informWidgets, className ); } -extern void qwsSetDecoration__12QApplicationP13QWSDecoration ( QApplication *app, QWSDecoration *deco ) +extern void qwsSetDecoration__12QApplicationP13QWSDecoration ( QWSDecoration *deco ) { static qapp_setdeco_t qsetdeco = 0; if ( !qsetdeco ) qsetdeco = (qapp_setdeco_t) resolve_symbol ( "qwsSetDecoration__12QApplicationP13QWSDecoration" ); if ( !opie_block_style_p ) - opie_block_style_p = (bool *) resolve_symbol ( "opie_block_style" ); + opie_block_style_p = (int *) resolve_symbol ( "opie_block_style" ); - if ( !qsetdeco || ( opie_block_style_p && *opie_block_style_p )) { + if ( !qsetdeco || ( opie_block_style_p && ( *opie_block_style_p & 0x04 ))) delete deco; - return; - } else - ( *qsetdeco ) ( app, deco ); + ( *qsetdeco ) ( deco ); } } |