Cleanup many #include statements: reorder so that a generic-to-specific

2008-08-03  Wouter Bolsterlee  <wbolster@svn.gnome.org>

	* shell/eggfindbar.c:
	* shell/ev-application.c:
	* shell/ev-message-area.c:
	* shell/ev-navigation-action.c:
	* shell/ev-open-recent-action.c:
	* shell/ev-page-action-widget.c:
	* shell/ev-page-action.c:
	* shell/ev-password-view.c:
	* shell/ev-properties-dialog.c:
	* shell/ev-properties-fonts.c:
	* shell/ev-sidebar-attachments.c:
	* shell/ev-sidebar-page.c:
	* shell/ev-sidebar-thumbnails.c:
	* shell/ev-stock-icons.c:
	* shell/ev-tooltip.c:
	* shell/ev-view.c:
	* shell/ev-window.c:
	* shell/main.c:

	Cleanup many #include statements: reorder so that a
	generic-to-specific order is used, use single gtk.h
	includes, and some other cleanups.

svn path=/trunk/; revision=3094

diff --git a/ChangeLog b/ChangeLog
index 37f539323d11a3630c6c7826f19ed53487831ee2..78d3fde41701b9c90a0b3905a2893ecfe8c00b06 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2008-08-03  Wouter Bolsterlee  <wbolster@svn.gnome.org>
+
+       * shell/eggfindbar.c:
+       * shell/ev-application.c:
+       * shell/ev-message-area.c:
+       * shell/ev-navigation-action.c:
+       * shell/ev-open-recent-action.c:
+       * shell/ev-page-action-widget.c:
+       * shell/ev-page-action.c:
+       * shell/ev-password-view.c:
+       * shell/ev-properties-dialog.c:
+       * shell/ev-properties-fonts.c:
+       * shell/ev-sidebar-attachments.c:
+       * shell/ev-sidebar-page.c:
+       * shell/ev-sidebar-thumbnails.c:
+       * shell/ev-stock-icons.c:
+       * shell/ev-tooltip.c:
+       * shell/ev-view.c:
+       * shell/ev-window.c:
+       * shell/main.c:
+
+       Cleanup many #include statements: reorder so that a
+       generic-to-specific order is used, use single gtk.h
+       includes, and some other cleanups.
+
 2008-08-03  Carlos Garcia Campos  <carlosgc@gnome.org>
 
        * shell/ev-jobs.h:

diff --git a/shell/eggfindbar.c b/shell/eggfindbar.c
index 62adea9d5cd61e0aab6ceb09d4f616705a47a9ba..3c8cb6114e0684ef849a19bd6c2cae6b229dbb73 100644 (file)
--- a/shell/eggfindbar.c
+++ b/shell/eggfindbar.c
@@ -21,20 +21,8 @@ Boston, MA 02111-1307, USA.
 #include "eggfindbar.h"
 
 #include <glib/gi18n.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtklabel.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkseparatortoolitem.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtktoggletoolbutton.h>
-#include <gtk/gtkversion.h>
 
 #include <string.h>
 

diff --git a/shell/ev-application.c b/shell/ev-application.c
index 7ad13820dd9d8f2de408a93d0edde90f29d9c83b..bdcdfcd6a6ea8f9a72d1b4a4f4fef7da7b5766cb 100644 (file)
--- a/shell/ev-application.c
+++ b/shell/ev-application.c
@@ -21,6 +21,15 @@
  */
 
 #include <config.h>
+
+#include <glib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#if WITH_GNOME
+#include <libgnomeui/gnome-client.h>
+#endif
+
 #include "ev-application.h"
 #include "ev-utils.h"
 #include "ev-file-helpers.h"
@@ -30,18 +39,6 @@
 #endif /* ENABLE_DBUS */
 #include "totem-scrsaver.h"
 
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <glib-object.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmain.h>
-
-#if WITH_GNOME
-#include <libgnomeui/gnome-client.h>
-#endif
-
 #ifdef ENABLE_DBUS
 #include "ev-application-service.h"
 #include <dbus/dbus-glib-bindings.h>

