[gimp/goat-invasion: 148/608] app: move base/boundary.[ch] to core/gimpboundary.[ch]

[Michael Natterer <mitch src gnome org>]

commit e1ae4e0b0f219ac73902781cc2a47fb7350f5628
Author: Michael Natterer <mitch gimp org>
Date:   Mon Mar 19 14:22:41 2012 +0100

    app: move base/boundary.[ch] to core/gimpboundary.[ch]
    
    No other changes yet, just make the move build.

 app/base/Makefile.am                         |    2 --
 app/base/base-types.h                        |    2 --
 app/core/Makefile.am                         |    2 ++
 app/core/core-types.h                        |    1 +
 app/core/gimpbezierdesc.c                    |    3 +--
 app/{base/boundary.c => core/gimpboundary.c} |   11 ++++++-----
 app/{base/boundary.h => core/gimpboundary.h} |    0
 app/core/gimpbrush-boundary.c                |    2 +-
 app/core/gimpchannel.c                       |    2 +-
 app/core/gimpdrawable-stroke.c               |    2 +-
 app/core/gimplayer-floating-sel.c            |    2 +-
 app/core/gimplayer.c                         |    2 +-
 app/display/gimpcanvasboundary.c             |    3 +--
 app/display/gimpdisplayshell-selection.c     |    3 +--
 app/display/gimpdisplayshell-transform.c     |    3 +--
 app/paint/gimppaintcore-stroke.c             |    3 +--
 app/tools/gimpeditselectiontool.c            |    3 +--
 app/tools/gimprectangleselecttool.c          |    3 +--
 app/tools/gimpregionselecttool.c             |    2 +-
 app/tools/gimptransformtool.c                |    2 +-
 20 files changed, 23 insertions(+), 30 deletions(-)
---
diff --git a/app/base/Makefile.am b/app/base/Makefile.am
index 7ac4ed0..46f93da 100644
--- a/app/base/Makefile.am
+++ b/app/base/Makefile.am
@@ -22,8 +22,6 @@ libappbase_a_SOURCES = \
 	base-types.h		\
 	base-utils.c		\
 	base-utils.h		\
-	boundary.c		\
-	boundary.h		\
 	color-balance.c		\
 	color-balance.h		\
 	cpercep.c		\
diff --git a/app/base/base-types.h b/app/base/base-types.h
index d967055..eb269dd 100644
--- a/app/base/base-types.h
+++ b/app/base/base-types.h
@@ -47,8 +47,6 @@
 
 /* types */
 
-typedef struct _BoundSeg            BoundSeg;
-
 typedef struct _GimpHistogram       GimpHistogram;
 typedef struct _GimpLut             GimpLut;
 
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index 38901dc..64b8344 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -55,6 +55,8 @@ libappcore_a_sources = \
 	gimparea.h				\
 	gimpbezierdesc.h			\
 	gimpbezierdesc.c			\
+	gimpboundary.c				\
+	gimpboundary.h				\
 	gimpbrush.c				\
 	gimpbrush.h				\
 	gimpbrush-boundary.c			\
diff --git a/app/core/core-types.h b/app/core/core-types.h
index cb8e141..d03aae1 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -177,6 +177,7 @@ typedef struct _GimpTagged          GimpTagged;      /* dummy typedef */
 /*  non-object types  */
 
 typedef struct _GimpArea            GimpArea;
+typedef struct _BoundSeg            BoundSeg;
 typedef struct _GimpCoords          GimpCoords;
 typedef struct _GimpGradientSegment GimpGradientSegment;
 typedef struct _GimpPaletteEntry    GimpPaletteEntry;
diff --git a/app/core/gimpbezierdesc.c b/app/core/gimpbezierdesc.c
index 03ea2f0..756b629 100644
--- a/app/core/gimpbezierdesc.c
+++ b/app/core/gimpbezierdesc.c
@@ -25,9 +25,8 @@
 
 #include "core-types.h"
 
-#include "base/boundary.h"
-
 #include "gimpbezierdesc.h"
+#include "gimpboundary.h"
 
 
 GType
