author | sandman <sandman> | 2002-09-23 10:16:35 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-09-23 10:16:35 (UTC) |
commit | 4af73fb07b69dce910abb2ac098b1045403cda67 (patch) (side-by-side diff) | |
tree | f8a7c1ff8a18a88709ac52e42a472431f0aa7010 | |
parent | 8b06ea9e4407628ebae54d63592e8b8c940a62ad (diff) | |
download | opie-4af73fb07b69dce910abb2ac098b1045403cda67.zip opie-4af73fb07b69dce910abb2ac098b1045403cda67.tar.gz opie-4af73fb07b69dce910abb2ac098b1045403cda67.tar.bz2 |
gcc workaround for inline applied once again .. thanks Harlekin ;)
-rw-r--r-- | library/inlinepics_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/inlinepics_p.h b/library/inlinepics_p.h index daa7413..c796326 100644 --- a/library/inlinepics_p.h +++ b/library/inlinepics_p.h @@ -3668,73 +3668,73 @@ static struct EmbedImage { { 16, 16, 8, (const unsigned char*)locked_data, 8, locked_ctable, TRUE, "locked" }, { 16, 16, 8, (const unsigned char*)lockedfolder_data, 10, lockedfolder_ctable, TRUE, "lockedfolder" }, { 10, 10, 32, (const unsigned char*)mag_data, 0, 0, TRUE, "mag" }, { 14, 14, 32, (const unsigned char*)month_data, 0, 0, TRUE, "month" }, { 14, 14, 32, (const unsigned char*)mute_data, 0, 0, TRUE, "mute" }, { 14, 14, 32, (const unsigned char*)new_data, 0, 0, TRUE, "new" }, { 14, 14, 32, (const unsigned char*)newfolder_data, 0, 0, TRUE, "newfolder" }, { 14, 14, 32, (const unsigned char*)next_data, 0, 0, TRUE, "next" }, { 13, 11, 8, (const unsigned char*)oneoverx_data, 2, oneoverx_ctable, TRUE, "oneoverx" }, { 16, 14, 8, (const unsigned char*)pass_data, 3, pass_ctable, TRUE, "pass" }, { 14, 14, 32, (const unsigned char*)paste_data, 0, 0, TRUE, "paste" }, { 14, 14, 32, (const unsigned char*)paste_inactive_data, 0, 0, TRUE, "paste_inactive" }, { 16, 16, 8, (const unsigned char*)pixmap_data, 20, pixmap_ctable, TRUE, "pixmap" }, { 14, 14, 32, (const unsigned char*)play_data, 0, 0, TRUE, "play" }, { 14, 14, 32, (const unsigned char*)play2_data, 0, 0, TRUE, "play2" }, { 14, 14, 32, (const unsigned char*)programs_data, 0, 0, TRUE, "programs" }, { 14, 14, 32, (const unsigned char*)quit_icon_data, 0, 0, TRUE, "quit_icon" }, { 15, 15, 32, (const unsigned char*)repeat_data, 0, 0, TRUE, "repeat" }, { 14, 14, 8, (const unsigned char*)reset_data, 3, reset_ctable, TRUE, "reset" }, { 16, 16, 32, (const unsigned char*)right_data, 0, 0, TRUE, "right" }, { 14, 14, 32, (const unsigned char*)rotate_data, 0, 0, TRUE, "rotate" }, { 14, 14, 32, (const unsigned char*)start_data, 0, 0, TRUE, "start" }, { 14, 14, 32, (const unsigned char*)stop_data, 0, 0, TRUE, "stop" }, { 16, 16, 32, (const unsigned char*)style_data, 0, 0, TRUE, "style" }, { 16, 16, 32, (const unsigned char*)table_pattern_data, 0, 0, TRUE, "table_pattern" }, { 16, 16, 8, (const unsigned char*)tgz_data, 7, tgz_ctable, TRUE, "tgz" }, { 14, 14, 32, (const unsigned char*)toys_data, 0, 0, TRUE, "toys" }, { 16, 16, 8, (const unsigned char*)trash_data, 10, trash_ctable, TRUE, "trash" }, { 16, 16, 8, (const unsigned char*)txt_data, 41, txt_ctable, TRUE, "txt" }, { 16, 16, 32, (const unsigned char*)underline_data, 0, 0, TRUE, "underline" }, { 14, 14, 32, (const unsigned char*)uninstall_data, 0, 0, TRUE, "uninstall" }, { 14, 14, 8, (const unsigned char*)uninstalled_data, 6, uninstalled_ctable, TRUE, "uninstalled" }, { 14, 14, 32, (const unsigned char*)up_data, 0, 0, TRUE, "up" }, { 14, 14, 32, (const unsigned char*)volume_data, 0, 0, TRUE, "volume" }, { 14, 14, 32, (const unsigned char*)wait_data, 0, 0, TRUE, "wait" }, { 14, 14, 32, (const unsigned char*)week_data, 0, 0, TRUE, "week" }, { 14, 14, 32, (const unsigned char*)wordgame_data, 0, 0, TRUE, "wordgame" }, { 9, 8, 8, (const unsigned char*)xtopowerofy_data, 2, xtopowerofy_ctable, TRUE, "xtopowerofy" }, { 13, 11, 8, (const unsigned char*)ythrootofx_data, 2, ythrootofx_ctable, TRUE, "ythrootofx" }, { 20, 20, 8, (const unsigned char*)zoom_data, 7, zoom_ctable, TRUE, "zoom" }, }; static int cmpEmbedImage(const void *a, const void *b) { const EmbedImage* ea = (const EmbedImage*)a; const EmbedImage* eb = (const EmbedImage*)b; return strcmp(ea->name,eb->name); } -inline const QImage& qembed_findImage(const char* name) +inline static const QImage& qembed_findImage(const char* name) { EmbedImage key; key.name = name; EmbedImage* r = (EmbedImage*)bsearch( &key, embed_image_vec, sizeof(embed_image_vec)/sizeof(EmbedImage), sizeof(EmbedImage), cmpEmbedImage ); QImage* img; if ( r ) { img = new QImage((uchar*)r->data, r->width, r->height, r->depth, (QRgb*)r->colorTable, r->numColors, QImage::BigEndian ); if ( r->alpha ) img->setAlphaBuffer(TRUE); } else { static QImage dummy; img = &dummy; } return *img; } #endif |