GNOME.org
 

[gimp] app: rename GimpBaseConfig to GimpGeglConfig

commit ede421bd452e9ff491f80205002106c0e29129b4
Author: Michael Natterer <mitch gimp org>
Date:   Mon May 14 22:57:58 2012 +0200

    app: rename GimpBaseConfig to GimpGeglConfig
    
    because that's its future purpose.

 app/app.c                                         |    4 +-
 app/base/base.c                                   |   12 ++--
 app/base/base.h                                   |    2 +-
 app/base/pixel-processor.c                        |    2 +-
 app/config/Makefile.am                            |    4 +-
 app/config/config-types.h                         |    2 +-
 app/config/gimpcoreconfig.c                       |    2 +-
 app/config/gimpcoreconfig.h                       |    6 +-
 app/config/{gimpbaseconfig.c => gimpgeglconfig.c} |   76 ++++++++++----------
 app/config/{gimpbaseconfig.h => gimpgeglconfig.h} |   26 ++++----
 app/core/gimp-utils.c                             |    2 -
 app/core/gimp.c                                   |    2 +-
 app/gegl/gimp-gegl.c                              |   10 ++--
 app/tests.c                                       |    8 +-
 app/widgets/gimpdatafactoryview.c                 |    2 -
 15 files changed, 78 insertions(+), 82 deletions(-)
