GNOME.org
 

[niepce] * Gtk header cleanup. See

commit 0f8b814b3235c8f5abe363473540f10dfa2c84c9
Author: Hubert Figuiere <hub figuiere net>
Date:   Fri May 1 21:44:18 2009 -0400

    	* Gtk header cleanup. See
    	http://live.gnome.org/GnomeGoals/CleanupGTKIncludes
---
 ChangeLog                                   |    3 +++
 src/ext/libgdl/gdl-dock-bar.h               |    2 +-
 src/ext/libgdl/gdl-dock-item-grip.c         |    4 +---
 src/ext/libgdl/gdl-dock-item-grip.h         |    2 +-
 src/ext/libgdl/gdl-dock-master.h            |    2 +-
 src/ext/libgdl/gdl-dock-object.h            |    2 +-
 src/ext/libgdl/gdl-dock-paned.c             |    3 +--
 src/ext/libgdl/gdl-stock.c                  |    1 -
 src/ext/libgdl/gdl-stock.h                  |    2 +-
 src/ext/libgdl/gdl-switcher.c               |    4 ----
 src/ext/libgdl/gdl-switcher.h               |    2 +-
 src/ext/libgdl/gdl-tools.h                  |    2 +-
 src/ext/libview/header.cc                   |    4 +---
 src/niepce/ui/librarymainviewcontroller.cpp |    2 +-
 src/niepce/ui/selectioncontroller.hpp       |    2 +-
 src/niepce/ui/thumb-view/eog-thumb-view.h   |    2 +-
 16 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 24eeb45..2f5fb20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-05-01  Hubert Figuiere  <hub figuiere net>
 
+	* Gtk header cleanup. See 
+	http://live.gnome.org/GnomeGoals/CleanupGTKIncludes
+
 	* src/fwk/base/color.hpp: Missing header for gcc 4.4
 
 2009-04-24  Hubert Figuiere  <hub figuiere net>
diff --git a/src/ext/libgdl/gdl-dock-bar.h b/src/ext/libgdl/gdl-dock-bar.h
index 22b99ed..c6697a4 100644
--- a/src/ext/libgdl/gdl-dock-bar.h
+++ b/src/ext/libgdl/gdl-dock-bar.h
@@ -22,7 +22,7 @@
 #ifndef __GDL_DOCK_BAR_H__
 #define __GDL_DOCK_BAR_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtk.h>
 #include "libgdl/gdl-dock.h"
 
 G_BEGIN_DECLS
diff --git a/src/ext/libgdl/gdl-dock-item-grip.c b/src/ext/libgdl/gdl-dock-item-grip.c
index 8ff6d8f..93ff669 100644
--- a/src/ext/libgdl/gdl-dock-item-grip.c
+++ b/src/ext/libgdl/gdl-dock-item-grip.c
@@ -17,9 +17,7 @@
 #include "gdl-i18n.h"
 #include <string.h>
 #include <glib-object.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkimage.h>
+#include <gtk/gtk.h>
 #include "gdl-dock-item.h"
 #include "gdl-dock-item-grip.h"
 #include "gdl-stock.h"
diff --git a/src/ext/libgdl/gdl-dock-item-grip.h b/src/ext/libgdl/gdl-dock-item-grip.h
index 377ea14..495e938 100644
--- a/src/ext/libgdl/gdl-dock-item-grip.h
+++ b/src/ext/libgdl/gdl-dock-item-grip.h
@@ -13,7 +13,7 @@
 #ifndef _GDL_DOCK_ITEM_GRIP_H_
 #define _GDL_DOCK_ITEM_GRIP_H_
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "libgdl/gdl-dock-item.h"
 
 G_BEGIN_DECLS
diff --git a/src/ext/libgdl/gdl-dock-master.h b/src/ext/libgdl/gdl-dock-master.h
index 72697b4..1a10405 100644
--- a/src/ext/libgdl/gdl-dock-master.h
+++ b/src/ext/libgdl/gdl-dock-master.h
@@ -25,7 +25,7 @@
 #define __GDL_DOCK_MASTER_H__
 
 #include <glib-object.h>
-#include <gtk/gtktypeutils.h>
+#include <gtk/gtk.h>
 #include "libgdl/gdl-dock-object.h"
 
 
diff --git a/src/ext/libgdl/gdl-dock-object.h b/src/ext/libgdl/gdl-dock-object.h
index 509bbfe..b7688c7 100644
--- a/src/ext/libgdl/gdl-dock-object.h
+++ b/src/ext/libgdl/gdl-dock-object.h
@@ -30,7 +30,7 @@
 #pragma GCC system_header
 #endif
 
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ext/libgdl/gdl-dock-paned.c b/src/ext/libgdl/gdl-dock-paned.c
index fe61c52..22ccc36 100644
--- a/src/ext/libgdl/gdl-dock-paned.c
+++ b/src/ext/libgdl/gdl-dock-paned.c
@@ -27,8 +27,7 @@
 
 #include "gdl-i18n.h"
 #include <string.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkvpaned.h>
