[gimp] app: rename GimpImageMapConfig to GimpSettings

From: Michael Natterer <mitch src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp] app: rename GimpImageMapConfig to GimpSettings
Date: Sat, 25 May 2013 13:28:40 +0000 (UTC)
commit 9072bf331a3e5f371edeb05f4ccf4dad12688f1b
Author: Michael Natterer <mitch gimp org>
Date:   Sat May 25 15:26:18 2013 +0200

    app: rename GimpImageMapConfig to GimpSettings
    
    It was misnamed from the beginning and has no relation to GimpImageMap
    except that it happens to be used by GimpImageMapTools. Now it feels
    less weird to potentially use it for other settings too.

 app/core/Makefile.am                          |    4 +-
 app/core/core-types.h                         |    2 +-
 app/core/gimpdrawable-operation.c             |    4 +-
 app/core/gimpimagemapconfig.c                 |  168 -------------------------
 app/core/gimpimagemapconfig.h                 |   57 ---------
 app/operations/gimpbrightnesscontrastconfig.c |    2 +-
 app/operations/gimpbrightnesscontrastconfig.h |   10 +-
 app/operations/gimpcageconfig.c               |    2 +-
 app/operations/gimpcageconfig.h               |   14 +-
 app/operations/gimpcolorbalanceconfig.c       |    2 +-
 app/operations/gimpcolorbalanceconfig.h       |   16 ++--
 app/operations/gimpcolorizeconfig.c           |    2 +-
 app/operations/gimpcolorizeconfig.h           |   12 +-
 app/operations/gimpcurvesconfig.c             |    2 +-
 app/operations/gimpcurvesconfig.h             |    6 +-
 app/operations/gimpdesaturateconfig.c         |    2 +-
 app/operations/gimpdesaturateconfig.h         |    6 +-
 app/operations/gimphuesaturationconfig.c      |    2 +-
 app/operations/gimphuesaturationconfig.h      |   16 ++--
 app/operations/gimplevelsconfig.c             |    2 +-
 app/operations/gimplevelsconfig.h             |    6 +-
 app/operations/gimpposterizeconfig.c          |    2 +-
 app/operations/gimpposterizeconfig.h          |    8 +-
 app/operations/gimpthresholdconfig.c          |    2 +-
 app/operations/gimpthresholdconfig.h          |   10 +-
 app/tools/gimpimagemaptool-settings.c         |    1 -
 app/tools/gimpimagemaptool.c                  |    6 +-
 app/tools/gimpoperationtool.c                 |    6 +-
 28 files changed, 73 insertions(+), 299 deletions(-)
---
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index eb87117..ed543e2 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -252,8 +252,6 @@ libappcore_a_sources = \
        gimpimagefile.h                         \
        gimpimagemap.c                          \
        gimpimagemap.h                          \
-       gimpimagemapconfig.c                    \
-       gimpimagemapconfig.h                    \
        gimpitem.c                              \
        gimpitem.h                              \
        gimpitem-exclusive.c                    \
@@ -335,6 +333,8 @@ libappcore_a_sources = \
        gimpscanconvert.h                       \
        gimpselection.c                         \
        gimpselection.h                         \
+       gimpsettings.c                          \
+       gimpsettings.h                          \
        gimpstrokeoptions.c                     \
        gimpstrokeoptions.h                     \
        gimpsubprogress.c                       \
diff --git a/app/core/core-types.h b/app/core/core-types.h
index af28586..9076c31 100644
--- a/app/core/core-types.h
+++ b/app/core/core-types.h
@@ -176,12 +176,12 @@ typedef struct _GimpGuide           GimpGuide;
 typedef struct _GimpHistogram       GimpHistogram;
 typedef struct _GimpIdTable         GimpIdTable;
 typedef struct _GimpImageMap        GimpImageMap;
-typedef struct _GimpImageMapConfig  GimpImageMapConfig;
 typedef struct _GimpImagefile       GimpImagefile;
 typedef struct _GimpInterpreterDB   GimpInterpreterDB;
 typedef struct _GimpParasiteList    GimpParasiteList;
 typedef struct _GimpPdbProgress     GimpPdbProgress;
 typedef struct _GimpProjection      GimpProjection;