diff --git a/app/base/boundary.c b/app/core/gimpboundary.c
similarity index 99%
rename from app/base/boundary.c
rename to app/core/gimpboundary.c
index 182d123..636da46 100644
--- a/app/base/boundary.c
+++ b/app/core/gimpboundary.c
@@ -24,12 +24,13 @@
 
 #include "libgimpmath/gimpmath.h"
 
-#include "base-types.h"
+#include "core-types.h"
 
-#include "boundary.h"
-#include "pixel-region.h"
-#include "tile.h"
-#include "tile-manager.h"
+#include "base/pixel-region.h"
+#include "base/tile.h"
+#include "base/tile-manager.h"
+
+#include "gimpboundary.h"
 
 
 /* BoundSeg array growth parameter */
diff --git a/app/base/boundary.h b/app/core/gimpboundary.h
similarity index 100%
rename from app/base/boundary.h
rename to app/core/gimpboundary.h
diff --git a/app/core/gimpbrush-boundary.c b/app/core/gimpbrush-boundary.c
index 6810805..068f912 100644
--- a/app/core/gimpbrush-boundary.c
+++ b/app/core/gimpbrush-boundary.c
@@ -22,11 +22,11 @@
 
 #include "core-types.h"
 
-#include "base/boundary.h"
 #include "base/pixel-region.h"
 #include "base/temp-buf.h"
 
 #include "gimpbezierdesc.h"
+#include "gimpboundary.h"
 #include "gimpbrush.h"
 #include "gimpbrush-boundary.h"
 
diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c
index 039c835..fff221f 100644
--- a/app/core/gimpchannel.c
+++ b/app/core/gimpchannel.c
@@ -26,7 +26,6 @@
 
 #include "core-types.h"
 
-#include "base/boundary.h"
 #include "base/pixel-region.h"
 #include "base/tile.h"
 #include "base/tile-manager.h"
@@ -42,6 +41,7 @@
 
 #include "gimp.h"
 #include "gimp-utils.h"
+#include "gimpboundary.h"
 #include "gimpcontainer.h"
 #include "gimperror.h"
 #include "gimpimage.h"
diff --git a/app/core/gimpdrawable-stroke.c b/app/core/gimpdrawable-stroke.c
index 80b21fc..801e94f 100644
--- a/app/core/gimpdrawable-stroke.c
+++ b/app/core/gimpdrawable-stroke.c
@@ -29,7 +29,6 @@
 
 #include "core-types.h"
 
-#include "base/boundary.h"
 #include "base/pixel-region.h"
 #include "base/tile-manager.h"
 
@@ -39,6 +38,7 @@
 #include "gimp.h"
 #include "gimp-apply-operation.h"
 #include "gimpbezierdesc.h"
+#include "gimpboundary.h"
 #include "gimpchannel.h"
 #include "gimpcontext.h"
 #include "gimpdrawable-stroke.h"
diff --git a/app/core/gimplayer-floating-sel.c b/app/core/gimplayer-floating-sel.c
index bf607d1..66605f8 100644
--- a/app/core/gimplayer-floating-sel.c
+++ b/app/core/gimplayer-floating-sel.c
@@ -23,9 +23,9 @@
 
 #include "core-types.h"
 
-#include "base/boundary.h"
 #include "base/pixel-region.h"
 
+#include "gimpboundary.h"
 #include "gimperror.h"
 #include "gimpimage.h"
 #include "gimpimage-undo.h"
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
index 319d7705..cd2974b 100644
--- a/app/core/gimplayer.c
+++ b/app/core/gimplayer.c
@@ -29,7 +29,6 @@
 
 #include "core-types.h"
 
-#include "base/boundary.h"
 #include "base/pixel-region.h"
 #include "base/tile-manager.h"
 #include "base/tile.h"
@@ -40,6 +39,7 @@
 #include "gegl/gimp-gegl-utils.h"
 
 #include "gimp-apply-operation.h"
+#include "gimpboundary.h"
 #include "gimpchannel-select.h"
 #include "gimpcontext.h"
 #include "gimpcontainer.h"
diff --git a/app/display/gimpcanvasboundary.c b/app/display/gimpcanvasboundary.c
index 7520cf8..f87e58d 100644
--- a/app/display/gimpcanvasboundary.c
+++ b/app/display/gimpcanvasboundary.c
@@ -28,8 +28,7 @@
 
 #include "display-types.h"
 