+#include <gtk/gtk.h>
 
 #include "gdl-tools.h"
 #include "gdl-dock-paned.h"
diff --git a/src/ext/libgdl/gdl-stock.c b/src/ext/libgdl/gdl-stock.c
index 94f8256..dc86e52 100644
--- a/src/ext/libgdl/gdl-stock.c
+++ b/src/ext/libgdl/gdl-stock.c
@@ -24,7 +24,6 @@
 #endif
 
 #include <gtk/gtk.h>
-#include <gtk/gtkiconfactory.h>
 #include "gdl-stock.h"
 #include "gdl-stock-icons.h"
 
diff --git a/src/ext/libgdl/gdl-stock.h b/src/ext/libgdl/gdl-stock.h
index 9046f4f..1f47f58 100644
--- a/src/ext/libgdl/gdl-stock.h
+++ b/src/ext/libgdl/gdl-stock.h
@@ -22,7 +22,7 @@
 #ifndef __GDL_STOCK_H__
 #define __GDL_STOCK_H__
 
-#include <glib/gmacros.h>   /* G_BEGIN_DECLS*/
+#include <glib.h>   /* G_BEGIN_DECLS*/
 
 G_BEGIN_DECLS
 
diff --git a/src/ext/libgdl/gdl-switcher.c b/src/ext/libgdl/gdl-switcher.c
index 880491d..ac3a311 100644
--- a/src/ext/libgdl/gdl-switcher.c
+++ b/src/ext/libgdl/gdl-switcher.c
@@ -35,10 +35,6 @@
 #include "libgdltypebuiltins.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktogglebutton.h>
 
 #if HAVE_GNOME
 #include <gconf/gconf-client.h>
diff --git a/src/ext/libgdl/gdl-switcher.h b/src/ext/libgdl/gdl-switcher.h
index be4b179..9c33f8b 100644
--- a/src/ext/libgdl/gdl-switcher.h
+++ b/src/ext/libgdl/gdl-switcher.h
@@ -25,7 +25,7 @@
 #ifndef _GDL_SWITCHER_H_
 #define _GDL_SWITCHER_H_
 
-#include <gtk/gtknotebook.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/ext/libgdl/gdl-tools.h b/src/ext/libgdl/gdl-tools.h
index 5e97bf3..b62c5db 100644
--- a/src/ext/libgdl/gdl-tools.h
+++ b/src/ext/libgdl/gdl-tools.h
@@ -31,7 +31,7 @@
 #endif
 
 #include <glib.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 /* FIXME: Toggle this */
 
diff --git a/src/ext/libview/header.cc b/src/ext/libview/header.cc
index 46a620d..5098a0a 100644
--- a/src/ext/libview/header.cc
+++ b/src/ext/libview/header.cc
@@ -29,9 +29,7 @@
 
 #include <gtkmm/settings.h>
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkrc.h>
+#include <gtk/gtk.h>
 
 #include <libview/header.hh>
 
diff --git a/src/niepce/ui/librarymainviewcontroller.cpp b/src/niepce/ui/librarymainviewcontroller.cpp
index c49725f..5d7d52f 100644
--- a/src/niepce/ui/librarymainviewcontroller.cpp
+++ b/src/niepce/ui/librarymainviewcontroller.cpp
@@ -18,7 +18,7 @@
  */
 
 
-#include <gtk/gtkcelllayout.h>
+#include <gtk/gtk.h>
 
 #include <glibmm/i18n.h>
 #include <glibmm/ustring.h>
diff --git a/src/niepce/ui/selectioncontroller.hpp b/src/niepce/ui/selectioncontroller.hpp
index 5efe902..7e50cff 100644
--- a/src/niepce/ui/selectioncontroller.hpp
+++ b/src/niepce/ui/selectioncontroller.hpp
@@ -21,7 +21,7 @@
 #ifndef _UI_SELECTIONCONTROLLER_H__
 #define _UI_SELECTIONCONTROLLER_H__
 
-#include <gtk/gtkiconview.h>
+#include <gtk/gtk.h>
 
 #include <sigc++/signal.h>
 
diff --git a/src/niepce/ui/thumb-view/eog-thumb-view.h b/src/niepce/ui/thumb-view/eog-thumb-view.h
index 2c3ced5..0e3086e 100644
--- a/src/niepce/ui/thumb-view/eog-thumb-view.h
+++ b/src/niepce/ui/thumb-view/eog-thumb-view.h
@@ -22,7 +22,7 @@
 #ifndef EOG_THUMB_VIEW_H
 #define EOG_THUMB_VIEW_H
 
-#include <gtk/gtkiconview.h>
+#include <gtk/gtk.h>
 #include "niepce/ui/imageliststore.h"
 
 /*#include "eog-image.h"*/
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]