GNOME.org
 

[planner] Clean up GLib and GTK+ includes (#590485)

commit 98b929f1a5c9c57cdf53a45a1f070de86f4e1a22
Author: Alexandre Franke <alexandre franke gmail com>
Date:   Sun Nov 8 23:52:11 2009 +0100

    Clean up GLib and GTK+ includes (#590485)

 libplanner/mrp-error.c              |    1 -
 src/eel-canvas-rect.c               |    2 +-
 src/planner-assignment-model.c      |    2 +-
 src/planner-calendar-dialog.h       |    2 +-
 src/planner-calendar-selector.h     |    2 +-
 src/planner-calendar.h              |    2 +-
 src/planner-cell-renderer-date.c    |   17 +----------------
 src/planner-cell-renderer-date.h    |    2 +-
 src/planner-cell-renderer-list.c    |   15 +--------------
 src/planner-cell-renderer-list.h    |    2 +-
 src/planner-cell-renderer-popup.c   |    7 +------
 src/planner-cell-renderer-popup.h   |    2 +-
 src/planner-day-type-dialog.h       |    2 +-
 src/planner-default-week-dialog.h   |    2 +-
 src/planner-gantt-chart.h           |    4 +---
 src/planner-gantt-header.c          |    2 +-
 src/planner-gantt-header.h          |    2 +-
 src/planner-gantt-model.c           |    3 +--
 src/planner-gantt-model.h           |    2 +-
 src/planner-gantt-print.h           |    2 +-
 src/planner-group-dialog.h          |    2 +-
 src/planner-group-model.c           |    2 +-
 src/planner-group-model.h           |    3 +--
 src/planner-list-model.c            |    2 +-
 src/planner-list-model.h            |    3 +--
 src/planner-main.c                  |    3 +--
 src/planner-phase-dialog.h          |    2 +-
 src/planner-plugin.h                |    2 +-
 src/planner-popup-button.h          |    2 +-
 src/planner-popup-entry.c           |    8 +-------
 src/planner-popup-entry.h           |    2 +-
 src/planner-predecessor-model.c     |    2 +-
 src/planner-property-dialog.c       |   12 +-----------
 src/planner-property-dialog.h       |    2 +-
 src/planner-property-model.c        |    2 +-
 src/planner-property-model.h        |    2 +-
 src/planner-resource-input-dialog.h |    2 +-
 src/planner-sidebar.h               |    2 +-
 src/planner-table-print-sheet.h     |    2 +-
 src/planner-task-date-widget.h      |    2 +-
 src/planner-task-dialog.h           |    2 +-
 src/planner-task-input-dialog.h     |    2 +-
 src/planner-task-popup.c            |    4 +---
 src/planner-task-tree.h             |    2 +-
 src/planner-usage-chart.h           |    4 +---
 src/planner-usage-model.c           |    3 +--
 src/planner-usage-model.h           |    2 +-
 src/planner-usage-tree.h            |    2 +-
 src/planner-window.h                |    3 +--
 src/planner-working-time-dialog.h   |    2 +-
 50 files changed, 49 insertions(+), 111 deletions(-)
---
diff --git a/libplanner/mrp-error.c b/libplanner/mrp-error.c
index 1d97570..6cf87a9 100644
--- a/libplanner/mrp-error.c
+++ b/libplanner/mrp-error.c
@@ -21,7 +21,6 @@
  */
 
 #include <config.h>
-#include <glib/gerror.h>
 #include "mrp-error.h"
 
 GQuark
diff --git a/src/eel-canvas-rect.c b/src/eel-canvas-rect.c
index 5037908..9046c54 100644
--- a/src/eel-canvas-rect.c
+++ b/src/eel-canvas-rect.c
@@ -28,7 +28,7 @@
 #include <math.h>
 #include <string.h>
 
-#include <glib/gstring.h>
+#include <glib.h>
 #include <libgnomecanvas/gnome-canvas-util.h>
 
 /* FIXME: check for this in configure and use it. */
diff --git a/src/planner-assignment-model.c b/src/planner-assignment-model.c
index 604e7a7..f86c1b0 100644
--- a/src/planner-assignment-model.c
+++ b/src/planner-assignment-model.c
@@ -21,7 +21,7 @@
  */
 
 #include <config.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libplanner/mrp-assignment.h>
 #include <libplanner/mrp-resource.h>
diff --git a/src/planner-calendar-dialog.h b/src/planner-calendar-dialog.h
index d25b60b..b4523c1 100644
--- a/src/planner-calendar-dialog.h
+++ b/src/planner-calendar-dialog.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_CALENDAR_DIALOG_H__
 #define __PLANNER_CALENDAR_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 #include "planner-window.h"
 
diff --git a/src/planner-calendar-selector.h b/src/planner-calendar-selector.h
index 425fcc8..b067c18 100644
--- a/src/planner-calendar-selector.h
+++ b/src/planner-calendar-selector.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_CALENDAR_SELECTOR_H__
 #define __PLANNER_CALENDAR_SELECTOR_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 #include "planner-window.h"
 
diff --git a/src/planner-calendar.h b/src/planner-calendar.h
index becec0d..a610eed 100644
--- a/src/planner-calendar.h
+++ b/src/planner-calendar.h
@@ -30,7 +30,7 @@
 #define __PLANNER_CALENDAR_H__
 
 #include <gdk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #define PLANNER_TYPE_CALENDAR                  (planner_calendar_get_type ())
 #define PLANNER_CALENDAR(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), PLANNER_TYPE_CALENDAR, PlannerCalendar))
diff --git a/src/planner-cell-renderer-date.c b/src/planner-cell-renderer-date.c
index b4e238f..a8bd22f 100644
--- a/src/planner-cell-renderer-date.c
+++ b/src/planner-cell-renderer-date.c
@@ -24,22 +24,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkcalendar.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include "planner-marshal.h"
 #include "planner-format.h"
diff --git a/src/planner-cell-renderer-date.h b/src/planner-cell-renderer-date.h
index 08a3ef1..33b98b7 100644
--- a/src/planner-cell-renderer-date.h
+++ b/src/planner-cell-renderer-date.h
@@ -25,7 +25,7 @@
 #define __PLANNER_CELL_RENDERER_DATE_H__
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-time.h>
 #include <libplanner/mrp-types.h>
 #include "planner-cell-renderer-popup.h"
diff --git a/src/planner-cell-renderer-list.c b/src/planner-cell-renderer-list.c
index a0d833e..8fe5597 100644
--- a/src/planner-cell-renderer-list.c
+++ b/src/planner-cell-renderer-list.c
@@ -23,20 +23,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include "planner-marshal.h"
 #include "planner-cell-renderer-list.h"
 #include "planner-popup-entry.h"
diff --git a/src/planner-cell-renderer-list.h b/src/planner-cell-renderer-list.h
index f5da2fb..56e578d 100644
--- a/src/planner-cell-renderer-list.h
+++ b/src/planner-cell-renderer-list.h
@@ -24,7 +24,7 @@
 #define __PLANNER_CELL_RENDERER_LIST_H__
 
 #include <glib-object.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "planner-cell-renderer-popup.h"
 
 #define PLANNER_TYPE_CELL_RENDERER_LIST	      (planner_cell_renderer_list_get_type ())
diff --git a/src/planner-cell-renderer-popup.c b/src/planner-cell-renderer-popup.c
index 428252e..110dfa0 100644
--- a/src/planner-cell-renderer-popup.c
+++ b/src/planner-cell-renderer-popup.c
@@ -22,12 +22,7 @@
 
 #include <config.h>
 #include <gdk/gdkkeysyms.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
 #include "planner-marshal.h"
 #include "planner-cell-renderer-popup.h"
 #include "planner-popup-entry.h"
diff --git a/src/planner-cell-renderer-popup.h b/src/planner-cell-renderer-popup.h
index 635d8ea..ecf0154 100644
--- a/src/planner-cell-renderer-popup.h
+++ b/src/planner-cell-renderer-popup.h
@@ -2,7 +2,7 @@
 #define __PLANNER_CELL_RENDERER_POPUP_H__
 
 #include <pango/pango.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <gtk/gtk.h>
 
 #define PLANNER_TYPE_CELL_RENDERER_POPUP		(planner_cell_renderer_popup_get_type ())
 #define PLANNER_CELL_RENDERER_POPUP(obj)		(GTK_CHECK_CAST ((obj), PLANNER_TYPE_CELL_RENDERER_POPUP, PlannerCellRendererPopup))
diff --git a/src/planner-day-type-dialog.h b/src/planner-day-type-dialog.h
index 848cced..a5fdb0f 100644
--- a/src/planner-day-type-dialog.h
+++ b/src/planner-day-type-dialog.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_DAY_TYPE_DIALOG_H__
 #define __PLANNER_DAY_TYPE_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 #include "planner-window.h"
 
diff --git a/src/planner-default-week-dialog.h b/src/planner-default-week-dialog.h
index 0b515e9..b1d7620 100644
--- a/src/planner-default-week-dialog.h
+++ b/src/planner-default-week-dialog.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_DEFAULT_WEEK_DIALOG_H__
 #define __PLANNER_DEFAULT_WEEK_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 #include <libplanner/mrp-calendar.h>
 #include "planner-window.h"
diff --git a/src/planner-gantt-chart.h b/src/planner-gantt-chart.h
index 93244e5..8d06f3a 100644
--- a/src/planner-gantt-chart.h
+++ b/src/planner-gantt-chart.h
@@ -23,9 +23,7 @@
 #ifndef __PLANNER_GANTT_CHART_H__
 #define __PLANNER_GANTT_CHART_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include "planner-task-tree.h"
 
diff --git a/src/planner-gantt-header.c b/src/planner-gantt-header.c
index a88486e..873ad11 100644
--- a/src/planner-gantt-header.c
+++ b/src/planner-gantt-header.c
@@ -25,7 +25,7 @@
 #include <time.h>
 #include <math.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-time.h>
 #include "planner-marshal.h"
 #include "planner-gantt-header.h"
diff --git a/src/planner-gantt-header.h b/src/planner-gantt-header.h
index 0d4ea2b..69dcdb2 100644
--- a/src/planner-gantt-header.h
+++ b/src/planner-gantt-header.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_GANTT_HEADER_H__
 #define __PLANNER_GANTT_HEADER_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 
 #define PLANNER_TYPE_GANTT_HEADER		(planner_gantt_header_get_type ())
 #define PLANNER_GANTT_HEADER(obj)		(GTK_CHECK_CAST ((obj), PLANNER_TYPE_GANTT_HEADER, PlannerGanttHeader))
diff --git a/src/planner-gantt-model.c b/src/planner-gantt-model.c
index 42ed928..8189b1c 100644
--- a/src/planner-gantt-model.c
+++ b/src/planner-gantt-model.c
@@ -25,8 +25,7 @@
 #include <string.h>
 #include <time.h>
 #include <glib.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreednd.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libplanner/mrp-task.h>
 #include "planner-marshal.h"
diff --git a/src/planner-gantt-model.h b/src/planner-gantt-model.h
index b381959..725ea41 100644
--- a/src/planner-gantt-model.h
+++ b/src/planner-gantt-model.h
@@ -25,7 +25,7 @@
 
 #include <libplanner/mrp-project.h>
 #include <libplanner/mrp-task.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 
 #define PLANNER_TYPE_GANTT_MODEL            (planner_gantt_model_get_type ())
 #define PLANNER_GANTT_MODEL(obj)            (GTK_CHECK_CAST ((obj), PLANNER_TYPE_GANTT_MODEL, PlannerGanttModel))
diff --git a/src/planner-gantt-print.h b/src/planner-gantt-print.h
index 3b9b788..5d0b435 100644
--- a/src/planner-gantt-print.h
+++ b/src/planner-gantt-print.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_GANTT_PRINT_H__
 #define __PLANNER_GANTT_PRINT_H__
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include "planner-print-job.h"
 #include "planner-view.h"
 
diff --git a/src/planner-group-dialog.h b/src/planner-group-dialog.h
index 1f5e1b2..ad0d266 100644
--- a/src/planner-group-dialog.h
+++ b/src/planner-group-dialog.h
@@ -24,7 +24,7 @@
 #ifndef __PLANNER_RESOURCES_GROUP_DIALOG_H__
 #define __PLANNER_RESOURCES_GROUP_DIALOG_H__
 
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "planner-view.h"
 
 GtkWidget *     planner_group_dialog_new               (PlannerView  *view);
diff --git a/src/planner-group-model.c b/src/planner-group-model.c
index 342cdb7..4daf49d 100644
--- a/src/planner-group-model.c
+++ b/src/planner-group-model.c
@@ -22,7 +22,7 @@
  */
 
 #include <config.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include "planner-group-model.h"
 
diff --git a/src/planner-group-model.h b/src/planner-group-model.h
index c2b8aac..7b26ca5 100644
--- a/src/planner-group-model.h
+++ b/src/planner-group-model.h
@@ -25,8 +25,7 @@
 #define __PLANNER_GROUP_MODEL_H__
 
 #include <glib-object.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 #include <libplanner/mrp-group.h>
 #include "planner-list-model.h"
diff --git a/src/planner-list-model.c b/src/planner-list-model.c
index 37332fb..65e9523 100644
--- a/src/planner-list-model.c
+++ b/src/planner-list-model.c
@@ -22,7 +22,7 @@
  */
 
 #include <config.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <string.h>
 
diff --git a/src/planner-list-model.h b/src/planner-list-model.h
index f20661d..108957d 100644
--- a/src/planner-list-model.h
+++ b/src/planner-list-model.h
@@ -25,8 +25,7 @@
 #define __PLANNER_LIST_MODEL_H__
 
 #include <glib-object.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-object.h>
 
 #define PLANNER_TYPE_LIST_MODEL	          (planner_list_model_get_type ())
diff --git a/src/planner-main.c b/src/planner-main.c
index 02488c6..7b989ea 100644
--- a/src/planner-main.c
+++ b/src/planner-main.c
@@ -23,8 +23,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #ifdef WITH_GNOME
 #include <libgnome/gnome-program.h>
diff --git a/src/planner-phase-dialog.h b/src/planner-phase-dialog.h
index f8ef987..ca826f3 100644
--- a/src/planner-phase-dialog.h
+++ b/src/planner-phase-dialog.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_PHASE_DIALOG_H__
 #define __PLANNER_PHASE_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 #include "planner-window.h"
 
diff --git a/src/planner-plugin.h b/src/planner-plugin.h
index 0fe4599..ff52d94 100644
--- a/src/planner-plugin.h
+++ b/src/planner-plugin.h
@@ -24,7 +24,7 @@
 #define __PLANNER_PLUGIN_H__
 
 #include <gmodule.h>
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "planner-window.h"
 
 #define PLANNER_TYPE_PLUGIN		   (planner_plugin_get_type ())
diff --git a/src/planner-popup-button.h b/src/planner-popup-button.h
index a2829cf..f245ccc 100644
--- a/src/planner-popup-button.h
+++ b/src/planner-popup-button.h
@@ -21,7 +21,7 @@
 #ifndef __PLANNER_POPUP_BUTTON_H__
 #define __PLANNER_POPUP_BUTTON_H__
 
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 
 #define PLANNER_TYPE_POPUP_BUTTON            (planner_popup_button_get_type ())
 #define PLANNER_POPUP_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PLANNER_TYPE_POPUP_BUTTON, PlannerPopupButton))
diff --git a/src/planner-popup-entry.c b/src/planner-popup-entry.c
index 2c0a9b6..d49db78 100644
--- a/src/planner-popup-entry.c
+++ b/src/planner-popup-entry.c
@@ -22,13 +22,7 @@
 
 #include <config.h>
 #include <string.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkcelleditable.h>
+#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include "planner-popup-entry.h"
 
diff --git a/src/planner-popup-entry.h b/src/planner-popup-entry.h
index 2eb3c4f..9256314 100644
--- a/src/planner-popup-entry.h
+++ b/src/planner-popup-entry.h
@@ -24,7 +24,7 @@
 #define __PLANNER_POPUP_ENTRY_H__
 
 #include <pango/pango.h>
-#include <gtk/gtkeventbox.h>
+#include <gtk/gtk.h>
 
 #define PLANNER_TYPE_POPUP_ENTRY		(planner_popup_entry_get_type ())
 #define PLANNER_POPUP_ENTRY(obj)		(GTK_CHECK_CAST ((obj), PLANNER_TYPE_POPUP_ENTRY, PlannerPopupEntry))
diff --git a/src/planner-predecessor-model.c b/src/planner-predecessor-model.c
index 7738646..698a903 100644
--- a/src/planner-predecessor-model.c
+++ b/src/planner-predecessor-model.c
@@ -22,7 +22,7 @@
  */
 
 #include <config.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include "planner-predecessor-model.h"
 
diff --git a/src/planner-property-dialog.c b/src/planner-property-dialog.c
index 242a987..284d83d 100644
--- a/src/planner-property-dialog.c
+++ b/src/planner-property-dialog.c
@@ -29,17 +29,7 @@
 #include <stdlib.h>
 #include <glib/gi18n.h>
 #include <glade/glade.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkmain.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-object.h>
 #include <libplanner/mrp-property.h>
 #include "libplanner/mrp-paths.h"
diff --git a/src/planner-property-dialog.h b/src/planner-property-dialog.h
index 3d38ffc..6a06d43 100644
--- a/src/planner-property-dialog.h
+++ b/src/planner-property-dialog.h
@@ -22,7 +22,7 @@
 #ifndef __PLANNER_PROPERTY_DIALOG_H__
 #define __PLANNER_PROPERTY_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 #include "planner-window.h"
 
diff --git a/src/planner-property-model.c b/src/planner-property-model.c
index a68fc3e..5122af8 100644
--- a/src/planner-property-model.c
+++ b/src/planner-property-model.c
@@ -24,7 +24,7 @@
 #include <config.h>
 #include <string.h>
 #include <glib/gi18n.h>
-#include <gtk/gtkliststore.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-property.h>
 #include "planner-property-model.h"
 
diff --git a/src/planner-property-model.h b/src/planner-property-model.h
index 2285b96..84711aa 100644
--- a/src/planner-property-model.h
+++ b/src/planner-property-model.h
@@ -22,7 +22,7 @@
 #ifndef __PLANNER_PROPERTY_MODEL_H__
 #define __PLANNER_PROPERTY_MODEL_H__
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 
 enum {
diff --git a/src/planner-resource-input-dialog.h b/src/planner-resource-input-dialog.h
index 084dabf..7a4dbeb 100644
--- a/src/planner-resource-input-dialog.h
+++ b/src/planner-resource-input-dialog.h
@@ -24,7 +24,7 @@
 #ifndef __PLANNER_RESOURCE_INPUT_DIALOG_H__
 #define __PLANNER_RESOURCE_INPUT_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "planner-window.h"
 
 GtkWidget * planner_resource_input_dialog_new (PlannerWindow *main_window);
diff --git a/src/planner-sidebar.h b/src/planner-sidebar.h
index 3c4014c..d7af98d 100644
--- a/src/planner-sidebar.h
+++ b/src/planner-sidebar.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_SIDEBAR_H__
 #define __PLANNER_SIDEBAR_H__
 
-#include <gtk/gtkframe.h>
+#include <gtk/gtk.h>
 
 #define PLANNER_TYPE_SIDEBAR		(planner_sidebar_get_type ())
 #define PLANNER_SIDEBAR(obj)		(GTK_CHECK_CAST ((obj), PLANNER_TYPE_SIDEBAR, PlannerSidebar))
diff --git a/src/planner-table-print-sheet.h b/src/planner-table-print-sheet.h
index e65d782..1b4b978 100644
--- a/src/planner-table-print-sheet.h
+++ b/src/planner-table-print-sheet.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_TABLE_PRINT_SHEET_H__
 #define __PLANNER_TABLE_PRINT_SHEET_H__
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include "planner-print-job.h"
 #include "planner-view.h"
 
diff --git a/src/planner-task-date-widget.h b/src/planner-task-date-widget.h
index db9c69b..78343c1 100644
--- a/src/planner-task-date-widget.h
+++ b/src/planner-task-date-widget.h
@@ -21,7 +21,7 @@
 #ifndef __PLANNER_TASK_DATE_WIDGET_H__
 #define __PLANNER_TASK_DATE_WIDGET_H__
 
-#include <gtk/gtktogglebutton.h>
+#include <gtk/gtk.h>
 
 #define PLANNER_TYPE_TASK_DATE_WIDGET            (planner_task_date_widget_get_type ())
 #define PLANNER_TASK_DATE_WIDGET(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), PLANNER_TYPE_TASK_DATE_WIDGET, PlannerTaskDateWidget))
diff --git a/src/planner-task-dialog.h b/src/planner-task-dialog.h
index 3da4cb0..fb945ce 100644
--- a/src/planner-task-dialog.h
+++ b/src/planner-task-dialog.h
@@ -22,7 +22,7 @@
 #ifndef __PLANNER_TASK_DIALOG_H__
 #define __PLANNER_TASK_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 #include "planner-window.h"
 
diff --git a/src/planner-task-input-dialog.h b/src/planner-task-input-dialog.h
index d7b1c8e..27df91e 100644
--- a/src/planner-task-input-dialog.h
+++ b/src/planner-task-input-dialog.h
@@ -24,7 +24,7 @@
 #ifndef __PLANNER_TASK_INPUT_DIALOG_H__
 #define __PLANNER_TASK_INPUT_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include "planner-window.h"
 
 GtkWidget * planner_task_input_dialog_new (PlannerWindow *main_window);
diff --git a/src/planner-task-popup.c b/src/planner-task-popup.c
index 4797711..c7bfea5 100644
--- a/src/planner-task-popup.c
+++ b/src/planner-task-popup.c
@@ -19,9 +19,7 @@
  */
 
 #include <config.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkmenu.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include "libplanner/mrp-paths.h"
 #include "planner-task-tree.h"
diff --git a/src/planner-task-tree.h b/src/planner-task-tree.h
index 8691ad2..ca1cc46 100644
--- a/src/planner-task-tree.h
+++ b/src/planner-task-tree.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_TASK_TREE_H__
 #define __PLANNER_TASK_TREE_H__
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 #include "planner-gantt-model.h"
 #include "planner-window.h"
diff --git a/src/planner-usage-chart.h b/src/planner-usage-chart.h
index a3bb347..21f6350 100644
--- a/src/planner-usage-chart.h
+++ b/src/planner-usage-chart.h
@@ -23,9 +23,7 @@
 #ifndef __PLANNER_USAGE_CHART_H__
 #define __PLANNER_USAGE_CHART_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <libgnomecanvas/gnome-canvas.h>
 #include "planner-usage-tree.h"
 
diff --git a/src/planner-usage-model.c b/src/planner-usage-model.c
index e73ca60..52ce9e6 100644
--- a/src/planner-usage-model.c
+++ b/src/planner-usage-model.c
@@ -27,8 +27,7 @@
 #include <time.h>
 #include <glib.h>
 #include <stdio.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreednd.h>
+#include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <libplanner/mrp-task.h>
 #include "planner-marshal.h"
diff --git a/src/planner-usage-model.h b/src/planner-usage-model.h
index 4342650..6e259d1 100644
--- a/src/planner-usage-model.h
+++ b/src/planner-usage-model.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_USAGE_MODEL_H__
 #define __PLANNER_USAGE_MODEL_H__
 
-#include <gtk/gtktreemodel.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 #include <libplanner/mrp-task.h>
 #include <libplanner/mrp-resource.h>
diff --git a/src/planner-usage-tree.h b/src/planner-usage-tree.h
index 7eda746..91a1b13 100644
--- a/src/planner-usage-tree.h
+++ b/src/planner-usage-tree.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_USAGE_TREE__
 #define __PLANNER_USAGE_TREE__
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 #include "planner-usage-model.h"
 #include "planner-window.h"
diff --git a/src/planner-window.h b/src/planner-window.h
index 53aa4fd..60d1a4f 100644
--- a/src/planner-window.h
+++ b/src/planner-window.h
@@ -25,8 +25,7 @@
 #define __PLANNER_WINDOW_H__
 
 #include <libplanner/mrp-project.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 #include "planner-application.h"
 #include "planner-cmd-manager.h"
 
diff --git a/src/planner-working-time-dialog.h b/src/planner-working-time-dialog.h
index 805bd11..d04c677 100644
--- a/src/planner-working-time-dialog.h
+++ b/src/planner-working-time-dialog.h
@@ -23,7 +23,7 @@
 #ifndef __PLANNER_WORKING_TIME_DIALOG_H__
 #define __PLANNER_WORKING_TIME_DIALOG_H__
 
-#include <gtk/gtkwidget.h>
+#include <gtk/gtk.h>
 #include <libplanner/mrp-project.h>
 #include "planner-window.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]