---
diff --git a/app/app.c b/app/app.c
index e6b7407..57d2b83 100644
--- a/app/app.c
+++ b/app/app.c
@@ -147,7 +147,7 @@ app_run (const gchar         *full_prog_name,
 {
   GimpInitStatusFunc  update_status_func = NULL;
   Gimp               *gimp;
-  GimpBaseConfig     *config;
+  GimpGeglConfig     *config;
   GMainLoop          *loop;
   gboolean            swap_is_ok;
 
@@ -189,7 +189,7 @@ app_run (const gchar         *full_prog_name,
 
   gimp_load_config (gimp, alternate_system_gimprc, alternate_gimprc);
 
-  config = GIMP_BASE_CONFIG (gimp->config);
+  config = GIMP_GEGL_CONFIG (gimp->config);
 
   /*  change the locale if a language if specified  */
   language_init (gimp->config->language);
diff --git a/app/base/base.c b/app/base/base.c
index b482623..43fb582 100644
--- a/app/base/base.c
+++ b/app/base/base.c
@@ -32,7 +32,7 @@
 
 #include "base-types.h"
 
-#include "config/gimpbaseconfig.h"
+#include "config/gimpgeglconfig.h"
 
 #include "composite/gimp-composite.h"
 
@@ -53,20 +53,20 @@ static void   base_num_processors_notify  (GObject     *config,
                                            gpointer     data);
 
 
-static GimpBaseConfig *base_config = NULL;
+static GimpGeglConfig *base_config = NULL;
 
 
 /*  public functions  */
 
 gboolean
-base_init (GimpBaseConfig *config,
+base_init (GimpGeglConfig *config,
            gboolean        be_verbose,
            gboolean        use_cpu_accel)
 {
   gboolean  swap_is_ok;
   gchar    *temp_dir;
 
-  g_return_val_if_fail (GIMP_IS_BASE_CONFIG (config), FALSE);
+  g_return_val_if_fail (GIMP_IS_GEGL_CONFIG (config), FALSE);
   g_return_val_if_fail (base_config == NULL, FALSE);
 
   base_config = g_object_ref (config);
@@ -192,7 +192,7 @@ base_tile_cache_size_notify (GObject    *config,
                              GParamSpec *param_spec,
                              gpointer    data)
 {
-  tile_cache_set_size (GIMP_BASE_CONFIG (config)->tile_cache_size);
+  tile_cache_set_size (GIMP_GEGL_CONFIG (config)->tile_cache_size);
 }
 
 static void
@@ -200,5 +200,5 @@ base_num_processors_notify (GObject    *config,
                             GParamSpec *param_spec,
                             gpointer    data)
 {
-  pixel_processor_set_num_threads (GIMP_BASE_CONFIG (config)->num_processors);
+  pixel_processor_set_num_threads (GIMP_GEGL_CONFIG (config)->num_processors);
 }
diff --git a/app/base/base.h b/app/base/base.h
index 8a67f9a..6e23b27 100644
--- a/app/base/base.h
+++ b/app/base/base.h
@@ -18,7 +18,7 @@
 #ifndef __BASE_H__
 #define __BASE_H__
 
-gboolean base_init (GimpBaseConfig *config,
+gboolean base_init (GimpGeglConfig *config,
                     gboolean        be_verbose,
                     gboolean        use_cpu_accel);
 void     base_exit (void);
diff --git a/app/base/pixel-processor.c b/app/base/pixel-processor.c
index ca28641..8913e6a 100644
--- a/app/base/pixel-processor.c
+++ b/app/base/pixel-processor.c
@@ -27,7 +27,7 @@
 
 #include "core/core-types.h" /* eek, but this file will die anyway */
 
-#include "config/gimpbaseconfig.h"
+#include "config/gimpgeglconfig.h"
 
 #include "pixel-processor.h"
 #include "pixel-region.h"
diff --git a/app/config/Makefile.am b/app/config/Makefile.am
index afa63f6..68e3ea6 100644
--- a/app/config/Makefile.am
+++ b/app/config/Makefile.am
@@ -32,14 +32,14 @@ libappconfig_a_sources = \
 	gimpconfig-file.h		\
 	gimpconfig-utils.c		\
 	gimpconfig-utils.h		\
-	gimpbaseconfig.c		\
-	gimpbaseconfig.h		\
 	gimpcoreconfig.c		\
 	gimpcoreconfig.h		\
 	gimpdisplayconfig.c		\
 	gimpdisplayconfig.h		\
 	gimpdisplayoptions.c		\
 	gimpdisplayoptions.h		\
+	gimpgeglconfig.c		\
+	gimpgeglconfig.h		\
 	gimpguiconfig.c			\
 	gimpguiconfig.h			\
 	gimppluginconfig.c		\
diff --git a/app/config/config-types.h b/app/config/config-types.h
index eed275d..55a1dc6 100644
--- a/app/config/config-types.h
+++ b/app/config/config-types.h
@@ -31,7 +31,7 @@
 #define GIMP_OPACITY_OPAQUE           1.0
 
 
-typedef struct _GimpBaseConfig       GimpBaseConfig;
+typedef struct _GimpGeglConfig       GimpGeglConfig;
 typedef struct _GimpCoreConfig       GimpCoreConfig;
 typedef struct _GimpDisplayConfig    GimpDisplayConfig;
 typedef struct _GimpGuiConfig        GimpGuiConfig;
diff --git a/app/config/gimpcoreconfig.c b/app/config/gimpcoreconfig.c
index 30b0872..dbc347b 100644
--- a/app/config/gimpcoreconfig.c
+++ b/app/config/gimpcoreconfig.c
@@ -131,7 +131,7 @@ static void gimp_core_config_color_management_notify (GObject      *object,
                                                       gpointer      data);
 
 
-G_DEFINE_TYPE (GimpCoreConfig, gimp_core_config, GIMP_TYPE_BASE_CONFIG)
+G_DEFINE_TYPE (GimpCoreConfig, gimp_core_config, GIMP_TYPE_GEGL_CONFIG)
 
 #define parent_class gimp_core_config_parent_class
 
diff --git a/app/config/gimpcoreconfig.h b/app/config/gimpcoreconfig.h
index 1b03c8f..3ffeacb 100644
--- a/app/config/gimpcoreconfig.h
+++ b/app/config/gimpcoreconfig.h
@@ -23,7 +23,7 @@
 
 #include "core/core-enums.h"
 
-#include "config/gimpbaseconfig.h"
+#include "config/gimpgeglconfig.h"
 
 
 #define GIMP_TYPE_CORE_CONFIG            (gimp_core_config_get_type ())
@@ -37,7 +37,7 @@ typedef struct _GimpCoreConfigClass GimpCoreConfigClass;
 
 struct _GimpCoreConfig
 {
-  GimpBaseConfig          parent_instance;
+  GimpGeglConfig          parent_instance;
 
   gchar                  *language;
   GimpInterpolationType   interpolation_type;
@@ -93,7 +93,7 @@ struct _GimpCoreConfig
 
 struct _GimpCoreConfigClass
 {
-  GimpBaseConfigClass  parent_class;
+  GimpGeglConfigClass  parent_class;
 };
 
 
diff --git a/app/config/gimpbaseconfig.c b/app/config/gimpgeglconfig.c
similarity index 74%
rename from app/config/gimpbaseconfig.c
rename to app/config/gimpgeglconfig.c
index 55cade7..856efd8 100644
--- a/app/config/gimpbaseconfig.c
+++ b/app/config/gimpgeglconfig.c
@@ -1,7 +1,7 @@
 /* GIMP - The GNU Image Manipulation Program
  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
  *
- * GimpBaseConfig class
+ * GimpGeglConfig class
  * Copyright (C) 2001  Sven Neumann <sven gimp org>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -34,7 +34,7 @@
 #include "base/pixel-processor.h"
 
 #include "gimprc-blurbs.h"
-#include "gimpbaseconfig.h"
+#include "gimpgeglconfig.h"
 
 #include "core/gimp-utils.h"
 
@@ -56,15 +56,15 @@ enum
 };
 
 
-static void   gimp_base_config_class_init   (GimpBaseConfigClass *klass);
-static void   gimp_base_config_init         (GimpBaseConfig      *config,
-                                             GimpBaseConfigClass *klass);
-static void   gimp_base_config_finalize     (GObject             *object);
-static void   gimp_base_config_set_property (GObject             *object,
+static void   gimp_gegl_config_class_init   (GimpGeglConfigClass *klass);
+static void   gimp_gegl_config_init         (GimpGeglConfig      *config,
+                                             GimpGeglConfigClass *klass);
+static void   gimp_gegl_config_finalize     (GObject             *object);
+static void   gimp_gegl_config_set_property (GObject             *object,
                                              guint                property_id,
                                              const GValue        *value,
                                              GParamSpec          *pspec);
-static void   gimp_base_config_get_property (GObject             *object,
+static void   gimp_gegl_config_get_property (GObject             *object,
                                              guint                property_id,
                                              GValue              *value,
                                              GParamSpec          *pspec);
@@ -74,7 +74,7 @@ static GObjectClass *parent_class = NULL;
 
 
 GType
-gimp_base_config_get_type (void)
+gimp_gegl_config_get_type (void)
 {
   static GType config_type = 0;
 
@@ -82,19 +82,19 @@ gimp_base_config_get_type (void)
     {
       const GTypeInfo config_info =
       {
-        sizeof (GimpBaseConfigClass),
+        sizeof (GimpGeglConfigClass),
         (GBaseInitFunc) NULL,
         (GBaseFinalizeFunc) NULL,
-        (GClassInitFunc) gimp_base_config_class_init,
+        (GClassInitFunc) gimp_gegl_config_class_init,
         NULL,           /* class_finalize */
         NULL,           /* class_data     */
-        sizeof (GimpBaseConfig),
+        sizeof (GimpGeglConfig),
         0,              /* n_preallocs    */
-        (GInstanceInitFunc) gimp_base_config_init,
+        (GInstanceInitFunc) gimp_gegl_config_init,
       };
 
       config_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "GimpBaseConfig",
+                                            "GimpGeglConfig",
                                             &config_info, 0);
     }
 
@@ -102,7 +102,7 @@ gimp_base_config_get_type (void)
 }
 
 static void
-gimp_base_config_class_init (GimpBaseConfigClass *klass)
+gimp_gegl_config_class_init (GimpGeglConfigClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   gint          num_processors;
@@ -110,9 +110,9 @@ gimp_base_config_class_init (GimpBaseConfigClass *klass)
 
   parent_class = g_type_class_peek_parent (klass);
 
-  object_class->finalize     = gimp_base_config_finalize;
-  object_class->set_property = gimp_base_config_set_property;
-  object_class->get_property = gimp_base_config_get_property;
+  object_class->finalize     = gimp_gegl_config_finalize;
+  object_class->set_property = gimp_gegl_config_set_property;
+  object_class->get_property = gimp_gegl_config_get_property;
 
   GIMP_CONFIG_INSTALL_PROP_PATH (object_class, PROP_TEMP_PATH,
                                  "temp-path", TEMP_PATH_BLURB,
@@ -162,19 +162,19 @@ gimp_base_config_class_init (GimpBaseConfigClass *klass)
 }
 
 static void
-gimp_base_config_init (GimpBaseConfig      *config,
-                       GimpBaseConfigClass *klass)
+gimp_gegl_config_init (GimpGeglConfig      *config,
+                       GimpGeglConfigClass *klass)
 {
   gimp_debug_add_instance (G_OBJECT (config), G_OBJECT_CLASS (klass));
 }
 
 static void
-gimp_base_config_finalize (GObject *object)
+gimp_gegl_config_finalize (GObject *object)
 {
-  GimpBaseConfig *base_config = GIMP_BASE_CONFIG (object);
+  GimpGeglConfig *gegl_config = GIMP_GEGL_CONFIG (object);
 
-  g_free (base_config->temp_path);
-  g_free (base_config->swap_path);
+  g_free (gegl_config->temp_path);
+  g_free (gegl_config->swap_path);
 
   gimp_debug_remove_instance (object);
 
@@ -182,28 +182,28 @@ gimp_base_config_finalize (GObject *object)
 }
 
 static void
-gimp_base_config_set_property (GObject      *object,
+gimp_gegl_config_set_property (GObject      *object,
                                guint         property_id,
                                const GValue *value,
                                GParamSpec   *pspec)
 {
-  GimpBaseConfig *base_config = GIMP_BASE_CONFIG (object);
+  GimpGeglConfig *gegl_config = GIMP_GEGL_CONFIG (object);
 
   switch (property_id)
     {
     case PROP_TEMP_PATH:
-      g_free (base_config->temp_path);
-      base_config->temp_path = g_value_dup_string (value);
+      g_free (gegl_config->temp_path);
+      gegl_config->temp_path = g_value_dup_string (value);
       break;
     case PROP_SWAP_PATH:
-      g_free (base_config->swap_path);
-      base_config->swap_path = g_value_dup_string (value);
+      g_free (gegl_config->swap_path);
+      gegl_config->swap_path = g_value_dup_string (value);
       break;
     case PROP_NUM_PROCESSORS:
-      base_config->num_processors = g_value_get_uint (value);
+      gegl_config->num_processors = g_value_get_uint (value);
       break;
     case PROP_TILE_CACHE_SIZE:
-      base_config->tile_cache_size = g_value_get_uint64 (value);
+      gegl_config->tile_cache_size = g_value_get_uint64 (value);
       break;
 
     case PROP_STINGY_MEMORY_USE:
@@ -217,26 +217,26 @@ gimp_base_config_set_property (GObject      *object,
 }
 
 static void
-gimp_base_config_get_property (GObject    *object,
+gimp_gegl_config_get_property (GObject    *object,
                                guint       property_id,
                                GValue     *value,
                                GParamSpec *pspec)
 {
-  GimpBaseConfig *base_config = GIMP_BASE_CONFIG (object);
+  GimpGeglConfig *gegl_config = GIMP_GEGL_CONFIG (object);
 
   switch (property_id)
     {
     case PROP_TEMP_PATH:
-      g_value_set_string (value, base_config->temp_path);
+      g_value_set_string (value, gegl_config->temp_path);
       break;
     case PROP_SWAP_PATH:
-      g_value_set_string (value, base_config->swap_path);
+      g_value_set_string (value, gegl_config->swap_path);
       break;
     case PROP_NUM_PROCESSORS:
-      g_value_set_uint (value, base_config->num_processors);
+      g_value_set_uint (value, gegl_config->num_processors);
       break;
     case PROP_TILE_CACHE_SIZE:
-      g_value_set_uint64 (value, base_config->tile_cache_size);
+      g_value_set_uint64 (value, gegl_config->tile_cache_size);
       break;
 
     case PROP_STINGY_MEMORY_USE:
diff --git a/app/config/gimpbaseconfig.h b/app/config/gimpgeglconfig.h
similarity index 56%
rename from app/config/gimpbaseconfig.h
rename to app/config/gimpgeglconfig.h
index 042b264..4567da5 100644
--- a/app/config/gimpbaseconfig.h
+++ b/app/config/gimpgeglconfig.h
@@ -1,7 +1,7 @@
 /* GIMP - The GNU Image Manipulation Program
  * Copyright (C) 1995 Spencer Kimball and Peter Mattis
  *
- * GimpBaseConfig class
+ * GimpGeglConfig class
  * Copyright (C) 2001  Sven Neumann <sven gimp org>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -18,20 +18,20 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GIMP_BASE_CONFIG_H__
-#define __GIMP_BASE_CONFIG_H__
+#ifndef __GIMP_GEGL_CONFIG_H__
+#define __GIMP_GEGL_CONFIG_H__
 
 
-#define GIMP_TYPE_BASE_CONFIG            (gimp_base_config_get_type ())
-#define GIMP_BASE_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BASE_CONFIG, GimpBaseConfig))
-#define GIMP_BASE_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BASE_CONFIG, GimpBaseConfigClass))
-#define GIMP_IS_BASE_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_BASE_CONFIG))
-#define GIMP_IS_BASE_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_BASE_CONFIG))
+#define GIMP_TYPE_GEGL_CONFIG            (gimp_gegl_config_get_type ())
+#define GIMP_GEGL_CONFIG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GEGL_CONFIG, GimpGeglConfig))
+#define GIMP_GEGL_CONFIG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GEGL_CONFIG, GimpGeglConfigClass))
+#define GIMP_IS_GEGL_CONFIG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GEGL_CONFIG))
+#define GIMP_IS_GEGL_CONFIG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GEGL_CONFIG))
 
 
-typedef struct _GimpBaseConfigClass GimpBaseConfigClass;
+typedef struct _GimpGeglConfigClass GimpGeglConfigClass;
 
-struct _GimpBaseConfig
+struct _GimpGeglConfig
 {
   GObject   parent_instance;
 
@@ -41,13 +41,13 @@ struct _GimpBaseConfig
   guint64   tile_cache_size;
 };
 
-struct _GimpBaseConfigClass
+struct _GimpGeglConfigClass
 {
   GObjectClass           parent_class;
 };
 
 
-GType  gimp_base_config_get_type (void) G_GNUC_CONST;
+GType  gimp_gegl_config_get_type (void) G_GNUC_CONST;
 
 
-#endif /* GIMP_BASE_CONFIG_H__ */
+#endif /* GIMP_GEGL_CONFIG_H__ */
diff --git a/app/core/gimp-utils.c b/app/core/gimp-utils.c
index 71478ea..abfda93 100644
--- a/app/core/gimp-utils.c
+++ b/app/core/gimp-utils.c
@@ -57,8 +57,6 @@
 
 #include "core-types.h"
 
-#include "config/gimpbaseconfig.h"
-
 #include "gimp.h"
 #include "gimp-utils.h"
 #include "gimpcontainer.h"
diff --git a/app/core/gimp.c b/app/core/gimp.c
index 1543afc..9df1c59 100644
--- a/app/core/gimp.c
+++ b/app/core/gimp.c
@@ -1314,7 +1314,7 @@ gimp_get_temp_filename (Gimp        *gimp,
   else
     basename = g_strdup_printf ("gimp-temp-%d%d", pid, id++);
 
-  path = gimp_config_path_expand (GIMP_BASE_CONFIG (gimp->config)->temp_path,
+  path = gimp_config_path_expand (GIMP_GEGL_CONFIG (gimp->config)->temp_path,
                                   TRUE, NULL);
 
   filename = g_build_filename (path, basename, NULL);
diff --git a/app/gegl/gimp-gegl.c b/app/gegl/gimp-gegl.c
index 0eaaccc..9a357d8 100644
--- a/app/gegl/gimp-gegl.c
+++ b/app/gegl/gimp-gegl.c
@@ -26,7 +26,7 @@
 
 #include "base/tile.h"
 
-#include "config/gimpbaseconfig.h"
+#include "config/gimpgeglconfig.h"
 
 #include "operations/gimp-operations.h"
 
@@ -36,17 +36,17 @@
 #include "gimp-gegl.h"
 
 
-static void  gimp_gegl_notify_tile_cache_size (GimpBaseConfig *config);
+static void  gimp_gegl_notify_tile_cache_size (GimpGeglConfig *config);
 
 
 void
 gimp_gegl_init (Gimp *gimp)
 {
-  GimpBaseConfig *config;
+  GimpGeglConfig *config;
 
   g_return_if_fail (GIMP_IS_GIMP (gimp));
 
-  config = GIMP_BASE_CONFIG (gimp->config);
+  config = GIMP_GEGL_CONFIG (gimp->config);
 
   g_object_set (gegl_config (),
                 "tile-width",  TILE_WIDTH,
@@ -72,7 +72,7 @@ gimp_gegl_init (Gimp *gimp)
 }
 
 static void
-gimp_gegl_notify_tile_cache_size (GimpBaseConfig *config)
+gimp_gegl_notify_tile_cache_size (GimpGeglConfig *config)
 {
   g_object_set (gegl_config (),
                 "cache-size", (gint) MIN (config->tile_cache_size, G_MAXINT),
diff --git a/app/tests.c b/app/tests.c
index 806d20f..47d149e 100644
--- a/app/tests.c
+++ b/app/tests.c
@@ -34,7 +34,7 @@
 
 #include "base/base.h"
 
-#include "config/gimpbaseconfig.h"
+#include "config/gimpgeglconfig.h"
 
 #include "core/gimp.h"
 #include "core/gimp-contexts.h"
@@ -63,7 +63,7 @@ Gimp *
 gimp_init_for_testing (void)
 {
   Gimp *gimp;
-  
+
   gimp_log_init ();
 
   gimp = gimp_new ("Unit Tested GIMP", NULL, FALSE, TRUE, TRUE, TRUE,
@@ -75,7 +75,7 @@ gimp_init_for_testing (void)
 
   gegl_init(NULL, NULL);
   gimp_gegl_init (gimp);
-  base_init (GIMP_BASE_CONFIG (gimp->config),
+  base_init (GIMP_GEGL_CONFIG (gimp->config),
              FALSE /*be_verbose*/,
              FALSE /*use_cpu_accel*/);
   gimp_initialize (gimp, gimp_status_func_dummy);
@@ -108,7 +108,7 @@ gimp_init_for_gui_testing_internal (gboolean     show_gui,
   gimp_set_show_gui (gimp, show_gui);
   units_init (gimp);
   gimp_load_config (gimp, gimprc, NULL);
-  base_init (GIMP_BASE_CONFIG (gimp->config),
+  base_init (GIMP_GEGL_CONFIG (gimp->config),
              FALSE /*be_verbose*/,
              FALSE /*use_cpu_accel*/);
   gegl_init(NULL, NULL);
diff --git a/app/widgets/gimpdatafactoryview.c b/app/widgets/gimpdatafactoryview.c
index 29bcdd2..7040fd0 100644
--- a/app/widgets/gimpdatafactoryview.c
+++ b/app/widgets/gimpdatafactoryview.c
@@ -29,8 +29,6 @@
 
 #include "widgets-types.h"
 
-#include "config/gimpbaseconfig.h"
-
 #include "core/gimp.h"
 #include "core/gimpcontainer.h"
 #include "core/gimpcontext.h"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]