[MPlayer-dev-eng] [patch] code-cleanup: Gui/* ()->(void) and readonly xpms
Stefan Huehner
stefan at huehner.org
Wed Jun 21 19:37:47 CEST 2006
Hi,
attached patches cleans up the Gui/* sub-directory.
mplayer_3_void.diff corrects function prototypes which no parameters
from () to the correct (void).
mplayer_4_const_xpm.diff makes most of the xpm-files read 'const char*'
instead of 'char*' to reflect the read-only status of the
xpm-definitions.
Regards,
Stefan
-------------- next part --------------
Index: wm/wsxdnd.c
===================================================================
--- wm/wsxdnd.c (revision 18774)
+++ wm/wsxdnd.c (working copy)
@@ -29,7 +29,7 @@
Atom atom_support;
-void wsXDNDInitialize()
+void wsXDNDInitialize(void)
{
_XA_XdndAware = XInternAtom(wsDisplay, "XdndAware", False);
Index: wm/wsxdnd.h
===================================================================
--- wm/wsxdnd.h (revision 18774)
+++ wm/wsxdnd.h (working copy)
@@ -3,7 +3,7 @@
#define _XDND_H_
-void wsXDNDInitialize();
+void wsXDNDInitialize(void);
Bool wsXDNDProcessSelection(wsTWindow* wnd,XEvent *event);
Bool wsXDNDProcessClientMessage(wsTWindow* wnd, XClientMessageEvent *event);
void wsXDNDMakeAwareness(wsTWindow* window);
-------------- next part --------------
Index: mplayer/pixmaps/dvd.xpm
===================================================================
--- mplayer/pixmaps/dvd.xpm (revision 18774)
+++ mplayer/pixmaps/dvd.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * dvd_xpm[] = {
+static const char * dvd_xpm[] = {
"16 16 110 2",
" c None",
". c #CACCD2",
Index: mplayer/pixmaps/next.xpm
===================================================================
--- mplayer/pixmaps/next.xpm (revision 18774)
+++ mplayer/pixmaps/next.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * next_xpm[] = {
+static const char * next_xpm[] = {
"16 16 60 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/aspect.xpm
===================================================================
--- mplayer/pixmaps/aspect.xpm (revision 18774)
+++ mplayer/pixmaps/aspect.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * aspect_xpm[] = {
+static const char * aspect_xpm[] = {
"16 16 3 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/title.xpm
===================================================================
--- mplayer/pixmaps/title.xpm (revision 18774)
+++ mplayer/pixmaps/title.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * title_xpm[] = {
+static const char * title_xpm[] = {
"16 16 4 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/stop.xpm
===================================================================
--- mplayer/pixmaps/stop.xpm (revision 18774)
+++ mplayer/pixmaps/stop.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * stop_xpm[] = {
+static const char * stop_xpm[] = {
"48 48 203 2",
" c None",
". c #5A5A5A",
Index: mplayer/pixmaps/chapter.xpm
===================================================================
--- mplayer/pixmaps/chapter.xpm (revision 18774)
+++ mplayer/pixmaps/chapter.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * chapter_xpm[] = {
+static const char * chapter_xpm[] = {
"16 16 4 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/empty1px.xpm
===================================================================
--- mplayer/pixmaps/empty1px.xpm (revision 18774)
+++ mplayer/pixmaps/empty1px.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * empty1px_xpm[] = {
+static const char * empty1px_xpm[] = {
"1 1 1 1",
" c None",
" "};
Index: mplayer/pixmaps/a43.xpm
===================================================================
--- mplayer/pixmaps/a43.xpm (revision 18774)
+++ mplayer/pixmaps/a43.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * a43_xpm[] = {
+static const char * a43_xpm[] = {
"18 16 3 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/sound.xpm
===================================================================
--- mplayer/pixmaps/sound.xpm (revision 18774)
+++ mplayer/pixmaps/sound.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * sound_xpm[] = {
+static const char * sound_xpm[] = {
"16 16 121 2",
" c None",
". c #939CA9",
Index: mplayer/pixmaps/loadeaf.xpm
===================================================================
--- mplayer/pixmaps/loadeaf.xpm (revision 18774)
+++ mplayer/pixmaps/loadeaf.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * loadeaf_xpm[] = {
+static const char * loadeaf_xpm[] = {
"16 16 132 2",
" c None",
". c #5C5C5C",
Index: mplayer/pixmaps/empty.xpm
===================================================================
--- mplayer/pixmaps/empty.xpm (revision 18774)
+++ mplayer/pixmaps/empty.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * empty_xpm[] = {
+static const char * empty_xpm[] = {
"16 16 1 1",
" c None",
" ",
Index: mplayer/pixmaps/logo.xpm
===================================================================
--- mplayer/pixmaps/logo.xpm (revision 18774)
+++ mplayer/pixmaps/logo.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * logo_xpm[] = {
+static const char * logo_xpm[] = {
"101 83 1141 2",
" c None",
". c #9094BB",
Index: mplayer/pixmaps/file2.xpm
===================================================================
--- mplayer/pixmaps/file2.xpm (revision 18774)
+++ mplayer/pixmaps/file2.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * file2_xpm[] = {
+static const char * file2_xpm[] = {
"16 16 8 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/url.xpm
===================================================================
--- mplayer/pixmaps/url.xpm (revision 18774)
+++ mplayer/pixmaps/url.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * url_xpm[] = {
+static const char * url_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/playdvd.xpm
===================================================================
--- mplayer/pixmaps/playdvd.xpm (revision 18774)
+++ mplayer/pixmaps/playdvd.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * playdvd_xpm[] = {
+static const char * playdvd_xpm[] = {
"16 16 118 2",
" c None",
". c #CACCD2",
Index: mplayer/pixmaps/play.xpm
===================================================================
--- mplayer/pixmaps/play.xpm (revision 18774)
+++ mplayer/pixmaps/play.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * play_xpm[] = {
+static const char * play_xpm[] = {
"16 16 37 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/question.xpm
===================================================================
--- mplayer/pixmaps/question.xpm (revision 18774)
+++ mplayer/pixmaps/question.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * question_xpm[] = {
+static const char * question_xpm[] = {
"48 48 284 2",
" c None",
". c #9B4C3A",
Index: mplayer/pixmaps/fs.xpm
===================================================================
--- mplayer/pixmaps/fs.xpm (revision 18774)
+++ mplayer/pixmaps/fs.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * fs_xpm[] = {
+static const char * fs_xpm[] = {
"16 16 90 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/half.xpm
===================================================================
--- mplayer/pixmaps/half.xpm (revision 18774)
+++ mplayer/pixmaps/half.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * half_xpm[] = {
+static const char * half_xpm[] = {
"16 16 125 2",
" c None",
". c #000000",
Index: mplayer/pixmaps/double.xpm
===================================================================
--- mplayer/pixmaps/double.xpm (revision 18774)
+++ mplayer/pixmaps/double.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * double_xpm[] = {
+static const char * double_xpm[] = {
"16 16 132 2",
" c None",
". c #000000",
Index: mplayer/pixmaps/pl.xpm
===================================================================
--- mplayer/pixmaps/pl.xpm (revision 18774)
+++ mplayer/pixmaps/pl.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * pl_xpm[] = {
+static const char * pl_xpm[] = {
"16 16 7 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/prev.xpm
===================================================================
--- mplayer/pixmaps/prev.xpm (revision 18774)
+++ mplayer/pixmaps/prev.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * prev_xpm[] = {
+static const char * prev_xpm[] = {
"16 16 58 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/vcd.xpm
===================================================================
--- mplayer/pixmaps/vcd.xpm (revision 18774)
+++ mplayer/pixmaps/vcd.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * vcd_xpm[] = {
+static const char * vcd_xpm[] = {
"16 16 160 2",
" c None",
". c #CC9665",
Index: mplayer/pixmaps/pause.xpm
===================================================================
--- mplayer/pixmaps/pause.xpm (revision 18774)
+++ mplayer/pixmaps/pause.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * pause_xpm[] = {
+static const char * pause_xpm[] = {
"16 16 29 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/delsub.xpm
===================================================================
--- mplayer/pixmaps/delsub.xpm (revision 18774)
+++ mplayer/pixmaps/delsub.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * delsub_xpm[] = {
+static const char * delsub_xpm[] = {
"16 16 3 1",
" c None",
". c #CD0909",
Index: mplayer/pixmaps/prefs.xpm
===================================================================
--- mplayer/pixmaps/prefs.xpm (revision 18774)
+++ mplayer/pixmaps/prefs.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * prefs_xpm[] = {
+static const char * prefs_xpm[] = {
"16 16 50 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/mplayer-desktop.xpm
===================================================================
--- mplayer/pixmaps/mplayer-desktop.xpm (revision 18774)
+++ mplayer/pixmaps/mplayer-desktop.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * mplayer_desktop_xpm[] = {
+static const char * mplayer_desktop_xpm[] = {
"47 39 107 2",
" c None",
". c #6D619F",
Index: mplayer/pixmaps/a169.xpm
===================================================================
--- mplayer/pixmaps/a169.xpm (revision 18774)
+++ mplayer/pixmaps/a169.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * a169_xpm[] = {
+static const char * a169_xpm[] = {
"18 16 3 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/tonguebla.xpm
===================================================================
--- mplayer/pixmaps/tonguebla.xpm (revision 18774)
+++ mplayer/pixmaps/tonguebla.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * tonguebla_xpm[] = {
+static const char * tonguebla_xpm[] = {
"16 16 137 2",
" c None",
". c #FC151B",
Index: mplayer/pixmaps/a11.xpm
===================================================================
--- mplayer/pixmaps/a11.xpm (revision 18774)
+++ mplayer/pixmaps/a11.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * a11_xpm[] = {
+static const char * a11_xpm[] = {
"18 16 3 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/ab.xpm
===================================================================
--- mplayer/pixmaps/ab.xpm (revision 18774)
+++ mplayer/pixmaps/ab.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * ab_xpm[] = {
+static const char * ab_xpm[] = {
"16 16 15 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/cancel.xpm
===================================================================
--- mplayer/pixmaps/cancel.xpm (revision 18774)
+++ mplayer/pixmaps/cancel.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * cancel_xpm[] = {
+static const char * cancel_xpm[] = {
"55 16 120 2",
" c None",
". c #786663",
Index: mplayer/pixmaps/normal.xpm
===================================================================
--- mplayer/pixmaps/normal.xpm (revision 18774)
+++ mplayer/pixmaps/normal.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * normal_xpm[] = {
+static const char * normal_xpm[] = {
"16 16 111 2",
" c None",
". c #000000",
Index: mplayer/pixmaps/icon.xpm
===================================================================
--- mplayer/pixmaps/icon.xpm (revision 18774)
+++ mplayer/pixmaps/icon.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * icon_xpm[] = {
+static const char * icon_xpm[] = {
"64 64 256 2",
" c None",
". c #060606",
Index: mplayer/pixmaps/sub.xpm
===================================================================
--- mplayer/pixmaps/sub.xpm (revision 18774)
+++ mplayer/pixmaps/sub.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * sub_xpm[] = {
+static const char * sub_xpm[] = {
"16 16 2 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/open.xpm
===================================================================
--- mplayer/pixmaps/open.xpm (revision 18774)
+++ mplayer/pixmaps/open.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * open_xpm[] = {
+static const char * open_xpm[] = {
"16 16 64 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/tongue.xpm
===================================================================
--- mplayer/pixmaps/tongue.xpm (revision 18774)
+++ mplayer/pixmaps/tongue.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * tongue_xpm[] = {
+static const char * tongue_xpm[] = {
"16 16 150 2",
" c None",
". c #FC151B",
Index: mplayer/pixmaps/playvcd.xpm
===================================================================
--- mplayer/pixmaps/playvcd.xpm (revision 18774)
+++ mplayer/pixmaps/playvcd.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * playvcd_xpm[] = {
+static const char * playvcd_xpm[] = {
"16 16 182 2",
" c None",
". c #CC9665",
Index: mplayer/pixmaps/skin.xpm
===================================================================
--- mplayer/pixmaps/skin.xpm (revision 18774)
+++ mplayer/pixmaps/skin.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * skin_xpm[] = {
+static const char * skin_xpm[] = {
"16 16 162 2",
" c None",
". c #DBA97F",
Index: mplayer/pixmaps/eq.xpm
===================================================================
--- mplayer/pixmaps/eq.xpm (revision 18774)
+++ mplayer/pixmaps/eq.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * eq_xpm[] = {
+static const char * eq_xpm[] = {
"16 16 16 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/stop2.xpm
===================================================================
--- mplayer/pixmaps/stop2.xpm (revision 18774)
+++ mplayer/pixmaps/stop2.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * stop2_xpm[] = {
+static const char * stop2_xpm[] = {
"16 16 29 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/ok.xpm
===================================================================
--- mplayer/pixmaps/ok.xpm (revision 18774)
+++ mplayer/pixmaps/ok.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * ok_xpm[] = {
+static const char * ok_xpm[] = {
"37 16 5 1",
" c None",
". c #3539EC",
Index: mplayer/pixmaps/exit.xpm
===================================================================
--- mplayer/pixmaps/exit.xpm (revision 18774)
+++ mplayer/pixmaps/exit.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * exit_xpm[] = {
+static const char * exit_xpm[] = {
"16 16 63 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/dolby.xpm
===================================================================
--- mplayer/pixmaps/dolby.xpm (revision 18774)
+++ mplayer/pixmaps/dolby.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * dolby_xpm[] = {
+static const char * dolby_xpm[] = {
"16 11 9 1",
" c None",
". c #000000",
Index: mplayer/pixmaps/a235.xpm
===================================================================
--- mplayer/pixmaps/a235.xpm (revision 18774)
+++ mplayer/pixmaps/a235.xpm (working copy)
@@ -1,5 +1,5 @@
/* XPM */
-static char * a235_xpm[] = {
+static const char * a235_xpm[] = {
"18 16 3 1",
" c None",
". c #000000",
More information about the MPlayer-dev-eng
mailing list