GNOME.org
 

[gimp] app: don't include individual files from libgimp*

commit 2af539020ba188555772d6bb4190bd6d6dbbc267
Author: Michael Natterer <mitch gimp org>
Date:   Thu Apr 28 14:23:33 2011 +0200

    app: don't include individual files from libgimp*

 app/base/levels.c                      |    4 +---
 app/core/core-types.h                  |    1 -
 app/paint/gimpperspectiveclone.h       |    1 -
 app/text/gimptext.h                    |    1 -
 app/text/gimptextlayer-transform.c     |    2 ++
 app/text/gimptextlayer.c               |    5 ++++-
 app/tools/gimpperspectiveclonetool.c   |    1 +
 app/tools/gimpperspectivetool.c        |    1 +
 app/tools/gimpsheartool.c              |    1 +
 app/tools/gimptransformtool.h          |    1 -
 app/widgets/gimpcolorpanel.c           |    1 +
 app/widgets/gimpcolorpanel.h           |    3 ---
 app/widgets/gimpcolorselectorpalette.h |    3 ---
 app/widgets/gimpiconpicker.c           |    2 ++
 app/widgets/gimpmessagebox.c           |    2 +-
 app/widgets/gimppdbdialog.h            |    2 --
 app/widgets/gimpprogressdialog.h       |    6 ------
 app/widgets/gimpviewablebutton.h       |    5 -----
 app/widgets/gimpviewabledialog.h       |    2 --
 19 files changed, 14 insertions(+), 30 deletions(-)
---
diff --git a/app/base/levels.c b/app/base/levels.c
index 16fff75..e8e489f 100644
--- a/app/base/levels.c
+++ b/app/base/levels.c
@@ -19,11 +19,9 @@
 
 #include <glib-object.h>
 
+#include "libgimpcolor/gimpcolor.h"
 #include "libgimpmath/gimpmath.h"
 
-#include "libgimpcolor/gimpcolortypes.h"
-#include "libgimpcolor/gimprgb.h"
-
 #include "base-types.h"
 
 #include "levels.h"
diff --git a/app/core/core-types.h b/app/core/core-types.h
index 8e158e6..a7fd2eb 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -22,7 +22,6 @@
 #include "libgimpmodule/gimpmoduletypes.h"
 #include "libgimpthumb/gimpthumb-types.h"
 #include "libgimpmath/gimpmathtypes.h"
-#include "libgimpmath/gimpvector.h"
 
 #include "base/base-types.h"
 
diff --git a/app/paint/gimpperspectiveclone.h b/app/paint/gimpperspectiveclone.h
index 75abc6e..a07eb34 100644
--- a/app/paint/gimpperspectiveclone.h
+++ b/app/paint/gimpperspectiveclone.h
@@ -19,7 +19,6 @@
 #define __GIMP_PERSPECTIVE_CLONE_H__
 
 
-#include "libgimpmath/gimpmatrix.h"
 #include "gimpclone.h"
 
 
diff --git a/app/text/gimptext.h b/app/text/gimptext.h
index 466f825..d5d9130 100644
--- a/app/text/gimptext.h
+++ b/app/text/gimptext.h
@@ -22,7 +22,6 @@
 #define __GIMP_TEXT_H__
 
 
-#include "libgimpmath/gimpmatrix.h"
 #include "core/gimpobject.h"
 
 
diff --git a/app/text/gimptextlayer-transform.c b/app/text/gimptextlayer-transform.c
index 965a54c..cf316fd 100644
--- a/app/text/gimptextlayer-transform.c
+++ b/app/text/gimptextlayer-transform.c
@@ -22,6 +22,8 @@
 
 #include <gegl.h>
 
+#include "libgimpmath/gimpmath.h"
+
 #include "text-types.h"
 
 #include "core/gimp-transform-utils.h"
