Author: cazfi
Date: Sun Oct 25 18:43:26 2015
New Revision: 30211

URL: http://svn.gna.org/viewcvs/freeciv?rev=30211&view=rev
Log:
Renamed client 'options' structure as 'gui_options' to avoid namespace conflict 
with
Qt headers.

See patch #6438

Modified:
    branches/S2_6/client/audio.c
    branches/S2_6/client/chatline_common.c
    branches/S2_6/client/citydlg_common.c
    branches/S2_6/client/cityrepdata.c
    branches/S2_6/client/client_main.c
    branches/S2_6/client/climisc.c
    branches/S2_6/client/clinet.c
    branches/S2_6/client/control.c
    branches/S2_6/client/goto.c
    branches/S2_6/client/gui-gtk-2.0/chatline.c
    branches/S2_6/client/gui-gtk-2.0/citydlg.c
    branches/S2_6/client/gui-gtk-2.0/cityrep.c
    branches/S2_6/client/gui-gtk-2.0/dialogs.c
    branches/S2_6/client/gui-gtk-2.0/gui_main.c
    branches/S2_6/client/gui-gtk-2.0/gui_stuff.c
    branches/S2_6/client/gui-gtk-2.0/luaconsole.c
    branches/S2_6/client/gui-gtk-2.0/mapctrl.c
    branches/S2_6/client/gui-gtk-2.0/mapview.c
    branches/S2_6/client/gui-gtk-2.0/menu.c
    branches/S2_6/client/gui-gtk-2.0/messagewin.c
    branches/S2_6/client/gui-gtk-2.0/pages.c
    branches/S2_6/client/gui-gtk-2.0/plrdlg.c
    branches/S2_6/client/gui-gtk-2.0/theme_dlg.c
    branches/S2_6/client/gui-gtk-2.0/themes.c
    branches/S2_6/client/gui-gtk-2.0/wldlg.c
    branches/S2_6/client/gui-gtk-3.0/chatline.c
    branches/S2_6/client/gui-gtk-3.0/citydlg.c
    branches/S2_6/client/gui-gtk-3.0/cityrep.c
    branches/S2_6/client/gui-gtk-3.0/dialogs.c
    branches/S2_6/client/gui-gtk-3.0/gui_main.c
    branches/S2_6/client/gui-gtk-3.0/gui_stuff.c
    branches/S2_6/client/gui-gtk-3.0/luaconsole.c
    branches/S2_6/client/gui-gtk-3.0/mapctrl.c
    branches/S2_6/client/gui-gtk-3.0/mapview.c
    branches/S2_6/client/gui-gtk-3.0/menu.c
    branches/S2_6/client/gui-gtk-3.0/messagewin.c
    branches/S2_6/client/gui-gtk-3.0/pages.c
    branches/S2_6/client/gui-gtk-3.0/plrdlg.c
    branches/S2_6/client/gui-gtk-3.0/theme_dlg.c
    branches/S2_6/client/gui-gtk-3.0/themes.c
    branches/S2_6/client/gui-gtk-3.0/wldlg.c
    branches/S2_6/client/gui-qt/chatline.cpp
    branches/S2_6/client/gui-qt/cityrep.cpp
    branches/S2_6/client/gui-qt/fc_client.cpp
    branches/S2_6/client/gui-qt/gui_main.cpp
    branches/S2_6/client/gui-qt/mapview.cpp
    branches/S2_6/client/gui-qt/menu.cpp
    branches/S2_6/client/gui-sdl/gui_main.c
    branches/S2_6/client/gui-sdl/gui_mouse.c
    branches/S2_6/client/gui-sdl/mapctrl.c
    branches/S2_6/client/gui-sdl/mapview.c
    branches/S2_6/client/gui-sdl/themes.c
    branches/S2_6/client/gui-sdl2/graphics.c
    branches/S2_6/client/gui-sdl2/gui_main.c
    branches/S2_6/client/gui-sdl2/gui_mouse.c
    branches/S2_6/client/gui-sdl2/mapctrl.c
    branches/S2_6/client/gui-sdl2/mapview.c
    branches/S2_6/client/gui-sdl2/themes.c
    branches/S2_6/client/gui-xaw/citydlg.c
    branches/S2_6/client/gui-xaw/cityrep.c
    branches/S2_6/client/gui-xaw/graphics.c
    branches/S2_6/client/gui-xaw/mapview.c
    branches/S2_6/client/gui-xaw/menu.c
    branches/S2_6/client/mapctrl_common.c
    branches/S2_6/client/mapview_common.c
    branches/S2_6/client/messagewin_common.c
    branches/S2_6/client/music.c
    branches/S2_6/client/options.c
    branches/S2_6/client/options.h
    branches/S2_6/client/overview_common.c
    branches/S2_6/client/packhand.c
    branches/S2_6/client/reqtree.c
    branches/S2_6/client/tilespec.c
    branches/S2_6/client/voteinfo.c

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: branches/S2_6/client/audio.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/audio.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/chatline_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/chatline_common.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/citydlg_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/citydlg_common.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/cityrepdata.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/cityrepdata.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/client_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/client_main.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/climisc.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/climisc.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/clinet.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/clinet.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/control.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/control.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/goto.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/goto.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/chatline.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/chatline.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/citydlg.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/cityrep.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/cityrep.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/dialogs.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/dialogs.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/gui_main.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/gui_stuff.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/gui_stuff.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/luaconsole.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/luaconsole.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/mapctrl.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/mapctrl.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/mapview.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/mapview.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/menu.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/messagewin.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/messagewin.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/pages.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/pages.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/plrdlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/plrdlg.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/theme_dlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/theme_dlg.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/themes.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/themes.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-2.0/wldlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/wldlg.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/chatline.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/chatline.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/citydlg.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/cityrep.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/cityrep.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/dialogs.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/dialogs.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/gui_main.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/gui_stuff.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/gui_stuff.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/luaconsole.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/luaconsole.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/mapctrl.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/mapctrl.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/mapview.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/mapview.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/menu.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/messagewin.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/messagewin.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/pages.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/pages.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/plrdlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/plrdlg.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/theme_dlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/theme_dlg.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/themes.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/themes.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-gtk-3.0/wldlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/wldlg.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-qt/chatline.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/chatline.cpp?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-qt/cityrep.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/cityrep.cpp?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-qt/fc_client.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/fc_client.cpp?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-qt/gui_main.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/gui_main.cpp?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-qt/mapview.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/mapview.cpp?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-qt/menu.cpp
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/menu.cpp?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-sdl/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/gui_main.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-sdl/gui_mouse.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/gui_mouse.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-sdl/mapctrl.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/mapctrl.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-sdl/mapview.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/mapview.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-sdl/themes.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/themes.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-sdl2/graphics.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/graphics.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-sdl2/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/gui_main.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-sdl2/gui_mouse.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/gui_mouse.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-sdl2/mapctrl.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/mapctrl.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-sdl2/mapview.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/mapview.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-sdl2/themes.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/themes.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-xaw/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/citydlg.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-xaw/cityrep.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/cityrep.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-xaw/graphics.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/graphics.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-xaw/mapview.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/mapview.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/gui-xaw/menu.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-xaw/menu.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/mapctrl_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/mapctrl_common.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/mapview_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/mapview_common.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/messagewin_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/messagewin_common.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/music.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/music.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/options.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/options.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/options.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/options.h?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/overview_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/overview_common.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/packhand.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/packhand.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/reqtree.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/reqtree.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/tilespec.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/tilespec.c?rev=30211&r1=30210&r2=30211&view=diff

Modified: branches/S2_6/client/voteinfo.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/voteinfo.c?rev=30211&r1=30210&r2=30211&view=diff


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to