summaryrefslogtreecommitdiff
authorsandman <sandman>2002-09-10 19:31:01 (UTC)
committer sandman <sandman>2002-09-10 19:31:01 (UTC)
commitb32eceaca5f1dbbfd7cd0709a34ce6f97929e28f (patch) (unidiff)
tree22a605d7a7d6e697140e0334e8160881d41fe6fc
parent62bed9ee719bba0432596ad21f326a9e91b8a547 (diff)
downloadopie-b32eceaca5f1dbbfd7cd0709a34ce6f97929e28f.zip
opie-b32eceaca5f1dbbfd7cd0709a34ce6f97929e28f.tar.gz
opie-b32eceaca5f1dbbfd7cd0709a34ce6f97929e28f.tar.bz2
Workaround for gcc bug: gcc is irgnoring the inline keyword and the
qembed_findImage function is exported to libqpe
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/inlinepics_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/inlinepics_p.h b/library/inlinepics_p.h
index 52d184b..892c321 100644
--- a/library/inlinepics_p.h
+++ b/library/inlinepics_p.h
@@ -5515,92 +5515,92 @@ static struct EmbedImage {
5515 { 14, 14, 32, (const unsigned char*)forward_inactive_data, 0, 0, TRUE, "forward_inactive" }, 5515 { 14, 14, 32, (const unsigned char*)forward_inactive_data, 0, 0, TRUE, "forward_inactive" },
5516 { 14, 14, 32, (const unsigned char*)fullscreen_data, 0, 0, TRUE, "fullscreen" }, 5516 { 14, 14, 32, (const unsigned char*)fullscreen_data, 0, 0, TRUE, "fullscreen" },
5517 { 19, 19, 32, (const unsigned char*)go_data, 0, 0, FALSE, "go" }, 5517 { 19, 19, 32, (const unsigned char*)go_data, 0, 0, FALSE, "go" },
5518 { 16, 16, 8, (const unsigned char*)h_src_data, 41, h_src_ctable, TRUE, "h_src" }, 5518 { 16, 16, 8, (const unsigned char*)h_src_data, 41, h_src_ctable, TRUE, "h_src" },
5519 { 14, 14, 32, (const unsigned char*)help_icon_data, 0, 0, TRUE, "help_icon" }, 5519 { 14, 14, 32, (const unsigned char*)help_icon_data, 0, 0, TRUE, "help_icon" },
5520 { 14, 14, 32, (const unsigned char*)home_data, 0, 0, TRUE, "home" }, 5520 { 14, 14, 32, (const unsigned char*)home_data, 0, 0, TRUE, "home" },
5521 { 14, 14, 8, (const unsigned char*)install_data, 10, install_ctable, TRUE, "install" }, 5521 { 14, 14, 8, (const unsigned char*)install_data, 10, install_ctable, TRUE, "install" },
5522 { 14, 14, 32, (const unsigned char*)installed_data, 0, 0, TRUE, "installed" }, 5522 { 14, 14, 32, (const unsigned char*)installed_data, 0, 0, TRUE, "installed" },
5523 { 16, 16, 32, (const unsigned char*)italic_data, 0, 0, TRUE, "italic" }, 5523 { 16, 16, 32, (const unsigned char*)italic_data, 0, 0, TRUE, "italic" },
5524 { 16, 16, 8, (const unsigned char*)konsole_data, 5, konsole_ctable, TRUE, "konsole" }, 5524 { 16, 16, 8, (const unsigned char*)konsole_data, 5, konsole_ctable, TRUE, "konsole" },
5525 { 16, 16, 32, (const unsigned char*)language_data, 0, 0, TRUE, "language" }, 5525 { 16, 16, 32, (const unsigned char*)language_data, 0, 0, TRUE, "language" },
5526 { 32, 32, 32, (const unsigned char*)launching_data, 0, 0, TRUE, "launching" }, 5526 { 32, 32, 32, (const unsigned char*)launching_data, 0, 0, TRUE, "launching" },
5527 { 16, 16, 32, (const unsigned char*)left_data, 0, 0, TRUE, "left" }, 5527 { 16, 16, 32, (const unsigned char*)left_data, 0, 0, TRUE, "left" },
5528 { 14, 14, 32, (const unsigned char*)library_data, 0, 0, TRUE, "library" }, 5528 { 14, 14, 32, (const unsigned char*)library_data, 0, 0, TRUE, "library" },
5529 { 16, 16, 8, (const unsigned char*)locked_data, 8, locked_ctable, TRUE, "locked" }, 5529 { 16, 16, 8, (const unsigned char*)locked_data, 8, locked_ctable, TRUE, "locked" },
5530 { 16, 16, 8, (const unsigned char*)lockedfolder_data, 10, lockedfolder_ctable, TRUE, "lockedfolder" }, 5530 { 16, 16, 8, (const unsigned char*)lockedfolder_data, 10, lockedfolder_ctable, TRUE, "lockedfolder" },
5531 { 10, 10, 32, (const unsigned char*)mag_data, 0, 0, TRUE, "mag" }, 5531 { 10, 10, 32, (const unsigned char*)mag_data, 0, 0, TRUE, "mag" },
5532 { 14, 14, 32, (const unsigned char*)month_data, 0, 0, TRUE, "month" }, 5532 { 14, 14, 32, (const unsigned char*)month_data, 0, 0, TRUE, "month" },
5533 { 14, 14, 32, (const unsigned char*)mute_data, 0, 0, TRUE, "mute" }, 5533 { 14, 14, 32, (const unsigned char*)mute_data, 0, 0, TRUE, "mute" },
5534 { 14, 14, 32, (const unsigned char*)new_data, 0, 0, TRUE, "new" }, 5534 { 14, 14, 32, (const unsigned char*)new_data, 0, 0, TRUE, "new" },
5535 { 14, 14, 32, (const unsigned char*)newfolder_data, 0, 0, TRUE, "newfolder" }, 5535 { 14, 14, 32, (const unsigned char*)newfolder_data, 0, 0, TRUE, "newfolder" },
5536 { 14, 14, 32, (const unsigned char*)next_data, 0, 0, TRUE, "next" }, 5536 { 14, 14, 32, (const unsigned char*)next_data, 0, 0, TRUE, "next" },
5537 { 13, 11, 8, (const unsigned char*)oneoverx_data, 2, oneoverx_ctable, TRUE, "oneoverx" }, 5537 { 13, 11, 8, (const unsigned char*)oneoverx_data, 2, oneoverx_ctable, TRUE, "oneoverx" },
5538 { 16, 14, 8, (const unsigned char*)pass_data, 3, pass_ctable, TRUE, "pass" }, 5538 { 16, 14, 8, (const unsigned char*)pass_data, 3, pass_ctable, TRUE, "pass" },
5539 { 14, 14, 32, (const unsigned char*)paste_data, 0, 0, TRUE, "paste" }, 5539 { 14, 14, 32, (const unsigned char*)paste_data, 0, 0, TRUE, "paste" },
5540 { 14, 14, 32, (const unsigned char*)paste_inactive_data, 0, 0, TRUE, "paste_inactive" }, 5540 { 14, 14, 32, (const unsigned char*)paste_inactive_data, 0, 0, TRUE, "paste_inactive" },
5541 { 16, 16, 8, (const unsigned char*)pixmap_data, 20, pixmap_ctable, TRUE, "pixmap" }, 5541 { 16, 16, 8, (const unsigned char*)pixmap_data, 20, pixmap_ctable, TRUE, "pixmap" },
5542 { 14, 14, 32, (const unsigned char*)play_data, 0, 0, TRUE, "play" }, 5542 { 14, 14, 32, (const unsigned char*)play_data, 0, 0, TRUE, "play" },
5543 { 14, 14, 32, (const unsigned char*)play2_data, 0, 0, TRUE, "play2" }, 5543 { 14, 14, 32, (const unsigned char*)play2_data, 0, 0, TRUE, "play2" },
5544 { 14, 14, 32, (const unsigned char*)programs_data, 0, 0, TRUE, "programs" }, 5544 { 14, 14, 32, (const unsigned char*)programs_data, 0, 0, TRUE, "programs" },
5545 { 14, 14, 32, (const unsigned char*)quit_icon_data, 0, 0, TRUE, "quit_icon" }, 5545 { 14, 14, 32, (const unsigned char*)quit_icon_data, 0, 0, TRUE, "quit_icon" },
5546 { 15, 15, 32, (const unsigned char*)repeat_data, 0, 0, TRUE, "repeat" }, 5546 { 15, 15, 32, (const unsigned char*)repeat_data, 0, 0, TRUE, "repeat" },
5547 { 14, 14, 8, (const unsigned char*)reset_data, 3, reset_ctable, TRUE, "reset" }, 5547 { 14, 14, 8, (const unsigned char*)reset_data, 3, reset_ctable, TRUE, "reset" },
5548 { 16, 16, 32, (const unsigned char*)right_data, 0, 0, TRUE, "right" }, 5548 { 16, 16, 32, (const unsigned char*)right_data, 0, 0, TRUE, "right" },
5549 { 14, 14, 32, (const unsigned char*)rotate_data, 0, 0, TRUE, "rotate" }, 5549 { 14, 14, 32, (const unsigned char*)rotate_data, 0, 0, TRUE, "rotate" },
5550 { 14, 14, 32, (const unsigned char*)start_data, 0, 0, TRUE, "start" }, 5550 { 14, 14, 32, (const unsigned char*)start_data, 0, 0, TRUE, "start" },
5551 { 14, 14, 32, (const unsigned char*)stop_data, 0, 0, TRUE, "stop" }, 5551 { 14, 14, 32, (const unsigned char*)stop_data, 0, 0, TRUE, "stop" },
5552 { 16, 16, 32, (const unsigned char*)style_data, 0, 0, TRUE, "style" }, 5552 { 16, 16, 32, (const unsigned char*)style_data, 0, 0, TRUE, "style" },
5553 { 16, 16, 32, (const unsigned char*)table_pattern_data, 0, 0, TRUE, "table_pattern" }, 5553 { 16, 16, 32, (const unsigned char*)table_pattern_data, 0, 0, TRUE, "table_pattern" },
5554 { 16, 16, 8, (const unsigned char*)tgz_data, 7, tgz_ctable, TRUE, "tgz" }, 5554 { 16, 16, 8, (const unsigned char*)tgz_data, 7, tgz_ctable, TRUE, "tgz" },
5555 { 14, 14, 32, (const unsigned char*)today_data, 0, 0, TRUE, "today" }, 5555 { 14, 14, 32, (const unsigned char*)today_data, 0, 0, TRUE, "today" },
5556 { 14, 14, 32, (const unsigned char*)toys_data, 0, 0, TRUE, "toys" }, 5556 { 14, 14, 32, (const unsigned char*)toys_data, 0, 0, TRUE, "toys" },
5557 { 16, 16, 8, (const unsigned char*)trash_data, 10, trash_ctable, TRUE, "trash" }, 5557 { 16, 16, 8, (const unsigned char*)trash_data, 10, trash_ctable, TRUE, "trash" },
5558 { 16, 16, 8, (const unsigned char*)txt_data, 41, txt_ctable, TRUE, "txt" }, 5558 { 16, 16, 8, (const unsigned char*)txt_data, 41, txt_ctable, TRUE, "txt" },
5559 { 16, 16, 32, (const unsigned char*)underline_data, 0, 0, TRUE, "underline" }, 5559 { 16, 16, 32, (const unsigned char*)underline_data, 0, 0, TRUE, "underline" },
5560 { 14, 14, 32, (const unsigned char*)uninstall_data, 0, 0, TRUE, "uninstall" }, 5560 { 14, 14, 32, (const unsigned char*)uninstall_data, 0, 0, TRUE, "uninstall" },
5561 { 14, 14, 8, (const unsigned char*)uninstalled_data, 6, uninstalled_ctable, TRUE, "uninstalled" }, 5561 { 14, 14, 8, (const unsigned char*)uninstalled_data, 6, uninstalled_ctable, TRUE, "uninstalled" },
5562 { 14, 14, 32, (const unsigned char*)up_data, 0, 0, TRUE, "up" }, 5562 { 14, 14, 32, (const unsigned char*)up_data, 0, 0, TRUE, "up" },
5563 { 14, 14, 32, (const unsigned char*)volume_data, 0, 0, TRUE, "volume" }, 5563 { 14, 14, 32, (const unsigned char*)volume_data, 0, 0, TRUE, "volume" },
5564 { 14, 14, 32, (const unsigned char*)wait_data, 0, 0, TRUE, "wait" }, 5564 { 14, 14, 32, (const unsigned char*)wait_data, 0, 0, TRUE, "wait" },
5565 { 14, 14, 32, (const unsigned char*)week_data, 0, 0, TRUE, "week" }, 5565 { 14, 14, 32, (const unsigned char*)week_data, 0, 0, TRUE, "week" },
5566 { 14, 14, 32, (const unsigned char*)wordgame_data, 0, 0, TRUE, "wordgame" }, 5566 { 14, 14, 32, (const unsigned char*)wordgame_data, 0, 0, TRUE, "wordgame" },
5567 { 96, 16, 8, (const unsigned char*)wordgame_shapes_data, 9, wordgame_shapes_ctable, TRUE, "wordgame_shapes" }, 5567 { 96, 16, 8, (const unsigned char*)wordgame_shapes_data, 9, wordgame_shapes_ctable, TRUE, "wordgame_shapes" },
5568 { 9, 8, 8, (const unsigned char*)xtopowerofy_data, 2, xtopowerofy_ctable, TRUE, "xtopowerofy" }, 5568 { 9, 8, 8, (const unsigned char*)xtopowerofy_data, 2, xtopowerofy_ctable, TRUE, "xtopowerofy" },
5569 { 13, 11, 8, (const unsigned char*)ythrootofx_data, 2, ythrootofx_ctable, TRUE, "ythrootofx" }, 5569 { 13, 11, 8, (const unsigned char*)ythrootofx_data, 2, ythrootofx_ctable, TRUE, "ythrootofx" },
5570 { 20, 20, 8, (const unsigned char*)zoom_data, 7, zoom_ctable, TRUE, "zoom" }, 5570 { 20, 20, 8, (const unsigned char*)zoom_data, 7, zoom_ctable, TRUE, "zoom" },
5571}; 5571};
5572 5572
5573static int cmpEmbedImage(const void *a, const void *b) 5573static int cmpEmbedImage(const void *a, const void *b)
5574{ 5574{
5575 const EmbedImage* ea = (const EmbedImage*)a; 5575 const EmbedImage* ea = (const EmbedImage*)a;
5576 const EmbedImage* eb = (const EmbedImage*)b; 5576 const EmbedImage* eb = (const EmbedImage*)b;
5577 return strcmp(ea->name,eb->name); 5577 return strcmp(ea->name,eb->name);
5578} 5578}
5579inline const QImage& qembed_findImage(const char* name) 5579inline static const QImage& qembed_findImage(const char* name)
5580{ 5580{
5581 EmbedImage key; key.name = name; 5581 EmbedImage key; key.name = name;
5582 EmbedImage* r = (EmbedImage*)bsearch( &key, embed_image_vec, 5582 EmbedImage* r = (EmbedImage*)bsearch( &key, embed_image_vec,
5583 sizeof(embed_image_vec)/sizeof(EmbedImage), sizeof(EmbedImage), cmpEmbedImage ); 5583 sizeof(embed_image_vec)/sizeof(EmbedImage), sizeof(EmbedImage), cmpEmbedImage );
5584 QImage* img; 5584 QImage* img;
5585 if ( r ) { 5585 if ( r ) {
5586 img = new QImage((uchar*)r->data, 5586 img = new QImage((uchar*)r->data,
5587 r->width, 5587 r->width,
5588 r->height, 5588 r->height,
5589 r->depth, 5589 r->depth,
5590#ifdef _WS_QWS_ 5590#ifdef _WS_QWS_
5591 (r->width*r->depth+31)/32*4, 5591 (r->width*r->depth+31)/32*4,
5592#endif 5592#endif
5593 (QRgb*)r->colorTable, 5593 (QRgb*)r->colorTable,
5594 r->numColors, 5594 r->numColors,
5595 QImage::BigEndian 5595 QImage::BigEndian
5596 ); 5596 );
5597 if ( r->alpha ) 5597 if ( r->alpha )
5598 img->setAlphaBuffer(TRUE); 5598 img->setAlphaBuffer(TRUE);
5599 } else { 5599 } else {
5600 static QImage dummy; 5600 static QImage dummy;
5601 img = &dummy; 5601 img = &dummy;
5602 } 5602 }
5603 return *img; 5603 return *img;
5604} 5604}
5605 5605
5606#endif 5606#endif