diff --git a/app/text/gimptextlayer.c b/app/text/gimptextlayer.c
index ad38a96..8c57e85 100644
--- a/app/text/gimptextlayer.c
+++ b/app/text/gimptextlayer.c
@@ -28,7 +28,10 @@
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpconfig/gimpconfig.h"
-#include "libgimpwidgets/gimpcairo-utils.h"
+
+#define GIMP_WIDGETS_COMPILATION
+#include "libgimpwidgets/gimpcairo-utils.h" /* eek */
+#undef GIMP_WIDGETS_COMPILATION
 
 #include "text-types.h"
 
diff --git a/app/tools/gimpperspectiveclonetool.c b/app/tools/gimpperspectiveclonetool.c
index 0e34af3..5670cfa 100644
--- a/app/tools/gimpperspectiveclonetool.c
+++ b/app/tools/gimpperspectiveclonetool.c
@@ -20,6 +20,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpmath/gimpmath.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "tools-types.h"
diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c
index 69de210..63220b4 100644
--- a/app/tools/gimpperspectivetool.c
+++ b/app/tools/gimpperspectivetool.c
@@ -22,6 +22,7 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 
+#include "libgimpmath/gimpmath.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "tools-types.h"
diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c
index 914b955..f83d340 100644
--- a/app/tools/gimpsheartool.c
+++ b/app/tools/gimpsheartool.c
@@ -22,6 +22,7 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpmath/gimpmath.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
 #include "tools-types.h"
diff --git a/app/tools/gimptransformtool.h b/app/tools/gimptransformtool.h
index 2639622..91718f8 100644
--- a/app/tools/gimptransformtool.h
+++ b/app/tools/gimptransformtool.h
@@ -19,7 +19,6 @@
 #define __GIMP_TRANSFORM_TOOL_H__
 
 
-#include "libgimpmath/gimpmatrix.h"
 #include "gimpdrawtool.h"
 
 
diff --git a/app/widgets/gimpcolorpanel.c b/app/widgets/gimpcolorpanel.c
index 2b7bb9c..cedf82f 100644
--- a/app/widgets/gimpcolorpanel.c
+++ b/app/widgets/gimpcolorpanel.c
@@ -20,6 +20,7 @@
 #include <gtk/gtk.h>
 
 #include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
 
 #include "widgets-types.h"
 
diff --git a/app/widgets/gimpcolorpanel.h b/app/widgets/gimpcolorpanel.h
index f52c7dd..e1c3d47 100644
--- a/app/widgets/gimpcolorpanel.h
+++ b/app/widgets/gimpcolorpanel.h
@@ -19,9 +19,6 @@
 #define __GIMP_COLOR_PANEL_H__
 
 
-#include "libgimpwidgets/gimpcolorbutton.h"
-
-
 #define GIMP_TYPE_COLOR_PANEL            (gimp_color_panel_get_type ())
 #define GIMP_COLOR_PANEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_PANEL, GimpColorPanel))
 #define GIMP_COLOR_PANEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_PANEL, GimpColorPanelClass))
diff --git a/app/widgets/gimpcolorselectorpalette.h b/app/widgets/gimpcolorselectorpalette.h
index d42cace..d93ebe3 100644
--- a/app/widgets/gimpcolorselectorpalette.h
+++ b/app/widgets/gimpcolorselectorpalette.h
@@ -22,9 +22,6 @@
 #define __GIMP_COLOR_SELECTOR_PALETTE_H__
 
 
-#include "libgimpwidgets/gimpcolorselector.h"
-
-
 #define GIMP_TYPE_COLOR_SELECTOR_PALETTE            (gimp_color_selector_palette_get_type ())
 #define GIMP_COLOR_SELECTOR_PALETTE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_SELECTOR_PALETTE, GimpColorSelectorPalette))
 #define GIMP_IS_COLOR_SELECTOR_PALETTE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLOR_SELECTOR_PALETTE))
