GNOME.org
 

[gnome-builder] buildconfig: rename BuildconfigConfiguration to BuildconfigConfig

commit 77206bcfe4a0ba25b33c56b810c52f9159414af5
Author: Christian Hergert <chergert redhat com>
Date:   Thu Jan 10 12:29:13 2019 -0800

    buildconfig: rename BuildconfigConfiguration to BuildconfigConfig

 src/plugins/buildconfig/buildconfig-plugin.c       |   4 +-
 ...rovider.c => ide-buildconfig-config-provider.c} | 122 ++++++++++-----------
 ...rovider.h => ide-buildconfig-config-provider.h} |   6 +-
 ...ig-configuration.c => ide-buildconfig-config.c} |  58 +++++-----
 ...ig-configuration.h => ide-buildconfig-config.h} |  14 +--
 .../buildconfig/ide-buildconfig-pipeline-addin.c   |   8 +-
 src/plugins/buildconfig/meson.build                |   4 +-
 7 files changed, 108 insertions(+), 108 deletions(-)
---
diff --git a/src/plugins/buildconfig/buildconfig-plugin.c b/src/plugins/buildconfig/buildconfig-plugin.c
index f7501666c..11bbba0c8 100644
--- a/src/plugins/buildconfig/buildconfig-plugin.c
+++ b/src/plugins/buildconfig/buildconfig-plugin.c
@@ -25,7 +25,7 @@
 #include <libpeas/peas.h>
 #include <libide-foundry.h>
 
-#include "ide-buildconfig-configuration-provider.h"
+#include "ide-buildconfig-config-provider.h"
 #include "ide-buildconfig-pipeline-addin.h"
 
 _IDE_EXTERN void
@@ -33,7 +33,7 @@ _gbp_buildconfig_register_types (PeasObjectModule *module)
 {
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_CONFIG_PROVIDER,
-                                              IDE_TYPE_BUILDCONFIG_CONFIGURATION_PROVIDER);
+                                              IDE_TYPE_BUILDCONFIG_CONFIG_PROVIDER);
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_BUILD_PIPELINE_ADDIN,
                                               IDE_TYPE_BUILDCONFIG_PIPELINE_ADDIN);
