app: move GimpHistogram from base/ to core/

app/base/Makefile.am

@@ -26,8 +26,6 @@ libappbase_a_SOURCES = \
 	color-balance.h		\
 	cpercep.c		\
 	cpercep.h		\
-	gimphistogram.c		\
-	gimphistogram.h		\
 	gimplut.c		\
 	gimplut.h		\
 	hue-saturation.c	\

app/base/base-types.h

@@ -47,7 +47,6 @@
 
 /* types */
 
-typedef struct _GimpHistogram       GimpHistogram;
 typedef struct _GimpLut             GimpLut;
 
 typedef struct _ColorBalance        ColorBalance;

app/base/lut-funcs.c

@@ -21,9 +21,9 @@
 
 #include "libgimpmath/gimpmath.h"
 
-#include "base-types.h"
+#include "core/core-types.h"
 
-#include "gimphistogram.h"
+#include "core/gimphistogram.h"
 #include "gimplut.h"
 #include "lut-funcs.h"
 

app/core/Makefile.am

@@ -195,6 +195,8 @@ libappcore_a_sources = \
 	gimpguide.h				\
 	gimpguideundo.c				\
 	gimpguideundo.h				\
+	gimphistogram.c				\
+	gimphistogram.h				\
 	gimpidtable.c				\
 	gimpidtable.h				\
 	gimpimage.c				\

app/core/core-types.h

@@ -153,6 +153,7 @@ typedef struct _GimpUndoAccumulator   GimpUndoAccumulator;
 typedef struct _GimpBuffer          GimpBuffer;
 typedef struct _GimpEnvironTable    GimpEnvironTable;
 typedef struct _GimpGuide           GimpGuide;
+typedef struct _GimpHistogram       GimpHistogram;
 typedef struct _GimpIdTable         GimpIdTable;
 typedef struct _GimpImageMap        GimpImageMap;
 typedef struct _GimpImageMapConfig  GimpImageMapConfig;

app/core/gimpdrawable-equalize.c

@@ -21,7 +21,6 @@
 
 #include "core-types.h"
 
-#include "base/gimphistogram.h"
 #include "base/gimplut.h"
 #include "base/lut-funcs.h"
 
@@ -29,6 +28,7 @@
 #include "gimpdrawable-equalize.h"
 #include "gimpdrawable-histogram.h"
 #include "gimpdrawable-process.h"
+#include "gimphistogram.h"
 
 #include "gimp-intl.h"
 

app/core/gimpdrawable-histogram.c

@@ -23,11 +23,11 @@
 
 #include "core-types.h"
 
-#include "base/gimphistogram.h"
 #include "base/pixel-region.h"
 
 #include "gimpchannel.h"
 #include "gimpdrawable-histogram.h"
+#include "gimphistogram.h"
 #include "gimpimage.h"
 
 

app/core/gimpdrawable-levels.c

@@ -21,8 +21,6 @@
 
 #include "core-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "gegl/gimplevelsconfig.h"
 
 #include "gimpdrawable.h"
@@ -30,6 +28,7 @@
 #include "gimpdrawable-levels.h"
 #include "gimpdrawable-operation.h"
 #include "gimpdrawable-process.h"
+#include "gimphistogram.h"
 #include "gimpprogress.h"
 
 #include "gimp-intl.h"

app/core/gimphistogram.c

@@ -26,11 +26,12 @@
 
 #include "libgimpmath/gimpmath.h"
 
-#include "base-types.h"
+#include "core-types.h"
+
+#include "base/pixel-processor.h"
+#include "base/pixel-region.h"
 
 #include "gimphistogram.h"
-#include "pixel-processor.h"
-#include "pixel-region.h"
 
 
 #ifdef ENABLE_MP

app/gegl/gimpcurvesconfig.c

@@ -32,9 +32,8 @@
 
 #include "gimp-gegl-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "core/gimpcurve.h"