diff --git a/app/widgets/gimpiconpicker.c b/app/widgets/gimpiconpicker.c
index 276bc2c..b1e4111 100644
--- a/app/widgets/gimpiconpicker.c
+++ b/app/widgets/gimpiconpicker.c
@@ -22,6 +22,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpwidgets/gimpwidgets.h"
+
 #include "widgets-types.h"
 
 #include "core/gimp.h"
diff --git a/app/widgets/gimpmessagebox.c b/app/widgets/gimpmessagebox.c
index 5bdad4a..f384c20 100644
--- a/app/widgets/gimpmessagebox.c
+++ b/app/widgets/gimpmessagebox.c
@@ -22,8 +22,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpbase/gimpbase.h"
 #include "libgimpwidgets/gimpwidgets.h"
-#include "libgimpbase/gimputils.h"
 
 #include "widgets-types.h"
 
diff --git a/app/widgets/gimppdbdialog.h b/app/widgets/gimppdbdialog.h
index 0417baf..77fd9b2 100644
--- a/app/widgets/gimppdbdialog.h
+++ b/app/widgets/gimppdbdialog.h
@@ -21,8 +21,6 @@
 #ifndef __GIMP_PDB_DIALOG_H__
 #define __GIMP_PDB_DIALOG_H__
 
-#include "libgimpwidgets/gimpdialog.h"
-
 G_BEGIN_DECLS
 
 
diff --git a/app/widgets/gimpprogressdialog.h b/app/widgets/gimpprogressdialog.h
index ce3c332..efc5668 100644
--- a/app/widgets/gimpprogressdialog.h
+++ b/app/widgets/gimpprogressdialog.h
@@ -21,10 +21,6 @@
 #ifndef __GIMP_PROGRESS_DIALOG_H__
 #define __GIMP_PROGRESS_DIALOG_H__
 
-#include "libgimpwidgets/gimpdialog.h"
-
-G_BEGIN_DECLS
-
 
 #define GIMP_TYPE_PROGRESS_DIALOG            (gimp_progress_dialog_get_type ())
 #define GIMP_PROGRESS_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PROGRESS_DIALOG, GimpProgressDialog))
@@ -54,6 +50,4 @@ GType       gimp_progress_dialog_get_type (void) G_GNUC_CONST;
 GtkWidget * gimp_progress_dialog_new      (void);
 
 
-G_END_DECLS
-
 #endif /* __GIMP_PROGRESS_DIALOG_H__ */
diff --git a/app/widgets/gimpviewablebutton.h b/app/widgets/gimpviewablebutton.h
index 7c887d2..72586d1 100644
--- a/app/widgets/gimpviewablebutton.h
+++ b/app/widgets/gimpviewablebutton.h
@@ -21,9 +21,6 @@
 #ifndef __GIMP_VIEWABLE_BUTTON_H__
 #define __GIMP_VIEWABLE_BUTTON_H__
 
-#include "libgimpwidgets/gimpbutton.h"
-
-G_BEGIN_DECLS
 
 #define GIMP_TYPE_VIEWABLE_BUTTON            (gimp_viewable_button_get_type ())
 #define GIMP_VIEWABLE_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_VIEWABLE_BUTTON, GimpViewableButton))
@@ -84,6 +81,4 @@ void         gimp_viewable_button_set_view_size (GimpViewableButton *button,
                                                  gint                view_size);
 
 
-G_END_DECLS
-
 #endif /* __GIMP_VIEWABLE_BUTTON_H__ */
diff --git a/app/widgets/gimpviewabledialog.h b/app/widgets/gimpviewabledialog.h
index 6c27eea..44c8cd0 100644
--- a/app/widgets/gimpviewabledialog.h
+++ b/app/widgets/gimpviewabledialog.h
@@ -21,8 +21,6 @@
 #ifndef __GIMP_VIEWABLE_DIALOG_H__
 #define __GIMP_VIEWABLE_DIALOG_H__
 
-#include "libgimpwidgets/gimpdialog.h"
-
 G_BEGIN_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]