diff --git a/src/plugins/buildconfig/ide-buildconfig-configuration-provider.c 
b/src/plugins/buildconfig/ide-buildconfig-config-provider.c
similarity index 83%
rename from src/plugins/buildconfig/ide-buildconfig-configuration-provider.c
rename to src/plugins/buildconfig/ide-buildconfig-config-provider.c
index fe8f29b36..e52da254b 100644
--- a/src/plugins/buildconfig/ide-buildconfig-configuration-provider.c
+++ b/src/plugins/buildconfig/ide-buildconfig-config-provider.c
@@ -1,4 +1,4 @@
-/* ide-buildconfig-configuration-provider.c
+/* ide-buildconfig-config-provider.c
  *
  * Copyright 2016 Matthew Leeds <mleeds redhat com>
  *
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#define G_LOG_DOMAIN "ide-buildconfig-configuration-provider"
+#define G_LOG_DOMAIN "ide-buildconfig-config-provider"
 
 #include "config.h"
 
@@ -33,12 +33,12 @@
 #include "ide-context.h"
 #include "ide-debug.h"
 
-#include "ide-buildconfig-configuration.h"
-#include "ide-buildconfig-configuration-provider.h"
+#include "ide-buildconfig-config.h"
+#include "ide-buildconfig-config-provider.h"
 
 #define DOT_BUILDCONFIG ".buildconfig"
 
-struct _IdeBuildconfigConfigurationProvider
+struct _IdeBuildconfigConfigProvider
 {
   IdeObject  parent_instance;
 
@@ -185,17 +185,17 @@ load_environ (IdeConfig *config,
 }
 
 static IdeConfig *
-ide_buildconfig_configuration_provider_create (IdeBuildconfigConfigurationProvider *self,
+ide_buildconfig_config_provider_create (IdeBuildconfigConfigProvider *self,
                                                const gchar                         *config_id)
 {
   g_autoptr(IdeConfig) config = NULL;
   g_autofree gchar *env_group = NULL;
 
-  g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (self));
+  g_assert (IDE_IS_BUILDCONFIG_CONFIG_PROVIDER (self));
   g_assert (self->key_file != NULL);
   g_assert (config_id != NULL);
 
-  config = g_object_new (IDE_TYPE_BUILDCONFIG_CONFIGURATION,
+  config = g_object_new (IDE_TYPE_BUILDCONFIG_CONFIG,
                          "id", config_id,
                          "parent", self,
                          NULL);
@@ -226,12 +226,12 @@ ide_buildconfig_configuration_provider_create (IdeBuildconfigConfigurationProvid
 }
 
 static void
-ide_buildconfig_configuration_provider_load_async (IdeConfigProvider *provider,
+ide_buildconfig_config_provider_load_async (IdeConfigProvider *provider,
                                                    GCancellable             *cancellable,
                                                    GAsyncReadyCallback       callback,
                                                    gpointer                  user_data)
 {
-  IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
+  IdeBuildconfigConfigProvider *self = (IdeBuildconfigConfigProvider *)provider;
   g_autoptr(IdeConfig) fallback = NULL;
   g_autoptr(IdeTask) task = NULL;
   g_autoptr(GError) error = NULL;
@@ -240,12 +240,12 @@ ide_buildconfig_configuration_provider_load_async (IdeConfigProvider *provider,
   IdeContext *context;
   gsize len;
 
-  g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (self));
+  g_assert (IDE_IS_BUILDCONFIG_CONFIG_PROVIDER (self));
   g_assert (self->key_file == NULL);
   g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
 
   task = ide_task_new (self, cancellable, callback, user_data);
-  ide_task_set_source_tag (task, ide_buildconfig_configuration_provider_load_async);
+  ide_task_set_source_tag (task, ide_buildconfig_config_provider_load_async);
   ide_task_set_priority (task, G_PRIORITY_LOW);
 
   self->key_file = g_key_file_new ();
@@ -277,7 +277,7 @@ ide_buildconfig_configuration_provider_load_async (IdeConfigProvider *provider,
       if (strchr (group, '.') != NULL)
         continue;
 
-      config = ide_buildconfig_configuration_provider_create (self, group);
+      config = ide_buildconfig_config_provider_create (self, group);
       ide_config_set_dirty (config, FALSE);
       ide_config_provider_emit_added (provider, config);
     }
@@ -287,7 +287,7 @@ ide_buildconfig_configuration_provider_load_async (IdeConfigProvider *provider,
 
 add_default:
   /* "Default" is not translated because .buildconfig can be checked in */
