From a72026820f68eda42c23cd0bb1d64955b5d82f04 Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Thu, 22 Jun 2017 08:16:43 +0200
Subject: [PATCH] app: rename gimpimage-pick-layer.[ch] to
 gimpimage-pick-item.[ch]

---
 app/core/Makefile.am                                       | 4 ++--
 app/core/{gimpimage-pick-layer.c => gimpimage-pick-item.c} | 2 +-
 app/core/{gimpimage-pick-layer.h => gimpimage-pick-item.h} | 6 +++---
 app/pdb/image-cmds.c                                       | 2 +-
 app/tools/gimpaligntool.c                                  | 2 +-
 app/tools/gimpmovetool.c                                   | 2 +-
 app/tools/gimpselectiontool.c                              | 2 +-
 app/tools/gimptexttool.c                                   | 2 +-
 tools/pdbgen/pdb/image.pdb                                 | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename app/core/{gimpimage-pick-layer.c => gimpimage-pick-item.c} (99%)
 rename app/core/{gimpimage-pick-layer.h => gimpimage-pick-item.h} (92%)

diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index b17abbf8fe..9d8190e42e 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -251,8 +251,8 @@ libappcore_a_sources = \
 	gimpimage-new.h				\
 	gimpimage-pick-color.c			\
 	gimpimage-pick-color.h			\
-	gimpimage-pick-layer.c			\
-	gimpimage-pick-layer.h			\
+	gimpimage-pick-item.c			\
+	gimpimage-pick-item.h			\
 	gimpimage-preview.c			\
 	gimpimage-preview.h			\
 	gimpimage-private.h			\
diff --git a/app/core/gimpimage-pick-layer.c b/app/core/gimpimage-pick-item.c
similarity index 99%
rename from app/core/gimpimage-pick-layer.c
rename to app/core/gimpimage-pick-item.c
index e2d0bb0585..8a811fd500 100644
--- a/app/core/gimpimage-pick-layer.c
+++ b/app/core/gimpimage-pick-item.c
@@ -24,7 +24,7 @@
 
 #include "gimpgrouplayer.h"
 #include "gimpimage.h"
-#include "gimpimage-pick-layer.h"
+#include "gimpimage-pick-item.h"
 #include "gimppickable.h"
 
 #include "text/gimptextlayer.h"
diff --git a/app/core/gimpimage-pick-layer.h b/app/core/gimpimage-pick-item.h
similarity index 92%
rename from app/core/gimpimage-pick-layer.h
rename to app/core/gimpimage-pick-item.h
index 9601fed059..63558987c1 100644
--- a/app/core/gimpimage-pick-layer.h
+++ b/app/core/gimpimage-pick-item.h
@@ -15,8 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GIMP_IMAGE_PICK_LAYER_H__
-#define __GIMP_IMAGE_PICK_LAYER_H__
+#ifndef __GIMP_IMAGE_PICK_ITEM_H__
+#define __GIMP_IMAGE_PICK_ITEM_H__
 
 
 GimpLayer     * gimp_image_pick_layer           (GimpImage *image,
@@ -30,4 +30,4 @@ GimpTextLayer * gimp_image_pick_text_layer      (GimpImage *image,
                                                  gint       y);
 
 
-#endif /* __GIMP_IMAGE_PICK_LAYER_H__ */
+#endif /* __GIMP_IMAGE_PICK_ITEM_H__ */
diff --git a/app/pdb/image-cmds.c b/app/pdb/image-cmds.c
index 5efbbaadb1..29977b0553 100644
--- a/app/pdb/image-cmds.c
+++ b/app/pdb/image-cmds.c
@@ -42,7 +42,7 @@
 #include "core/gimpimage-merge.h"
 #include "core/gimpimage-metadata.h"
 #include "core/gimpimage-pick-color.h"
-#include "core/gimpimage-pick-layer.h"
+#include "core/gimpimage-pick-item.h"
 #include "core/gimpimage.h"
 #include "core/gimpitem.h"
 #include "core/gimplayer.h"
diff --git a/app/tools/gimpaligntool.c b/app/tools/gimpaligntool.c
index 67ce70b1f4..c883ab3740 100644
--- a/app/tools/gimpaligntool.c
+++ b/app/tools/gimpaligntool.c
@@ -33,7 +33,7 @@
 #include "core/gimpimage.h"
 #include "core/gimpimage-arrange.h"
 #include "core/gimpimage-guides.h"
-#include "core/gimpimage-pick-layer.h"
+#include "core/gimpimage-pick-item.h"
 #include "core/gimpimage-undo.h"
 #include "core/gimplayer.h"
 
diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c
index 29865fa649..c6f2ef43cf 100644
--- a/app/tools/gimpmovetool.c
+++ b/app/tools/gimpmovetool.c
@@ -35,7 +35,7 @@
 #include "core/gimpguide.h"
 #include "core/gimpimage.h"
 #include "core/gimpimage-guides.h"
-#include "core/gimpimage-pick-layer.h"
+#include "core/gimpimage-pick-item.h"
 #include "core/gimplayer.h"
 #include "core/gimpimage-undo.h"
 #include "core/gimplayermask.h"
diff --git a/app/tools/gimpselectiontool.c b/app/tools/gimpselectiontool.c
index d3111e0762..7a121a0b92 100644
--- a/app/tools/gimpselectiontool.c
+++ b/app/tools/gimpselectiontool.c
@@ -26,7 +26,7 @@
 
 #include "core/gimpchannel.h"
 #include "core/gimpimage.h"
-#include "core/gimpimage-pick-layer.h"
+#include "core/gimpimage-pick-item.h"
 #include "core/gimppickable.h"
 
 #include "display/gimpdisplay.h"
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index 982ab26d8a..4f3ad7ec54 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -34,7 +34,7 @@
 #include "core/gimp.h"
 #include "core/gimpcontext.h"
 #include "core/gimpimage.h"
-#include "core/gimpimage-pick-layer.h"
+#include "core/gimpimage-pick-item.h"
 #include "core/gimpimage-undo.h"
 #include "core/gimpimage-undo-push.h"
 #include "core/gimplayer-floating-selection.h"
diff --git a/tools/pdbgen/pdb/image.pdb b/tools/pdbgen/pdb/image.pdb
index dc1a71c7b9..5f5617cd53 100644
--- a/tools/pdbgen/pdb/image.pdb
+++ b/tools/pdbgen/pdb/image.pdb
@@ -519,7 +519,7 @@ HELP
     );
 
     %invoke = (
-        headers => [ qw("core/gimpimage-pick-layer.h") ],
+        headers => [ qw("core/gimpimage-pick-item.h") ],
         code => <<'CODE'
 {
   layer = gimp_image_pick_layer (image, x, y);