+#include "core/gimphistogram.h"
 
 #include "gimpcurvesconfig.h"
 

app/gegl/gimplevelsconfig.c

@@ -33,9 +33,8 @@
 
 #include "gimp-gegl-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "core/gimpcurve.h"
+#include "core/gimphistogram.h"
 
 #include "gimpcurvesconfig.h"
 #include "gimplevelsconfig.h"

app/pdb/color-cmds.c

@@ -23,7 +23,6 @@
 
 #include "pdb-types.h"
 
-#include "base/gimphistogram.h"
 #include "core/gimpdrawable-color-balance.h"
 #include "core/gimpdrawable-equalize.h"
 #include "core/gimpdrawable-histogram.h"
@@ -31,6 +30,7 @@
 #include "core/gimpdrawable-levels.h"
 #include "core/gimpdrawable-operation.h"
 #include "core/gimpdrawable.h"
+#include "core/gimphistogram.h"
 #include "core/gimpparamspecs.h"
 #include "gegl/gimpbrightnesscontrastconfig.h"
 #include "gegl/gimpcolorizeconfig.h"

app/tools/gimpcurvestool.c

@@ -30,8 +30,6 @@
 
 #include "tools-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "gegl/gimpcurvesconfig.h"
 #include "gegl/gimpoperationcurves.h"
 
@@ -41,6 +39,7 @@
 #include "core/gimpdrawable.h"
 #include "core/gimpdrawable-histogram.h"
 #include "core/gimperror.h"
+#include "core/gimphistogram.h"
 #include "core/gimpimage.h"
 
 #include "widgets/gimpcolorbar.h"

app/tools/gimplevelstool.c

@@ -30,14 +30,13 @@
 
 #include "tools-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "gegl/gimplevelsconfig.h"
 #include "gegl/gimpoperationlevels.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimpdrawable-histogram.h"
 #include "core/gimperror.h"
+#include "core/gimphistogram.h"
 #include "core/gimpimage.h"
 
 #include "widgets/gimpcolorbar.h"

app/tools/gimpthresholdtool.c

@@ -25,13 +25,12 @@
 
 #include "tools-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "gegl/gimpthresholdconfig.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimpdrawable-histogram.h"
 #include "core/gimperror.h"
+#include "core/gimphistogram.h"
 #include "core/gimpimage.h"
 
 #include "widgets/gimphelp-ids.h"

app/widgets/gimphistogrambox.c

@@ -26,7 +26,7 @@
 
 #include "widgets-types.h"
 
-#include "base/gimphistogram.h"
+#include "core/gimphistogram.h"
 
 #include "gimpcolorbar.h"
 #include "gimphandlebar.h"

app/widgets/gimphistogrameditor.c

@@ -24,11 +24,10 @@
 
 #include "widgets-types.h"
 
-#include "base/gimphistogram.h"
-
 #include "core/gimp.h"
 #include "core/gimpdrawable.h"
 #include "core/gimpdrawable-histogram.h"
+#include "core/gimphistogram.h"
 #include "core/gimpimage.h"
 
 #include "gimpdocked.h"

app/widgets/gimphistogramview.c

@@ -23,8 +23,7 @@
 
 #include "widgets-types.h"
 
-#include "base/gimphistogram.h"
-
+#include "core/gimphistogram.h"
 #include "core/gimpmarshal.h"
 
 #include "gimphistogramview.h"

tools/pdbgen/pdb/color.pdb

@@ -655,8 +655,8 @@ HELP
     );
 
     %invoke = (
-	headers => [ qw("base/gimphistogram.h"
-                        "core/gimpdrawable-histogram.h") ],
+	headers => [ qw("core/gimpdrawable-histogram.h"
+                        "core/gimphistogram.h") ],
 	code => <<'CODE'
 {
   if (! gimp_pdb_item_is_attached (GIMP_ITEM (drawable), NULL, FALSE, error) ||