Author: cazfi Date: Thu Dec 17 08:39:44 2015 New Revision: 31040 URL: http://svn.gna.org/viewcvs/freeciv?rev=31040&view=rev Log: Made corrections to include order & comments, and some other minor style corrections to gtk3-client
See patch #6684 Modified: trunk/client/gui-gtk-3.0/canvas.c trunk/client/gui-gtk-3.0/choice_dialog.c trunk/client/gui-gtk-3.0/choice_dialog.h trunk/client/gui-gtk-3.0/citizensinfo.h trunk/client/gui-gtk-3.0/cma_fe.c trunk/client/gui-gtk-3.0/colors.c trunk/client/gui-gtk-3.0/dialogs.h trunk/client/gui-gtk-3.0/editgui.h trunk/client/gui-gtk-3.0/finddlg.c trunk/client/gui-gtk-3.0/graphics.h trunk/client/gui-gtk-3.0/gtkpixcomm.h trunk/client/gui-gtk-3.0/happiness.h trunk/client/gui-gtk-3.0/helpdlg.c trunk/client/gui-gtk-3.0/luaconsole.c trunk/client/gui-gtk-3.0/mapctrl.c trunk/client/gui-gtk-3.0/mapview.h trunk/client/gui-gtk-3.0/pages.h trunk/client/gui-gtk-3.0/plrdlg.c trunk/client/gui-gtk-3.0/plrdlg.h trunk/client/gui-gtk-3.0/soundset_dlg.c trunk/client/gui-gtk-3.0/sprite.c trunk/client/gui-gtk-3.0/sprite.h trunk/client/gui-gtk-3.0/tileset_dlg.c trunk/client/gui-gtk-3.0/wldlg.h Modified: trunk/client/gui-gtk-3.0/canvas.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/canvas.c?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/canvas.c (original) +++ trunk/client/gui-gtk-3.0/canvas.c Thu Dec 17 08:39:44 2015 @@ -15,10 +15,12 @@ #include <fc_config.h> #endif -#include "canvas.h" +/* gui-gtk-3.0 */ #include "colors.h" #include "gui_main.h" #include "mapview.h" + +#include "canvas.h" /**************************************************************************** Create a canvas of the given size. Modified: trunk/client/gui-gtk-3.0/choice_dialog.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/choice_dialog.c?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/choice_dialog.c (original) +++ trunk/client/gui-gtk-3.0/choice_dialog.c Thu Dec 17 08:39:44 2015 @@ -18,8 +18,10 @@ #include <gtk/gtk.h> +/* utility */ #include "support.h" +/* gui-gtk-3.0 */ #include "gui_main.h" #include "gui_stuff.h" Modified: trunk/client/gui-gtk-3.0/choice_dialog.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/choice_dialog.h?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/choice_dialog.h (original) +++ trunk/client/gui-gtk-3.0/choice_dialog.h Thu Dec 17 08:39:44 2015 @@ -28,11 +28,11 @@ void choice_dialog_end(GtkWidget *dshell); int choice_dialog_get_number_of_buttons(GtkWidget *cd); void choice_dialog_button_set_sensitive(GtkWidget *shl, int button, - gboolean state); + gboolean state); void choice_dialog_button_set_label(GtkWidget *cd, int button, const char* label); void choice_dialog_button_set_tooltip(GtkWidget *cd, int number, const char* tool_tip); void choice_dialog_button_move_to_the_end(GtkWidget *cd, const int number); -#endif +#endif /* FC__CHOICE_DIALOG_H */ Modified: trunk/client/gui-gtk-3.0/citizensinfo.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/citizensinfo.h?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/citizensinfo.h (original) +++ trunk/client/gui-gtk-3.0/citizensinfo.h Thu Dec 17 08:39:44 2015 @@ -25,4 +25,3 @@ void citizens_dialog_close(const struct city *pcity); #endif /* FC__CITIZENSINFO_H */ - Modified: trunk/client/gui-gtk-3.0/cma_fe.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/cma_fe.c?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/cma_fe.c (original) +++ trunk/client/gui-gtk-3.0/cma_fe.c Thu Dec 17 08:39:44 2015 @@ -35,7 +35,7 @@ #include "messagewin_g.h" #include "options.h" -/* client/gtk-3.0 */ +/* client/gui-gtk-3.0 */ #include "cityrep.h" #include "dialogs.h" #include "gui_main.h" Modified: trunk/client/gui-gtk-3.0/colors.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/colors.c?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/colors.c (original) +++ trunk/client/gui-gtk-3.0/colors.c Thu Dec 17 08:39:44 2015 @@ -19,9 +19,11 @@ #include <gtk/gtk.h> +/* utility */ #include "log.h" #include "mem.h" +/* client/gui-gtk-3.0 */ #include "gui_main.h" #include "colors.h" Modified: trunk/client/gui-gtk-3.0/dialogs.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/dialogs.h?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/dialogs.h (original) +++ trunk/client/gui-gtk-3.0/dialogs.h Thu Dec 17 08:39:44 2015 @@ -19,7 +19,7 @@ void popup_revolution_dialog(struct government *government); void message_dialog_button_set_sensitive(GtkWidget *shl, int button, - gboolean state); + gboolean state); gboolean taxrates_callback(GtkWidget *w, GdkEventButton *ev, gpointer data); void nationset_sync_to_server(const char *nationset); Modified: trunk/client/gui-gtk-3.0/editgui.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/editgui.h?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/editgui.h (original) +++ trunk/client/gui-gtk-3.0/editgui.h Thu Dec 17 08:39:44 2015 @@ -15,6 +15,7 @@ #include <gtk/gtk.h> +/* client */ #include "editor.h" #include "editgui_g.h" Modified: trunk/client/gui-gtk-3.0/finddlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/finddlg.c?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/finddlg.c (original) +++ trunk/client/gui-gtk-3.0/finddlg.c Thu Dec 17 08:39:44 2015 @@ -48,7 +48,7 @@ static void find_response(struct gui_dialog *dlg, int response, gpointer data); static void find_destroy_callback(GtkWidget *w, gpointer data); static void find_selection_callback(GtkTreeSelection *selection, - GtkTreeModel *model); + GtkTreeModel *model); static struct tile *pos; Modified: trunk/client/gui-gtk-3.0/graphics.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/graphics.h?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/graphics.h (original) +++ trunk/client/gui-gtk-3.0/graphics.h Thu Dec 17 08:39:44 2015 @@ -15,9 +15,11 @@ #include <gtk/gtk.h> +/* client */ #include "graphics_g.h" #include "mapview_common.h" +/* client/gui-gtk-3.0 */ #include "canvas.h" #include "sprite.h" @@ -32,4 +34,3 @@ extern GdkCursor *fc_cursors[CURSOR_LAST][NUM_CURSOR_FRAMES]; #endif /* FC__GRAPHICS_H */ - Modified: trunk/client/gui-gtk-3.0/gtkpixcomm.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/gtkpixcomm.h?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/gtkpixcomm.h (original) +++ trunk/client/gui-gtk-3.0/gtkpixcomm.h Thu Dec 17 08:39:44 2015 @@ -63,17 +63,16 @@ }; -GType gtk_pixcomm_get_type (void) G_GNUC_CONST; -GtkWidget *gtk_pixcomm_new (gint width, gint height); +GType gtk_pixcomm_get_type (void)G_GNUC_CONST; +GtkWidget *gtk_pixcomm_new(gint width, gint height); void gtk_pixcomm_set_scale(GtkPixcomm *pixcomm, gdouble scale); cairo_surface_t *gtk_pixcomm_get_surface(GtkPixcomm *pixcomm); void gtk_pixcomm_copyto(GtkPixcomm *pixcomm, struct sprite *src, - gint x, gint y); -void gtk_pixcomm_clear (GtkPixcomm *pixcomm); + gint x, gint y); +void gtk_pixcomm_clear(GtkPixcomm *pixcomm); GtkWidget *gtk_pixcomm_new_from_sprite(struct sprite *sprite); void gtk_pixcomm_set_from_sprite(GtkPixcomm *p, struct sprite *sprite); G_END_DECLS #endif /* __GTK_PIXCOMM_H__ */ - Modified: trunk/client/gui-gtk-3.0/happiness.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/happiness.h?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/happiness.h (original) +++ trunk/client/gui-gtk-3.0/happiness.h Thu Dec 17 08:39:44 2015 @@ -14,6 +14,8 @@ #define FC__HAPPINESS_H #include <gtk/gtk.h> + +/* client/gui-gtk-3.0 */ #include "citydlg.h" void happiness_dialog_init(void); Modified: trunk/client/gui-gtk-3.0/helpdlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/helpdlg.c?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/helpdlg.c (original) +++ trunk/client/gui-gtk-3.0/helpdlg.c Thu Dec 17 08:39:44 2015 @@ -21,7 +21,6 @@ #include <math.h> /* sqrt */ #include <gtk/gtk.h> -#include "gtkpixcomm.h" /* utility */ #include "fcintl.h" @@ -44,13 +43,16 @@ /* client */ #include "client_main.h" #include "climisc.h" -#include "colors.h" -#include "graphics.h" -#include "gui_main.h" -#include "gui_stuff.h" #include "helpdata.h" #include "options.h" #include "tilespec.h" + +/* client/gui-gtk-3.0 */ +#include "colors.h" +#include "graphics.h" +#include "gtkpixcomm.h" +#include "gui_main.h" +#include "gui_stuff.h" #include "helpdlg.h" Modified: trunk/client/gui-gtk-3.0/luaconsole.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/luaconsole.c?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/luaconsole.c (original) +++ trunk/client/gui-gtk-3.0/luaconsole.c Thu Dec 17 08:39:44 2015 @@ -29,7 +29,7 @@ /* client */ #include "options.h" -/* client/gui-gtk-2.0 */ +/* client/gui-gtk-3.0 */ #include "chatline.h" #include "gui_main.h" #include "gui_stuff.h" Modified: trunk/client/gui-gtk-3.0/mapctrl.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/mapctrl.c?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/mapctrl.c (original) +++ trunk/client/gui-gtk-3.0/mapctrl.c Thu Dec 17 08:39:44 2015 @@ -31,24 +31,28 @@ #include "overview_common.h" /* client */ -#include "chatline.h" -#include "citydlg.h" #include "client_main.h" #include "climap.h" #include "climisc.h" +#include "control.h" +#include "editor.h" +#include "tilespec.h" +#include "text.h" + +/* client/agents */ +#include "cma_core.h" + +/* client/gui-gtk-3.0 */ +#include "chatline.h" +#include "citydlg.h" #include "colors.h" -#include "control.h" #include "dialogs.h" #include "editgui.h" -#include "editor.h" #include "graphics.h" #include "gui_main.h" #include "inputdlg.h" #include "mapview.h" #include "menu.h" -#include "tilespec.h" -#include "cma_core.h" -#include "text.h" #include "mapctrl.h" Modified: trunk/client/gui-gtk-3.0/mapview.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/mapview.h?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/mapview.h (original) +++ trunk/client/gui-gtk-3.0/mapview.h Thu Dec 17 08:39:44 2015 @@ -15,15 +15,17 @@ #include <gtk/gtk.h> +/* common */ #include "fc_types.h" -#include "gtkpixcomm.h" - +/* client */ #include "citydlg_common.h" #include "mapview_g.h" #include "mapview_common.h" +/* client/gui-gtk-3.0 */ #include "canvas.h" +#include "gtkpixcomm.h" #include "graphics.h" GdkPixbuf *get_thumb_pixbuf(int onoff); @@ -33,7 +35,7 @@ gboolean overview_canvas_draw(GtkWidget *w, cairo_t *cr, gpointer data); gboolean map_canvas_draw(GtkWidget *w, cairo_t *cr, gpointer data); gboolean map_canvas_configure(GtkWidget *w, GdkEventConfigure *ev, - gpointer data); + gpointer data); void put_unit_gpixmap(struct unit *punit, GtkPixcomm *p); @@ -44,13 +46,13 @@ void update_map_canvas_scrollbars_size(void); void pixmap_put_overlay_tile(GdkWindow *pixmap, float zoom, - int canvas_x, int canvas_y, - struct sprite *ssprite); + int canvas_x, int canvas_y, + struct sprite *ssprite); void pixmap_put_overlay_tile_draw(struct canvas *pcanvas, - int canvas_x, int canvas_y, - struct sprite *ssprite, - bool fog); + int canvas_x, int canvas_y, + struct sprite *ssprite, + bool fog); void mapview_freeze(void); void mapview_thaw(void); Modified: trunk/client/gui-gtk-3.0/pages.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/pages.h?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/pages.h (original) +++ trunk/client/gui-gtk-3.0/pages.h Thu Dec 17 08:39:44 2015 @@ -15,6 +15,7 @@ #include <gtk/gtk.h> +/* utility */ #include "support.h" /* bool type */ #include "pages_g.h" Modified: trunk/client/gui-gtk-3.0/plrdlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/plrdlg.c?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/plrdlg.c (original) +++ trunk/client/gui-gtk-3.0/plrdlg.c Thu Dec 17 08:39:44 2015 @@ -34,20 +34,24 @@ #include "player.h" /* client */ -#include "chatline.h" #include "client_main.h" #include "climisc.h" #include "connectdlg_common.h" +#include "tilespec.h" +#include "colors.h" +#include "graphics.h" +#include "options.h" +#include "text.h" + +/* client/gui-gtk-3.0 */ +#include "chatline.h" #include "dialogs.h" #include "gui_main.h" #include "gui_stuff.h" #include "inteldlg.h" #include "spaceshipdlg.h" -#include "tilespec.h" #include "colors.h" #include "graphics.h" -#include "options.h" -#include "text.h" #include "plrdlg.h" Modified: trunk/client/gui-gtk-3.0/plrdlg.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/plrdlg.h?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/plrdlg.h (original) +++ trunk/client/gui-gtk-3.0/plrdlg.h Thu Dec 17 08:39:44 2015 @@ -21,4 +21,5 @@ GdkPixbuf *get_flag(const struct nation_type *pnation); extern struct gui_dialog *players_dialog_shell; + #endif /* FC__PLRDLG_H */ Modified: trunk/client/gui-gtk-3.0/soundset_dlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/soundset_dlg.c?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/soundset_dlg.c (original) +++ trunk/client/gui-gtk-3.0/soundset_dlg.c Thu Dec 17 08:39:44 2015 @@ -26,6 +26,8 @@ /* client */ #include "audio.h" #include "client_main.h" + +/* client/gui-gtk-3.0 */ #include "gui_main.h" #include "gui_stuff.h" Modified: trunk/client/gui-gtk-3.0/sprite.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/sprite.c?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/sprite.c (original) +++ trunk/client/gui-gtk-3.0/sprite.c Thu Dec 17 08:39:44 2015 @@ -20,7 +20,7 @@ #include "mem.h" #include "shared.h" -/* client/gtk-3.0 */ +/* client/gui-gtk-3.0 */ #include "colors.h" #include "sprite.h" Modified: trunk/client/gui-gtk-3.0/sprite.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/sprite.h?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/sprite.h (original) +++ trunk/client/gui-gtk-3.0/sprite.h Thu Dec 17 08:39:44 2015 @@ -25,7 +25,7 @@ struct sprite *sprite_scale(struct sprite *src, int new_w, int new_h); void sprite_get_bounding_box(struct sprite *sprite, int *start_x, - int *start_y, int *end_x, int *end_y); + int *start_y, int *end_x, int *end_y); struct sprite *crop_blankspace(struct sprite *s); /******************************************************************** Modified: trunk/client/gui-gtk-3.0/tileset_dlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/tileset_dlg.c?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/tileset_dlg.c (original) +++ trunk/client/gui-gtk-3.0/tileset_dlg.c Thu Dec 17 08:39:44 2015 @@ -25,9 +25,11 @@ #include "unitlist.h" /* client */ +#include "tilespec.h" + +/* client/gui-gtk-3.0 */ #include "gui_main.h" #include "gui_stuff.h" -#include "tilespec.h" #include "dialogs_g.h" Modified: trunk/client/gui-gtk-3.0/wldlg.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/wldlg.h?rev=31040&r1=31039&r2=31040&view=diff ============================================================================== --- trunk/client/gui-gtk-3.0/wldlg.h (original) +++ trunk/client/gui-gtk-3.0/wldlg.h Thu Dec 17 08:39:44 2015 @@ -15,9 +15,12 @@ #include <gtk/gtk.h> -#include "worklist.h" +/* common */ #include "improvement.h" #include "unittype.h" +#include "worklist.h" + +/* client */ #include "climisc.h" #include "wldlg_g.h" _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits