gimp r27581 - in trunk: . app/actions app/dialogs app/display app/widgets

[martinn svn gnome org]

Author: martinn
Date: Sun Nov  9 17:51:43 2008
New Revision: 27581
URL: http://svn.gnome.org/viewvc/gimp?rev=27581&view=rev

Log:
Prepare GimpCursorView for a dependency to GimpDisplayShell.

* app/widgets/gimpcursorview.[ch]: Move from here...

* app/display/gimpcursorview.[ch]: ...to here.

* app/widgets/Makefile.am
* app/display/Makefile.am: Change accordingly.

* app/actions/cursor-info-actions.c
* app/dialogs/dialogs-constructors.c
* app/actions/cursor-info-commands.c
* app/display/gimpdisplayshell-cursor.c: Update includes.


Added:
   trunk/app/display/gimpcursorview.c   (contents, props changed)
      - copied, changed from r27579, /trunk/app/widgets/gimpcursorview.c
   trunk/app/display/gimpcursorview.h   (props changed)
      - copied unchanged from r27579, /trunk/app/widgets/gimpcursorview.h
Removed:
   trunk/app/widgets/gimpcursorview.c
   trunk/app/widgets/gimpcursorview.h
Modified:
   trunk/ChangeLog
   trunk/app/actions/cursor-info-actions.c
   trunk/app/actions/cursor-info-commands.c
   trunk/app/dialogs/dialogs-constructors.c
   trunk/app/display/Makefile.am
   trunk/app/display/gimpdisplayshell-cursor.c
   trunk/app/widgets/Makefile.am

Modified: trunk/app/actions/cursor-info-actions.c
==============================================================================
--- trunk/app/actions/cursor-info-actions.c	(original)
+++ trunk/app/actions/cursor-info-actions.c	Sun Nov  9 17:51:43 2008
@@ -25,9 +25,10 @@
 #include "actions-types.h"
 
 #include "widgets/gimpactiongroup.h"
-#include "widgets/gimpcursorview.h"
 #include "widgets/gimphelp-ids.h"
 
+#include "display/gimpcursorview.h"
+
 #include "cursor-info-actions.h"
 #include "cursor-info-commands.h"
 

Modified: trunk/app/actions/cursor-info-commands.c
==============================================================================
--- trunk/app/actions/cursor-info-commands.c	(original)
+++ trunk/app/actions/cursor-info-commands.c	Sun Nov  9 17:51:43 2008
@@ -25,10 +25,11 @@
 
 #include "actions-types.h"
 
-#include "widgets/gimpcursorview.h"
 #include "widgets/gimphelp-ids.h"
 #include "widgets/gimpwidgets-utils.h"
 
+#include "display/gimpcursorview.h"
+
 #include "cursor-info-commands.h"
 
 #include "gimp-intl.h"

Modified: trunk/app/dialogs/dialogs-constructors.c
==============================================================================
--- trunk/app/dialogs/dialogs-constructors.c	(original)
+++ trunk/app/dialogs/dialogs-constructors.c	Sun Nov  9 17:51:43 2008
@@ -41,7 +41,6 @@
 #include "widgets/gimpcontainergridview.h"
 #include "widgets/gimpcontainertreeview.h"
 #include "widgets/gimpcontainerview-utils.h"
-#include "widgets/gimpcursorview.h"
 #include "widgets/gimpdataeditor.h"
 #include "widgets/gimpdevicestatus.h"
 #include "widgets/gimpdialogfactory.h"
@@ -67,6 +66,7 @@
 #include "widgets/gimpundoeditor.h"
 #include "widgets/gimpvectorstreeview.h"
 
+#include "display/gimpcursorview.h"
 #include "display/gimpnavigationeditor.h"
 
 #include "about-dialog.h"

Modified: trunk/app/display/Makefile.am
==============================================================================
--- trunk/app/display/Makefile.am	(original)
+++ trunk/app/display/Makefile.am	Sun Nov  9 17:51:43 2008
@@ -19,6 +19,8 @@
 	display-types.h				\
 	gimpcanvas.c				\
 	gimpcanvas.h				\
+	gimpcursorview.c			\
+	gimpcursorview.h			\
 	gimpdisplay.c				\
 	gimpdisplay.h				\
 	gimpdisplayoptions.c			\

Copied: trunk/app/display/gimpcursorview.c (from r27579, /trunk/app/widgets/gimpcursorview.c)
==============================================================================
--- /trunk/app/widgets/gimpcursorview.c	(original)
+++ trunk/app/display/gimpcursorview.c	Sun Nov  9 17:51:43 2008
@@ -31,19 +31,20 @@
 #include "libgimpcolor/gimpcolor.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
-#include "widgets-types.h"
+#include "display-types.h"
 
 #include "core/gimpimage.h"
 #include "core/gimpimage-pick-color.h"
 #include "core/gimpitem.h"
 #include "core/gimpunit.h"
 
-#include "gimpcolorframe.h"
+#include "widgets/gimpcolorframe.h"
+#include "widgets/gimpdocked.h"
+#include "widgets/gimpeditor.h"
+#include "widgets/gimpmenufactory.h"
+#include "widgets/gimpsessioninfo-aux.h"
+
 #include "gimpcursorview.h"
-#include "gimpdocked.h"
-#include "gimpeditor.h"
-#include "gimpmenufactory.h"
-#include "gimpsessioninfo-aux.h"
 
 #include "gimp-intl.h"
 

Modified: trunk/app/display/gimpdisplayshell-cursor.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-cursor.c	(original)
+++ trunk/app/display/gimpdisplayshell-cursor.c	Sun Nov  9 17:51:43 2008
@@ -29,11 +29,11 @@
 #include "core/gimpimage.h"
 
 #include "widgets/gimpcursor.h"
-#include "widgets/gimpcursorview.h"
 #include "widgets/gimpdialogfactory.h"
 #include "widgets/gimpsessioninfo.h"
 
 #include "gimpdisplay.h"
+#include "gimpcursorview.h"
 #include "gimpdisplayshell.h"
 #include "gimpdisplayshell-cursor.h"
 #include "gimpdisplayshell-transform.h"

Modified: trunk/app/widgets/Makefile.am
==============================================================================
--- trunk/app/widgets/Makefile.am	(original)
+++ trunk/app/widgets/Makefile.am	Sun Nov  9 17:51:43 2008
@@ -101,8 +101,6 @@
 	gimpcontrollerwheel.h		\
 	gimpcursor.c			\
 	gimpcursor.h			\
-	gimpcursorview.c		\
-	gimpcursorview.h		\
 	gimpcurveview.c			\
 	gimpcurveview.h			\
 	gimpdasheditor.c		\