[gimp] app: move GimpToolDialog from app/widgets/ to app/display/

[Michael Natterer <mitch src gnome org>]

commit 1f5e1803340c3542efb6ee447609153d6f7ef170
Author: Michael Natterer <mitch gimp org>
Date:   Sun Mar 20 13:34:03 2011 +0100

    app: move GimpToolDialog from app/widgets/ to app/display/
    
    Zero logic changes yet, just a rename.

 app/display/Makefile.am                   |    4 +++-
 app/display/display-types.h               |    2 ++
 app/{widgets => display}/gimptooldialog.c |    5 +++--
 app/{widgets => display}/gimptooldialog.h |    0
 app/tools/gimpcolorpickertool.c           |    2 +-
 app/tools/gimpimagemaptool.c              |    2 +-
 app/tools/gimpmeasuretool.c               |    2 +-
 app/tools/gimptransformtool.c             |    2 +-
 app/widgets/Makefile.am                   |    2 --
 app/widgets/widgets-types.h               |    1 -
 10 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/app/display/Makefile.am b/app/display/Makefile.am
index 51b4826..cbaa3da 100644
--- a/app/display/Makefile.am
+++ b/app/display/Makefile.am
@@ -132,7 +132,9 @@ libappdisplay_a_sources = \
 	gimpscalecombobox.c			\
 	gimpscalecombobox.h			\
 	gimpstatusbar.c				\
-	gimpstatusbar.h
+	gimpstatusbar.h				\
+	gimptooldialog.c			\
+	gimptooldialog.h
 
 libappdisplay_a_built_sources = display-enums.c
 
diff --git a/app/display/display-types.h b/app/display/display-types.h
index e2b634f..e09f0b2 100644
--- a/app/display/display-types.h
+++ b/app/display/display-types.h
@@ -78,6 +78,8 @@ typedef struct _GimpNavigationEditor  GimpNavigationEditor;
 typedef struct _GimpScaleComboBox     GimpScaleComboBox;
 typedef struct _GimpStatusbar         GimpStatusbar;
 
+typedef struct _GimpToolDialog        GimpToolDialog;
+
 typedef struct _Selection             Selection;
 
 
diff --git a/app/widgets/gimptooldialog.c b/app/display/gimptooldialog.c
similarity index 97%
rename from app/widgets/gimptooldialog.c
rename to app/display/gimptooldialog.c
index 8e8c5e8..c90de21 100644
--- a/app/widgets/gimptooldialog.c
+++ b/app/display/gimptooldialog.c
@@ -24,12 +24,13 @@
 
 #include "libgimpwidgets/gimpwidgets.h"
 
-#include "widgets-types.h"
+#include "display-types.h"
 
 #include "core/gimpobject.h"
 #include "core/gimptoolinfo.h"
 
-#include "gimpdialogfactory.h"
+#include "widgets/gimpdialogfactory.h"
+
 #include "gimptooldialog.h"
 
 
diff --git a/app/widgets/gimptooldialog.h b/app/display/gimptooldialog.h
similarity index 100%
rename from app/widgets/gimptooldialog.h
rename to app/display/gimptooldialog.h
diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c
index 97ebdf8..1c2295b 100644
--- a/app/tools/gimpcolorpickertool.c
+++ b/app/tools/gimpcolorpickertool.c
@@ -29,10 +29,10 @@
 
 #include "widgets/gimpcolorframe.h"
 #include "widgets/gimphelp-ids.h"
-#include "widgets/gimptooldialog.h"
 #include "widgets/gimpwidgets-utils.h"
 
 #include "display/gimpdisplay.h"
+#include "display/gimptooldialog.h"
 
 #include "gimpcolorpickeroptions.h"
 #include "gimpcolorpickertool.h"
diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c
index c183f70..1de335f 100644
--- a/app/tools/gimpimagemaptool.c
+++ b/app/tools/gimpimagemaptool.c
@@ -54,13 +54,13 @@
 #include "widgets/gimpoverlaybox.h"
 #include "widgets/gimpoverlaydialog.h"
 #include "widgets/gimpsettingsbox.h"
-#include "widgets/gimptooldialog.h"
 #include "widgets/gimpwidgets-utils.h"
 
 #include "display/gimpdisplay.h"
 #include "display/gimpdisplayshell.h"
 #include "display/gimpdisplayshell-transform.h"
 #include "display/gimpimagewindow.h"
+#include "display/gimptooldialog.h"
 
 #include "gimpcoloroptions.h"
 #include "gimpimagemaptool.h"
diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c
index abe5cdf..f183c2a 100644
--- a/app/tools/gimpmeasuretool.c
+++ b/app/tools/gimpmeasuretool.c
@@ -39,7 +39,6 @@
 #include "core/gimpimage-undo-push.h"
 
 #include "widgets/gimphelp-ids.h"
-#include "widgets/gimptooldialog.h"
 #include "widgets/gimpwidgets-utils.h"
 
 #include "display/gimpcanvasgroup.h"
@@ -47,6 +46,7 @@
 #include "display/gimpdisplay.h"
 #include "display/gimpdisplayshell.h"
 #include "display/gimpdisplayshell-appearance.h"
+#include "display/gimptooldialog.h"
 
 #include "gimpmeasureoptions.h"
 #include "gimpmeasuretool.h"
diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
index 0f160b4..d7742ad 100644
--- a/app/tools/gimptransformtool.c
+++ b/app/tools/gimptransformtool.c
@@ -50,7 +50,6 @@
 #include "vectors/gimpstroke.h"
 
 #include "widgets/gimpdialogfactory.h"
-#include "widgets/gimptooldialog.h"
 
 #include "display/gimpcanvasgroup.h"
 #include "display/gimpdisplay.h"
@@ -58,6 +57,7 @@
 #include "display/gimpdisplayshell-appearance.h"
 #include "display/gimpdisplayshell-expose.h"
 #include "display/gimpdisplayshell-transform.h"
+#include "display/gimptooldialog.h"
 
 #include "gimptoolcontrol.h"
 #include "gimptransformoptions.h"
diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am
index 256d34a..8170350 100644
--- a/app/widgets/Makefile.am
+++ b/app/widgets/Makefile.am
@@ -338,8 +338,6 @@ libappwidgets_a_sources = \
 	gimptoolbox-image-area.h	\
 	gimptoolbox-indicator-area.c	\
 	gimptoolbox-indicator-area.h	\
-	gimptooldialog.c		\
-	gimptooldialog.h		\
 	gimptooleditor.c		\
 	gimptooleditor.h		\
 	gimptooloptionseditor.c		\
diff --git a/app/widgets/widgets-types.h b/app/widgets/widgets-types.h
index aa61b29..9735533 100644
--- a/app/widgets/widgets-types.h
+++ b/app/widgets/widgets-types.h
@@ -137,7 +137,6 @@ typedef struct _GimpMessageDialog            GimpMessageDialog;
 typedef struct _GimpProfileChooserDialog     GimpProfileChooserDialog;
 typedef struct _GimpProgressDialog           GimpProgressDialog;
 typedef struct _GimpTextEditor               GimpTextEditor;
-typedef struct _GimpToolDialog               GimpToolDialog;
 typedef struct _GimpViewableDialog           GimpViewableDialog;