[vlc-devel] commit: move pointer to .rodata (Francois Cartegnie )

[Rémi Denis-Courmont]

Le jeudi 18 juin 2009 11:20:42 git version control, vous avez écrit :
> vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Jun 14
> 22:50:47 2009 +0200| [4fe1c33f752e25fc88847b301bc37a749cc59a26] |
> committer: Rémi Duraffort
>
> move pointer to .rodata
>
> Signed-off-by: Rémi Duraffort <ivoire at videolan.org>
>
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4fe1c33f752e25fc88
> >847b301bc37a749cc59a26
>
> ---
>
>  modules/gui/qt4/components/preferences_widgets.cpp |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/modules/gui/qt4/components/preferences_widgets.cpp
> b/modules/gui/qt4/components/preferences_widgets.cpp index 309cf16..6c74223
> 100644
> --- a/modules/gui/qt4/components/preferences_widgets.cpp
> +++ b/modules/gui/qt4/components/preferences_widgets.cpp
> @@ -214,9 +214,9 @@ void InterfacePreviewWidget::setPreview( int comboid )
>      /* Need to move resources references as soon as qt4.cpp
>         local defines has been moved somewhere else
>      */
> -    char * pixmaps[] = { ":/prefsmenu/sample_classic",
> -                         ":/prefsmenu/sample_complete",
> -                         ":/prefsmenu/sample_minimal" };
> +    const char * pixmaps[] = { ":/prefsmenu/sample_classic",
> +                               ":/prefsmenu/sample_complete",
> +                               ":/prefsmenu/sample_minimal" };

As the string have almost the same sizes, it's yet better to do:
       const char pixmaps[28][] = { ":/prefsmenu/sample_classic",
                                  ":/prefsmenu/sample_complete",
                                  ":/prefsmenu/sample_minimal" };
or maybe it's the other way around. Otherwise, the three pointers are not in 
RODATA (since they're relocatable).

-- 
Rémi Denis-Courmont
http://www.remlab.net/