+typedef struct _GimpSettings        GimpSettings;
 typedef struct _GimpSubProgress     GimpSubProgress;
 typedef struct _GimpTag             GimpTag;
 typedef struct _GimpTreeHandler     GimpTreeHandler;
diff --git a/app/core/gimpdrawable-operation.c b/app/core/gimpdrawable-operation.c
index bef4d29..e3c177f 100644
--- a/app/core/gimpdrawable-operation.c
+++ b/app/core/gimpdrawable-operation.c
@@ -31,8 +31,8 @@
 #include "gimpdrawable.h"
 #include "gimpdrawable-operation.h"
 #include "gimpdrawable-shadow.h"
-#include "gimpimagemapconfig.h"
 #include "gimpprogress.h"
+#include "gimpsettings.h"
 
 
 /*  public functions  */
@@ -87,7 +87,7 @@ gimp_drawable_apply_operation_by_name (GimpDrawable *drawable,
   g_return_if_fail (progress == NULL || GIMP_IS_PROGRESS (progress));
   g_return_if_fail (undo_desc != NULL);
   g_return_if_fail (operation_type != NULL);
-  g_return_if_fail (config == NULL || GIMP_IS_IMAGE_MAP_CONFIG (config));
+  g_return_if_fail (config == NULL || GIMP_IS_SETTINGS (config));
 
   node = g_object_new (GEGL_TYPE_NODE,
                        "operation", operation_type,
diff --git a/app/operations/gimpbrightnesscontrastconfig.c b/app/operations/gimpbrightnesscontrastconfig.c
index 3cd3d46..b079fd4 100644
--- a/app/operations/gimpbrightnesscontrastconfig.c
+++ b/app/operations/gimpbrightnesscontrastconfig.c
@@ -51,7 +51,7 @@ static void   gimp_brightness_contrast_config_set_property (GObject      *object
 
 G_DEFINE_TYPE_WITH_CODE (GimpBrightnessContrastConfig,
                          gimp_brightness_contrast_config,
-                         GIMP_TYPE_IMAGE_MAP_CONFIG,
+                         GIMP_TYPE_SETTINGS,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
 
 #define parent_class gimp_brightness_contrast_config_parent_class
diff --git a/app/operations/gimpbrightnesscontrastconfig.h b/app/operations/gimpbrightnesscontrastconfig.h
index 149c033..e53dd17 100644
--- a/app/operations/gimpbrightnesscontrastconfig.h
+++ b/app/operations/gimpbrightnesscontrastconfig.h
@@ -22,7 +22,7 @@
 #define __GIMP_BRIGHTNESS_CONTRAST_CONFIG_H__
 
 
-#include "core/gimpimagemapconfig.h"
+#include "core/gimpsettings.h"
 
 
 #define GIMP_TYPE_BRIGHTNESS_CONTRAST_CONFIG            (gimp_brightness_contrast_config_get_type ())
@@ -37,15 +37,15 @@ typedef struct _GimpBrightnessContrastConfigClass GimpBrightnessContrastConfigCl
 
 struct _GimpBrightnessContrastConfig
 {
-  GimpImageMapConfig  parent_instance;
+  GimpSettings  parent_instance;
 
-  gdouble             brightness;
-  gdouble             contrast;
+  gdouble       brightness;
+  gdouble       contrast;
 };
 
 struct _GimpBrightnessContrastConfigClass
 {
-  GimpImageMapConfigClass  parent_class;
+  GimpSettingsClass  parent_class;
 };
 
 
diff --git a/app/operations/gimpcageconfig.c b/app/operations/gimpcageconfig.c
index 964a9ab..71d5c45 100644
--- a/app/operations/gimpcageconfig.c
+++ b/app/operations/gimpcageconfig.c
@@ -53,7 +53,7 @@ static void   gimp_cage_config_compute_edges_normal   (GimpCageConfig *gcc);
 
 
 G_DEFINE_TYPE_WITH_CODE (GimpCageConfig, gimp_cage_config,
-                         GIMP_TYPE_IMAGE_MAP_CONFIG,
+                         GIMP_TYPE_SETTINGS,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
                                                 NULL))
 
diff --git a/app/operations/gimpcageconfig.h b/app/operations/gimpcageconfig.h
index 77b5394..e8e4995 100644
--- a/app/operations/gimpcageconfig.h
+++ b/app/operations/gimpcageconfig.h
@@ -21,7 +21,7 @@
 #define __GIMP_CAGE_CONFIG_H__
 
 
-#include "core/gimpimagemapconfig.h"
+#include "core/gimpsettings.h"
 
 
 struct _GimpCagePoint
@@ -46,18 +46,18 @@ typedef struct _GimpCageConfigClass GimpCageConfigClass;
 
 struct _GimpCageConfig
 {
-  GimpImageMapConfig  parent_instance;
+  GimpSettings  parent_instance;
 
-  GArray             *cage_points;
+  GArray       *cage_points;
 
-  gdouble             displacement_x;
-  gdouble             displacement_y;
-  GimpCageMode        cage_mode;  /* Cage mode, used to commit displacement */
+  gdouble       displacement_x;
+  gdouble       displacement_y;
+  GimpCageMode  cage_mode;  /* Cage mode, used to commit displacement */
 };
 
 struct _GimpCageConfigClass
 {
-  GimpImageMapConfigClass  parent_class;
+  GimpSettingsClass  parent_class;
 };
 
 
diff --git a/app/operations/gimpcolorbalanceconfig.c b/app/operations/gimpcolorbalanceconfig.c
index 42bb655..8a97349 100644
--- a/app/operations/gimpcolorbalanceconfig.c
+++ b/app/operations/gimpcolorbalanceconfig.c
@@ -71,7 +71,7 @@ static gboolean gimp_color_balance_config_copy         (GimpConfig       *src,
 
 
 G_DEFINE_TYPE_WITH_CODE (GimpColorBalanceConfig, gimp_color_balance_config,
-                         GIMP_TYPE_IMAGE_MAP_CONFIG,
+                         GIMP_TYPE_SETTINGS,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
                                                 gimp_color_balance_config_iface_init))
 
diff --git a/app/operations/gimpcolorbalanceconfig.h b/app/operations/gimpcolorbalanceconfig.h
index d207db0..5f2e40b 100644
--- a/app/operations/gimpcolorbalanceconfig.h
+++ b/app/operations/gimpcolorbalanceconfig.h
@@ -22,7 +22,7 @@
 #define __GIMP_COLOR_BALANCE_CONFIG_H__
 
 
-#include "core/gimpimagemapconfig.h"
+#include "core/gimpsettings.h"
 
 
 #define GIMP_TYPE_COLOR_BALANCE_CONFIG            (gimp_color_balance_config_get_type ())
@@ -37,20 +37,20 @@ typedef struct _GimpColorBalanceConfigClass GimpColorBalanceConfigClass;
 
 struct _GimpColorBalanceConfig
 {
-  GimpImageMapConfig  parent_instance;
+  GimpSettings      parent_instance;
 
-  GimpTransferMode    range;
+  GimpTransferMode  range;
 
-  gdouble             cyan_red[3];
-  gdouble             magenta_green[3];
-  gdouble             yellow_blue[3];
+  gdouble           cyan_red[3];
+  gdouble           magenta_green[3];
+  gdouble           yellow_blue[3];
 
-  gboolean            preserve_luminosity;
+  gboolean          preserve_luminosity;
 };
 
 struct _GimpColorBalanceConfigClass
 {
-  GimpImageMapConfigClass  parent_class;
+  GimpSettingsClass  parent_class;
 };
 
 
diff --git a/app/operations/gimpcolorizeconfig.c b/app/operations/gimpcolorizeconfig.c
index c7378a9..0e9241e 100644
--- a/app/operations/gimpcolorizeconfig.c
+++ b/app/operations/gimpcolorizeconfig.c
@@ -52,7 +52,7 @@ static void   gimp_colorize_config_set_property (GObject      *object,
 
 
 G_DEFINE_TYPE_WITH_CODE (GimpColorizeConfig, gimp_colorize_config,
-                         GIMP_TYPE_IMAGE_MAP_CONFIG,
+                         GIMP_TYPE_SETTINGS,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
 
 #define parent_class gimp_colorize_config_parent_class
diff --git a/app/operations/gimpcolorizeconfig.h b/app/operations/gimpcolorizeconfig.h
index c15b119..2fbaf15 100644
--- a/app/operations/gimpcolorizeconfig.h
+++ b/app/operations/gimpcolorizeconfig.h
@@ -22,7 +22,7 @@
 #define __GIMP_COLORIZE_CONFIG_H__
 
 
-#include "core/gimpimagemapconfig.h"
+#include "core/gimpsettings.h"
 
 
 #define GIMP_TYPE_COLORIZE_CONFIG            (gimp_colorize_config_get_type ())
@@ -37,16 +37,16 @@ typedef struct _GimpColorizeConfigClass GimpColorizeConfigClass;
 
 struct _GimpColorizeConfig
 {
-  GimpImageMapConfig  parent_instance;
+  GimpSettings  parent_instance;
 
-  gdouble             hue;
-  gdouble             saturation;
-  gdouble             lightness;
+  gdouble       hue;
+  gdouble       saturation;
+  gdouble       lightness;
 };
 
 struct _GimpColorizeConfigClass
 {
-  GimpImageMapConfigClass  parent_class;
+  GimpSettingsClass  parent_class;
 };
 
 
diff --git a/app/operations/gimpcurvesconfig.c b/app/operations/gimpcurvesconfig.c
index b75177d..9c438c8 100644
--- a/app/operations/gimpcurvesconfig.c
+++ b/app/operations/gimpcurvesconfig.c
@@ -80,7 +80,7 @@ static void     gimp_curves_config_curve_dirty  (GimpCurve        *curve,
 
 
 G_DEFINE_TYPE_WITH_CODE (GimpCurvesConfig, gimp_curves_config,
-                         GIMP_TYPE_IMAGE_MAP_CONFIG,
+                         GIMP_TYPE_SETTINGS,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
                                                 gimp_curves_config_iface_init))
 
diff --git a/app/operations/gimpcurvesconfig.h b/app/operations/gimpcurvesconfig.h
index ecfd15e..1bcf96d 100644
--- a/app/operations/gimpcurvesconfig.h
+++ b/app/operations/gimpcurvesconfig.h
@@ -22,7 +22,7 @@
 #define __GIMP_CURVES_CONFIG_H__
 
 
-#include "core/gimpimagemapconfig.h"
+#include "core/gimpsettings.h"
 
 
 #define GIMP_TYPE_CURVES_CONFIG            (gimp_curves_config_get_type ())
@@ -37,7 +37,7 @@ typedef struct _GimpCurvesConfigClass GimpCurvesConfigClass;
 
 struct _GimpCurvesConfig
 {
-  GimpImageMapConfig    parent_instance;
+  GimpSettings          parent_instance;
 
   GimpHistogramChannel  channel;
 
@@ -46,7 +46,7 @@ struct _GimpCurvesConfig
 
 struct _GimpCurvesConfigClass
 {
-  GimpImageMapConfigClass  parent_class;
+  GimpSettingsClass  parent_class;
 };
 
 
diff --git a/app/operations/gimpdesaturateconfig.c b/app/operations/gimpdesaturateconfig.c
index 03d8442..c2e2f5c 100644
--- a/app/operations/gimpdesaturateconfig.c
+++ b/app/operations/gimpdesaturateconfig.c
@@ -47,7 +47,7 @@ static void   gimp_desaturate_config_set_property (GObject      *object,
 
 
 G_DEFINE_TYPE_WITH_CODE (GimpDesaturateConfig, gimp_desaturate_config,
-                         GIMP_TYPE_IMAGE_MAP_CONFIG,
+                         GIMP_TYPE_SETTINGS,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
 
 #define parent_class gimp_desaturate_config_parent_class
diff --git a/app/operations/gimpdesaturateconfig.h b/app/operations/gimpdesaturateconfig.h
index 0c701d6..9b4c6e4 100644
--- a/app/operations/gimpdesaturateconfig.h
+++ b/app/operations/gimpdesaturateconfig.h
@@ -22,7 +22,7 @@
 #define __GIMP_DESATURATE_CONFIG_H__
 
 
-#include "core/gimpimagemapconfig.h"
+#include "core/gimpsettings.h"
 
 
 #define GIMP_TYPE_DESATURATE_CONFIG            (gimp_desaturate_config_get_type ())
@@ -37,14 +37,14 @@ typedef struct _GimpDesaturateConfigClass GimpDesaturateConfigClass;
 
 struct _GimpDesaturateConfig
 {
-  GimpImageMapConfig  parent_instance;
+  GimpSettings        parent_instance;
 
   GimpDesaturateMode  mode;
 };
 
 struct _GimpDesaturateConfigClass
 {
-  GimpImageMapConfigClass  parent_class;
+  GimpSettingsClass  parent_class;
 };
 
 
diff --git a/app/operations/gimphuesaturationconfig.c b/app/operations/gimphuesaturationconfig.c
index 200d469..28a785e 100644
--- a/app/operations/gimphuesaturationconfig.c
+++ b/app/operations/gimphuesaturationconfig.c
@@ -68,7 +68,7 @@ static gboolean gimp_hue_saturation_config_copy         (GimpConfig       *src,
 
 
 G_DEFINE_TYPE_WITH_CODE (GimpHueSaturationConfig, gimp_hue_saturation_config,
-                         GIMP_TYPE_IMAGE_MAP_CONFIG,
+                         GIMP_TYPE_SETTINGS,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
                                                 gimp_hue_saturation_config_iface_init))
 
diff --git a/app/operations/gimphuesaturationconfig.h b/app/operations/gimphuesaturationconfig.h
index 02b2d22..915d831 100644
--- a/app/operations/gimphuesaturationconfig.h
+++ b/app/operations/gimphuesaturationconfig.h
@@ -22,7 +22,7 @@
 #define __GIMP_HUE_SATURATION_CONFIG_H__
 
 
-#include "core/gimpimagemapconfig.h"
+#include "core/gimpsettings.h"
 
 
 #define GIMP_TYPE_HUE_SATURATION_CONFIG            (gimp_hue_saturation_config_get_type ())
@@ -37,20 +37,20 @@ typedef struct _GimpHueSaturationConfigClass GimpHueSaturationConfigClass;
 
 struct _GimpHueSaturationConfig
 {
-  GimpImageMapConfig  parent_instance;
+  GimpSettings  parent_instance;
 
-  GimpHueRange        range;
+  GimpHueRange  range;
 
-  gdouble             hue[7];
-  gdouble             saturation[7];
-  gdouble             lightness[7];
+  gdouble       hue[7];
+  gdouble       saturation[7];
+  gdouble       lightness[7];
 
-  gdouble             overlap;
+  gdouble       overlap;
 };
 
 struct _GimpHueSaturationConfigClass
 {
-  GimpImageMapConfigClass  parent_class;
+  GimpSettingsClass  parent_class;
 };
 
 
diff --git a/app/operations/gimplevelsconfig.c b/app/operations/gimplevelsconfig.c
index c545c24..1c953dc 100644
--- a/app/operations/gimplevelsconfig.c
+++ b/app/operations/gimplevelsconfig.c
@@ -83,7 +83,7 @@ static gboolean gimp_levels_config_copy         (GimpConfig       *src,
 
 
 G_DEFINE_TYPE_WITH_CODE (GimpLevelsConfig, gimp_levels_config,
-                         GIMP_TYPE_IMAGE_MAP_CONFIG,
+                         GIMP_TYPE_SETTINGS,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG,
                                                 gimp_levels_config_iface_init))
 
diff --git a/app/operations/gimplevelsconfig.h b/app/operations/gimplevelsconfig.h
index 752d5cc..1ad5930 100644
--- a/app/operations/gimplevelsconfig.h
+++ b/app/operations/gimplevelsconfig.h
@@ -22,7 +22,7 @@
 #define __GIMP_LEVELS_CONFIG_H__
 
 
-#include "core/gimpimagemapconfig.h"
+#include "core/gimpsettings.h"
 
 
 #define GIMP_TYPE_LEVELS_CONFIG            (gimp_levels_config_get_type ())
@@ -37,7 +37,7 @@ typedef struct _GimpLevelsConfigClass GimpLevelsConfigClass;
 
 struct _GimpLevelsConfig
 {
-  GimpImageMapConfig    parent_instance;
+  GimpSettings          parent_instance;
 
   GimpHistogramChannel  channel;
 
@@ -52,7 +52,7 @@ struct _GimpLevelsConfig
 
 struct _GimpLevelsConfigClass
 {
-  GimpImageMapConfigClass  parent_class;
+  GimpSettingsClass  parent_class;
 };
 
 
diff --git a/app/operations/gimpposterizeconfig.c b/app/operations/gimpposterizeconfig.c
index e8922c3..22be719 100644
--- a/app/operations/gimpposterizeconfig.c
+++ b/app/operations/gimpposterizeconfig.c
@@ -47,7 +47,7 @@ static void   gimp_posterize_config_set_property (GObject      *object,
 
 
 G_DEFINE_TYPE_WITH_CODE (GimpPosterizeConfig, gimp_posterize_config,
-                         GIMP_TYPE_IMAGE_MAP_CONFIG,
+                         GIMP_TYPE_SETTINGS,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
 
 #define parent_class gimp_posterize_config_parent_class
diff --git a/app/operations/gimpposterizeconfig.h b/app/operations/gimpposterizeconfig.h
index e767f55..4d813d3 100644
--- a/app/operations/gimpposterizeconfig.h
+++ b/app/operations/gimpposterizeconfig.h
@@ -22,7 +22,7 @@
 #define __GIMP_POSTERIZE_CONFIG_H__
 
 
-#include "core/gimpimagemapconfig.h"
+#include "core/gimpsettings.h"
 
 
 #define GIMP_TYPE_POSTERIZE_CONFIG            (gimp_posterize_config_get_type ())
@@ -37,14 +37,14 @@ typedef struct _GimpPosterizeConfigClass GimpPosterizeConfigClass;
 
 struct _GimpPosterizeConfig
 {
-  GimpImageMapConfig  parent_instance;
+  GimpSettings  parent_instance;
 
-  gint                levels;
+  gint          levels;
 };
 
 struct _GimpPosterizeConfigClass
 {
-  GimpImageMapConfigClass  parent_class;
+  GimpSettingsClass  parent_class;
 };
 
 
diff --git a/app/operations/gimpthresholdconfig.c b/app/operations/gimpthresholdconfig.c
index 89523c4..88e43ce 100644
--- a/app/operations/gimpthresholdconfig.c
+++ b/app/operations/gimpthresholdconfig.c
@@ -48,7 +48,7 @@ static void   gimp_threshold_config_set_property (GObject      *object,
 
 
 G_DEFINE_TYPE_WITH_CODE (GimpThresholdConfig, gimp_threshold_config,
-                         GIMP_TYPE_IMAGE_MAP_CONFIG,
+                         GIMP_TYPE_SETTINGS,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_CONFIG, NULL))
 
 #define parent_class gimp_threshold_config_parent_class
diff --git a/app/operations/gimpthresholdconfig.h b/app/operations/gimpthresholdconfig.h
index f4a14f7..b8fc8ca 100644
--- a/app/operations/gimpthresholdconfig.h
+++ b/app/operations/gimpthresholdconfig.h
@@ -22,7 +22,7 @@
 #define __GIMP_THRESHOLD_CONFIG_H__
 
 
-#include "core/gimpimagemapconfig.h"
+#include "core/gimpsettings.h"
 
 
 #define GIMP_TYPE_THRESHOLD_CONFIG            (gimp_threshold_config_get_type ())
@@ -37,15 +37,15 @@ typedef struct _GimpThresholdConfigClass GimpThresholdConfigClass;
 
 struct _GimpThresholdConfig
 {
-  GimpImageMapConfig  parent_instance;
+  GimpSettings  parent_instance;
 
-  gdouble             low;
-  gdouble             high;
+  gdouble       low;
+  gdouble       high;
 };
 
 struct _GimpThresholdConfigClass
 {
-  GimpImageMapConfigClass  parent_class;
+  GimpSettingsClass  parent_class;
 };
 
 
diff --git a/app/tools/gimpimagemaptool-settings.c b/app/tools/gimpimagemaptool-settings.c
index b4c3320..cee147f 100644
--- a/app/tools/gimpimagemaptool-settings.c
+++ b/app/tools/gimpimagemaptool-settings.c
@@ -33,7 +33,6 @@
 
 #include "core/gimp.h"
 #include "core/gimpcontext.h"
-#include "core/gimpimagemapconfig.h"
 #include "core/gimplist.h"
 #include "core/gimptoolinfo.h"
 
diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c
index 7d5a55a..d0d8a2c 100644
--- a/app/tools/gimpimagemaptool.c
+++ b/app/tools/gimpimagemaptool.c
@@ -44,11 +44,11 @@
 #include "core/gimpimage.h"
 #include "core/gimpimage-pick-color.h"
 #include "core/gimpimagemap.h"
-#include "core/gimpimagemapconfig.h"
 #include "core/gimplist.h"
 #include "core/gimppickable.h"
 #include "core/gimpprogress.h"
 #include "core/gimpprojection.h"
+#include "core/gimpsettings.h"
 #include "core/gimptoolinfo.h"
 
 #include "widgets/gimpdialogfactory.h"
@@ -195,9 +195,9 @@ gimp_image_map_tool_class_init (GimpImageMapToolClass *klass)
 static void
 gimp_image_map_tool_base_init (GimpImageMapToolClass *klass)
 {
-  klass->recent_settings = gimp_list_new (GIMP_TYPE_IMAGE_MAP_CONFIG, TRUE);
+  klass->recent_settings = gimp_list_new (GIMP_TYPE_SETTINGS, TRUE);
   gimp_list_set_sort_func (GIMP_LIST (klass->recent_settings),
-                           (GCompareFunc) gimp_image_map_config_compare);
+                           (GCompareFunc) gimp_settings_compare);
 }
 
 static void
diff --git a/app/tools/gimpoperationtool.c b/app/tools/gimpoperationtool.c
index 2cbc8c9..f60f6ba 100644
--- a/app/tools/gimpoperationtool.c
+++ b/app/tools/gimpoperationtool.c
@@ -36,9 +36,9 @@
 #include "core/gimperror.h"
 #include "core/gimpimage.h"
 #include "core/gimpimagemap.h"
-#include "core/gimpimagemapconfig.h"
 #include "core/gimplist.h"
 #include "core/gimpparamspecs-duplicate.h"
+#include "core/gimpsettings.h"
 
 #include "widgets/gimphelp-ids.h"
 #include "widgets/gimppropwidgets.h"
@@ -235,7 +235,7 @@ gimp_operation_tool_get_settings_ui (GimpImageMapTool  *image_map_tool,
   settings = gimp_gegl_get_config_container (type);
   if (! gimp_list_get_sort_func (GIMP_LIST (settings)))
     gimp_list_set_sort_func (GIMP_LIST (settings),
-                             (GCompareFunc) gimp_image_map_config_compare);
+                             (GCompareFunc) gimp_settings_compare);
 
   basename = g_strconcat (G_OBJECT_TYPE_NAME (tool->config), ".settings", NULL);
   filename = g_build_filename (gimp_directory (), "filters", basename, NULL);
@@ -295,7 +295,7 @@ gimp_operation_tool_set_operation (GimpOperationTool *tool,
     g_object_unref (tool->config);
 
   tool->config = gimp_gegl_get_config_proxy (tool->operation,
-                                             GIMP_TYPE_IMAGE_MAP_CONFIG);
+                                             GIMP_TYPE_SETTINGS);
 
   gimp_image_map_tool_get_operation (GIMP_IMAGE_MAP_TOOL (tool));
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]