-#include "base/boundary.h"
-
+#include "core/gimpboundary.h"
 #include "core/gimpparamspecs.h"
 
 #include "widgets/gimpcairo.h"
diff --git a/app/display/gimpdisplayshell-selection.c b/app/display/gimpdisplayshell-selection.c
index f05c839..a3521dc 100644
--- a/app/display/gimpdisplayshell-selection.c
+++ b/app/display/gimpdisplayshell-selection.c
@@ -24,9 +24,8 @@
 
 #include "config/gimpdisplayconfig.h"
 
-#include "base/boundary.h"
-
 #include "core/gimp.h"
+#include "core/gimpboundary.h"
 #include "core/gimpchannel.h"
 #include "core/gimpimage.h"
 
diff --git a/app/display/gimpdisplayshell-transform.c b/app/display/gimpdisplayshell-transform.c
index 843b49d..af6f1bd 100644
--- a/app/display/gimpdisplayshell-transform.c
+++ b/app/display/gimpdisplayshell-transform.c
@@ -24,8 +24,7 @@
 
 #include "display-types.h"
 
-#include "base/boundary.h"
-
+#include "core/gimpboundary.h"
 #include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
 
diff --git a/app/paint/gimppaintcore-stroke.c b/app/paint/gimppaintcore-stroke.c
index 7c1a8f3..2b88ffe 100644
--- a/app/paint/gimppaintcore-stroke.c
+++ b/app/paint/gimppaintcore-stroke.c
@@ -23,8 +23,7 @@
 
 #include "paint-types.h"
 
-#include "base/boundary.h"
-
+#include "core/gimpboundary.h"
 #include "core/gimpdrawable.h"
 #include "core/gimperror.h"
 #include "core/gimpcoords.h"
diff --git a/app/tools/gimpeditselectiontool.c b/app/tools/gimpeditselectiontool.c
index 6454bd5..3dce466 100644
--- a/app/tools/gimpeditselectiontool.c
+++ b/app/tools/gimpeditselectiontool.c
@@ -29,10 +29,9 @@
 
 #include "tools-types.h"
 
-#include "base/boundary.h"
-
 #include "core/gimp.h"
 #include "core/gimp-utils.h"
+#include "core/gimpboundary.h"
 #include "core/gimpimage.h"
 #include "core/gimpimage-guides.h"
 #include "core/gimpimage-item-list.h"
diff --git a/app/tools/gimprectangleselecttool.c b/app/tools/gimprectangleselecttool.c
index a7bc9bc..62eeed8 100644
--- a/app/tools/gimprectangleselecttool.c
+++ b/app/tools/gimprectangleselecttool.c
@@ -25,8 +25,7 @@
 
 #include "tools-types.h"
 
-#include "base/boundary.h"
-
+#include "core/gimpboundary.h"
 #include "core/gimpchannel.h"
 #include "core/gimpchannel-select.h"
 #include "core/gimplayer-floating-sel.h"
diff --git a/app/tools/gimpregionselecttool.c b/app/tools/gimpregionselecttool.c
index 12af209..dabfdd5 100644
--- a/app/tools/gimpregionselecttool.c
+++ b/app/tools/gimpregionselecttool.c
@@ -26,9 +26,9 @@
 
 #include "tools-types.h"
 
-#include "base/boundary.h"
 #include "base/pixel-region.h"
 
+#include "core/gimpboundary.h"
 #include "core/gimpchannel.h"
 #include "core/gimpchannel-select.h"
 #include "core/gimpimage.h"
diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
index b5fad86..0fa2f76 100644
--- a/app/tools/gimptransformtool.c
+++ b/app/tools/gimptransformtool.c
@@ -29,10 +29,10 @@
 
 #include "tools-types.h"
 
-#include "base/boundary.h"
 #include "base/tile-manager.h"
 
 #include "core/gimp.h"
+#include "core/gimpboundary.h"
 #include "core/gimpcontext.h"
 #include "core/gimpchannel.h"
 #include "core/gimpdrawable-transform.h"