-  fallback = g_object_new (IDE_TYPE_BUILDCONFIG_CONFIGURATION,
+  fallback = g_object_new (IDE_TYPE_BUILDCONFIG_CONFIG,
                            "display-name", "Default",
                            "id", "default",
                            "parent", self,
@@ -302,11 +302,11 @@ complete:
 }
 
 static gboolean
-ide_buildconfig_configuration_provider_load_finish (IdeConfigProvider  *provider,
+ide_buildconfig_config_provider_load_finish (IdeConfigProvider  *provider,
                                                     GAsyncResult              *result,
                                                     GError                   **error)
 {
-  g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (provider));
+  g_assert (IDE_IS_BUILDCONFIG_CONFIG_PROVIDER (provider));
   g_assert (IDE_IS_TASK (result));
   g_assert (ide_task_is_valid (IDE_TASK (result), provider));
 
@@ -314,7 +314,7 @@ ide_buildconfig_configuration_provider_load_finish (IdeConfigProvider  *provider
 }
 
 static void
-ide_buildconfig_configuration_provider_save_cb (GObject      *object,
+ide_buildconfig_config_provider_save_cb (GObject      *object,
                                                 GAsyncResult *result,
                                                 gpointer      user_data)
 {
@@ -333,12 +333,12 @@ ide_buildconfig_configuration_provider_save_cb (GObject      *object,
 }
 
 static void
-ide_buildconfig_configuration_provider_save_async (IdeConfigProvider *provider,
+ide_buildconfig_config_provider_save_async (IdeConfigProvider *provider,
                                                    GCancellable             *cancellable,
                                                    GAsyncReadyCallback       callback,
                                                    gpointer                  user_data)
 {
-  IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
+  IdeBuildconfigConfigProvider *self = (IdeBuildconfigConfigProvider *)provider;
   g_autoptr(GHashTable) group_names = NULL;
   g_autoptr(IdeTask) task = NULL;
   g_autoptr(GFile) file = NULL;
@@ -352,12 +352,12 @@ ide_buildconfig_configuration_provider_save_async (IdeConfigProvider *provider,
   gboolean dirty = FALSE;
   gsize length = 0;
 
-  g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (self));
+  g_assert (IDE_IS_BUILDCONFIG_CONFIG_PROVIDER (self));
   g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
   g_assert (self->key_file != NULL);
 
   task = ide_task_new (self, cancellable, callback, user_data);
-  ide_task_set_source_tag (task, ide_buildconfig_configuration_provider_save_async);
+  ide_task_set_source_tag (task, ide_buildconfig_config_provider_save_async);
   ide_task_set_priority (task, G_PRIORITY_LOW);
 
   dirty = self->key_file_dirty;
@@ -415,7 +415,7 @@ ide_buildconfig_configuration_provider_save_async (IdeConfigProvider *provider,
       g_key_file_set_string (self->key_file, config_id, key, \
                              ide_config_##getter (config) ?: "")
 #define PERSIST_STRV_KEY(key, getter) G_STMT_START { \
-      const gchar * const *val = ide_buildconfig_configuration_##getter (IDE_BUILDCONFIG_CONFIGURATION 
(config)); \
+      const gchar * const *val = ide_buildconfig_config_##getter (IDE_BUILDCONFIG_CONFIG (config)); \
       gsize vlen = val ? g_strv_length ((gchar **)val) : 0; \
       g_key_file_set_string_list (self->key_file, config_id, key, val, vlen); \
 } G_STMT_END
@@ -519,16 +519,16 @@ ide_buildconfig_configuration_provider_save_async (IdeConfigProvider *provider,
                                        FALSE,
                                        G_FILE_CREATE_NONE,
                                        cancellable,
-                                       ide_buildconfig_configuration_provider_save_cb,
+                                       ide_buildconfig_config_provider_save_cb,
                                        g_steal_pointer (&task));
 }
 
 static gboolean
-ide_buildconfig_configuration_provider_save_finish (IdeConfigProvider  *provider,
+ide_buildconfig_config_provider_save_finish (IdeConfigProvider  *provider,
                                                     GAsyncResult              *result,
                                                     GError                   **error)
 {
-  g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (provider));
+  g_assert (IDE_IS_BUILDCONFIG_CONFIG_PROVIDER (provider));
   g_assert (IDE_IS_TASK (result));
   g_assert (ide_task_is_valid (IDE_TASK (result), provider));
 
@@ -536,17 +536,17 @@ ide_buildconfig_configuration_provider_save_finish (IdeConfigProvider  *provider
 }
 
 static void
-ide_buildconfig_configuration_provider_delete (IdeConfigProvider *provider,
+ide_buildconfig_config_provider_delete (IdeConfigProvider *provider,
                                                IdeConfig         *config)
 {
-  IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
+  IdeBuildconfigConfigProvider *self = (IdeBuildconfigConfigProvider *)provider;
   g_autoptr(IdeConfig) hold = NULL;
   g_autofree gchar *env = NULL;
   const gchar *config_id;
   gboolean had_group;
 
-  g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (self));
-  g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION (config));
+  g_assert (IDE_IS_BUILDCONFIG_CONFIG_PROVIDER (self));
+  g_assert (IDE_IS_BUILDCONFIG_CONFIG (config));
   g_assert (self->key_file != NULL);
   g_assert (self->configs->len > 0);
 
@@ -581,7 +581,7 @@ ide_buildconfig_configuration_provider_delete (IdeConfigProvider *provider,
       g_autoptr(IdeConfig) new_config = NULL;
 
       /* "Default" is not translated because .buildconfig can be checked in */
-      new_config = g_object_new (IDE_TYPE_BUILDCONFIG_CONFIGURATION,
+      new_config = g_object_new (IDE_TYPE_BUILDCONFIG_CONFIG,
                                  "display-name", "Default",
                                  "id", "default",
                                  "parent", self,
@@ -601,10 +601,10 @@ ide_buildconfig_configuration_provider_delete (IdeConfigProvider *provider,
 }
 
 static void
-ide_buildconfig_configuration_provider_duplicate (IdeConfigProvider *provider,
+ide_buildconfig_config_provider_duplicate (IdeConfigProvider *provider,
                                                   IdeConfig         *config)
 {
-  IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
+  IdeBuildconfigConfigProvider *self = (IdeBuildconfigConfigProvider *)provider;
   g_autoptr(IdeConfig) new_config = NULL;
   g_autofree GParamSpec **pspecs = NULL;
   g_autofree gchar *new_config_id = NULL;
@@ -616,9 +616,9 @@ ide_buildconfig_configuration_provider_duplicate (IdeConfigProvider *provider,
   IdeContext *context;
   guint n_pspecs = 0;
 
-  g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (self));
+  g_assert (IDE_IS_BUILDCONFIG_CONFIG_PROVIDER (self));
   g_assert (IDE_IS_CONFIG (config));
-  g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION (config));
+  g_assert (IDE_IS_BUILDCONFIG_CONFIG (config));
 
   context = ide_object_get_context (IDE_OBJECT (self));
   g_assert (IDE_IS_CONTEXT (context));
@@ -638,7 +638,7 @@ ide_buildconfig_configuration_provider_duplicate (IdeConfigProvider *provider,
 
   env = ide_config_get_environment (config);
 
-  new_config = g_object_new (IDE_TYPE_BUILDCONFIG_CONFIGURATION,
+  new_config = g_object_new (IDE_TYPE_BUILDCONFIG_CONFIG,
                              "id", new_config_id,
                              "display-name", new_name,
                              "parent", self,
@@ -675,12 +675,12 @@ ide_buildconfig_configuration_provider_duplicate (IdeConfigProvider *provider,
 }
 
 static void
-ide_buildconfig_configuration_provider_unload (IdeConfigProvider *provider)
+ide_buildconfig_config_provider_unload (IdeConfigProvider *provider)
 {
-  IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
+  IdeBuildconfigConfigProvider *self = (IdeBuildconfigConfigProvider *)provider;
   g_autoptr(GPtrArray) configs = NULL;
 
-  g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (self));
+  g_assert (IDE_IS_BUILDCONFIG_CONFIG_PROVIDER (self));
   g_assert (self->configs != NULL);
 
   configs = g_steal_pointer (&self->configs);
@@ -694,12 +694,12 @@ ide_buildconfig_configuration_provider_unload (IdeConfigProvider *provider)
 }
 
 static void
-ide_buildconfig_configuration_provider_added (IdeConfigProvider *provider,
+ide_buildconfig_config_provider_added (IdeConfigProvider *provider,
                                               IdeConfig         *config)
 {
-  IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
+  IdeBuildconfigConfigProvider *self = (IdeBuildconfigConfigProvider *)provider;
 
-  g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (self));
+  g_assert (IDE_IS_BUILDCONFIG_CONFIG_PROVIDER (self));
   g_assert (IDE_IS_CONFIG (config));
   g_assert (self->configs != NULL);
 
@@ -707,12 +707,12 @@ ide_buildconfig_configuration_provider_added (IdeConfigProvider *provider,
 }
 
 static void
-ide_buildconfig_configuration_provider_removed (IdeConfigProvider *provider,
+ide_buildconfig_config_provider_removed (IdeConfigProvider *provider,
                                                 IdeConfig         *config)
 {
-  IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
+  IdeBuildconfigConfigProvider *self = (IdeBuildconfigConfigProvider *)provider;
 
-  g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (self));
+  g_assert (IDE_IS_BUILDCONFIG_CONFIG_PROVIDER (self));
   g_assert (IDE_IS_CONFIG (config));
   g_assert (self->configs != NULL);
 
@@ -725,44 +725,44 @@ ide_buildconfig_configuration_provider_removed (IdeConfigProvider *provider,
 static void
 configuration_provider_iface_init (IdeConfigProviderInterface *iface)
 {
-  iface->added = ide_buildconfig_configuration_provider_added;
-  iface->removed = ide_buildconfig_configuration_provider_removed;
-  iface->load_async = ide_buildconfig_configuration_provider_load_async;
-  iface->load_finish = ide_buildconfig_configuration_provider_load_finish;
-  iface->save_async = ide_buildconfig_configuration_provider_save_async;
-  iface->save_finish = ide_buildconfig_configuration_provider_save_finish;
-  iface->delete = ide_buildconfig_configuration_provider_delete;
-  iface->duplicate = ide_buildconfig_configuration_provider_duplicate;
-  iface->unload = ide_buildconfig_configuration_provider_unload;
+  iface->added = ide_buildconfig_config_provider_added;
+  iface->removed = ide_buildconfig_config_provider_removed;
+  iface->load_async = ide_buildconfig_config_provider_load_async;
+  iface->load_finish = ide_buildconfig_config_provider_load_finish;
+  iface->save_async = ide_buildconfig_config_provider_save_async;
+  iface->save_finish = ide_buildconfig_config_provider_save_finish;
+  iface->delete = ide_buildconfig_config_provider_delete;
+  iface->duplicate = ide_buildconfig_config_provider_duplicate;
+  iface->unload = ide_buildconfig_config_provider_unload;
 }
 
-G_DEFINE_TYPE_WITH_CODE (IdeBuildconfigConfigurationProvider,
-                         ide_buildconfig_configuration_provider,
+G_DEFINE_TYPE_WITH_CODE (IdeBuildconfigConfigProvider,
+                         ide_buildconfig_config_provider,
                          IDE_TYPE_OBJECT,
                          G_IMPLEMENT_INTERFACE (IDE_TYPE_CONFIG_PROVIDER,
                                                 configuration_provider_iface_init))
 
 static void
-ide_buildconfig_configuration_provider_finalize (GObject *object)
+ide_buildconfig_config_provider_finalize (GObject *object)
 {
-  IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)object;
+  IdeBuildconfigConfigProvider *self = (IdeBuildconfigConfigProvider *)object;
 
   g_clear_pointer (&self->configs, g_ptr_array_unref);
   g_clear_pointer (&self->key_file, g_key_file_free);
 
-  G_OBJECT_CLASS (ide_buildconfig_configuration_provider_parent_class)->finalize (object);
+  G_OBJECT_CLASS (ide_buildconfig_config_provider_parent_class)->finalize (object);
 }
 
 static void
-ide_buildconfig_configuration_provider_class_init (IdeBuildconfigConfigurationProviderClass *klass)
+ide_buildconfig_config_provider_class_init (IdeBuildconfigConfigProviderClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->finalize = ide_buildconfig_configuration_provider_finalize;
+  object_class->finalize = ide_buildconfig_config_provider_finalize;
 }
 
 static void
-ide_buildconfig_configuration_provider_init (IdeBuildconfigConfigurationProvider *self)
+ide_buildconfig_config_provider_init (IdeBuildconfigConfigProvider *self)
 {
   self->configs = g_ptr_array_new_with_free_func (g_object_unref);
 }
diff --git a/src/plugins/buildconfig/ide-buildconfig-configuration-provider.h 
b/src/plugins/buildconfig/ide-buildconfig-config-provider.h
similarity index 73%
rename from src/plugins/buildconfig/ide-buildconfig-configuration-provider.h
rename to src/plugins/buildconfig/ide-buildconfig-config-provider.h
index 83fb0d7f5..414d4fc97 100644
--- a/src/plugins/buildconfig/ide-buildconfig-configuration-provider.h
+++ b/src/plugins/buildconfig/ide-buildconfig-config-provider.h
@@ -1,4 +1,4 @@
-/* ide-buildconfig-configuration-provider.h
+/* ide-buildconfig-config-provider.h
  *
  * Copyright 2016 Matthew Leeds <mleeds redhat com>
  *
@@ -24,8 +24,8 @@
 
 G_BEGIN_DECLS
 
-#define IDE_TYPE_BUILDCONFIG_CONFIGURATION_PROVIDER (ide_buildconfig_configuration_provider_get_type())
+#define IDE_TYPE_BUILDCONFIG_CONFIG_PROVIDER (ide_buildconfig_config_provider_get_type())
 
-G_DECLARE_FINAL_TYPE (IdeBuildconfigConfigurationProvider, ide_buildconfig_configuration_provider, IDE, 
BUILDCONFIG_CONFIGURATION_PROVIDER, IdeObject)
+G_DECLARE_FINAL_TYPE (IdeBuildconfigConfigProvider, ide_buildconfig_config_provider, IDE, 
BUILDCONFIG_CONFIG_PROVIDER, IdeObject)
 
 G_END_DECLS
diff --git a/src/plugins/buildconfig/ide-buildconfig-configuration.c 
b/src/plugins/buildconfig/ide-buildconfig-config.c
similarity index 61%
rename from src/plugins/buildconfig/ide-buildconfig-configuration.c
rename to src/plugins/buildconfig/ide-buildconfig-config.c
index 498dd81d0..c57ed4911 100644
--- a/src/plugins/buildconfig/ide-buildconfig-configuration.c
+++ b/src/plugins/buildconfig/ide-buildconfig-config.c
@@ -1,4 +1,4 @@
-/* ide-buildconfig-configuration.c
+/* ide-buildconfig-config.c
  *
  * Copyright 2017-2019 Christian Hergert <chergert redhat com>
  *
@@ -18,13 +18,13 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-#define G_LOG_DOMAIN "ide-buildconfig-configuration"
+#define G_LOG_DOMAIN "ide-buildconfig-config"
 
 #include "config.h"
 
-#include "ide-buildconfig-configuration.h"
+#include "ide-buildconfig-config.h"
 
-struct _IdeBuildconfigConfiguration
+struct _IdeBuildconfigConfig
 {
   IdeConfig   parent_instance;
 
@@ -39,37 +39,37 @@ enum {
   N_PROPS
 };
 
-G_DEFINE_TYPE (IdeBuildconfigConfiguration, ide_buildconfig_configuration, IDE_TYPE_CONFIG)
+G_DEFINE_TYPE (IdeBuildconfigConfig, ide_buildconfig_config, IDE_TYPE_CONFIG)
 
 static GParamSpec *properties [N_PROPS];
 
 static void
-ide_buildconfig_configuration_finalize (GObject *object)
+ide_buildconfig_config_finalize (GObject *object)
 {
-  IdeBuildconfigConfiguration *self = (IdeBuildconfigConfiguration *)object;
+  IdeBuildconfigConfig *self = (IdeBuildconfigConfig *)object;
 
   g_clear_pointer (&self->prebuild, g_strfreev);
   g_clear_pointer (&self->postbuild, g_strfreev);
 
-  G_OBJECT_CLASS (ide_buildconfig_configuration_parent_class)->finalize (object);
+  G_OBJECT_CLASS (ide_buildconfig_config_parent_class)->finalize (object);
 }
 
 static void
-ide_buildconfig_configuration_get_property (GObject    *object,
+ide_buildconfig_config_get_property (GObject    *object,
                                             guint       prop_id,
                                             GValue     *value,
                                             GParamSpec *pspec)
 {
-  IdeBuildconfigConfiguration *self = (IdeBuildconfigConfiguration *)object;
+  IdeBuildconfigConfig *self = (IdeBuildconfigConfig *)object;
 
   switch (prop_id)
     {
     case PROP_PREBUILD:
-      g_value_set_boxed (value, ide_buildconfig_configuration_get_prebuild (self));
+      g_value_set_boxed (value, ide_buildconfig_config_get_prebuild (self));
       break;
 
     case PROP_POSTBUILD:
-      g_value_set_boxed (value, ide_buildconfig_configuration_get_postbuild (self));
+      g_value_set_boxed (value, ide_buildconfig_config_get_postbuild (self));
       break;
 
     default:
@@ -78,21 +78,21 @@ ide_buildconfig_configuration_get_property (GObject    *object,
 }
 
 static void
-ide_buildconfig_configuration_set_property (GObject      *object,
+ide_buildconfig_config_set_property (GObject      *object,
                                             guint         prop_id,
                                             const GValue *value,
                                             GParamSpec   *pspec)
 {
-  IdeBuildconfigConfiguration *self = (IdeBuildconfigConfiguration *)object;
+  IdeBuildconfigConfig *self = (IdeBuildconfigConfig *)object;
 
   switch (prop_id)
     {
     case PROP_PREBUILD:
-      ide_buildconfig_configuration_set_prebuild (self, g_value_get_boxed (value));
+      ide_buildconfig_config_set_prebuild (self, g_value_get_boxed (value));
       break;
 
     case PROP_POSTBUILD:
-      ide_buildconfig_configuration_set_postbuild (self, g_value_get_boxed (value));
+      ide_buildconfig_config_set_postbuild (self, g_value_get_boxed (value));
       break;
 
     default:
@@ -101,13 +101,13 @@ ide_buildconfig_configuration_set_property (GObject      *object,
 }
 
 static void
-ide_buildconfig_configuration_class_init (IdeBuildconfigConfigurationClass *klass)
+ide_buildconfig_config_class_init (IdeBuildconfigConfigClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-  object_class->finalize = ide_buildconfig_configuration_finalize;
-  object_class->get_property = ide_buildconfig_configuration_get_property;
-  object_class->set_property = ide_buildconfig_configuration_set_property;
+  object_class->finalize = ide_buildconfig_config_finalize;
+  object_class->get_property = ide_buildconfig_config_get_property;
+  object_class->set_property = ide_buildconfig_config_set_property;
 
   properties [PROP_PREBUILD] =
     g_param_spec_boxed ("prebuild", NULL, NULL,
@@ -123,31 +123,31 @@ ide_buildconfig_configuration_class_init (IdeBuildconfigConfigurationClass *klas
 }
 
 static void
-ide_buildconfig_configuration_init (IdeBuildconfigConfiguration *self)
+ide_buildconfig_config_init (IdeBuildconfigConfig *self)
 {
 }
 
 const gchar * const *
-ide_buildconfig_configuration_get_prebuild (IdeBuildconfigConfiguration *self)
+ide_buildconfig_config_get_prebuild (IdeBuildconfigConfig *self)
 {
-  g_return_val_if_fail (IDE_IS_BUILDCONFIG_CONFIGURATION (self), NULL);
+  g_return_val_if_fail (IDE_IS_BUILDCONFIG_CONFIG (self), NULL);
 
   return (const gchar * const *)self->prebuild;
 }
 
 const gchar * const *
-ide_buildconfig_configuration_get_postbuild (IdeBuildconfigConfiguration *self)
+ide_buildconfig_config_get_postbuild (IdeBuildconfigConfig *self)
 {
-  g_return_val_if_fail (IDE_IS_BUILDCONFIG_CONFIGURATION (self), NULL);
+  g_return_val_if_fail (IDE_IS_BUILDCONFIG_CONFIG (self), NULL);
 
   return (const gchar * const *)self->postbuild;
 }
 
 void
-ide_buildconfig_configuration_set_prebuild (IdeBuildconfigConfiguration *self,
+ide_buildconfig_config_set_prebuild (IdeBuildconfigConfig *self,
                                             const gchar * const         *prebuild)
 {
-  g_return_if_fail (IDE_IS_BUILDCONFIG_CONFIGURATION (self));
+  g_return_if_fail (IDE_IS_BUILDCONFIG_CONFIG (self));
 
   if (self->prebuild != (gchar **)prebuild)
     {
@@ -158,10 +158,10 @@ ide_buildconfig_configuration_set_prebuild (IdeBuildconfigConfiguration *self,
 }
 
 void
-ide_buildconfig_configuration_set_postbuild (IdeBuildconfigConfiguration *self,
+ide_buildconfig_config_set_postbuild (IdeBuildconfigConfig *self,
                                              const gchar * const         *postbuild)
 {
-  g_return_if_fail (IDE_IS_BUILDCONFIG_CONFIGURATION (self));
+  g_return_if_fail (IDE_IS_BUILDCONFIG_CONFIG (self));
 
   if (self->postbuild != (gchar **)postbuild)
     {
diff --git a/src/plugins/buildconfig/ide-buildconfig-configuration.h 
b/src/plugins/buildconfig/ide-buildconfig-config.h
similarity index 61%
rename from src/plugins/buildconfig/ide-buildconfig-configuration.h
rename to src/plugins/buildconfig/ide-buildconfig-config.h
index 5a250c50d..1d876650d 100644
--- a/src/plugins/buildconfig/ide-buildconfig-configuration.h
+++ b/src/plugins/buildconfig/ide-buildconfig-config.h
@@ -1,4 +1,4 @@
-/* ide-buildconfig-configuration.h
+/* ide-buildconfig-config.h
  *
  * Copyright 2017-2019 Christian Hergert <chergert redhat com>
  *
@@ -24,15 +24,15 @@
 
 G_BEGIN_DECLS
 
-#define IDE_TYPE_BUILDCONFIG_CONFIGURATION (ide_buildconfig_configuration_get_type())
+#define IDE_TYPE_BUILDCONFIG_CONFIG (ide_buildconfig_config_get_type())
 
-G_DECLARE_FINAL_TYPE (IdeBuildconfigConfiguration, ide_buildconfig_configuration, IDE, 
BUILDCONFIG_CONFIGURATION, IdeConfig)
+G_DECLARE_FINAL_TYPE (IdeBuildconfigConfig, ide_buildconfig_config, IDE, BUILDCONFIG_CONFIG, IdeConfig)
 
-const gchar * const *ide_buildconfig_configuration_get_prebuild  (IdeBuildconfigConfiguration *self);
-void                 ide_buildconfig_configuration_set_prebuild  (IdeBuildconfigConfiguration *self,
+const gchar * const *ide_buildconfig_config_get_prebuild  (IdeBuildconfigConfig *self);
+void                 ide_buildconfig_config_set_prebuild  (IdeBuildconfigConfig *self,
                                                                   const gchar * const         *prebuild);
-const gchar * const *ide_buildconfig_configuration_get_postbuild (IdeBuildconfigConfiguration *self);
-void                 ide_buildconfig_configuration_set_postbuild (IdeBuildconfigConfiguration *self,
+const gchar * const *ide_buildconfig_config_get_postbuild (IdeBuildconfigConfig *self);
+void                 ide_buildconfig_config_set_postbuild (IdeBuildconfigConfig *self,
                                                                   const gchar * const         *postbuild);
 
 G_END_DECLS
diff --git a/src/plugins/buildconfig/ide-buildconfig-pipeline-addin.c 
b/src/plugins/buildconfig/ide-buildconfig-pipeline-addin.c
index a2d44c7f2..44488c6fb 100644
--- a/src/plugins/buildconfig/ide-buildconfig-pipeline-addin.c
+++ b/src/plugins/buildconfig/ide-buildconfig-pipeline-addin.c
@@ -25,7 +25,7 @@
 #include <libide-foundry.h>
 #include <libide-threading.h>
 
-#include "ide-buildconfig-configuration.h"
+#include "ide-buildconfig-config.h"
 #include "ide-buildconfig-pipeline-addin.h"
 
 static void
@@ -81,13 +81,13 @@ ide_buildconfig_pipeline_addin_load (IdeBuildPipelineAddin *addin,
 
   config = ide_build_pipeline_get_configuration (pipeline);
 
-  if (!IDE_IS_BUILDCONFIG_CONFIGURATION (config))
+  if (!IDE_IS_BUILDCONFIG_CONFIG (config))
     return;
 
   env = ide_config_get_environ (config);
 
-  prebuild = ide_buildconfig_configuration_get_prebuild (IDE_BUILDCONFIG_CONFIGURATION (config));
-  postbuild = ide_buildconfig_configuration_get_postbuild (IDE_BUILDCONFIG_CONFIGURATION (config));
+  prebuild = ide_buildconfig_config_get_prebuild (IDE_BUILDCONFIG_CONFIG (config));
+  postbuild = ide_buildconfig_config_get_postbuild (IDE_BUILDCONFIG_CONFIG (config));
 
   if (prebuild != NULL)
     {
diff --git a/src/plugins/buildconfig/meson.build b/src/plugins/buildconfig/meson.build
index d1e51c7ae..528ba7656 100644
--- a/src/plugins/buildconfig/meson.build
+++ b/src/plugins/buildconfig/meson.build
@@ -1,7 +1,7 @@
 plugins_sources += files([
   'buildconfig-plugin.c',
-  'ide-buildconfig-configuration.c',
-  'ide-buildconfig-configuration-provider.c',
+  'ide-buildconfig-config.c',
+  'ide-buildconfig-config-provider.c',
   'ide-buildconfig-pipeline-addin.c',
 ])
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]