[gimp/gtk3-port: 235/336] libgimpconfig: remove all deprecated cruft
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 235/336] libgimpconfig: remove all deprecated cruft
- Date: Fri, 4 May 2018 10:08:07 +0000 (UTC)
commit dc55ff896f8771893f27943835b8b9edc7462499
Author: Michael Natterer <mitch gimp org>
Date: Sat Apr 28 14:14:45 2018 +0200
libgimpconfig: remove all deprecated cruft
libgimpconfig/gimpcolorconfig.c | 20 +-------------
libgimpconfig/gimpcolorconfig.h | 2 -
libgimpconfig/gimpconfig-params.h | 52 -------------------------------------
3 files changed, 1 insertions(+), 73 deletions(-)
---
diff --git a/libgimpconfig/gimpcolorconfig.c b/libgimpconfig/gimpcolorconfig.c
index ea8266c..c9b7d9d 100644
--- a/libgimpconfig/gimpcolorconfig.c
+++ b/libgimpconfig/gimpcolorconfig.c
@@ -128,8 +128,7 @@ enum
PROP_SIMULATION_USE_BPC,
PROP_SIMULATION_OPTIMIZE,
PROP_SIMULATION_GAMUT_CHECK,
- PROP_OUT_OF_GAMUT_COLOR,
- PROP_DISPLAY_MODULE
+ PROP_OUT_OF_GAMUT_COLOR
};
@@ -303,13 +302,6 @@ gimp_color_config_class_init (GimpColorConfigClass *klass)
FALSE, &color,
GIMP_PARAM_STATIC_STRINGS);
- GIMP_CONFIG_PROP_STRING (object_class, PROP_DISPLAY_MODULE,
- "display-module",
- "Display module",
- "This property is deprecated and its value ignored",
- "CdisplayLcms",
- GIMP_PARAM_STATIC_STRINGS);
-
g_type_class_add_private (object_class, sizeof (GimpColorConfigPrivate));
}
@@ -338,9 +330,6 @@ gimp_color_config_finalize (GObject *object)
if (color_config->printer_profile)
g_free (color_config->printer_profile);
- if (color_config->display_module)
- g_free (color_config->display_module);
-
G_OBJECT_CLASS (parent_class)->finalize (object);
}
@@ -411,10 +400,6 @@ gimp_color_config_set_property (GObject *object,
case PROP_OUT_OF_GAMUT_COLOR:
color_config->out_of_gamut_color = *(GimpRGB *) g_value_get_boxed (value);
break;
- case PROP_DISPLAY_MODULE:
- g_free (color_config->display_module);
- color_config->display_module = g_value_dup_string (value);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
@@ -484,9 +469,6 @@ gimp_color_config_get_property (GObject *object,
case PROP_OUT_OF_GAMUT_COLOR:
g_value_set_boxed (value, &color_config->out_of_gamut_color);
break;
- case PROP_DISPLAY_MODULE:
- g_value_set_string (value, color_config->display_module);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
diff --git a/libgimpconfig/gimpcolorconfig.h b/libgimpconfig/gimpcolorconfig.h
index 39e96d9..d716210 100644
--- a/libgimpconfig/gimpcolorconfig.h
+++ b/libgimpconfig/gimpcolorconfig.h
@@ -50,8 +50,6 @@ struct _GimpColorConfig
GimpColorRenderingIntent display_intent;
GimpColorRenderingIntent simulation_intent;
- gchar *display_module;
-
gboolean simulation_gamut_check;
GimpRGB out_of_gamut_color;
diff --git a/libgimpconfig/gimpconfig-params.h b/libgimpconfig/gimpconfig-params.h
index 2c988f8..a2cd4e5 100644
--- a/libgimpconfig/gimpconfig-params.h
+++ b/libgimpconfig/gimpconfig-params.h
@@ -183,58 +183,6 @@ G_BEGIN_DECLS
GIMP_CONFIG_PARAM_SERIALIZE))
-/* deprecated macros, they all lack the "nick" parameter */
-
-#ifndef GIMP_DISABLE_DEPRECATED
-
-#define GIMP_CONFIG_INSTALL_PROP_BOOLEAN(class, id, name, blurb, default, flags) \
- GIMP_CONFIG_PROP_BOOLEAN(class, id, name, NULL, blurb, default, flags);
-
-#define GIMP_CONFIG_INSTALL_PROP_INT(class, id, name, blurb, min, max, default, flags) \
- GIMP_CONFIG_PROP_INT(class, id, name, NULL, blurb, min, max, default, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_UINT(class, id, name, blurb, min, max, default, flags) \
- GIMP_CONFIG_PROP_UINT(class, id, name, NULL, blurb, min, max, default, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_UNIT(class, id, name, blurb, pixels, percent, default, flags) \
- GIMP_CONFIG_PROP_UNIT(class, id, name, NULL, blurb, pixels, percent, default, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_MEMSIZE(class, id, name, blurb, min, max, default, flags) \
- GIMP_CONFIG_PROP_MEMSIZE(class, id, name, NULL, blurb, min, max, default, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_DOUBLE(class, id, name, blurb, min, max, default, flags) \
- GIMP_CONFIG_PROP_DOUBLE(class, id, name, NULL, blurb, min, max, default, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_RESOLUTION(class, id, name, blurb, default, flags) \
- GIMP_CONFIG_PROP_RESOLUTION(class, id, name, NULL, blurb, default, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_ENUM(class, id, name, blurb, enum_type, default, flags) \
- GIMP_CONFIG_PROP_ENUM(class, id, name, NULL, blurb, enum_type, default, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_STRING(class, id, name, blurb, default, flags) \
- GIMP_CONFIG_PROP_STRING(class, id, name, NULL, blurb, default, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_PATH(class, id, name, blurb, path_type, default, flags) \
- GIMP_CONFIG_PROP_PATH(class, id, name, NULL, blurb, path_type, default, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_RGB(class, id, name, blurb, has_alpha, default, flags) \
- GIMP_CONFIG_PROP_RGB(class, id, name, NULL, blurb, has_alpha, default, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_MATRIX2(class, id, name, blurb, default, flags) \
- GIMP_CONFIG_PROP_MATRIX2(class, id, name, NULL, blurb, default, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_OBJECT(class, id, name, blurb, object_type, flags) \
- GIMP_CONFIG_PROP_OBJECT(class, id, name, NULL, blurb, object_type, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_BOXED(class, id, name, blurb, boxed_type, flags) \
- GIMP_CONFIG_PROP_BOXED(class, id, name, NULL, blurb, boxed_type, flags)
-
-#define GIMP_CONFIG_INSTALL_PROP_POINTER(class, id, name, blurb, flags) \
- GIMP_CONFIG_PROP_POINTER(class, id, name, NULL, blurb, flags)
-
-#endif /* GIMP_DISABLE_DEPRECATED */
-
-
G_END_DECLS
#endif /* __GIMP_CONFIG_PARAMS_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]