[gimp/soc-2010-cage-2] app: derive GimpCageOptions directly from GimpToolOptions

[Michael Muré <mmure src gnome org>]

commit e61f730768a1e67e091a006afe6f921fd87c094b
Author: Michael Natterer <mitch gimp org>
Date:   Thu Nov 4 22:28:47 2010 +0100

    app: derive GimpCageOptions directly from GimpToolOptions

 app/tools/gimpcageoptions.c |    3 +--
 app/tools/gimpcageoptions.h |    8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/app/tools/gimpcageoptions.c b/app/tools/gimpcageoptions.c
index 888f785..981f339 100644
--- a/app/tools/gimpcageoptions.c
+++ b/app/tools/gimpcageoptions.c
@@ -61,7 +61,7 @@ static void   gimp_cage_options_get_property (GObject    *object,
 
 
 G_DEFINE_TYPE (GimpCageOptions, gimp_cage_options,
-               GIMP_TYPE_TRANSFORM_OPTIONS)
+               GIMP_TYPE_TOOL_OPTIONS)
 
 #define parent_class gimp_cage_options_parent_class
 
@@ -89,7 +89,6 @@ gimp_cage_options_class_init (GimpCageOptionsClass *klass)
 static void
 gimp_cage_options_init (GimpCageOptions *options)
 {
-
 }
 
 static void
diff --git a/app/tools/gimpcageoptions.h b/app/tools/gimpcageoptions.h
index 14815b9..00f2775 100644
--- a/app/tools/gimpcageoptions.h
+++ b/app/tools/gimpcageoptions.h
@@ -21,7 +21,7 @@
 #define __GIMP_CAGE_OPTIONS_H__
 
 
-#include "tools/gimptransformoptions.h"
+#include "core/gimptooloptions.h"
 
 
 #define GIMP_TYPE_CAGE_OPTIONS            (gimp_cage_options_get_type ())
@@ -37,10 +37,10 @@ typedef struct _GimpCageOptionsClass GimpCageOptionsClass;
 
 struct _GimpCageOptions
 {
-  GimpTransformOptions  parent_instance;
+  GimpToolOptions  parent_instance;
 
-  GimpCageMode          cage_mode;
-  gboolean              fill_plain_color;
+  GimpCageMode     cage_mode;
+  gboolean         fill_plain_color;
 };
 
 struct _GimpCageOptionsClass