[gnome-builder] refactor: rename get_configuration() to get_config()
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] refactor: rename get_configuration() to get_config()
- Date: Thu, 10 Jan 2019 20:54:02 +0000 (UTC)
commit b227ae3342b285dea5d0be13cfb01bebc05b6555
Author: Christian Hergert <chergert redhat com>
Date: Thu Jan 10 12:45:40 2019 -0800
refactor: rename get_configuration() to get_config()
doc/help/plugins/processes/runtimes.rst | 2 +-
doc/help/plugins/running.rst | 2 +-
src/libide/foundry/ide-build-manager.c | 2 +-
src/libide/foundry/ide-build-pipeline.c | 58 +++++++++++-----------
src/libide/foundry/ide-build-pipeline.h | 2 +-
src/libide/foundry/ide-build-system.c | 2 +-
src/libide/foundry/ide-config-manager.c | 12 ++---
src/libide/foundry/ide-config-manager.h | 2 +-
src/libide/foundry/ide-runtime-manager.c | 2 +-
src/libide/foundry/ide-runtime-provider.c | 2 +-
src/libide/foundry/ide-toolchain-manager.c | 2 +-
src/plugins/autotools/ide-autotools-make-stage.c | 2 +-
.../autotools/ide-autotools-makecache-stage.c | 2 +-
.../autotools/ide-autotools-pipeline-addin.c | 4 +-
.../buildconfig/ide-buildconfig-config-provider.c | 2 +-
.../buildconfig/ide-buildconfig-pipeline-addin.c | 2 +-
src/plugins/buildui/gbp-buildui-omni-bar-section.c | 2 +-
src/plugins/buildui/gbp-buildui-workspace-addin.c | 2 +-
src/plugins/cargo/cargo_plugin.py | 2 +-
src/plugins/cmake/gbp-cmake-pipeline-addin.c | 2 +-
src/plugins/deviced/gbp-deviced-deploy-strategy.c | 6 +--
src/plugins/eslint/eslint_plugin.py | 2 +-
src/plugins/flatpak/gbp-flatpak-download-stage.c | 2 +-
src/plugins/flatpak/gbp-flatpak-pipeline-addin.c | 12 ++---
src/plugins/flatpak/gbp-flatpak-runtime-provider.c | 2 +-
src/plugins/glade/gbp-glade-workbench-addin.c | 2 +-
src/plugins/gradle/gradle_plugin.py | 2 +-
src/plugins/make/make_plugin.py | 2 +-
src/plugins/maven/maven_plugin.py | 2 +-
src/plugins/meson/gbp-meson-build-system.c | 2 +-
src/plugins/meson/gbp-meson-pipeline-addin.c | 2 +-
src/plugins/npm/npm_plugin.py | 2 +-
src/plugins/phpize/phpize_plugin.py | 2 +-
src/plugins/valgrind/valgrind_plugin.py | 2 +-
34 files changed, 75 insertions(+), 75 deletions(-)
---
diff --git a/doc/help/plugins/processes/runtimes.rst b/doc/help/plugins/processes/runtimes.rst
index 56a8eb5db..9de5be246 100644
--- a/doc/help/plugins/processes/runtimes.rst
+++ b/doc/help/plugins/processes/runtimes.rst
@@ -17,7 +17,7 @@ The current build configuration can be accessed from the ``Ide.ConfigurationMana
.. code-block:: py
- config_manager = context.get_configuration_manager()
+ config_manager = context.get_config()
config = config_manager.get_current()
runtime = config.get_runtime()
diff --git a/doc/help/plugins/running.rst b/doc/help/plugins/running.rst
index e3c40f4db..f0a8d0379 100644
--- a/doc/help/plugins/running.rst
+++ b/doc/help/plugins/running.rst
@@ -63,7 +63,7 @@ Now register a run handler to handle the launch request.
# valgrind inside the runtime environment.
pipeline = build_manager.get_pipeline()
if pipeline:
- runtime = pipeline.get_configuration().get_runtime()
+ runtime = pipeline.get_config().get_runtime()
if runtime and runtime.contains_program_in_path('valgrind'):
if not self.has_handler:
run_manager.add_handler('valgrind', _('Run with Valgrind'), 'system-run-symbolic',
'<primary>F10', self.valgrind_handler)
diff --git a/src/libide/foundry/ide-build-manager.c b/src/libide/foundry/ide-build-manager.c
index f542d3451..5499557ea 100644
--- a/src/libide/foundry/ide-build-manager.c
+++ b/src/libide/foundry/ide-build-manager.c
@@ -577,7 +577,7 @@ ide_build_manager_invalidate_pipeline (IdeBuildManager *self)
*/
ide_build_manager_set_can_build (self, FALSE);
self->pipeline = g_object_new (IDE_TYPE_BUILD_PIPELINE,
- "configuration", config,
+ "config", config,
"device", device,
NULL);
ide_object_append (IDE_OBJECT (self), IDE_OBJECT (self->pipeline));
diff --git a/src/libide/foundry/ide-build-pipeline.c b/src/libide/foundry/ide-build-pipeline.c
index 085b0e5a2..79d904b7e 100644
--- a/src/libide/foundry/ide-build-pipeline.c
+++ b/src/libide/foundry/ide-build-pipeline.c
@@ -141,7 +141,7 @@ struct _IdeBuildPipeline
* the real configuration so that we do not need to synchronize
* with the UI process for accesses.
*/
- IdeConfig *configuration;
+ IdeConfig *config;
/*
* The device we are building for. This allows components to setup
@@ -365,7 +365,7 @@ G_DEFINE_TYPE_WITH_CODE (IdeBuildPipeline, ide_build_pipeline, IDE_TYPE_OBJECT,
enum {
PROP_0,
PROP_BUSY,
- PROP_CONFIGURATION,
+ PROP_CONFIG,
PROP_DEVICE,
PROP_MESSAGE,
PROP_PHASE,
@@ -826,7 +826,7 @@ ide_build_pipeline_get_phase (IdeBuildPipeline *self)
}
/**
- * ide_build_pipeline_get_configuration:
+ * ide_build_pipeline_get_config:
*
* Gets the #IdeConfig to use for the pipeline.
*
@@ -835,11 +835,11 @@ ide_build_pipeline_get_phase (IdeBuildPipeline *self)
* Since: 3.32
*/
IdeConfig *
-ide_build_pipeline_get_configuration (IdeBuildPipeline *self)
+ide_build_pipeline_get_config (IdeBuildPipeline *self)
{
g_return_val_if_fail (IDE_IS_BUILD_PIPELINE (self), NULL);
- return self->configuration;
+ return self->config;
}
static void
@@ -1006,12 +1006,12 @@ register_build_commands_stage (IdeBuildPipeline *self,
g_assert (IDE_IS_BUILD_PIPELINE (self));
g_assert (IDE_IS_CONTEXT (context));
- g_assert (IDE_IS_CONFIG (self->configuration));
+ g_assert (IDE_IS_CONFIG (self->config));
- if (NULL == (build_commands = ide_config_get_build_commands (self->configuration)))
+ if (NULL == (build_commands = ide_config_get_build_commands (self->config)))
return;
- if ((rundir = ide_config_get_build_commands_dir (self->configuration)))
+ if ((rundir = ide_config_get_build_commands_dir (self->config)))
rundir_path = g_file_get_path (rundir);
for (guint i = 0; build_commands[i]; i++)
@@ -1057,9 +1057,9 @@ register_post_install_commands_stage (IdeBuildPipeline *self,
g_assert (IDE_IS_BUILD_PIPELINE (self));
g_assert (IDE_IS_CONTEXT (context));
- g_assert (IDE_IS_CONFIG (self->configuration));
+ g_assert (IDE_IS_CONFIG (self->config));
- post_install_commands = ide_config_get_post_install_commands (self->configuration);
+ post_install_commands = ide_config_get_post_install_commands (self->config);
if (post_install_commands == NULL)
return;
for (guint i = 0; post_install_commands[i]; i++)
@@ -1333,7 +1333,7 @@ ide_build_pipeline_finalize (GObject *object)
g_clear_object (&self->device);
g_clear_object (&self->runtime);
g_clear_object (&self->toolchain);
- g_clear_object (&self->configuration);
+ g_clear_object (&self->config);
g_clear_pointer (&self->pipeline, g_array_unref);
g_clear_pointer (&self->srcdir, g_free);
g_clear_pointer (&self->builddir, g_free);
@@ -1388,7 +1388,7 @@ ide_build_pipeline_initable_init (GInitable *initable,
IDE_ENTRY;
g_assert (IDE_IS_BUILD_PIPELINE (self));
- g_assert (IDE_IS_CONFIG (self->configuration));
+ g_assert (IDE_IS_CONFIG (self->config));
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
g_debug ("initializing build pipeline with device %s",
@@ -1429,13 +1429,13 @@ ide_build_pipeline_initable_init (GInitable *initable,
ide_build_pipeline_intercept_pty_master_cb,
self);
- g_signal_connect_object (self->configuration,
+ g_signal_connect_object (self->config,
"notify::ready",
G_CALLBACK (ide_build_pipeline_notify_ready),
self,
G_CONNECT_SWAPPED);
- ide_build_pipeline_notify_ready (self, NULL, self->configuration);
+ ide_build_pipeline_notify_ready (self, NULL, self->config);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_PTY]);
@@ -1461,7 +1461,7 @@ ide_build_pipeline_parent_set (IdeObject *object,
g_assert (IDE_IS_BUILD_PIPELINE (self));
g_assert (!parent || IDE_IS_OBJECT (parent));
- g_assert (IDE_IS_CONFIG (self->configuration));
+ g_assert (IDE_IS_CONFIG (self->config));
if (parent == NULL)
return;
@@ -1491,8 +1491,8 @@ ide_build_pipeline_get_property (GObject *object,
g_value_set_boolean (value, self->busy);
break;
- case PROP_CONFIGURATION:
- g_value_set_object (value, ide_build_pipeline_get_configuration (self));
+ case PROP_CONFIG:
+ g_value_set_object (value, ide_build_pipeline_get_config (self));
break;
case PROP_MESSAGE:
@@ -1522,8 +1522,8 @@ ide_build_pipeline_set_property (GObject *object,
switch (prop_id)
{
- case PROP_CONFIGURATION:
- self->configuration = g_value_dup_object (value);
+ case PROP_CONFIG:
+ self->config = g_value_dup_object (value);
break;
case PROP_DEVICE:
@@ -1569,8 +1569,8 @@ ide_build_pipeline_class_init (IdeBuildPipelineClass *klass)
*
* Since: 3.32
*/
- properties [PROP_CONFIGURATION] =
- g_param_spec_object ("configuration",
+ properties [PROP_CONFIG] =
+ g_param_spec_object ("config",
"Configuration",
"Configuration",
IDE_TYPE_CONFIG,
@@ -1972,7 +1972,7 @@ ide_build_pipeline_task_notify_completed (IdeBuildPipeline *self,
* build operation completes. If the configuration is no longer valid,
* go ahead and unload the pipeline.
*/
- if (!ide_config_get_ready (self->configuration))
+ if (!ide_config_get_ready (self->config))
ide_build_pipeline_unload (self);
else
ide_build_pipeline_queue_flush (self);
@@ -2909,7 +2909,7 @@ ide_build_pipeline_create_launcher (IdeBuildPipeline *self,
g_return_val_if_fail (IDE_IS_BUILD_PIPELINE (self), NULL);
- runtime = ide_config_get_runtime (self->configuration);
+ runtime = ide_config_get_runtime (self->config);
if (runtime == NULL)
{
@@ -2917,7 +2917,7 @@ ide_build_pipeline_create_launcher (IdeBuildPipeline *self,
G_IO_ERROR,
G_IO_ERROR_FAILED,
"The runtime %s is missing",
- ide_config_get_runtime_id (self->configuration));
+ ide_config_get_runtime_id (self->config));
return NULL;
}
@@ -2925,7 +2925,7 @@ ide_build_pipeline_create_launcher (IdeBuildPipeline *self,
if (ret != NULL)
{
- IdeEnvironment *env = ide_config_get_environment (self->configuration);
+ IdeEnvironment *env = ide_config_get_environment (self->config);
ide_subprocess_launcher_set_clear_env (ret, TRUE);
ide_subprocess_launcher_overlay_environment (ret, env);
@@ -2935,7 +2935,7 @@ ide_build_pipeline_create_launcher (IdeBuildPipeline *self,
ide_subprocess_launcher_set_flags (ret,
(G_SUBPROCESS_FLAGS_STDERR_PIPE |
G_SUBPROCESS_FLAGS_STDOUT_PIPE));
- ide_config_apply_path (self->configuration, ret);
+ ide_config_apply_path (self->config, ret);
}
return g_steal_pointer (&ret);
@@ -3956,7 +3956,7 @@ _ide_build_pipeline_set_toolchain (IdeBuildPipeline *self,
ide_object_lock (IDE_OBJECT (self));
if (g_set_object (&self->toolchain, toolchain))
- ide_config_set_toolchain (self->configuration, toolchain);
+ ide_config_set_toolchain (self->config, toolchain);
ide_object_unlock (IDE_OBJECT (self));
}
@@ -4006,8 +4006,8 @@ _ide_build_pipeline_check_toolchain (IdeBuildPipeline *self,
manager = ide_toolchain_manager_from_context (context);
g_return_if_fail (IDE_IS_TOOLCHAIN_MANAGER (manager));
- toolchain = ide_config_get_toolchain (self->configuration);
- runtime = ide_config_get_runtime (self->configuration);
+ toolchain = ide_config_get_toolchain (self->config);
+ runtime = ide_config_get_runtime (self->config);
device_triplet = ide_device_info_get_host_triplet (info);
toolchain_triplet = ide_toolchain_get_host_triplet (toolchain);
diff --git a/src/libide/foundry/ide-build-pipeline.h b/src/libide/foundry/ide-build-pipeline.h
index e85476c06..bd0a647f1 100644
--- a/src/libide/foundry/ide-build-pipeline.h
+++ b/src/libide/foundry/ide-build-pipeline.h
@@ -83,7 +83,7 @@ gboolean ide_build_pipeline_is_ready (IdeBuildPipel
IDE_AVAILABLE_IN_3_32
gboolean ide_build_pipeline_get_busy (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
-IdeConfig *ide_build_pipeline_get_configuration (IdeBuildPipeline *self);
+IdeConfig *ide_build_pipeline_get_config (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
IdeDevice *ide_build_pipeline_get_device (IdeBuildPipeline *self);
IDE_AVAILABLE_IN_3_32
diff --git a/src/libide/foundry/ide-build-system.c b/src/libide/foundry/ide-build-system.c
index 6d07294b7..831b43f7b 100644
--- a/src/libide/foundry/ide-build-system.c
+++ b/src/libide/foundry/ide-build-system.c
@@ -474,7 +474,7 @@ ide_build_system_get_builddir (IdeBuildSystem *self,
context = ide_object_get_context (IDE_OBJECT (self));
vcs = ide_vcs_from_context (context);
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
config_id = ide_config_get_id (config);
runtime = ide_build_pipeline_get_runtime (pipeline);
runtime_id = ide_runtime_get_id (runtime);
diff --git a/src/libide/foundry/ide-config-manager.c b/src/libide/foundry/ide-config-manager.c
index 8eeb86835..76afc2dcd 100644
--- a/src/libide/foundry/ide-config-manager.c
+++ b/src/libide/foundry/ide-config-manager.c
@@ -115,7 +115,7 @@ ide_config_manager_actions_current (IdeConfigManager *self,
id = g_variant_get_string (param, NULL);
- if ((config = ide_config_manager_get_configuration (self, id)))
+ if ((config = ide_config_manager_get_config (self, id)))
ide_config_manager_set_current (self, config);
}
@@ -132,7 +132,7 @@ ide_config_manager_actions_duplicate (IdeConfigManager *self,
id = g_variant_get_string (param, NULL);
- if ((config = ide_config_manager_get_configuration (self, id)))
+ if ((config = ide_config_manager_get_config (self, id)))
ide_config_manager_duplicate (self, config);
}
@@ -149,7 +149,7 @@ ide_config_manager_actions_delete (IdeConfigManager *self,
id = g_variant_get_string (param, NULL);
- if ((config = ide_config_manager_get_configuration (self, id)))
+ if ((config = ide_config_manager_get_config (self, id)))
ide_config_manager_delete (self, config);
}
@@ -270,7 +270,7 @@ ide_config_manager_save_finish (IdeConfigManager *self,
}
/**
- * ide_config_manager_get_configuration:
+ * ide_config_manager_get_config:
* @self: An #IdeConfigManager
* @id: The string identifier of the configuration
*
@@ -282,7 +282,7 @@ ide_config_manager_save_finish (IdeConfigManager *self,
* Since: 3.32
*/
IdeConfig *
-ide_config_manager_get_configuration (IdeConfigManager *self,
+ide_config_manager_get_config (IdeConfigManager *self,
const gchar *id)
{
g_return_val_if_fail (IDE_IS_MAIN_THREAD (), NULL);
@@ -767,7 +767,7 @@ notify_providers_loaded (IdeConfigManager *self,
const gchar *str = g_variant_get_string (user_value, NULL);
IdeConfig *config;
- if ((config = ide_config_manager_get_configuration (self, str)))
+ if ((config = ide_config_manager_get_config (self, str)))
{
if (config != self->current)
ide_config_manager_set_current (self, config);
diff --git a/src/libide/foundry/ide-config-manager.h b/src/libide/foundry/ide-config-manager.h
index 0d007e97b..778ac08bd 100644
--- a/src/libide/foundry/ide-config-manager.h
+++ b/src/libide/foundry/ide-config-manager.h
@@ -47,7 +47,7 @@ IDE_AVAILABLE_IN_3_32
void ide_config_manager_set_current (IdeConfigManager *self,
IdeConfig *configuration);
IDE_AVAILABLE_IN_3_32
-IdeConfig *ide_config_manager_get_configuration (IdeConfigManager *self,
+IdeConfig *ide_config_manager_get_config (IdeConfigManager *self,
const gchar *id);
IDE_AVAILABLE_IN_3_32
void ide_config_manager_duplicate (IdeConfigManager *self,
diff --git a/src/libide/foundry/ide-runtime-manager.c b/src/libide/foundry/ide-runtime-manager.c
index 51f979159..0a59717ec 100644
--- a/src/libide/foundry/ide-runtime-manager.c
+++ b/src/libide/foundry/ide-runtime-manager.c
@@ -351,7 +351,7 @@ _ide_runtime_manager_prepare_async (IdeRuntimeManager *self,
g_return_if_fail (IDE_IS_BUILD_PIPELINE (pipeline));
g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
runtime_id = ide_config_get_runtime_id (config);
task = ide_task_new (self, cancellable, callback, user_data);
diff --git a/src/libide/foundry/ide-runtime-provider.c b/src/libide/foundry/ide-runtime-provider.c
index 27fa3d2f1..3530f20dc 100644
--- a/src/libide/foundry/ide-runtime-provider.c
+++ b/src/libide/foundry/ide-runtime-provider.c
@@ -134,7 +134,7 @@ ide_runtime_provider_real_bootstrap_async (IdeRuntimeProvider *self,
ide_task_set_source_tag (task, ide_runtime_provider_real_bootstrap_async);
ide_task_set_priority (task, G_PRIORITY_LOW);
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
runtime_id = ide_config_get_runtime_id (config);
ide_task_set_task_data (task, g_strdup (runtime_id), g_free);
diff --git a/src/libide/foundry/ide-toolchain-manager.c b/src/libide/foundry/ide-toolchain-manager.c
index d74b8a64d..aa06ecece 100644
--- a/src/libide/foundry/ide-toolchain-manager.c
+++ b/src/libide/foundry/ide-toolchain-manager.c
@@ -514,7 +514,7 @@ _ide_toolchain_manager_prepare_async (IdeToolchainManager *self,
g_return_if_fail (IDE_IS_BUILD_PIPELINE (pipeline));
g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
toolchain_id = ide_config_get_toolchain_id (config);
task = g_task_new (self, cancellable, callback, user_data);
diff --git a/src/plugins/autotools/ide-autotools-make-stage.c
b/src/plugins/autotools/ide-autotools-make-stage.c
index 6910f4401..7e0e09ad9 100644
--- a/src/plugins/autotools/ide-autotools-make-stage.c
+++ b/src/plugins/autotools/ide-autotools-make-stage.c
@@ -92,7 +92,7 @@ create_launcher (IdeAutotoolsMakeStage *self,
if (self->make == NULL)
{
- IdeConfig *config = ide_build_pipeline_get_configuration (pipeline);
+ IdeConfig *config = ide_build_pipeline_get_config (pipeline);
IdeRuntime *runtime = ide_config_get_runtime (config);
if (ide_runtime_contains_program_in_path (runtime, "gmake", cancellable))
diff --git a/src/plugins/autotools/ide-autotools-makecache-stage.c
b/src/plugins/autotools/ide-autotools-makecache-stage.c
index d5231aea3..67da87413 100644
--- a/src/plugins/autotools/ide-autotools-makecache-stage.c
+++ b/src/plugins/autotools/ide-autotools-makecache-stage.c
@@ -214,7 +214,7 @@ ide_autotools_makecache_stage_new_for_pipeline (IdeBuildPipeline *pipeline,
g_return_val_if_fail (IDE_IS_BUILD_PIPELINE (pipeline), NULL);
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
runtime = ide_config_get_runtime (config);
cache_path = ide_build_pipeline_build_builddir_path (pipeline, "Makecache", NULL);
diff --git a/src/plugins/autotools/ide-autotools-pipeline-addin.c
b/src/plugins/autotools/ide-autotools-pipeline-addin.c
index 4156065d9..538df81ee 100644
--- a/src/plugins/autotools/ide-autotools-pipeline-addin.c
+++ b/src/plugins/autotools/ide-autotools-pipeline-addin.c
@@ -226,7 +226,7 @@ register_configure_stage (IdeAutotoolsPipelineAddin *self,
ide_subprocess_launcher_push_argv (launcher, configure_path);
/* --host=triplet */
- configuration = ide_build_pipeline_get_configuration (pipeline);
+ configuration = ide_build_pipeline_get_config (pipeline);
toolchain = ide_build_pipeline_get_toolchain (pipeline);
triplet = ide_toolchain_get_host_triplet (toolchain);
host_arg = g_strdup_printf ("--host=%s", ide_triplet_get_full_name (triplet));
@@ -332,7 +332,7 @@ register_make_stage (IdeAutotoolsPipelineAddin *self,
g_assert (IDE_IS_AUTOTOOLS_PIPELINE_ADDIN (self));
g_assert (IDE_IS_BUILD_PIPELINE (pipeline));
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
parallel = ide_config_get_parallelism (config);
stage = g_object_new (IDE_TYPE_AUTOTOOLS_MAKE_STAGE,
diff --git a/src/plugins/buildconfig/ide-buildconfig-config-provider.c
b/src/plugins/buildconfig/ide-buildconfig-config-provider.c
index e52da254b..28fc0bace 100644
--- a/src/plugins/buildconfig/ide-buildconfig-config-provider.c
+++ b/src/plugins/buildconfig/ide-buildconfig-config-provider.c
@@ -102,7 +102,7 @@ get_next_id (IdeConfigManager *manager,
tries = g_ptr_array_new_with_free_func (g_free);
- while (ide_config_manager_get_configuration (manager, id))
+ while (ide_config_manager_get_config (manager, id))
{
g_autofree gchar *next = gen_next_id (id);
id = next;
diff --git a/src/plugins/buildconfig/ide-buildconfig-pipeline-addin.c
b/src/plugins/buildconfig/ide-buildconfig-pipeline-addin.c
index 44488c6fb..31c88a1b7 100644
--- a/src/plugins/buildconfig/ide-buildconfig-pipeline-addin.c
+++ b/src/plugins/buildconfig/ide-buildconfig-pipeline-addin.c
@@ -79,7 +79,7 @@ ide_buildconfig_pipeline_addin_load (IdeBuildPipelineAddin *addin,
g_assert (IDE_IS_BUILDCONFIG_PIPELINE_ADDIN (addin));
g_assert (IDE_IS_BUILD_PIPELINE (pipeline));
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
if (!IDE_IS_BUILDCONFIG_CONFIG (config))
return;
diff --git a/src/plugins/buildui/gbp-buildui-omni-bar-section.c
b/src/plugins/buildui/gbp-buildui-omni-bar-section.c
index 97922e1fd..0565b76e3 100644
--- a/src/plugins/buildui/gbp-buildui-omni-bar-section.c
+++ b/src/plugins/buildui/gbp-buildui-omni-bar-section.c
@@ -82,7 +82,7 @@ gbp_buildui_omni_bar_section_notify_pipeline (GbpBuilduiOmniBarSection *self,
if ((pipeline = ide_build_manager_get_pipeline (build_manager)))
{
- IdeConfig *config = ide_build_pipeline_get_configuration (pipeline);
+ IdeConfig *config = ide_build_pipeline_get_config (pipeline);
const gchar *config_id = ide_config_get_id (config);
const gchar *display_name = ide_config_get_display_name (config);
IdeRuntime *runtime = ide_config_get_runtime (config);
diff --git a/src/plugins/buildui/gbp-buildui-workspace-addin.c
b/src/plugins/buildui/gbp-buildui-workspace-addin.c
index 07d7073fb..e8225beec 100644
--- a/src/plugins/buildui/gbp-buildui-workspace-addin.c
+++ b/src/plugins/buildui/gbp-buildui-workspace-addin.c
@@ -191,7 +191,7 @@ on_edit_config_cb (GSimpleAction *action,
context = ide_widget_get_context (GTK_WIDGET (self->workspace));
config_manager = ide_config_manager_from_context (context);
id = g_variant_get_string (param, NULL);
- config = ide_config_manager_get_configuration (config_manager, id);
+ config = ide_config_manager_get_config (config_manager, id);
if (config != NULL)
gbp_buildui_config_surface_set_config (self->surface, config);
diff --git a/src/plugins/cargo/cargo_plugin.py b/src/plugins/cargo/cargo_plugin.py
index 7e34c1cd7..c26aba2f6 100644
--- a/src/plugins/cargo/cargo_plugin.py
+++ b/src/plugins/cargo/cargo_plugin.py
@@ -90,7 +90,7 @@ class CargoPipelineAddin(Ide.Object, Ide.BuildPipelineAddin):
return
cargo_toml = build_system.props.project_file.get_path()
- config = pipeline.get_configuration()
+ config = pipeline.get_config()
builddir = pipeline.get_builddir()
runtime = config.get_runtime()
diff --git a/src/plugins/cmake/gbp-cmake-pipeline-addin.c b/src/plugins/cmake/gbp-cmake-pipeline-addin.c
index b5abe96f4..7725b3b40 100644
--- a/src/plugins/cmake/gbp-cmake-pipeline-addin.c
+++ b/src/plugins/cmake/gbp-cmake-pipeline-addin.c
@@ -109,7 +109,7 @@ gbp_cmake_pipeline_addin_load (IdeBuildPipelineAddin *addin,
g_object_get (build_system, "project-file", &project_file, NULL);
project_file_name = g_file_get_basename (project_file);
- configuration = ide_build_pipeline_get_configuration (pipeline);
+ configuration = ide_build_pipeline_get_config (pipeline);
runtime = ide_build_pipeline_get_runtime (pipeline);
toolchain = ide_build_pipeline_get_toolchain (pipeline);
diff --git a/src/plugins/deviced/gbp-deviced-deploy-strategy.c
b/src/plugins/deviced/gbp-deviced-deploy-strategy.c
index 942cb3fee..e3eed3567 100644
--- a/src/plugins/deviced/gbp-deviced-deploy-strategy.c
+++ b/src/plugins/deviced/gbp-deviced-deploy-strategy.c
@@ -77,7 +77,7 @@ gbp_deviced_deploy_strategy_load_async (IdeDeployStrategy *strategy,
task = ide_task_new (self, cancellable, callback, user_data);
ide_task_set_source_tag (task, gbp_deviced_deploy_strategy_load_async);
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
if (!(device = ide_build_pipeline_get_device (pipeline)) ||
!GBP_IS_DEVICED_DEVICE (device) ||
@@ -201,7 +201,7 @@ deploy_get_commit_cb (GObject *object,
commit_id = gbp_deviced_device_get_commit_finish (device, result, NULL);
context = ide_object_get_context (IDE_OBJECT (state->pipeline));
- config = ide_build_pipeline_get_configuration (state->pipeline);
+ config = ide_build_pipeline_get_config (state->pipeline);
toolchain = ide_build_pipeline_get_toolchain (state->pipeline);
triplet = ide_toolchain_get_host_triplet (toolchain);
arch = ide_triplet_get_arch (triplet);
@@ -324,7 +324,7 @@ gbp_deviced_deploy_strategy_deploy_async (IdeDeployStrategy *strategy,
task = ide_task_new (self, cancellable, callback, user_data);
ide_task_set_source_tag (task, gbp_deviced_deploy_strategy_deploy_async);
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
device = ide_build_pipeline_get_device (pipeline);
toolchain = ide_build_pipeline_get_toolchain (pipeline);
triplet = ide_toolchain_get_host_triplet (toolchain);
diff --git a/src/plugins/eslint/eslint_plugin.py b/src/plugins/eslint/eslint_plugin.py
index 847c35f1e..e31e38103 100644
--- a/src/plugins/eslint/eslint_plugin.py
+++ b/src/plugins/eslint/eslint_plugin.py
@@ -58,7 +58,7 @@ class ESLintDiagnosticProvider(Ide.Object, Ide.DiagnosticProvider):
pipeline = build_manager.get_pipeline()
if pipeline is not None:
srcdir = pipeline.get_srcdir()
- runtime = pipeline.get_configuration().get_runtime()
+ runtime = pipeline.get_config().get_runtime()
launcher = runtime.create_launcher()
if launcher is None:
diff --git a/src/plugins/flatpak/gbp-flatpak-download-stage.c
b/src/plugins/flatpak/gbp-flatpak-download-stage.c
index 5731765e6..9fdd19e8d 100644
--- a/src/plugins/flatpak/gbp-flatpak-download-stage.c
+++ b/src/plugins/flatpak/gbp-flatpak-download-stage.c
@@ -76,7 +76,7 @@ gbp_flatpak_download_stage_query (IdeBuildStage *stage,
return;
}
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
g_assert (!config || IDE_IS_CONFIG (config));
if (!GBP_IS_FLATPAK_MANIFEST (config))
diff --git a/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
b/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
index 3f541c78d..2e6d07cb1 100644
--- a/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
@@ -284,7 +284,7 @@ register_build_init_stage (GbpFlatpakPipelineAddin *self,
launcher = create_subprocess_launcher ();
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
runtime = ide_build_pipeline_get_runtime (pipeline);
if (!GBP_IS_FLATPAK_RUNTIME (runtime))
@@ -415,7 +415,7 @@ register_dependencies_stage (GbpFlatpakPipelineAddin *self,
g_assert (IDE_IS_BUILD_PIPELINE (pipeline));
g_assert (IDE_IS_CONTEXT (context));
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
/* If there is no manifest, then there are no dependencies
* to build for this configuration.
@@ -492,7 +492,7 @@ register_build_finish_stage (GbpFlatpakPipelineAddin *self,
g_assert (IDE_IS_BUILD_PIPELINE (pipeline));
g_assert (IDE_IS_CONTEXT (context));
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
if (!GBP_IS_FLATPAK_MANIFEST (config))
return TRUE;
@@ -543,7 +543,7 @@ register_build_export_stage (GbpFlatpakPipelineAddin *self,
g_assert (IDE_IS_BUILD_PIPELINE (pipeline));
g_assert (IDE_IS_CONTEXT (context));
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
if (!GBP_IS_FLATPAK_MANIFEST (config))
return TRUE;
@@ -616,7 +616,7 @@ register_build_bundle_stage (GbpFlatpakPipelineAddin *self,
g_assert (IDE_IS_BUILD_PIPELINE (pipeline));
g_assert (IDE_IS_CONTEXT (context));
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
if (!GBP_IS_FLATPAK_MANIFEST (config))
return TRUE;
@@ -679,7 +679,7 @@ gbp_flatpak_pipeline_addin_load (IdeBuildPipelineAddin *addin,
g_assert (GBP_IS_FLATPAK_PIPELINE_ADDIN (self));
g_assert (IDE_IS_BUILD_PIPELINE (pipeline));
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
if (!GBP_IS_FLATPAK_MANIFEST (config))
{
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
index bf799142d..f9fee0a6d 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
@@ -648,7 +648,7 @@ gbp_flatpak_runtime_provider_bootstrap_async (IdeRuntimeProvider *provider,
toolchain = ide_build_pipeline_get_toolchain (pipeline);
triplet = ide_toolchain_get_host_triplet (toolchain);
build_arch = ide_triplet_get_arch (triplet);
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
runtime_id = ide_config_get_runtime_id (config);
if (runtime_id == NULL ||
diff --git a/src/plugins/glade/gbp-glade-workbench-addin.c b/src/plugins/glade/gbp-glade-workbench-addin.c
index 2c1d60b6d..77aa47593 100644
--- a/src/plugins/glade/gbp-glade-workbench-addin.c
+++ b/src/plugins/glade/gbp-glade-workbench-addin.c
@@ -248,7 +248,7 @@ on_build_pipeline_changed_cb (GbpGladeWorkbenchAddin *self,
if (pipeline != NULL)
{
- IdeConfig *config = ide_build_pipeline_get_configuration (pipeline);
+ IdeConfig *config = ide_build_pipeline_get_config (pipeline);
IdeRuntime *runtime = ide_build_pipeline_get_runtime (pipeline);
g_autoptr(GFile) translated = NULL;
g_autoptr(GFile) catalog_file = NULL;
diff --git a/src/plugins/gradle/gradle_plugin.py b/src/plugins/gradle/gradle_plugin.py
index 7ea71c430..4eea2fb77 100755
--- a/src/plugins/gradle/gradle_plugin.py
+++ b/src/plugins/gradle/gradle_plugin.py
@@ -68,7 +68,7 @@ class GradlePipelineAddin(Ide.Object, Ide.BuildPipelineAddin):
if type(build_system) != GradleBuildSystem:
return
- config = pipeline.get_configuration()
+ config = pipeline.get_config()
builddir = pipeline.get_builddir()
runtime = config.get_runtime()
srcdir = pipeline.get_srcdir()
diff --git a/src/plugins/make/make_plugin.py b/src/plugins/make/make_plugin.py
index 4e5e46f8a..ce598de78 100644
--- a/src/plugins/make/make_plugin.py
+++ b/src/plugins/make/make_plugin.py
@@ -83,7 +83,7 @@ class MakePipelineAddin(Ide.Object, Ide.BuildPipelineAddin):
if type(build_system) != MakeBuildSystem:
return
- config = pipeline.get_configuration()
+ config = pipeline.get_config()
runtime = config.get_runtime()
# If the configuration has set $MAKE, then use it.
diff --git a/src/plugins/maven/maven_plugin.py b/src/plugins/maven/maven_plugin.py
index f49fca56d..1032bccb9 100755
--- a/src/plugins/maven/maven_plugin.py
+++ b/src/plugins/maven/maven_plugin.py
@@ -67,7 +67,7 @@ class MavenPipelineAddin(Ide.Object, Ide.BuildPipelineAddin):
if type(build_system) != MavenBuildSystem:
return
- config = pipeline.get_configuration()
+ config = pipeline.get_config()
builddir = pipeline.get_builddir()
runtime = config.get_runtime()
srcdir = pipeline.get_srcdir()
diff --git a/src/plugins/meson/gbp-meson-build-system.c b/src/plugins/meson/gbp-meson-build-system.c
index 4b7e9e9e7..9da78e7af 100644
--- a/src/plugins/meson/gbp-meson-build-system.c
+++ b/src/plugins/meson/gbp-meson-build-system.c
@@ -647,7 +647,7 @@ gbp_meson_build_system_get_builddir (IdeBuildSystem *build_system,
* then use "_build" as our build directory to build in-tree.
*/
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
locality = ide_config_get_locality (config);
if ((locality & IDE_BUILD_LOCALITY_OUT_OF_TREE) == 0)
diff --git a/src/plugins/meson/gbp-meson-pipeline-addin.c b/src/plugins/meson/gbp-meson-pipeline-addin.c
index 88cc4c565..6562f27fb 100644
--- a/src/plugins/meson/gbp-meson-pipeline-addin.c
+++ b/src/plugins/meson/gbp-meson-pipeline-addin.c
@@ -138,7 +138,7 @@ gbp_meson_pipeline_addin_load (IdeBuildPipelineAddin *addin,
if (!GBP_IS_MESON_BUILD_SYSTEM (build_system))
IDE_GOTO (failure);
- config = ide_build_pipeline_get_configuration (pipeline);
+ config = ide_build_pipeline_get_config (pipeline);
runtime = ide_build_pipeline_get_runtime (pipeline);
toolchain = ide_build_pipeline_get_toolchain (pipeline);
srcdir = ide_build_pipeline_get_srcdir (pipeline);
diff --git a/src/plugins/npm/npm_plugin.py b/src/plugins/npm/npm_plugin.py
index bc57aecc6..be3b08059 100644
--- a/src/plugins/npm/npm_plugin.py
+++ b/src/plugins/npm/npm_plugin.py
@@ -69,7 +69,7 @@ class NPMPipelineAddin(Ide.Object, Ide.BuildPipelineAddin):
return
package_json = build_system.props.project_file
- config = pipeline.get_configuration()
+ config = pipeline.get_config()
builddir = pipeline.get_builddir()
runtime = config.get_runtime()
diff --git a/src/plugins/phpize/phpize_plugin.py b/src/plugins/phpize/phpize_plugin.py
index f162a1e31..41999815f 100644
--- a/src/plugins/phpize/phpize_plugin.py
+++ b/src/plugins/phpize/phpize_plugin.py
@@ -177,7 +177,7 @@ class PHPizeBuildPipelineAddin(Ide.Object, Ide.BuildPipelineAddin):
if type(build_system) != PHPizeBuildSystem:
return
- config = pipeline.get_configuration()
+ config = pipeline.get_config()
runtime = config.get_runtime()
srcdir = pipeline.get_srcdir()
diff --git a/src/plugins/valgrind/valgrind_plugin.py b/src/plugins/valgrind/valgrind_plugin.py
index d067c4d44..67fbf8f75 100644
--- a/src/plugins/valgrind/valgrind_plugin.py
+++ b/src/plugins/valgrind/valgrind_plugin.py
@@ -47,7 +47,7 @@ class ValgrindWorkbenchAddin(GObject.Object, Ide.WorkbenchAddin):
# valgrind inside the runtime environment.
pipeline = build_manager.get_pipeline()
if pipeline is not None:
- runtime = pipeline.get_configuration().get_runtime()
+ runtime = pipeline.get_config().get_runtime()
if runtime and runtime.contains_program_in_path('valgrind'):
if not self.has_handler:
run_manager.add_handler('valgrind', _('Run with Valgrind'), 'system-run-symbolic',
'<primary>F10', self.valgrind_handler)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]