diff --git a/shell/ev-message-area.c b/shell/ev-message-area.c
index 845f6fd22dd4b3446cd9b90f0c6baba28c395a2a..70c76a5814af4050f20d4e5acf9282a2e967774a 100644 (file)
--- a/shell/ev-message-area.c
+++ b/shell/ev-message-area.c
@@ -22,12 +22,8 @@
  */
 
 #include <config.h>
-#include <gtk/gtkaccessible.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkstock.h>
+
+#include <gtk/gtk.h>
 
 #include "ev-message-area.h"
 

diff --git a/shell/ev-navigation-action.c b/shell/ev-navigation-action.c
index 6a5e3a522ddce0623b10baaf7123ad21539566d9..5670a04e2e0f68208560d2003ea5e8e06b0e6ab0 100644 (file)
--- a/shell/ev-navigation-action.c
+++ b/shell/ev-navigation-action.c
@@ -20,18 +20,12 @@
 
 #include "config.h"
 
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
 #include "ev-navigation-action.h"
 #include "ev-navigation-action-widget.h"
 
-#include <gtk/gtklabel.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenutoolbutton.h>
-#include <glib/gi18n.h>
-
 enum
 {
        WIDGET_ACTIVATE_LINK,

diff --git a/shell/ev-open-recent-action.c b/shell/ev-open-recent-action.c
index e021c6b2634fff1b7303773cf4a4f600817ce619..0a4f309584e80d549826c268a41b7904110e8233 100644 (file)
--- a/shell/ev-open-recent-action.c
+++ b/shell/ev-open-recent-action.c
@@ -18,8 +18,9 @@
  */
 
 #include <config.h>
-#include <gtk/gtk.h>
+
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
 
 #include "ev-open-recent-action.h"
 

diff --git a/shell/ev-page-action-widget.c b/shell/ev-page-action-widget.c
index 2bef853d583e75b8f269eff5ec90822cd1603aab..482615a4b494f100af498ceda3e8f11f0a65a111 100644 (file)
--- a/shell/ev-page-action-widget.c
+++ b/shell/ev-page-action-widget.c
@@ -20,6 +20,10 @@
 
 #include "config.h"
 
+#include <string.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
 #include "ev-page-action.h"
 #include "ev-page-cache.h"
 #include "ev-window.h"
@@ -27,13 +31,6 @@
 #include "ev-page-action-widget.h"
 #include "ev-marshal.h"
 
-#include <glib/gi18n.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <string.h>
-
 /* Widget we pass back */
 static void  ev_page_action_widget_init       (EvPageActionWidget      *action_widget);
 static void  ev_page_action_widget_class_init (EvPageActionWidgetClass *action_widget);

diff --git a/shell/ev-page-action.c b/shell/ev-page-action.c
index 39ce3ec560e21bf411d931997dd32517d0ac1f14..1d4151ff31848599d2a778d1d632a408db5f5262 100644 (file)
--- a/shell/ev-page-action.c
+++ b/shell/ev-page-action.c
@@ -18,7 +18,14 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
+
+#include <string.h>
+#include <stdlib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
 
 #include "ev-page-action.h"
 #include "ev-page-cache.h"
@@ -27,14 +34,6 @@
 #include "ev-page-action-widget.h"
 #include "ev-marshal.h"
 
-#include <glib/gi18n.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkhbox.h>
-#include <string.h>
-#include <stdlib.h>
-
 struct _EvPageActionPrivate
 {
        EvPageCache *page_cache;

diff --git a/shell/ev-password-view.c b/shell/ev-password-view.c
index fc52fa7b9a090ca2816ee13cbea384d719b6dcf0..b53300d46c2bc49facdf34c70c400ee8ce0f289f 100644 (file)
--- a/shell/ev-password-view.c
+++ b/shell/ev-password-view.c
@@ -22,10 +22,11 @@
 #include "config.h"
 #endif
 
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include "ev-password-view.h"
+#include <gtk/gtk.h>
+
 #include "ev-marshal.h"
+#include "ev-password-view.h"
 
 enum {
        UNLOCK,

diff --git a/shell/ev-properties-dialog.c b/shell/ev-properties-dialog.c
index 16494e167ea20e19f32739c0d803e2d3e6cd67e5..24bd3d6232929a5cea06ee496eb6a94eff635cec 100644 (file)
--- a/shell/ev-properties-dialog.c
+++ b/shell/ev-properties-dialog.c
@@ -22,18 +22,14 @@
 #include "config.h"
 #endif
 
-#include "ev-properties-view.h"
-#include "ev-properties-fonts.h"
-#include "ev-properties-dialog.h"
-#include "ev-page-cache.h"
-#include "ev-document-fonts.h"
-
 #include <glib/gi18n.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkbox.h>
+#include <gtk/gtk.h>
+
+#include "ev-document-fonts.h"
+#include "ev-page-cache.h"
+#include "ev-properties-dialog.h"
+#include "ev-properties-fonts.h"
+#include "ev-properties-view.h"
 
 struct _EvPropertiesDialog {
        GtkDialog base_instance;

diff --git a/shell/ev-properties-fonts.c b/shell/ev-properties-fonts.c
index 385cda10ba4462058c03f8c170167b9e2da75a92..bb634ef3a3c75385655cb08dcd8084cb9bdee06c 100644 (file)
--- a/shell/ev-properties-fonts.c
+++ b/shell/ev-properties-fonts.c
@@ -22,15 +22,15 @@
 #include "config.h"
 #endif
 
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <glade/glade.h>
+
 #include "ev-properties-fonts.h"
 #include "ev-document-fonts.h"
 #include "ev-jobs.h"
 #include "ev-job-scheduler.h"
 
-#include <glib/gi18n.h>
-#include <gtk/gtktreeview.h>
-#include <glade/glade.h>
-
 struct _EvPropertiesFonts {
        GtkVBox base_instance;
 

diff --git a/shell/ev-sidebar-attachments.c b/shell/ev-sidebar-attachments.c
index 2aeadd69a68343ee2e1ca4bb4f02d5096816e8b1..11305334fb93ba1a200bc7cb68bc69cea8892134 100644 (file)
--- a/shell/ev-sidebar-attachments.c
+++ b/shell/ev-sidebar-attachments.c
@@ -25,10 +25,10 @@
 #include "config.h"
 #endif
 
+#include <string.h>
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <gtk/gtk.h>
-#include <string.h>
 
 #include "ev-file-helpers.h"
 #include "ev-sidebar-attachments.h"

diff --git a/shell/ev-sidebar-page.c b/shell/ev-sidebar-page.c
index 8e6a33d2e07fc422dfd7cc59582df27386530523..6043ec5c04e3e92b9f3d736e95343b8f3d51e5e8 100644 (file)
--- a/shell/ev-sidebar-page.c
+++ b/shell/ev-sidebar-page.c
@@ -22,9 +22,10 @@
 #include "config.h"
 #endif
 
-#include "ev-sidebar-page.h"
 #include <gtk/gtk.h>
 
+#include "ev-sidebar-page.h"
+
 static void ev_sidebar_page_iface_init (gpointer iface);
 
 GType

diff --git a/shell/ev-sidebar-thumbnails.c b/shell/ev-sidebar-thumbnails.c
index 7fe62f16c065ca3c280d3fbe44fcefd879b04e9d..690c7de6afb42f4f264e1286989d83bb5c3c6d82 100644 (file)
--- a/shell/ev-sidebar-thumbnails.c
+++ b/shell/ev-sidebar-thumbnails.c
@@ -27,8 +27,8 @@
 #endif
 
 #include <string.h>
-#include <gtk/gtk.h>
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
 
 #include "ev-sidebar-page.h"
 #include "ev-sidebar-thumbnails.h"

diff --git a/shell/ev-stock-icons.c b/shell/ev-stock-icons.c
index ce15dc65d5a346339f5d77947105f00c1950974b..09536ca709c749f284a7438ce7a60e2f98edb9d3 100644 (file)
--- a/shell/ev-stock-icons.c
+++ b/shell/ev-stock-icons.c
@@ -24,9 +24,8 @@
 #include <config.h>
 #include "ev-stock-icons.h"
 
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkstock.h>
-#include <gdk/gdkpixbuf.h>
+#include <gtk/gtk.h>
+#include <gdk/gdk.h>
 
 typedef struct {
        char *stock_id;

diff --git a/shell/ev-tooltip.c b/shell/ev-tooltip.c
index 9f0cf65b023df691224fed77bfeff418c59d345f..b23a6c9998b1152325bc7749cb77720e1fa3ea3f 100644 (file)
--- a/shell/ev-tooltip.c
+++ b/shell/ev-tooltip.c
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include "ev-tooltip.h"
+#include <gtk/gtk.h>
 
-#include <gtk/gtklabel.h>
+#include "ev-tooltip.h"
 
 #define DEFAULT_DELAY 500
 #define STICKY_DELAY 500

diff --git a/shell/ev-view.c b/shell/ev-view.c
index 49b604b08322518a3a849370a3742a88859698d0..1def7fb7656e00cebc1b9e171e70a81050efc09d 100644 (file)
--- a/shell/ev-view.c
+++ b/shell/ev-view.c
@@ -18,15 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#include <config.h>
+#include "config.h"
+
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
-#include <gtk/gtkalignment.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkclipboard.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "ev-marshal.h"

diff --git a/shell/ev-window.c b/shell/ev-window.c
index 4c312ea408167c11e843cdd344c717c2e1cf37e0..5768b7ca8c6023211a72188ad855b6ecfff42390 100644 (file)
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -28,6 +28,18 @@
 #include "config.h"
 #endif
 
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <glib/gstdio.h>
+#include <glib/gi18n.h>
+#include <gio/gio.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkprintunixdialog.h>
+#include <gconf/gconf-client.h>
+
 #include "ev-window.h"
 #include "ev-window-title.h"
 #include "ev-navigation-action.h"
@@ -68,27 +80,15 @@
 #include "ev-message-area.h"
 #include "ev-mount-operation.h"
 #include "ev-file-monitor.h"
+
 #ifdef ENABLE_DBUS
 #include "ev-media-player-keys.h"
 #endif /* ENABLE_DBUS */
 
-#include <gtk/gtkprintunixdialog.h>
-
 #ifdef ENABLE_PDF
 #include <poppler.h>
 #endif
 
-#include <glib/gstdio.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-#include <gconf/gconf-client.h>
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
 typedef enum {
        PAGE_MODE_DOCUMENT,
        PAGE_MODE_PASSWORD

diff --git a/shell/main.c b/shell/main.c
index eb5c08ab1b7c654e619661d4120982de039258dd..b0c26caa979690489647fcb7f66f856ca771aea3 100644 (file)
--- a/shell/main.c
+++ b/shell/main.c
@@ -19,15 +19,11 @@
 
 #include "config.h"
 
-#include "ev-application.h"
-#include "ev-metadata-manager.h"
-#include "ev-debug.h"
-
-#include <glib/gi18n.h>
-#include <gdk/gdkx.h>
-#include <gtk/gtkmain.h>
 #include <stdlib.h>
 #include <string.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 
 #if WITH_GNOME
 #include <libgnome/gnome-program.h>
@@ -40,9 +36,12 @@
 #include <dbus/dbus-glib-bindings.h>
 #endif
 
-#include "ev-stock-icons.h"
-#include "ev-file-helpers.h"
+#include "ev-application.h"
 #include "ev-backends-manager.h"
+#include "ev-debug.h"
+#include "ev-file-helpers.h"
+#include "ev-metadata-manager.h"
+#include "ev-stock-icons.h"
 
 static gchar   *ev_page_label;
 static gchar   *ev_find_string;