Author: cazfi
Date: Sat Dec 19 12:50:56 2015
New Revision: 31101
URL: http://svn.gna.org/viewcvs/freeciv?rev=31101&view=rev
Log:
Removed gtkpixcomm.h includes, where possible, from gtk3-client
See patch #6692
Modified:
branches/S2_6/client/gui-gtk-3.0/canvas.h
branches/S2_6/client/gui-gtk-3.0/editgui.c
branches/S2_6/client/gui-gtk-3.0/editprop.c
branches/S2_6/client/gui-gtk-3.0/graphics.c
branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.c
branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.h
branches/S2_6/client/gui-gtk-3.0/gui_main.h
branches/S2_6/client/gui-gtk-3.0/menu.c
branches/S2_6/client/gui-gtk-3.0/repodlgs.c
Modified: branches/S2_6/client/gui-gtk-3.0/canvas.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/canvas.h?rev=31101&r1=31100&r2=31101&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/canvas.h (original)
+++ branches/S2_6/client/gui-gtk-3.0/canvas.h Sat Dec 19 12:50:56 2015
@@ -17,8 +17,6 @@
#include "canvas_g.h"
-#include "gtkpixcomm.h"
-
struct canvas
{
cairo_surface_t *surface;
Modified: branches/S2_6/client/gui-gtk-3.0/editgui.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/editgui.c?rev=31101&r1=31100&r2=31101&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/editgui.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/editgui.c Sat Dec 19 12:50:56 2015
@@ -38,11 +38,10 @@
/* client */
#include "chatline_common.h"
#include "client_main.h"
+#include "dialogs_g.h"
#include "editor.h"
#include "mapview_common.h"
#include "tilespec.h"
-
-#include "dialogs_g.h"
/* client/gui-gtk-3.0 */
#include "canvas.h"
@@ -51,6 +50,7 @@
#include "gui_main.h"
#include "gui_stuff.h"
#include "plrdlg.h"
+#include "sprite.h"
enum tool_value_selector_columns {
Modified: branches/S2_6/client/gui-gtk-3.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/editprop.c?rev=31101&r1=31100&r2=31101&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/editprop.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/editprop.c Sat Dec 19 12:50:56 2015
@@ -46,6 +46,7 @@
#include "gui_main.h"
#include "gui_stuff.h"
#include "plrdlg.h"
+#include "sprite.h"
#include "editprop.h"
Modified: branches/S2_6/client/gui-gtk-3.0/graphics.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/graphics.c?rev=31101&r1=31100&r2=31101&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/graphics.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/graphics.c Sat Dec 19 12:50:56 2015
@@ -20,8 +20,6 @@
#include <string.h>
#include <gtk/gtk.h>
-
-#include "gtkpixcomm.h"
/* utility */
#include "log.h"
Modified: branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.c?rev=31101&r1=31100&r2=31101&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.c Sat Dec 19 12:50:56 2015
@@ -43,6 +43,7 @@
/* gui-gtk-3.0 */
#include "gui_main.h"
+#include "sprite.h"
#include "gtkpixcomm.h"
Modified: branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.h?rev=31101&r1=31100&r2=31101&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.h (original)
+++ branches/S2_6/client/gui-gtk-3.0/gtkpixcomm.h Sat Dec 19 12:50:56 2015
@@ -27,11 +27,7 @@
#ifndef __GTK_PIXCOMM_H__
#define __GTK_PIXCOMM_H__
-
#include <gtk/gtk.h>
-
-#include "sprite.h"
-
G_BEGIN_DECLS
Modified: branches/S2_6/client/gui-gtk-3.0/gui_main.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/gui_main.h?rev=31101&r1=31100&r2=31101&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/gui_main.h (original)
+++ branches/S2_6/client/gui-gtk-3.0/gui_main.h Sat Dec 19 12:50:56 2015
@@ -15,7 +15,6 @@
#include <gtk/gtk.h>
-#include "gtkpixcomm.h"
#include "gui_main_g.h"
/* network string charset conversion */
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=31101&r1=31100&r2=31101&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/menu.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/menu.c Sat Dec 19 12:50:56 2015
@@ -52,6 +52,7 @@
#include "gui_main.h"
#include "gui_stuff.h"
#include "helpdlg.h"
+#include "luaconsole.h"
#include "mapctrl.h" /* center_on_unit(). */
#include "messagedlg.h"
#include "messagewin.h"
@@ -60,7 +61,7 @@
#include "plrdlg.h"
#include "ratesdlg.h"
#include "repodlgs.h"
-#include "luaconsole.h"
+#include "sprite.h"
#include "spaceshipdlg.h"
#include "unitselect.h"
#include "wldlg.h"
Modified: branches/S2_6/client/gui-gtk-3.0/repodlgs.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/repodlgs.c?rev=31101&r1=31100&r2=31101&view=diff
==============================================================================
--- branches/S2_6/client/gui-gtk-3.0/repodlgs.c (original)
+++ branches/S2_6/client/gui-gtk-3.0/repodlgs.c Sat Dec 19 12:50:56 2015
@@ -58,6 +58,7 @@
#include "gui_stuff.h"
#include "helpdlg.h"
#include "plrdlg.h"
+#include "sprite.h"
#include "repodlgs.h"
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
