[gnome-builder] foundry: rename IdeConfiguration* to IdeConfig
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] foundry: rename IdeConfiguration* to IdeConfig
- Date: Thu, 10 Jan 2019 20:15:36 +0000 (UTC)
commit 9b1bf50524f76ba9f5f9a305ca52209de809dab8
Author: Christian Hergert <chergert redhat com>
Date: Thu Jan 10 12:15:18 2019 -0800
foundry: rename IdeConfiguration* to IdeConfig
This handles the core IdeConfiguration object renamin to IdeConfig. We
still need to adjust the plugins to rename their corresponding objects,
but they will continue to work in the mean time.
src/libide/foundry/ide-build-manager.c | 16 +-
src/libide/foundry/ide-build-pipeline.c | 52 +-
src/libide/foundry/ide-build-pipeline.h | 4 +-
src/libide/foundry/ide-build-system.c | 6 +-
...onfiguration-manager.c => ide-config-manager.c} | 498 ++++++++--------
...onfiguration-manager.h => ide-config-manager.h} | 34 +-
...onfiguration-private.h => ide-config-private.h} | 6 +-
...figuration-provider.c => ide-config-provider.c} | 216 +++----
...figuration-provider.h => ide-config-provider.h} | 60 +-
.../foundry/{ide-configuration.c => ide-config.c} | 628 ++++++++++-----------
.../foundry/{ide-configuration.h => ide-config.h} | 126 ++---
src/libide/foundry/ide-device.c | 6 +-
src/libide/foundry/ide-device.h | 4 +-
src/libide/foundry/ide-foundry-compat.c | 12 +-
src/libide/foundry/ide-foundry-init.c | 4 +-
src/libide/foundry/ide-foundry-types.h | 6 +-
src/libide/foundry/ide-run-manager.c | 20 +-
src/libide/foundry/ide-runner.c | 34 +-
src/libide/foundry/ide-runtime-manager.c | 6 +-
src/libide/foundry/ide-runtime-provider.c | 6 +-
src/libide/foundry/ide-runtime.c | 14 +-
src/libide/foundry/ide-runtime.h | 4 +-
src/libide/foundry/ide-toolchain-manager.c | 6 +-
src/libide/foundry/libide-foundry.h | 6 +-
src/libide/foundry/meson.build | 16 +-
src/libide/gui/ide-config-view-addin.c | 4 +-
src/libide/gui/ide-config-view-addin.h | 4 +-
src/libide/gui/ide-workbench.c | 2 +-
src/plugins/autotools/ide-autotools-make-stage.c | 4 +-
.../autotools/ide-autotools-makecache-stage.c | 4 +-
.../autotools/ide-autotools-pipeline-addin.c | 10 +-
src/plugins/autotools/ide-makecache.c | 10 +-
src/plugins/buildconfig/buildconfig-plugin.c | 2 +-
.../ide-buildconfig-configuration-provider.c | 140 ++---
.../buildconfig/ide-buildconfig-configuration.c | 4 +-
.../buildconfig/ide-buildconfig-configuration.h | 2 +-
.../buildconfig/ide-buildconfig-pipeline-addin.c | 4 +-
src/plugins/buildui/gbp-buildui-config-surface.c | 28 +-
src/plugins/buildui/gbp-buildui-config-surface.h | 2 +-
.../buildui/gbp-buildui-config-view-addin.c | 46 +-
src/plugins/buildui/gbp-buildui-omni-bar-section.c | 8 +-
src/plugins/buildui/gbp-buildui-runtime-row.c | 14 +-
src/plugins/buildui/gbp-buildui-runtime-row.h | 2 +-
src/plugins/buildui/gbp-buildui-workspace-addin.c | 12 +-
src/plugins/cmake/gbp-cmake-build-system.c | 10 +-
src/plugins/cmake/gbp-cmake-pipeline-addin.c | 12 +-
src/plugins/deviced/gbp-deviced-deploy-strategy.c | 10 +-
src/plugins/flatpak/flatpak-plugin.c | 2 +-
.../flatpak/gbp-flatpak-build-target-provider.c | 8 +-
.../flatpak/gbp-flatpak-configuration-provider.c | 84 +--
src/plugins/flatpak/gbp-flatpak-download-stage.c | 4 +-
src/plugins/flatpak/gbp-flatpak-manifest.c | 50 +-
src/plugins/flatpak/gbp-flatpak-manifest.h | 2 +-
src/plugins/flatpak/gbp-flatpak-pipeline-addin.c | 18 +-
src/plugins/flatpak/gbp-flatpak-runner.c | 10 +-
src/plugins/flatpak/gbp-flatpak-runtime-provider.c | 6 +-
src/plugins/flatpak/gbp-flatpak-runtime.c | 20 +-
src/plugins/flatpak/gbp-flatpak-workbench-addin.c | 2 +-
src/plugins/gjs-symbols/gjs_symbols.py | 2 +-
src/plugins/glade/gbp-glade-workbench-addin.c | 4 +-
src/plugins/meson/gbp-meson-build-system.c | 24 +-
src/plugins/meson/gbp-meson-pipeline-addin.c | 14 +-
src/plugins/sysprof/gbp-sysprof-workspace-addin.c | 10 +-
.../terminal/gbp-terminal-workspace-addin.c | 10 +-
src/plugins/vala-pack/ide-vala-index.vala | 2 +-
src/plugins/vala-pack/meson.build | 2 +-
.../vala-pack/{config.vapi => valaconfig.vapi} | 2 +-
67 files changed, 1200 insertions(+), 1200 deletions(-)
---
diff --git a/src/libide/foundry/ide-build-manager.c b/src/libide/foundry/ide-build-manager.c
index 9ab244b6b..f542d3451 100644
--- a/src/libide/foundry/ide-build-manager.c
+++ b/src/libide/foundry/ide-build-manager.c
@@ -31,8 +31,8 @@
#include "ide-build-manager.h"
#include "ide-build-pipeline.h"
#include "ide-build-private.h"
-#include "ide-configuration-manager.h"
-#include "ide-configuration.h"
+#include "ide-config-manager.h"
+#include "ide-config.h"
#include "ide-device-info.h"
#include "ide-device-manager.h"
#include "ide-device.h"
@@ -516,9 +516,9 @@ static void
ide_build_manager_invalidate_pipeline (IdeBuildManager *self)
{
g_autoptr(IdeTask) task = NULL;
- IdeConfigurationManager *config_manager;
+ IdeConfigManager *config_manager;
IdeDeviceManager *device_manager;
- IdeConfiguration *config;
+ IdeConfig *config;
IdeContext *context;
IdeDevice *device;
@@ -561,10 +561,10 @@ ide_build_manager_invalidate_pipeline (IdeBuildManager *self)
if (ide_object_in_destruction (IDE_OBJECT (context)))
IDE_EXIT;
- config_manager = ide_configuration_manager_from_context (context);
+ config_manager = ide_config_manager_from_context (context);
device_manager = ide_device_manager_from_context (context);
- config = ide_configuration_manager_get_current (config_manager);
+ config = ide_config_manager_get_current (config_manager);
device = ide_device_manager_get_device (device_manager);
/*
@@ -641,7 +641,7 @@ initable_init (GInitable *initable,
GError **error)
{
IdeBuildManager *self = (IdeBuildManager *)initable;
- IdeConfigurationManager *config_manager;
+ IdeConfigManager *config_manager;
IdeDeviceManager *device_manager;
IdeContext *context;
IdeVcs *vcs;
@@ -652,7 +652,7 @@ initable_init (GInitable *initable,
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
context = ide_object_get_context (IDE_OBJECT (self));
- config_manager = ide_configuration_manager_from_context (context);
+ config_manager = ide_config_manager_from_context (context);
device_manager = ide_device_manager_from_context (context);
vcs = ide_vcs_from_context (context);
diff --git a/src/libide/foundry/ide-build-pipeline.c b/src/libide/foundry/ide-build-pipeline.c
index e3c8ff91b..085b0e5a2 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.
*/
- IdeConfiguration *configuration;
+ IdeConfig *configuration;
/*
* The device we are building for. This allows components to setup
@@ -160,14 +160,14 @@ struct _IdeBuildPipeline
/*
* The runtime we're using to build. This may be different than what
- * is specified in the IdeConfiguration, as the @device could alter
+ * is specified in the IdeConfig, as the @device could alter
* what architecture we're building for (and/or cross-compiling).
*/
IdeRuntime *runtime;
/*
* The toolchain we're using to build. This may be different than what
- * is specified in the IdeConfiguration, as the @device could alter
+ * is specified in the IdeConfig, as the @device could alter
* what architecture we're building for (and/or cross-compiling).
*/
IdeToolchain *toolchain;
@@ -828,13 +828,13 @@ ide_build_pipeline_get_phase (IdeBuildPipeline *self)
/**
* ide_build_pipeline_get_configuration:
*
- * Gets the #IdeConfiguration to use for the pipeline.
+ * Gets the #IdeConfig to use for the pipeline.
*
- * Returns: (transfer none): An #IdeConfiguration
+ * Returns: (transfer none): An #IdeConfig
*
* Since: 3.32
*/
-IdeConfiguration *
+IdeConfig *
ide_build_pipeline_get_configuration (IdeBuildPipeline *self)
{
g_return_val_if_fail (IDE_IS_BUILD_PIPELINE (self), NULL);
@@ -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_CONFIGURATION (self->configuration));
+ g_assert (IDE_IS_CONFIG (self->configuration));
- if (NULL == (build_commands = ide_configuration_get_build_commands (self->configuration)))
+ if (NULL == (build_commands = ide_config_get_build_commands (self->configuration)))
return;
- if ((rundir = ide_configuration_get_build_commands_dir (self->configuration)))
+ if ((rundir = ide_config_get_build_commands_dir (self->configuration)))
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_CONFIGURATION (self->configuration));
+ g_assert (IDE_IS_CONFIG (self->configuration));
- post_install_commands = ide_configuration_get_post_install_commands (self->configuration);
+ post_install_commands = ide_config_get_post_install_commands (self->configuration);
if (post_install_commands == NULL)
return;
for (guint i = 0; post_install_commands[i]; i++)
@@ -1147,7 +1147,7 @@ ide_build_pipeline_load_cb (IdleLoadState *state)
*
* This manages the loading of addins which will register their necessary build
* stages. We do this separately from ::constructed so that we can
- * enable/disable the pipeline as the IdeConfiguration:ready property changes.
+ * enable/disable the pipeline as the IdeConfig:ready property changes.
* This could happen when the device or runtime is added/removed while the
* application is running.
*
@@ -1291,12 +1291,12 @@ ide_build_pipeline_unload (IdeBuildPipeline *self)
static void
ide_build_pipeline_notify_ready (IdeBuildPipeline *self,
GParamSpec *pspec,
- IdeConfiguration *configuration)
+ IdeConfig *configuration)
{
IDE_ENTRY;
g_assert (IDE_IS_BUILD_PIPELINE (self));
- g_assert (IDE_IS_CONFIGURATION (configuration));
+ g_assert (IDE_IS_CONFIG (configuration));
/*
* If we're being realistic, we can only really setup the build pipeline one
@@ -1305,7 +1305,7 @@ ide_build_pipeline_notify_ready (IdeBuildPipeline *self,
* the active configuration changes.
*/
- if (ide_configuration_get_ready (configuration))
+ if (ide_config_get_ready (configuration))
{
g_signal_handlers_disconnect_by_func (configuration,
G_CALLBACK (ide_build_pipeline_notify_ready),
@@ -1388,7 +1388,7 @@ ide_build_pipeline_initable_init (GInitable *initable,
IDE_ENTRY;
g_assert (IDE_IS_BUILD_PIPELINE (self));
- g_assert (IDE_IS_CONFIGURATION (self->configuration));
+ g_assert (IDE_IS_CONFIG (self->configuration));
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
g_debug ("initializing build pipeline with device %s",
@@ -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_CONFIGURATION (self->configuration));
+ g_assert (IDE_IS_CONFIG (self->configuration));
if (parent == NULL)
return;
@@ -1573,7 +1573,7 @@ ide_build_pipeline_class_init (IdeBuildPipelineClass *klass)
g_param_spec_object ("configuration",
"Configuration",
"Configuration",
- IDE_TYPE_CONFIGURATION,
+ IDE_TYPE_CONFIG,
(G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
/**
@@ -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_configuration_get_ready (self->configuration))
+ if (!ide_config_get_ready (self->configuration))
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_configuration_get_runtime (self->configuration);
+ runtime = ide_config_get_runtime (self->configuration);
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_configuration_get_runtime_id (self->configuration));
+ ide_config_get_runtime_id (self->configuration));
return NULL;
}
@@ -2925,7 +2925,7 @@ ide_build_pipeline_create_launcher (IdeBuildPipeline *self,
if (ret != NULL)
{
- IdeEnvironment *env = ide_configuration_get_environment (self->configuration);
+ IdeEnvironment *env = ide_config_get_environment (self->configuration);
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_configuration_apply_path (self->configuration, ret);
+ ide_config_apply_path (self->configuration, 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_configuration_set_toolchain (self->configuration, toolchain);
+ ide_config_set_toolchain (self->configuration, 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_configuration_get_toolchain (self->configuration);
- runtime = ide_configuration_get_runtime (self->configuration);
+ toolchain = ide_config_get_toolchain (self->configuration);
+ runtime = ide_config_get_runtime (self->configuration);
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 37065956a..e85476c06 100644
--- a/src/libide/foundry/ide-build-pipeline.h
+++ b/src/libide/foundry/ide-build-pipeline.h
@@ -33,7 +33,7 @@
#include "ide-build-log.h"
#include "ide-build-stage.h"
-#include "ide-configuration.h"
+#include "ide-config.h"
#include "ide-runtime.h"
#include "ide-triplet.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
-IdeConfiguration *ide_build_pipeline_get_configuration (IdeBuildPipeline *self);
+IdeConfig *ide_build_pipeline_get_configuration (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 d2820d7fd..6d07294b7 100644
--- a/src/libide/foundry/ide-build-system.c
+++ b/src/libide/foundry/ide-build-system.c
@@ -31,7 +31,7 @@
#include "ide-build-manager.h"
#include "ide-build-pipeline.h"
#include "ide-build-system.h"
-#include "ide-configuration.h"
+#include "ide-config.h"
#include "ide-device.h"
#include "ide-foundry-compat.h"
#include "ide-toolchain.h"
@@ -465,7 +465,7 @@ ide_build_system_get_builddir (IdeBuildSystem *self,
{
g_autofree gchar *name = NULL;
g_autofree gchar *branch = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
const gchar *config_id;
const gchar *runtime_id;
IdeRuntime *runtime;
@@ -475,7 +475,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_id = ide_configuration_get_id (config);
+ config_id = ide_config_get_id (config);
runtime = ide_build_pipeline_get_runtime (pipeline);
runtime_id = ide_runtime_get_id (runtime);
branch = ide_vcs_get_branch_name (vcs);
diff --git a/src/libide/foundry/ide-configuration-manager.c b/src/libide/foundry/ide-config-manager.c
similarity index 60%
rename from src/libide/foundry/ide-configuration-manager.c
rename to src/libide/foundry/ide-config-manager.c
index d5c712f12..8eeb86835 100644
--- a/src/libide/foundry/ide-configuration-manager.c
+++ b/src/libide/foundry/ide-config-manager.c
@@ -1,4 +1,4 @@
-/* ide-configuration-manager.c
+/* ide-config-manager.c
*
* Copyright 2016-2019 Christian Hergert <chergert redhat com>
*
@@ -18,7 +18,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-#define G_LOG_DOMAIN "ide-configuration-manager"
+#define G_LOG_DOMAIN "ide-config-manager"
#include "config.h"
@@ -27,20 +27,20 @@
#include <libide-threading.h>
#include <libpeas/peas.h>
-#include "ide-configuration-manager.h"
-#include "ide-configuration-private.h"
-#include "ide-configuration.h"
-#include "ide-configuration-provider.h"
+#include "ide-config-manager.h"
+#include "ide-config-private.h"
+#include "ide-config.h"
+#include "ide-config-provider.h"
#define WRITEBACK_DELAY_SEC 3
-struct _IdeConfigurationManager
+struct _IdeConfigManager
{
GObject parent_instance;
GCancellable *cancellable;
GArray *configs;
- IdeConfiguration *current;
+ IdeConfig *current;
PeasExtensionSet *providers;
GSettings *project_settings;
@@ -51,31 +51,31 @@ struct _IdeConfigurationManager
typedef struct
{
- IdeConfigurationProvider *provider;
- IdeConfiguration *config;
+ IdeConfigProvider *provider;
+ IdeConfig *config;
} ConfigInfo;
static void async_initable_iface_init (GAsyncInitableIface *iface);
static void list_model_iface_init (GListModelInterface *iface);
-static void ide_configuration_manager_save_tick (IdeTask *task);
-static void ide_configuration_manager_actions_current (IdeConfigurationManager *self,
+static void ide_config_manager_save_tick (IdeTask *task);
+static void ide_config_manager_actions_current (IdeConfigManager *self,
GVariant *param);
-static void ide_configuration_manager_actions_delete (IdeConfigurationManager *self,
+static void ide_config_manager_actions_delete (IdeConfigManager *self,
GVariant *param);
-static void ide_configuration_manager_actions_duplicate (IdeConfigurationManager *self,
+static void ide_config_manager_actions_duplicate (IdeConfigManager *self,
GVariant *param);
-DZL_DEFINE_ACTION_GROUP (IdeConfigurationManager, ide_configuration_manager, {
- { "current", ide_configuration_manager_actions_current, "s" },
- { "delete", ide_configuration_manager_actions_delete, "s" },
- { "duplicate", ide_configuration_manager_actions_duplicate, "s" },
+DZL_DEFINE_ACTION_GROUP (IdeConfigManager, ide_config_manager, {
+ { "current", ide_config_manager_actions_current, "s" },
+ { "delete", ide_config_manager_actions_delete, "s" },
+ { "duplicate", ide_config_manager_actions_duplicate, "s" },
})
-G_DEFINE_TYPE_EXTENDED (IdeConfigurationManager, ide_configuration_manager, IDE_TYPE_OBJECT, 0,
+G_DEFINE_TYPE_EXTENDED (IdeConfigManager, ide_config_manager, IDE_TYPE_OBJECT, 0,
G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, list_model_iface_init)
G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE, async_initable_iface_init)
G_IMPLEMENT_INTERFACE (G_TYPE_ACTION_GROUP,
- ide_configuration_manager_init_action_group))
+ ide_config_manager_init_action_group))
enum {
PROP_0,
@@ -103,10 +103,10 @@ config_info_clear (gpointer data)
}
static void
-ide_configuration_manager_actions_current (IdeConfigurationManager *self,
+ide_config_manager_actions_current (IdeConfigManager *self,
GVariant *param)
{
- IdeConfiguration *config;
+ IdeConfig *config;
const gchar *id;
g_assert (IDE_IS_MAIN_THREAD ());
@@ -115,15 +115,15 @@ ide_configuration_manager_actions_current (IdeConfigurationManager *self,
id = g_variant_get_string (param, NULL);
- if ((config = ide_configuration_manager_get_configuration (self, id)))
- ide_configuration_manager_set_current (self, config);
+ if ((config = ide_config_manager_get_configuration (self, id)))
+ ide_config_manager_set_current (self, config);
}
static void
-ide_configuration_manager_actions_duplicate (IdeConfigurationManager *self,
+ide_config_manager_actions_duplicate (IdeConfigManager *self,
GVariant *param)
{
- IdeConfiguration *config;
+ IdeConfig *config;
const gchar *id;
g_assert (IDE_IS_MAIN_THREAD ());
@@ -132,15 +132,15 @@ ide_configuration_manager_actions_duplicate (IdeConfigurationManager *self,
id = g_variant_get_string (param, NULL);
- if ((config = ide_configuration_manager_get_configuration (self, id)))
- ide_configuration_manager_duplicate (self, config);
+ if ((config = ide_config_manager_get_configuration (self, id)))
+ ide_config_manager_duplicate (self, config);
}
static void
-ide_configuration_manager_actions_delete (IdeConfigurationManager *self,
+ide_config_manager_actions_delete (IdeConfigManager *self,
GVariant *param)
{
- IdeConfiguration *config;
+ IdeConfig *config;
const gchar *id;
g_assert (IDE_IS_MAIN_THREAD ());
@@ -149,53 +149,53 @@ ide_configuration_manager_actions_delete (IdeConfigurationManager *self,
id = g_variant_get_string (param, NULL);
- if ((config = ide_configuration_manager_get_configuration (self, id)))
- ide_configuration_manager_delete (self, config);
+ if ((config = ide_config_manager_get_configuration (self, id)))
+ ide_config_manager_delete (self, config);
}
static void
-ide_configuration_manager_collect_providers (PeasExtensionSet *set,
+ide_config_manager_collect_providers (PeasExtensionSet *set,
PeasPluginInfo *plugin_info,
PeasExtension *exten,
gpointer user_data)
{
- IdeConfigurationProvider *provider = (IdeConfigurationProvider *)exten;
+ IdeConfigProvider *provider = (IdeConfigProvider *)exten;
GPtrArray *providers = user_data;
g_assert (PEAS_IS_EXTENSION_SET (set));
g_assert (plugin_info != NULL);
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (provider));
+ g_assert (IDE_IS_CONFIG_PROVIDER (provider));
g_assert (providers != NULL);
g_ptr_array_add (providers, g_object_ref (provider));
}
static void
-ide_configuration_manager_save_cb (GObject *object,
+ide_config_manager_save_cb (GObject *object,
GAsyncResult *result,
gpointer user_data)
{
- IdeConfigurationProvider *provider = (IdeConfigurationProvider *)object;
+ IdeConfigProvider *provider = (IdeConfigProvider *)object;
g_autoptr(IdeTask) task = user_data;
g_autoptr(GError) error = NULL;
IDE_ENTRY;
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (provider));
+ g_assert (IDE_IS_CONFIG_PROVIDER (provider));
g_assert (IDE_IS_TASK (task));
- if (!ide_configuration_provider_save_finish (provider, result, &error))
+ if (!ide_config_provider_save_finish (provider, result, &error))
g_warning ("%s: %s", G_OBJECT_TYPE_NAME (provider), error->message);
- ide_configuration_manager_save_tick (task);
+ ide_config_manager_save_tick (task);
IDE_EXIT;
}
static void
-ide_configuration_manager_save_tick (IdeTask *task)
+ide_config_manager_save_tick (IdeTask *task)
{
- IdeConfigurationProvider *provider;
+ IdeConfigProvider *provider;
GCancellable *cancellable;
GPtrArray *providers;
@@ -214,11 +214,11 @@ ide_configuration_manager_save_tick (IdeTask *task)
provider = g_ptr_array_index (providers, providers->len - 1);
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (provider));
+ g_assert (IDE_IS_CONFIG_PROVIDER (provider));
- ide_configuration_provider_save_async (provider,
+ ide_config_provider_save_async (provider,
cancellable,
- ide_configuration_manager_save_cb,
+ ide_config_manager_save_cb,
g_object_ref (task));
g_ptr_array_remove_index (providers, providers->len - 1);
@@ -227,7 +227,7 @@ ide_configuration_manager_save_tick (IdeTask *task)
}
void
-ide_configuration_manager_save_async (IdeConfigurationManager *self,
+ide_config_manager_save_async (IdeConfigManager *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -237,65 +237,65 @@ ide_configuration_manager_save_async (IdeConfigurationManager *self,
IDE_ENTRY;
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
task = ide_task_new (self, cancellable, callback, user_data);
- ide_task_set_source_tag (task, ide_configuration_manager_save_async);
+ ide_task_set_source_tag (task, ide_config_manager_save_async);
ide_task_set_priority (task, G_PRIORITY_LOW);
providers = g_ptr_array_new_with_free_func (g_object_unref);
peas_extension_set_foreach (self->providers,
- ide_configuration_manager_collect_providers,
+ ide_config_manager_collect_providers,
providers);
ide_task_set_task_data (task, g_ptr_array_ref (providers), g_ptr_array_unref);
if (providers->len == 0)
ide_task_return_boolean (task, TRUE);
else
- ide_configuration_manager_save_tick (task);
+ ide_config_manager_save_tick (task);
IDE_EXIT;
}
gboolean
-ide_configuration_manager_save_finish (IdeConfigurationManager *self,
+ide_config_manager_save_finish (IdeConfigManager *self,
GAsyncResult *result,
GError **error)
{
- g_return_val_if_fail (IDE_IS_CONFIGURATION_MANAGER (self), FALSE);
+ g_return_val_if_fail (IDE_IS_CONFIG_MANAGER (self), FALSE);
g_return_val_if_fail (IDE_IS_TASK (result), FALSE);
return ide_task_propagate_boolean (IDE_TASK (result), error);
}
/**
- * ide_configuration_manager_get_configuration:
- * @self: An #IdeConfigurationManager
+ * ide_config_manager_get_configuration:
+ * @self: An #IdeConfigManager
* @id: The string identifier of the configuration
*
- * Gets the #IdeConfiguration by id. See ide_configuration_get_id().
+ * Gets the #IdeConfig by id. See ide_config_get_id().
*
- * Returns: (transfer none) (nullable): An #IdeConfiguration or %NULL if
+ * Returns: (transfer none) (nullable): An #IdeConfig or %NULL if
* the configuration could not be found.
*
* Since: 3.32
*/
-IdeConfiguration *
-ide_configuration_manager_get_configuration (IdeConfigurationManager *self,
+IdeConfig *
+ide_config_manager_get_configuration (IdeConfigManager *self,
const gchar *id)
{
g_return_val_if_fail (IDE_IS_MAIN_THREAD (), NULL);
- g_return_val_if_fail (IDE_IS_CONFIGURATION_MANAGER (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG_MANAGER (self), NULL);
g_return_val_if_fail (id != NULL, NULL);
for (guint i = 0; i < self->configs->len; i++)
{
const ConfigInfo *info = &g_array_index (self->configs, ConfigInfo, i);
- g_assert (IDE_IS_CONFIGURATION (info->config));
+ g_assert (IDE_IS_CONFIG (info->config));
- if (ide_str_equal0 (id, ide_configuration_get_id (info->config)))
+ if (ide_str_equal0 (id, ide_config_get_id (info->config)))
return info->config;
}
@@ -303,91 +303,91 @@ ide_configuration_manager_get_configuration (IdeConfigurationManager *self,
}
static const gchar *
-ide_configuration_manager_get_display_name (IdeConfigurationManager *self)
+ide_config_manager_get_display_name (IdeConfigManager *self)
{
- g_return_val_if_fail (IDE_IS_CONFIGURATION_MANAGER (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG_MANAGER (self), NULL);
if (self->current != NULL)
- return ide_configuration_get_display_name (self->current);
+ return ide_config_get_display_name (self->current);
return "";
}
static void
-ide_configuration_manager_notify_display_name (IdeConfigurationManager *self,
+ide_config_manager_notify_display_name (IdeConfigManager *self,
GParamSpec *pspec,
- IdeConfiguration *configuration)
+ IdeConfig *configuration)
{
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
- g_assert (IDE_IS_CONFIGURATION (configuration));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
+ g_assert (IDE_IS_CONFIG (configuration));
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_CURRENT_DISPLAY_NAME]);
}
static void
-ide_configuration_manager_notify_ready (IdeConfigurationManager *self,
+ide_config_manager_notify_ready (IdeConfigManager *self,
GParamSpec *pspec,
- IdeConfiguration *configuration)
+ IdeConfig *configuration)
{
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
- g_assert (IDE_IS_CONFIGURATION (configuration));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
+ g_assert (IDE_IS_CONFIG (configuration));
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_READY]);
}
static void
-ide_configuration_manager_dispose (GObject *object)
+ide_config_manager_dispose (GObject *object)
{
- IdeConfigurationManager *self = (IdeConfigurationManager *)object;
+ IdeConfigManager *self = (IdeConfigManager *)object;
if (self->current != NULL)
{
g_signal_handlers_disconnect_by_func (self->current,
- G_CALLBACK (ide_configuration_manager_notify_display_name),
+ G_CALLBACK (ide_config_manager_notify_display_name),
self);
g_signal_handlers_disconnect_by_func (self->current,
- G_CALLBACK (ide_configuration_manager_notify_ready),
+ G_CALLBACK (ide_config_manager_notify_ready),
self);
}
g_cancellable_cancel (self->cancellable);
g_clear_object (&self->project_settings);
- G_OBJECT_CLASS (ide_configuration_manager_parent_class)->dispose (object);
+ G_OBJECT_CLASS (ide_config_manager_parent_class)->dispose (object);
}
static void
-ide_configuration_manager_finalize (GObject *object)
+ide_config_manager_finalize (GObject *object)
{
- IdeConfigurationManager *self = (IdeConfigurationManager *)object;
+ IdeConfigManager *self = (IdeConfigManager *)object;
g_clear_object (&self->current);
g_clear_object (&self->cancellable);
g_clear_pointer (&self->configs, g_array_unref);
- G_OBJECT_CLASS (ide_configuration_manager_parent_class)->finalize (object);
+ G_OBJECT_CLASS (ide_config_manager_parent_class)->finalize (object);
}
static void
-ide_configuration_manager_get_property (GObject *object,
+ide_config_manager_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
- IdeConfigurationManager *self = IDE_CONFIGURATION_MANAGER (object);
+ IdeConfigManager *self = IDE_CONFIG_MANAGER (object);
switch (prop_id)
{
case PROP_CURRENT:
- g_value_set_object (value, ide_configuration_manager_get_current (self));
+ g_value_set_object (value, ide_config_manager_get_current (self));
break;
case PROP_CURRENT_DISPLAY_NAME:
- g_value_set_string (value, ide_configuration_manager_get_display_name (self));
+ g_value_set_string (value, ide_config_manager_get_display_name (self));
break;
case PROP_READY:
- g_value_set_boolean (value, ide_configuration_manager_get_ready (self));
+ g_value_set_boolean (value, ide_config_manager_get_ready (self));
break;
default:
@@ -396,17 +396,17 @@ ide_configuration_manager_get_property (GObject *object,
}
static void
-ide_configuration_manager_set_property (GObject *object,
+ide_config_manager_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
- IdeConfigurationManager *self = IDE_CONFIGURATION_MANAGER (object);
+ IdeConfigManager *self = IDE_CONFIG_MANAGER (object);
switch (prop_id)
{
case PROP_CURRENT:
- ide_configuration_manager_set_current (self, g_value_get_object (value));
+ ide_config_manager_set_current (self, g_value_get_object (value));
break;
default:
@@ -415,20 +415,20 @@ ide_configuration_manager_set_property (GObject *object,
}
static void
-ide_configuration_manager_class_init (IdeConfigurationManagerClass *klass)
+ide_config_manager_class_init (IdeConfigManagerClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- object_class->dispose = ide_configuration_manager_dispose;
- object_class->finalize = ide_configuration_manager_finalize;
- object_class->get_property = ide_configuration_manager_get_property;
- object_class->set_property = ide_configuration_manager_set_property;
+ object_class->dispose = ide_config_manager_dispose;
+ object_class->finalize = ide_config_manager_finalize;
+ object_class->get_property = ide_config_manager_get_property;
+ object_class->set_property = ide_config_manager_set_property;
properties [PROP_CURRENT] =
g_param_spec_object ("current",
"Current",
"The current configuration for the context",
- IDE_TYPE_CONFIGURATION,
+ IDE_TYPE_CONFIG,
(G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
properties [PROP_CURRENT_DISPLAY_NAME] =
@@ -448,8 +448,8 @@ ide_configuration_manager_class_init (IdeConfigurationManagerClass *klass)
g_object_class_install_properties (object_class, LAST_PROP, properties);
/**
- * IdeConfigurationManager::invalidate:
- * @self: an #IdeConfigurationManager
+ * IdeConfigManager::invalidate:
+ * @self: an #IdeConfigManager
*
* This signal is emitted any time a new configuration is selected or the
* currently selected configurations state changes.
@@ -466,7 +466,7 @@ ide_configuration_manager_class_init (IdeConfigurationManagerClass *klass)
}
static void
-ide_configuration_manager_init (IdeConfigurationManager *self)
+ide_config_manager_init (IdeConfigManager *self)
{
self->cancellable = g_cancellable_new ();
self->configs = g_array_new (FALSE, FALSE, sizeof (ConfigInfo));
@@ -474,30 +474,30 @@ ide_configuration_manager_init (IdeConfigurationManager *self)
}
static GType
-ide_configuration_manager_get_item_type (GListModel *model)
+ide_config_manager_get_item_type (GListModel *model)
{
- return IDE_TYPE_CONFIGURATION;
+ return IDE_TYPE_CONFIG;
}
static guint
-ide_configuration_manager_get_n_items (GListModel *model)
+ide_config_manager_get_n_items (GListModel *model)
{
- IdeConfigurationManager *self = (IdeConfigurationManager *)model;
+ IdeConfigManager *self = (IdeConfigManager *)model;
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
g_assert (self->configs != NULL);
return self->configs->len;
}
static gpointer
-ide_configuration_manager_get_item (GListModel *model,
+ide_config_manager_get_item (GListModel *model,
guint position)
{
- IdeConfigurationManager *self = (IdeConfigurationManager *)model;
+ IdeConfigManager *self = (IdeConfigManager *)model;
const ConfigInfo *info;
- g_return_val_if_fail (IDE_IS_CONFIGURATION_MANAGER (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG_MANAGER (self), NULL);
g_return_val_if_fail (position < self->configs->len, NULL);
info = &g_array_index (self->configs, ConfigInfo, position);
@@ -508,61 +508,61 @@ ide_configuration_manager_get_item (GListModel *model,
static void
list_model_iface_init (GListModelInterface *iface)
{
- iface->get_item_type = ide_configuration_manager_get_item_type;
- iface->get_n_items = ide_configuration_manager_get_n_items;
- iface->get_item = ide_configuration_manager_get_item;
+ iface->get_item_type = ide_config_manager_get_item_type;
+ iface->get_n_items = ide_config_manager_get_n_items;
+ iface->get_item = ide_config_manager_get_item;
}
static gboolean
-ide_configuration_manager_do_save (gpointer data)
+ide_config_manager_do_save (gpointer data)
{
- IdeConfigurationManager *self = data;
+ IdeConfigManager *self = data;
IDE_ENTRY;
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
self->queued_save_source = 0;
g_signal_emit (self, signals [INVALIDATE], 0);
- ide_configuration_manager_save_async (self, NULL, NULL, NULL);
+ ide_config_manager_save_async (self, NULL, NULL, NULL);
IDE_RETURN (G_SOURCE_REMOVE);
}
static void
-ide_configuration_manager_changed (IdeConfigurationManager *self,
- IdeConfiguration *config)
+ide_config_manager_changed (IdeConfigManager *self,
+ IdeConfig *config)
{
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
+ g_assert (IDE_IS_CONFIG (config));
g_clear_handle_id (&self->queued_save_source, g_source_remove);
self->queued_save_source =
g_timeout_add_seconds_full (G_PRIORITY_LOW,
WRITEBACK_DELAY_SEC,
- ide_configuration_manager_do_save,
+ ide_config_manager_do_save,
g_object_ref (self),
g_object_unref);
}
static void
-ide_configuration_manager_config_added (IdeConfigurationManager *self,
- IdeConfiguration *config,
- IdeConfigurationProvider *provider)
+ide_config_manager_config_added (IdeConfigManager *self,
+ IdeConfig *config,
+ IdeConfigProvider *provider)
{
ConfigInfo info = {0};
IDE_ENTRY;
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
- g_assert (IDE_IS_CONFIGURATION (config));
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (provider));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
+ g_assert (IDE_IS_CONFIG (config));
+ g_assert (IDE_IS_CONFIG_PROVIDER (provider));
g_signal_connect_object (config,
"changed",
- G_CALLBACK (ide_configuration_manager_changed),
+ G_CALLBACK (ide_config_manager_changed),
self,
G_CONNECT_SWAPPED);
@@ -573,23 +573,23 @@ ide_configuration_manager_config_added (IdeConfigurationManager *self,
g_list_model_items_changed (G_LIST_MODEL (self), self->configs->len - 1, 0, 1);
if (self->current == NULL)
- ide_configuration_manager_set_current (self, config);
+ ide_config_manager_set_current (self, config);
- _ide_configuration_attach (config);
+ _ide_config_attach (config);
IDE_EXIT;
}
static void
-ide_configuration_manager_config_removed (IdeConfigurationManager *self,
- IdeConfiguration *config,
- IdeConfigurationProvider *provider)
+ide_config_manager_config_removed (IdeConfigManager *self,
+ IdeConfig *config,
+ IdeConfigProvider *provider)
{
IDE_ENTRY;
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
- g_assert (IDE_IS_CONFIGURATION (config));
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (provider));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
+ g_assert (IDE_IS_CONFIG (config));
+ g_assert (IDE_IS_CONFIG_PROVIDER (provider));
for (guint i = 0; i < self->configs->len; i++)
{
@@ -598,7 +598,7 @@ ide_configuration_manager_config_removed (IdeConfigurationManager *self,
if (info->provider == provider && info->config == config)
{
g_signal_handlers_disconnect_by_func (config,
- G_CALLBACK (ide_configuration_manager_changed),
+ G_CALLBACK (ide_config_manager_changed),
self);
g_array_remove_index (self->configs, i);
g_list_model_items_changed (G_LIST_MODEL (self), i, 1, 0);
@@ -610,24 +610,24 @@ ide_configuration_manager_config_removed (IdeConfigurationManager *self,
}
static void
-ide_configuration_manager_provider_load_cb (GObject *object,
+ide_config_manager_provider_load_cb (GObject *object,
GAsyncResult *result,
gpointer user_data)
{
- IdeConfigurationProvider *provider = (IdeConfigurationProvider *)object;
+ IdeConfigProvider *provider = (IdeConfigProvider *)object;
IdeContext *context;
- g_autoptr(IdeConfigurationManager) self = user_data;
+ g_autoptr(IdeConfigManager) self = user_data;
g_autoptr(GError) error = NULL;
IDE_ENTRY;
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (provider));
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
+ g_assert (IDE_IS_CONFIG_PROVIDER (provider));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
g_assert (IDE_IS_TASK (result));
context = ide_object_get_context (IDE_OBJECT (self));
- if (!ide_configuration_provider_load_finish (provider, result, &error))
+ if (!ide_config_provider_load_finish (provider, result, &error))
ide_context_warning (context,
"Failed to initialize config provider: %s: %s",
G_OBJECT_TYPE_NAME (provider), error->message);
@@ -636,81 +636,81 @@ ide_configuration_manager_provider_load_cb (GObject *object,
}
static void
-provider_connect (IdeConfigurationManager *self,
- IdeConfigurationProvider *provider)
+provider_connect (IdeConfigManager *self,
+ IdeConfigProvider *provider)
{
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (provider));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
+ g_assert (IDE_IS_CONFIG_PROVIDER (provider));
g_signal_connect_object (provider,
"added",
- G_CALLBACK (ide_configuration_manager_config_added),
+ G_CALLBACK (ide_config_manager_config_added),
self,
G_CONNECT_SWAPPED);
g_signal_connect_object (provider,
"removed",
- G_CALLBACK (ide_configuration_manager_config_removed),
+ G_CALLBACK (ide_config_manager_config_removed),
self,
G_CONNECT_SWAPPED);
}
static void
-provider_disconnect (IdeConfigurationManager *self,
- IdeConfigurationProvider *provider)
+provider_disconnect (IdeConfigManager *self,
+ IdeConfigProvider *provider)
{
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (provider));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
+ g_assert (IDE_IS_CONFIG_PROVIDER (provider));
g_signal_handlers_disconnect_by_func (provider,
- G_CALLBACK (ide_configuration_manager_config_added),
+ G_CALLBACK (ide_config_manager_config_added),
self);
g_signal_handlers_disconnect_by_func (provider,
- G_CALLBACK (ide_configuration_manager_config_removed),
+ G_CALLBACK (ide_config_manager_config_removed),
self);
}
static void
-ide_configuration_manager_provider_added (PeasExtensionSet *set,
+ide_config_manager_provider_added (PeasExtensionSet *set,
PeasPluginInfo *plugin_info,
PeasExtension *exten,
gpointer user_data)
{
- IdeConfigurationManager *self = user_data;
- IdeConfigurationProvider *provider = (IdeConfigurationProvider *)exten;
+ IdeConfigManager *self = user_data;
+ IdeConfigProvider *provider = (IdeConfigProvider *)exten;
g_assert (IDE_IS_MAIN_THREAD ());
g_assert (PEAS_IS_EXTENSION_SET (set));
g_assert (plugin_info != NULL);
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (provider));
+ g_assert (IDE_IS_CONFIG_PROVIDER (provider));
provider_connect (self, provider);
ide_object_append (IDE_OBJECT (self), IDE_OBJECT (provider));
- ide_configuration_provider_load_async (provider,
+ ide_config_provider_load_async (provider,
self->cancellable,
- ide_configuration_manager_provider_load_cb,
+ ide_config_manager_provider_load_cb,
g_object_ref (self));
}
static void
-ide_configuration_manager_provider_removed (PeasExtensionSet *set,
+ide_config_manager_provider_removed (PeasExtensionSet *set,
PeasPluginInfo *plugin_info,
PeasExtension *exten,
gpointer user_data)
{
- IdeConfigurationManager *self = user_data;
- IdeConfigurationProvider *provider = (IdeConfigurationProvider *)exten;
- g_autoptr(IdeConfigurationProvider) hold = NULL;
+ IdeConfigManager *self = user_data;
+ IdeConfigProvider *provider = (IdeConfigProvider *)exten;
+ g_autoptr(IdeConfigProvider) hold = NULL;
g_assert (IDE_IS_MAIN_THREAD ());
g_assert (PEAS_IS_EXTENSION_SET (set));
g_assert (plugin_info != NULL);
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (provider));
+ g_assert (IDE_IS_CONFIG_PROVIDER (provider));
hold = g_object_ref (provider);
- ide_configuration_provider_unload (provider);
+ ide_config_provider_unload (provider);
provider_disconnect (self, provider);
@@ -722,7 +722,7 @@ ide_configuration_manager_provider_removed (PeasExtensionSet *set,
{
g_warning ("%s failed to remove configuration \"%s\"",
G_OBJECT_TYPE_NAME (provider),
- ide_configuration_get_id (info->config));
+ ide_config_get_id (info->config));
g_array_remove_index (self->configs, i);
}
}
@@ -731,13 +731,13 @@ ide_configuration_manager_provider_removed (PeasExtensionSet *set,
}
static void
-notify_providers_loaded (IdeConfigurationManager *self,
+notify_providers_loaded (IdeConfigManager *self,
GParamSpec *pspec,
IdeTask *task)
{
g_autoptr(GVariant) user_value = NULL;
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
g_assert (IDE_IS_TASK (task));
if (self->project_settings == NULL)
@@ -765,12 +765,12 @@ notify_providers_loaded (IdeConfigurationManager *self,
if (user_value != NULL)
{
const gchar *str = g_variant_get_string (user_value, NULL);
- IdeConfiguration *config;
+ IdeConfig *config;
- if ((config = ide_configuration_manager_get_configuration (self, str)))
+ if ((config = ide_config_manager_get_configuration (self, str)))
{
if (config != self->current)
- ide_configuration_manager_set_current (self, config);
+ ide_config_manager_set_current (self, config);
}
}
@@ -778,12 +778,12 @@ notify_providers_loaded (IdeConfigurationManager *self,
}
static void
-ide_configuration_manager_init_load_cb (GObject *object,
+ide_config_manager_init_load_cb (GObject *object,
GAsyncResult *result,
gpointer user_data)
{
- IdeConfigurationProvider *provider = (IdeConfigurationProvider *)object;
- IdeConfigurationManager *self;
+ IdeConfigProvider *provider = (IdeConfigProvider *)object;
+ IdeConfigManager *self;
g_autoptr(GError) error = NULL;
g_autoptr(IdeTask) task = user_data;
GPtrArray *providers;
@@ -791,14 +791,14 @@ ide_configuration_manager_init_load_cb (GObject *object,
IDE_ENTRY;
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (provider));
+ g_assert (IDE_IS_CONFIG_PROVIDER (provider));
g_assert (G_IS_ASYNC_RESULT (result));
g_assert (IDE_IS_TASK (task));
self = ide_task_get_source_object (task);
- g_assert (IDE_IS_CONFIGURATION_MANAGER (self));
+ g_assert (IDE_IS_CONFIG_MANAGER (self));
- if (!ide_configuration_provider_load_finish (provider, result, &error))
+ if (!ide_config_provider_load_finish (provider, result, &error))
{
g_assert (error != NULL);
g_warning ("Failed to initialize config provider: %s: %s",
@@ -819,13 +819,13 @@ ide_configuration_manager_init_load_cb (GObject *object,
}
static void
-ide_configuration_manager_init_async (GAsyncInitable *initable,
+ide_config_manager_init_async (GAsyncInitable *initable,
gint priority,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
- IdeConfigurationManager *self = (IdeConfigurationManager *)initable;
+ IdeConfigManager *self = (IdeConfigManager *)initable;
g_autoptr(GPtrArray) providers = NULL;
g_autoptr(IdeTask) task = NULL;
IdeContext *context;
@@ -834,7 +834,7 @@ ide_configuration_manager_init_async (GAsyncInitable *initable,
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
task = ide_task_new (self, cancellable, callback, user_data);
- ide_task_set_source_tag (task, ide_configuration_manager_init_async);
+ ide_task_set_source_tag (task, ide_config_manager_init_async);
ide_task_set_priority (task, priority);
g_signal_connect_swapped (task,
@@ -848,43 +848,43 @@ ide_configuration_manager_init_async (GAsyncInitable *initable,
self->project_settings = ide_context_ref_project_settings (context);
self->providers = peas_extension_set_new (peas_engine_get_default (),
- IDE_TYPE_CONFIGURATION_PROVIDER,
+ IDE_TYPE_CONFIG_PROVIDER,
NULL);
g_signal_connect (self->providers,
"extension-added",
- G_CALLBACK (ide_configuration_manager_provider_added),
+ G_CALLBACK (ide_config_manager_provider_added),
self);
g_signal_connect (self->providers,
"extension-removed",
- G_CALLBACK (ide_configuration_manager_provider_removed),
+ G_CALLBACK (ide_config_manager_provider_removed),
self);
- /* We don't call ide_configuration_manager_provider_added() here for each
+ /* We don't call ide_config_manager_provider_added() here for each
* of our providers because we want to be in control of the async lifetime
* and delay our init_async() completion until loaders have finished
*/
providers = g_ptr_array_new_with_free_func (g_object_unref);
peas_extension_set_foreach (self->providers,
- ide_configuration_manager_collect_providers,
+ ide_config_manager_collect_providers,
providers);
ide_task_set_task_data (task, g_ptr_array_ref (providers), g_ptr_array_unref);
for (guint i = 0; i < providers->len; i++)
{
- IdeConfigurationProvider *provider = g_ptr_array_index (providers, i);
+ IdeConfigProvider *provider = g_ptr_array_index (providers, i);
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (provider));
+ g_assert (IDE_IS_CONFIG_PROVIDER (provider));
provider_connect (self, provider);
ide_object_append (IDE_OBJECT (self), IDE_OBJECT (provider));
- ide_configuration_provider_load_async (provider,
+ ide_config_provider_load_async (provider,
cancellable,
- ide_configuration_manager_init_load_cb,
+ ide_config_manager_init_load_cb,
g_object_ref (task));
}
@@ -893,12 +893,12 @@ ide_configuration_manager_init_async (GAsyncInitable *initable,
}
static gboolean
-ide_configuration_manager_init_finish (GAsyncInitable *initable,
+ide_config_manager_init_finish (GAsyncInitable *initable,
GAsyncResult *result,
GError **error)
{
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION_MANAGER (initable));
+ g_assert (IDE_IS_CONFIG_MANAGER (initable));
g_assert (IDE_IS_TASK (result));
return ide_task_propagate_boolean (IDE_TASK (result), error);
@@ -907,27 +907,27 @@ ide_configuration_manager_init_finish (GAsyncInitable *initable,
static void
async_initable_iface_init (GAsyncInitableIface *iface)
{
- iface->init_async = ide_configuration_manager_init_async;
- iface->init_finish = ide_configuration_manager_init_finish;
+ iface->init_async = ide_config_manager_init_async;
+ iface->init_finish = ide_config_manager_init_finish;
}
void
-ide_configuration_manager_set_current (IdeConfigurationManager *self,
- IdeConfiguration *current)
+ide_config_manager_set_current (IdeConfigManager *self,
+ IdeConfig *current)
{
g_return_if_fail (IDE_IS_MAIN_THREAD ());
- g_return_if_fail (IDE_IS_CONFIGURATION_MANAGER (self));
- g_return_if_fail (!current || IDE_IS_CONFIGURATION (current));
+ g_return_if_fail (IDE_IS_CONFIG_MANAGER (self));
+ g_return_if_fail (!current || IDE_IS_CONFIG (current));
if (self->current != current)
{
if (self->current != NULL)
{
g_signal_handlers_disconnect_by_func (self->current,
- G_CALLBACK (ide_configuration_manager_notify_display_name),
+ G_CALLBACK (ide_config_manager_notify_display_name),
self);
g_signal_handlers_disconnect_by_func (self->current,
- G_CALLBACK (ide_configuration_manager_notify_ready),
+ G_CALLBACK (ide_config_manager_notify_ready),
self);
g_clear_object (&self->current);
}
@@ -938,18 +938,18 @@ ide_configuration_manager_set_current (IdeConfigurationManager *self,
g_signal_connect_object (current,
"notify::display-name",
- G_CALLBACK (ide_configuration_manager_notify_display_name),
+ G_CALLBACK (ide_config_manager_notify_display_name),
self,
G_CONNECT_SWAPPED);
g_signal_connect_object (current,
"notify::ready",
- G_CALLBACK (ide_configuration_manager_notify_ready),
+ G_CALLBACK (ide_config_manager_notify_ready),
self,
G_CONNECT_SWAPPED);
if (self->propagate_to_settings && self->project_settings != NULL)
{
- g_autofree gchar *new_id = g_strdup (ide_configuration_get_id (current));
+ g_autofree gchar *new_id = g_strdup (ide_config_get_id (current));
g_settings_set_string (self->project_settings, "config-id", new_id);
}
}
@@ -963,8 +963,8 @@ ide_configuration_manager_set_current (IdeConfigurationManager *self,
}
/**
- * ide_configuration_manager_ref_current:
- * @self: An #IdeConfigurationManager
+ * ide_config_manager_ref_current:
+ * @self: An #IdeConfigManager
*
* Gets the current configuration to use for building.
*
@@ -973,16 +973,16 @@ ide_configuration_manager_set_current (IdeConfigurationManager *self,
* background items might use, such as tags builders which need to discover
* settings.
*
- * Returns: (transfer full): An #IdeConfiguration
+ * Returns: (transfer full): An #IdeConfig
*
* Since: 3.32
*/
-IdeConfiguration *
-ide_configuration_manager_ref_current (IdeConfigurationManager *self)
+IdeConfig *
+ide_config_manager_ref_current (IdeConfigManager *self)
{
- g_autoptr(IdeConfiguration) ret = NULL;
+ g_autoptr(IdeConfig) ret = NULL;
- g_return_val_if_fail (IDE_IS_CONFIGURATION_MANAGER (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG_MANAGER (self), NULL);
g_return_val_if_fail (self->current != NULL || self->configs->len > 0, NULL);
ide_object_lock (IDE_OBJECT (self));
@@ -993,8 +993,8 @@ ide_configuration_manager_ref_current (IdeConfigurationManager *self)
{
const ConfigInfo *info = &g_array_index (self->configs, ConfigInfo, 0);
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (info->provider));
- g_assert (IDE_IS_CONFIGURATION (info->config));
+ g_assert (IDE_IS_CONFIG_PROVIDER (info->provider));
+ g_assert (IDE_IS_CONFIG (info->config));
ret = g_object_ref (info->config);
}
@@ -1005,8 +1005,8 @@ ide_configuration_manager_ref_current (IdeConfigurationManager *self)
}
/**
- * ide_configuration_manager_get_current:
- * @self: An #IdeConfigurationManager
+ * ide_config_manager_get_current:
+ * @self: An #IdeConfigManager
*
* Gets the current configuration to use for building.
*
@@ -1015,15 +1015,15 @@ ide_configuration_manager_ref_current (IdeConfigurationManager *self)
* background items might use, such as tags builders which need to discover
* settings.
*
- * Returns: (transfer none): An #IdeConfiguration
+ * Returns: (transfer none): An #IdeConfig
*
* Since: 3.32
*/
-IdeConfiguration *
-ide_configuration_manager_get_current (IdeConfigurationManager *self)
+IdeConfig *
+ide_config_manager_get_current (IdeConfigManager *self)
{
g_return_val_if_fail (IDE_IS_MAIN_THREAD (), NULL);
- g_return_val_if_fail (IDE_IS_CONFIGURATION_MANAGER (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG_MANAGER (self), NULL);
g_return_val_if_fail (self->current != NULL || self->configs->len > 0, NULL);
if (self->current != NULL)
@@ -1033,8 +1033,8 @@ ide_configuration_manager_get_current (IdeConfigurationManager *self)
{
const ConfigInfo *info = &g_array_index (self->configs, ConfigInfo, 0);
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (info->provider));
- g_assert (IDE_IS_CONFIGURATION (info->config));
+ g_assert (IDE_IS_CONFIG_PROVIDER (info->provider));
+ g_assert (IDE_IS_CONFIG (info->config));
return info->config;
}
@@ -1045,65 +1045,65 @@ ide_configuration_manager_get_current (IdeConfigurationManager *self)
}
void
-ide_configuration_manager_duplicate (IdeConfigurationManager *self,
- IdeConfiguration *config)
+ide_config_manager_duplicate (IdeConfigManager *self,
+ IdeConfig *config)
{
- g_return_if_fail (IDE_IS_CONFIGURATION_MANAGER (self));
- g_return_if_fail (IDE_IS_CONFIGURATION (config));
+ g_return_if_fail (IDE_IS_CONFIG_MANAGER (self));
+ g_return_if_fail (IDE_IS_CONFIG (config));
for (guint i = 0; i < self->configs->len; i++)
{
const ConfigInfo *info = &g_array_index (self->configs, ConfigInfo, i);
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (info->provider));
- g_assert (IDE_IS_CONFIGURATION (info->config));
+ g_assert (IDE_IS_CONFIG_PROVIDER (info->provider));
+ g_assert (IDE_IS_CONFIG (info->config));
if (info->config == config)
{
- g_autoptr(IdeConfigurationProvider) provider = g_object_ref (info->provider);
+ g_autoptr(IdeConfigProvider) provider = g_object_ref (info->provider);
info = NULL; /* info becomes invalid */
- ide_configuration_provider_duplicate (provider, config);
- ide_configuration_provider_save_async (provider, NULL, NULL, NULL);
+ ide_config_provider_duplicate (provider, config);
+ ide_config_provider_save_async (provider, NULL, NULL, NULL);
break;
}
}
}
void
-ide_configuration_manager_delete (IdeConfigurationManager *self,
- IdeConfiguration *config)
+ide_config_manager_delete (IdeConfigManager *self,
+ IdeConfig *config)
{
- g_autoptr(IdeConfiguration) hold = NULL;
+ g_autoptr(IdeConfig) hold = NULL;
- g_return_if_fail (IDE_IS_CONFIGURATION_MANAGER (self));
- g_return_if_fail (IDE_IS_CONFIGURATION (config));
+ g_return_if_fail (IDE_IS_CONFIG_MANAGER (self));
+ g_return_if_fail (IDE_IS_CONFIG (config));
hold = g_object_ref (config);
for (guint i = 0; i < self->configs->len; i++)
{
const ConfigInfo *info = &g_array_index (self->configs, ConfigInfo, i);
- g_autoptr(IdeConfigurationProvider) provider = NULL;
+ g_autoptr(IdeConfigProvider) provider = NULL;
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (info->provider));
- g_assert (IDE_IS_CONFIGURATION (info->config));
+ g_assert (IDE_IS_CONFIG_PROVIDER (info->provider));
+ g_assert (IDE_IS_CONFIG (info->config));
provider = g_object_ref (info->provider);
if (info->config == config)
{
info = NULL; /* info becomes invalid */
- ide_configuration_provider_delete (provider, config);
- ide_configuration_provider_save_async (provider, NULL, NULL, NULL);
+ ide_config_provider_delete (provider, config);
+ ide_config_provider_save_async (provider, NULL, NULL, NULL);
break;
}
}
}
/**
- * ide_configuration_manager_get_ready:
- * @self: an #IdeConfigurationManager
+ * ide_config_manager_get_ready:
+ * @self: an #IdeConfigManager
*
* This returns %TRUE if the current configuration is ready for usage.
*
@@ -1117,33 +1117,33 @@ ide_configuration_manager_delete (IdeConfigurationManager *self,
* Since: 3.32
*/
gboolean
-ide_configuration_manager_get_ready (IdeConfigurationManager *self)
+ide_config_manager_get_ready (IdeConfigManager *self)
{
- IdeConfiguration *config;
+ IdeConfig *config;
- g_return_val_if_fail (IDE_IS_CONFIGURATION_MANAGER (self), FALSE);
+ g_return_val_if_fail (IDE_IS_CONFIG_MANAGER (self), FALSE);
- if ((config = ide_configuration_manager_get_current (self)))
- return ide_configuration_get_ready (config);
+ if ((config = ide_config_manager_get_current (self)))
+ return ide_config_get_ready (config);
return FALSE;
}
/**
- * ide_configuration_manager_ref_from_context:
+ * ide_config_manager_ref_from_context:
* @context: an #IdeContext
*
- * Thread-safe version of ide_configuration_manager_from_context().
+ * Thread-safe version of ide_config_manager_from_context().
*
- * Returns: (transfer full): an #IdeConfigurationManager
+ * Returns: (transfer full): an #IdeConfigManager
*
* Since: 3.32
*/
-IdeConfigurationManager *
-ide_configuration_manager_ref_from_context (IdeContext *context)
+IdeConfigManager *
+ide_config_manager_ref_from_context (IdeContext *context)
{
g_return_val_if_fail (IDE_IS_CONTEXT (context), NULL);
return ide_object_ensure_child_typed (IDE_OBJECT (context),
- IDE_TYPE_CONFIGURATION_MANAGER);
+ IDE_TYPE_CONFIG_MANAGER);
}
diff --git a/src/libide/foundry/ide-configuration-manager.h b/src/libide/foundry/ide-config-manager.h
similarity index 60%
rename from src/libide/foundry/ide-configuration-manager.h
rename to src/libide/foundry/ide-config-manager.h
index 040f58295..0d007e97b 100644
--- a/src/libide/foundry/ide-configuration-manager.h
+++ b/src/libide/foundry/ide-config-manager.h
@@ -1,4 +1,4 @@
-/* ide-configuration-manager.h
+/* ide-config-manager.h
*
* Copyright 2016-2019 Christian Hergert <chergert redhat com>
*
@@ -30,41 +30,41 @@
G_BEGIN_DECLS
-#define IDE_TYPE_CONFIGURATION_MANAGER (ide_configuration_manager_get_type())
+#define IDE_TYPE_CONFIG_MANAGER (ide_config_manager_get_type())
IDE_AVAILABLE_IN_3_32
-G_DECLARE_FINAL_TYPE (IdeConfigurationManager, ide_configuration_manager, IDE, CONFIGURATION_MANAGER,
IdeObject)
+G_DECLARE_FINAL_TYPE (IdeConfigManager, ide_config_manager, IDE, CONFIG_MANAGER, IdeObject)
IDE_AVAILABLE_IN_3_32
-IdeConfigurationManager *ide_configuration_manager_from_context (IdeContext *context);
+IdeConfigManager *ide_config_manager_from_context (IdeContext *context);
IDE_AVAILABLE_IN_3_32
-IdeConfigurationManager *ide_configuration_manager_ref_from_context (IdeContext *context);
+IdeConfigManager *ide_config_manager_ref_from_context (IdeContext *context);
IDE_AVAILABLE_IN_3_32
-IdeConfiguration *ide_configuration_manager_get_current (IdeConfigurationManager *self);
+IdeConfig *ide_config_manager_get_current (IdeConfigManager *self);
IDE_AVAILABLE_IN_3_32
-IdeConfiguration *ide_configuration_manager_ref_current (IdeConfigurationManager *self);
+IdeConfig *ide_config_manager_ref_current (IdeConfigManager *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_manager_set_current (IdeConfigurationManager *self,
- IdeConfiguration *configuration);
+void ide_config_manager_set_current (IdeConfigManager *self,
+ IdeConfig *configuration);
IDE_AVAILABLE_IN_3_32
-IdeConfiguration *ide_configuration_manager_get_configuration (IdeConfigurationManager *self,
+IdeConfig *ide_config_manager_get_configuration (IdeConfigManager *self,
const gchar *id);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_manager_duplicate (IdeConfigurationManager *self,
- IdeConfiguration *config);
+void ide_config_manager_duplicate (IdeConfigManager *self,
+ IdeConfig *config);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_manager_delete (IdeConfigurationManager *self,
- IdeConfiguration *config);
+void ide_config_manager_delete (IdeConfigManager *self,
+ IdeConfig *config);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_manager_save_async (IdeConfigurationManager *self,
+void ide_config_manager_save_async (IdeConfigManager *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
IDE_AVAILABLE_IN_3_32
-gboolean ide_configuration_manager_save_finish (IdeConfigurationManager *self,
+gboolean ide_config_manager_save_finish (IdeConfigManager *self,
GAsyncResult *result,
GError **error);
IDE_AVAILABLE_IN_3_32
-gboolean ide_configuration_manager_get_ready (IdeConfigurationManager *self);
+gboolean ide_config_manager_get_ready (IdeConfigManager *self);
G_END_DECLS
diff --git a/src/libide/foundry/ide-configuration-private.h b/src/libide/foundry/ide-config-private.h
similarity index 87%
rename from src/libide/foundry/ide-configuration-private.h
rename to src/libide/foundry/ide-config-private.h
index 633ec9115..ede9a4208 100644
--- a/src/libide/foundry/ide-configuration-private.h
+++ b/src/libide/foundry/ide-config-private.h
@@ -1,4 +1,4 @@
-/* ide-configuration-private.h
+/* ide-config-private.h
*
* Copyright 2018-2019 Christian Hergert <chergert redhat com>
*
@@ -20,10 +20,10 @@
#pragma once
-#include "ide-configuration.h"
+#include "ide-config.h"
G_BEGIN_DECLS
-void _ide_configuration_attach (IdeConfiguration *self);
+void _ide_config_attach (IdeConfig *self);
G_END_DECLS
diff --git a/src/libide/foundry/ide-configuration-provider.c b/src/libide/foundry/ide-config-provider.c
similarity index 54%
rename from src/libide/foundry/ide-configuration-provider.c
rename to src/libide/foundry/ide-config-provider.c
index d95347a1e..c5b160caf 100644
--- a/src/libide/foundry/ide-configuration-provider.c
+++ b/src/libide/foundry/ide-config-provider.c
@@ -1,4 +1,4 @@
-/* ide-configuration-provider.c
+/* ide-config-provider.c
*
* Copyright 2016 Matthew Leeds <mleeds redhat com>
*
@@ -18,15 +18,15 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-#define G_LOG_DOMAIN "ide-configuration-provider"
+#define G_LOG_DOMAIN "ide-config-provider"
#include "config.h"
-#include "ide-configuration.h"
-#include "ide-configuration-manager.h"
-#include "ide-configuration-provider.h"
+#include "ide-config.h"
+#include "ide-config-manager.h"
+#include "ide-config-provider.h"
-G_DEFINE_INTERFACE (IdeConfigurationProvider, ide_configuration_provider, IDE_TYPE_OBJECT)
+G_DEFINE_INTERFACE (IdeConfigProvider, ide_config_provider, IDE_TYPE_OBJECT)
enum {
ADDED,
@@ -37,17 +37,17 @@ enum {
static guint signals [N_SIGNALS];
static void
-ide_configuration_provider_real_load_async (IdeConfigurationProvider *self,
+ide_config_provider_real_load_async (IdeConfigProvider *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (self));
+ g_assert (IDE_IS_CONFIG_PROVIDER (self));
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
g_task_report_new_error (self, callback, user_data,
- ide_configuration_provider_real_load_async,
+ ide_config_provider_real_load_async,
G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
"%s does not implement load_async",
@@ -55,12 +55,12 @@ ide_configuration_provider_real_load_async (IdeConfigurationProvider *self,
}
static gboolean
-ide_configuration_provider_real_load_finish (IdeConfigurationProvider *self,
+ide_config_provider_real_load_finish (IdeConfigProvider *self,
GAsyncResult *result,
GError **error)
{
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (self));
+ g_assert (IDE_IS_CONFIG_PROVIDER (self));
g_assert (G_IS_TASK (result));
g_assert (g_task_is_valid (G_TASK (result), self));
@@ -68,35 +68,35 @@ ide_configuration_provider_real_load_finish (IdeConfigurationProvider *self,
}
static void
-ide_configuration_provider_real_duplicate (IdeConfigurationProvider *self,
- IdeConfiguration *config)
+ide_config_provider_real_duplicate (IdeConfigProvider *self,
+ IdeConfig *config)
{
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (self));
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG_PROVIDER (self));
+ g_assert (IDE_IS_CONFIG (config));
}
static void
-ide_configuration_provider_real_unload (IdeConfigurationProvider *self)
+ide_config_provider_real_unload (IdeConfigProvider *self)
{
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (self));
+ g_assert (IDE_IS_CONFIG_PROVIDER (self));
}
static void
-ide_configuration_provider_real_save_async (IdeConfigurationProvider *self,
+ide_config_provider_real_save_async (IdeConfigProvider *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (self));
+ g_assert (IDE_IS_CONFIG_PROVIDER (self));
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
g_task_report_new_error (self, callback, user_data,
- ide_configuration_provider_real_save_async,
+ ide_config_provider_real_save_async,
G_IO_ERROR,
G_IO_ERROR_NOT_SUPPORTED,
"%s does not implement save_async",
@@ -104,12 +104,12 @@ ide_configuration_provider_real_save_async (IdeConfigurationProvider *self,
}
static gboolean
-ide_configuration_provider_real_save_finish (IdeConfigurationProvider *self,
+ide_config_provider_real_save_finish (IdeConfigProvider *self,
GAsyncResult *result,
GError **error)
{
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION_PROVIDER (self));
+ g_assert (IDE_IS_CONFIG_PROVIDER (self));
g_assert (G_IS_TASK (result));
g_assert (g_task_is_valid (G_TASK (result), self));
@@ -117,19 +117,19 @@ ide_configuration_provider_real_save_finish (IdeConfigurationProvider *self,
}
static void
-ide_configuration_provider_default_init (IdeConfigurationProviderInterface *iface)
+ide_config_provider_default_init (IdeConfigProviderInterface *iface)
{
- iface->load_async = ide_configuration_provider_real_load_async;
- iface->load_finish = ide_configuration_provider_real_load_finish;
- iface->duplicate = ide_configuration_provider_real_duplicate;
- iface->unload = ide_configuration_provider_real_unload;
- iface->save_async = ide_configuration_provider_real_save_async;
- iface->save_finish = ide_configuration_provider_real_save_finish;
+ iface->load_async = ide_config_provider_real_load_async;
+ iface->load_finish = ide_config_provider_real_load_finish;
+ iface->duplicate = ide_config_provider_real_duplicate;
+ iface->unload = ide_config_provider_real_unload;
+ iface->save_async = ide_config_provider_real_save_async;
+ iface->save_finish = ide_config_provider_real_save_finish;
/**
- * IdeConfigurationProvider:added:
- * @self: an #IdeConfigurationProvider
- * @config: an #IdeConfiguration
+ * IdeConfigProvider:added:
+ * @self: an #IdeConfigProvider
+ * @config: an #IdeConfig
*
* The "added" signal is emitted when a configuration
* has been added to a configuration provider.
@@ -140,18 +140,18 @@ ide_configuration_provider_default_init (IdeConfigurationProviderInterface *ifac
g_signal_new ("added",
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (IdeConfigurationProviderInterface, added),
+ G_STRUCT_OFFSET (IdeConfigProviderInterface, added),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1, IDE_TYPE_CONFIGURATION);
+ G_TYPE_NONE, 1, IDE_TYPE_CONFIG);
g_signal_set_va_marshaller (signals [ADDED],
G_TYPE_FROM_INTERFACE (iface),
g_cclosure_marshal_VOID__OBJECTv);
/**
- * IdeConfigurationProvider:removed:
- * @self: an #IdeConfigurationProvider
- * @config: an #IdeConfiguration
+ * IdeConfigProvider:removed:
+ * @self: an #IdeConfigProvider
+ * @config: an #IdeConfig
*
* The "removed" signal is emitted when a configuration
* has been removed from a configuration provider.
@@ -162,10 +162,10 @@ ide_configuration_provider_default_init (IdeConfigurationProviderInterface *ifac
g_signal_new ("removed",
G_TYPE_FROM_INTERFACE (iface),
G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (IdeConfigurationProviderInterface, removed),
+ G_STRUCT_OFFSET (IdeConfigProviderInterface, removed),
NULL, NULL,
g_cclosure_marshal_VOID__OBJECT,
- G_TYPE_NONE, 1, IDE_TYPE_CONFIGURATION);
+ G_TYPE_NONE, 1, IDE_TYPE_CONFIG);
g_signal_set_va_marshaller (signals [REMOVED],
G_TYPE_FROM_INTERFACE (iface),
g_cclosure_marshal_VOID__OBJECTv);
@@ -173,8 +173,8 @@ ide_configuration_provider_default_init (IdeConfigurationProviderInterface *ifac
}
/**
- * ide_configuration_provider_load_async:
- * @self: a #IdeConfigurationProvider
+ * ide_config_provider_load_async:
+ * @self: a #IdeConfigProvider
* @cancellable: (nullable): a #GCancellable or %NULL
* @callback: a callback to execute upon completion
* @user_data: closure data for @callback
@@ -182,74 +182,74 @@ ide_configuration_provider_default_init (IdeConfigurationProviderInterface *ifac
* This function is called to initialize the configuration provider after
* the plugin instance has been created. The provider should locate any
* build configurations within the project and call
- * ide_configuration_provider_emit_added() before completing the
+ * ide_config_provider_emit_added() before completing the
* asynchronous function so that the configuration manager may be made
* aware of the configurations.
*
* Since: 3.32
*/
void
-ide_configuration_provider_load_async (IdeConfigurationProvider *self,
+ide_config_provider_load_async (IdeConfigProvider *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
g_return_if_fail (IDE_IS_MAIN_THREAD ());
- g_return_if_fail (IDE_IS_CONFIGURATION_PROVIDER (self));
+ g_return_if_fail (IDE_IS_CONFIG_PROVIDER (self));
g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
- IDE_CONFIGURATION_PROVIDER_GET_IFACE (self)->load_async (self, cancellable, callback, user_data);
+ IDE_CONFIG_PROVIDER_GET_IFACE (self)->load_async (self, cancellable, callback, user_data);
}
/**
- * ide_configuration_provider_load_finish:
- * @self: a #IdeConfigurationProvider
+ * ide_config_provider_load_finish:
+ * @self: a #IdeConfigProvider
* @result: a #GAsyncResult
* @error: a location for a #GError, or %NULL
*
- * Completes an asynchronous request to ide_configuration_provider_load_async().
+ * Completes an asynchronous request to ide_config_provider_load_async().
*
* Returns: %TRUE if successful; otherwise %FALSE and @error is set.
*
* Since: 3.32
*/
gboolean
-ide_configuration_provider_load_finish (IdeConfigurationProvider *self,
+ide_config_provider_load_finish (IdeConfigProvider *self,
GAsyncResult *result,
GError **error)
{
g_return_val_if_fail (IDE_IS_MAIN_THREAD (), FALSE);
- g_return_val_if_fail (IDE_IS_CONFIGURATION_PROVIDER (self), FALSE);
+ g_return_val_if_fail (IDE_IS_CONFIG_PROVIDER (self), FALSE);
g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
- return IDE_CONFIGURATION_PROVIDER_GET_IFACE (self)->load_finish (self, result, error);
+ return IDE_CONFIG_PROVIDER_GET_IFACE (self)->load_finish (self, result, error);
}
/**
- * ide_configuration_provider_unload:
- * @self: a #IdeConfigurationProvider
+ * ide_config_provider_unload:
+ * @self: a #IdeConfigProvider
*
* Requests that the configuration provider unload any state. This is called
* shortly before the configuration provider is finalized.
*
- * Implementations of #IdeConfigurationProvider should emit removed
+ * Implementations of #IdeConfigProvider should emit removed
* for every configuration they have registered so that the
- * #IdeConfigurationManager has correct information.
+ * #IdeConfigManager has correct information.
*
* Since: 3.32
*/
void
-ide_configuration_provider_unload (IdeConfigurationProvider *self)
+ide_config_provider_unload (IdeConfigProvider *self)
{
g_return_if_fail (IDE_IS_MAIN_THREAD ());
- g_return_if_fail (IDE_IS_CONFIGURATION_PROVIDER (self));
+ g_return_if_fail (IDE_IS_CONFIG_PROVIDER (self));
- IDE_CONFIGURATION_PROVIDER_GET_IFACE (self)->unload (self);
+ IDE_CONFIG_PROVIDER_GET_IFACE (self)->unload (self);
}
/**
- * ide_configuration_provider_save_async:
- * @self: a #IdeConfigurationProvider
+ * ide_config_provider_save_async:
+ * @self: a #IdeConfigProvider
* @cancellable: (nullable): a #GCancellable or %NULL
* @callback: a callback to execute upon completion
* @user_data: closure data for @callback
@@ -263,113 +263,113 @@ ide_configuration_provider_unload (IdeConfigurationProvider *self)
* Since: 3.32
*/
void
-ide_configuration_provider_save_async (IdeConfigurationProvider *self,
+ide_config_provider_save_async (IdeConfigProvider *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
g_return_if_fail (IDE_IS_MAIN_THREAD ());
- g_return_if_fail (IDE_IS_CONFIGURATION_PROVIDER (self));
+ g_return_if_fail (IDE_IS_CONFIG_PROVIDER (self));
g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
- IDE_CONFIGURATION_PROVIDER_GET_IFACE (self)->save_async (self, cancellable, callback, user_data);
+ IDE_CONFIG_PROVIDER_GET_IFACE (self)->save_async (self, cancellable, callback, user_data);
}
/**
- * ide_configuration_provider_save_finish:
- * @self: a #IdeConfigurationProvider
+ * ide_config_provider_save_finish:
+ * @self: a #IdeConfigProvider
* @result: a #GAsyncResult
* @error: a location for a #GError, or %NULL
*
- * Completes an asynchronous request to ide_configuration_provider_save_async().
+ * Completes an asynchronous request to ide_config_provider_save_async().
*
* Returns: %TRUE if successful; otherwise %FALSE and @error is set.
*
* Since: 3.32
*/
gboolean
-ide_configuration_provider_save_finish (IdeConfigurationProvider *self,
+ide_config_provider_save_finish (IdeConfigProvider *self,
GAsyncResult *result,
GError **error)
{
g_return_val_if_fail (IDE_IS_MAIN_THREAD (), FALSE);
- g_return_val_if_fail (IDE_IS_CONFIGURATION_PROVIDER (self), FALSE);
+ g_return_val_if_fail (IDE_IS_CONFIG_PROVIDER (self), FALSE);
g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
- return IDE_CONFIGURATION_PROVIDER_GET_IFACE (self)->save_finish (self, result, error);
+ return IDE_CONFIG_PROVIDER_GET_IFACE (self)->save_finish (self, result, error);
}
/**
- * ide_configuration_provider_emit_added:
- * @self: an #IdeConfigurationProvider
- * @config: an #IdeConfiguration
+ * ide_config_provider_emit_added:
+ * @self: an #IdeConfigProvider
+ * @config: an #IdeConfig
*
- * #IdeConfigurationProvider implementations should call this function with
+ * #IdeConfigProvider implementations should call this function with
* a @config when it has discovered a new configuration.
*
* Since: 3.32
*/
void
-ide_configuration_provider_emit_added (IdeConfigurationProvider *self,
- IdeConfiguration *config)
+ide_config_provider_emit_added (IdeConfigProvider *self,
+ IdeConfig *config)
{
- g_return_if_fail (IDE_IS_CONFIGURATION_PROVIDER (self));
- g_return_if_fail (IDE_IS_CONFIGURATION (config));
+ g_return_if_fail (IDE_IS_CONFIG_PROVIDER (self));
+ g_return_if_fail (IDE_IS_CONFIG (config));
g_signal_emit (self, signals [ADDED], 0, config);
}
/**
- * ide_configuration_provider_emit_removed:
- * @self: an #IdeConfigurationProvider
- * @config: an #IdeConfiguration
+ * ide_config_provider_emit_removed:
+ * @self: an #IdeConfigProvider
+ * @config: an #IdeConfig
*
- * #IdeConfigurationProvider implementations should call this function with
+ * #IdeConfigProvider implementations should call this function with
* a @config when it has discovered it was removed.
*
* Since: 3.32
*/
void
-ide_configuration_provider_emit_removed (IdeConfigurationProvider *self,
- IdeConfiguration *config)
+ide_config_provider_emit_removed (IdeConfigProvider *self,
+ IdeConfig *config)
{
- g_return_if_fail (IDE_IS_CONFIGURATION_PROVIDER (self));
- g_return_if_fail (IDE_IS_CONFIGURATION (config));
+ g_return_if_fail (IDE_IS_CONFIG_PROVIDER (self));
+ g_return_if_fail (IDE_IS_CONFIG (config));
g_signal_emit (self, signals [REMOVED], 0, config);
}
/**
- * ide_configuration_provider_delete:
- * @self: a #IdeConfigurationProvider
- * @config: an #IdeConfiguration owned by the provider
+ * ide_config_provider_delete:
+ * @self: a #IdeConfigProvider
+ * @config: an #IdeConfig owned by the provider
*
* Requests that the configuration provider delete the configuration.
*
- * ide_configuration_provider_save_async() will be called by the
- * #IdeConfigurationManager after calling this function.
+ * ide_config_provider_save_async() will be called by the
+ * #IdeConfigManager after calling this function.
*
* Since: 3.32
*/
void
-ide_configuration_provider_delete (IdeConfigurationProvider *self,
- IdeConfiguration *config)
+ide_config_provider_delete (IdeConfigProvider *self,
+ IdeConfig *config)
{
g_return_if_fail (IDE_IS_MAIN_THREAD ());
- g_return_if_fail (IDE_IS_CONFIGURATION_PROVIDER (self));
- g_return_if_fail (IDE_IS_CONFIGURATION (config));
+ g_return_if_fail (IDE_IS_CONFIG_PROVIDER (self));
+ g_return_if_fail (IDE_IS_CONFIG (config));
- if (IDE_CONFIGURATION_PROVIDER_GET_IFACE (self)->delete)
- IDE_CONFIGURATION_PROVIDER_GET_IFACE (self)->delete (self, config);
+ if (IDE_CONFIG_PROVIDER_GET_IFACE (self)->delete)
+ IDE_CONFIG_PROVIDER_GET_IFACE (self)->delete (self, config);
else
g_warning ("Cannot delete configuration %s",
- ide_configuration_get_id (config));
+ ide_config_get_id (config));
}
/**
- * ide_configuration_provider_duplicate:
- * @self: an #IdeConfigurationProvider
- * @config: an #IdeConfiguration
+ * ide_config_provider_duplicate:
+ * @self: an #IdeConfigProvider
+ * @config: an #IdeConfig
*
* Requests that the configuration provider duplicate the configuration.
*
@@ -377,21 +377,21 @@ ide_configuration_provider_delete (IdeConfigurationProvider *self,
* without breaking a previous configuration.
*
* The configuration provider does not need to persist the configuration
- * in this function, ide_configuration_provider_save_async() will be called
+ * in this function, ide_config_provider_save_async() will be called
* afterwards to persist configurations to disk.
*
- * It is expected that the #IdeConfigurationProvider will emit
- * #IdeConfigurationProvider::added with the new configuration.
+ * It is expected that the #IdeConfigProvider will emit
+ * #IdeConfigProvider::added with the new configuration.
*
* Since: 3.32
*/
void
-ide_configuration_provider_duplicate (IdeConfigurationProvider *self,
- IdeConfiguration *config)
+ide_config_provider_duplicate (IdeConfigProvider *self,
+ IdeConfig *config)
{
g_return_if_fail (IDE_IS_MAIN_THREAD ());
- g_return_if_fail (IDE_IS_CONFIGURATION_PROVIDER (self));
- g_return_if_fail (IDE_IS_CONFIGURATION (config));
+ g_return_if_fail (IDE_IS_CONFIG_PROVIDER (self));
+ g_return_if_fail (IDE_IS_CONFIG (config));
- IDE_CONFIGURATION_PROVIDER_GET_IFACE (self)->duplicate (self, config);
+ IDE_CONFIG_PROVIDER_GET_IFACE (self)->duplicate (self, config);
}
diff --git a/src/libide/foundry/ide-configuration-provider.h b/src/libide/foundry/ide-config-provider.h
similarity index 56%
rename from src/libide/foundry/ide-configuration-provider.h
rename to src/libide/foundry/ide-config-provider.h
index 5ff84b7c3..bb26e7092 100644
--- a/src/libide/foundry/ide-configuration-provider.h
+++ b/src/libide/foundry/ide-config-provider.h
@@ -1,4 +1,4 @@
-/* ide-configuration-provider.h
+/* ide-config-provider.h
*
* Copyright 2016 Matthew Leeds <mleeds redhat com>
* Copyright 2018-2019 Christian Hergert <chergert redhat com>
@@ -31,70 +31,70 @@
G_BEGIN_DECLS
-#define IDE_TYPE_CONFIGURATION_PROVIDER (ide_configuration_provider_get_type ())
+#define IDE_TYPE_CONFIG_PROVIDER (ide_config_provider_get_type ())
IDE_AVAILABLE_IN_3_32
-G_DECLARE_INTERFACE (IdeConfigurationProvider, ide_configuration_provider, IDE, CONFIGURATION_PROVIDER,
IdeObject)
+G_DECLARE_INTERFACE (IdeConfigProvider, ide_config_provider, IDE, CONFIG_PROVIDER, IdeObject)
-struct _IdeConfigurationProviderInterface
+struct _IdeConfigProviderInterface
{
GTypeInterface parent_iface;
- void (*added) (IdeConfigurationProvider *self,
- IdeConfiguration *config);
- void (*removed) (IdeConfigurationProvider *self,
- IdeConfiguration *config);
- void (*load_async) (IdeConfigurationProvider *self,
+ void (*added) (IdeConfigProvider *self,
+ IdeConfig *config);
+ void (*removed) (IdeConfigProvider *self,
+ IdeConfig *config);
+ void (*load_async) (IdeConfigProvider *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
- gboolean (*load_finish) (IdeConfigurationProvider *self,
+ gboolean (*load_finish) (IdeConfigProvider *self,
GAsyncResult *result,
GError **error);
- void (*save_async) (IdeConfigurationProvider *self,
+ void (*save_async) (IdeConfigProvider *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
- gboolean (*save_finish) (IdeConfigurationProvider *self,
+ gboolean (*save_finish) (IdeConfigProvider *self,
GAsyncResult *result,
GError **error);
- void (*delete) (IdeConfigurationProvider *self,
- IdeConfiguration *config);
- void (*duplicate) (IdeConfigurationProvider *self,
- IdeConfiguration *config);
- void (*unload) (IdeConfigurationProvider *self);
+ void (*delete) (IdeConfigProvider *self,
+ IdeConfig *config);
+ void (*duplicate) (IdeConfigProvider *self,
+ IdeConfig *config);
+ void (*unload) (IdeConfigProvider *self);
};
IDE_AVAILABLE_IN_3_32
-void ide_configuration_provider_emit_added (IdeConfigurationProvider *self,
- IdeConfiguration *config);
+void ide_config_provider_emit_added (IdeConfigProvider *self,
+ IdeConfig *config);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_provider_emit_removed (IdeConfigurationProvider *self,
- IdeConfiguration *config);
+void ide_config_provider_emit_removed (IdeConfigProvider *self,
+ IdeConfig *config);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_provider_load_async (IdeConfigurationProvider *self,
+void ide_config_provider_load_async (IdeConfigProvider *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
IDE_AVAILABLE_IN_3_32
-gboolean ide_configuration_provider_load_finish (IdeConfigurationProvider *self,
+gboolean ide_config_provider_load_finish (IdeConfigProvider *self,
GAsyncResult *result,
GError **error);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_provider_save_async (IdeConfigurationProvider *self,
+void ide_config_provider_save_async (IdeConfigProvider *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data);
IDE_AVAILABLE_IN_3_32
-gboolean ide_configuration_provider_save_finish (IdeConfigurationProvider *self,
+gboolean ide_config_provider_save_finish (IdeConfigProvider *self,
GAsyncResult *result,
GError **error);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_provider_delete (IdeConfigurationProvider *self,
- IdeConfiguration *config);
-void ide_configuration_provider_duplicate (IdeConfigurationProvider *self,
- IdeConfiguration *config);
+void ide_config_provider_delete (IdeConfigProvider *self,
+ IdeConfig *config);
+void ide_config_provider_duplicate (IdeConfigProvider *self,
+ IdeConfig *config);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_provider_unload (IdeConfigurationProvider *self);
+void ide_config_provider_unload (IdeConfigProvider *self);
G_END_DECLS
diff --git a/src/libide/foundry/ide-configuration.c b/src/libide/foundry/ide-config.c
similarity index 61%
rename from src/libide/foundry/ide-configuration.c
rename to src/libide/foundry/ide-config.c
index 3efafce34..6df4cd0dd 100644
--- a/src/libide/foundry/ide-configuration.c
+++ b/src/libide/foundry/ide-config.c
@@ -1,4 +1,4 @@
-/* ide-configuration.c
+/* ide-config.c
*
* Copyright 2016-2019 Christian Hergert <chergert redhat com>
*
@@ -18,15 +18,15 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/
-#define G_LOG_DOMAIN "ide-configuration"
+#define G_LOG_DOMAIN "ide-config"
#include "config.h"
#include <string.h>
-#include "ide-configuration-manager.h"
-#include "ide-configuration-private.h"
-#include "ide-configuration.h"
+#include "ide-config-manager.h"
+#include "ide-config-private.h"
+#include "ide-config.h"
#include "ide-foundry-enums.h"
#include "ide-foundry-compat.h"
#include "ide-runtime-manager.h"
@@ -66,14 +66,14 @@ typedef struct
/*
* This is used to determine if we can make progress building
* with this configuration. When runtimes are added/removed, the
- * IdeConfiguration:ready property will be notified.
+ * IdeConfig:ready property will be notified.
*/
guint runtime_ready : 1;
IdeBuildLocality locality : 3;
-} IdeConfigurationPrivate;
+} IdeConfigPrivate;
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (IdeConfiguration, ide_configuration, IDE_TYPE_OBJECT)
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (IdeConfig, ide_config, IDE_TYPE_OBJECT)
enum {
PROP_0,
@@ -132,42 +132,42 @@ _value_new (GType type)
}
static void
-ide_configuration_block_changed (IdeConfiguration *self)
+ide_config_block_changed (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_assert (IDE_IS_CONFIGURATION (self));
+ g_assert (IDE_IS_CONFIG (self));
priv->block_changed++;
}
static void
-ide_configuration_unblock_changed (IdeConfiguration *self)
+ide_config_unblock_changed (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_assert (IDE_IS_CONFIGURATION (self));
+ g_assert (IDE_IS_CONFIG (self));
priv->block_changed--;
}
static void
-ide_configuration_emit_changed (IdeConfiguration *self)
+ide_config_emit_changed (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_assert (IDE_IS_CONFIGURATION (self));
+ g_assert (IDE_IS_CONFIG (self));
if (priv->block_changed == 0)
g_signal_emit (self, signals [CHANGED], 0);
}
static IdeRuntime *
-ide_configuration_real_get_runtime (IdeConfiguration *self)
+ide_config_real_get_runtime (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
if (priv->runtime_id != NULL)
{
@@ -180,12 +180,12 @@ ide_configuration_real_get_runtime (IdeConfiguration *self)
}
static void
-ide_configuration_set_id (IdeConfiguration *self,
+ide_config_set_id (IdeConfig *self,
const gchar *id)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (id != NULL);
if (g_strcmp0 (id, priv->id) != 0)
@@ -197,17 +197,17 @@ ide_configuration_set_id (IdeConfiguration *self,
}
static void
-ide_configuration_runtime_manager_items_changed (IdeConfiguration *self,
+ide_config_runtime_manager_items_changed (IdeConfig *self,
guint position,
guint added,
guint removed,
IdeRuntimeManager *runtime_manager)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
IdeRuntime *runtime;
gboolean runtime_ready;
- g_assert (IDE_IS_CONFIGURATION (self));
+ g_assert (IDE_IS_CONFIG (self));
if (ide_object_in_destruction (IDE_OBJECT (self)))
return;
@@ -228,46 +228,46 @@ ide_configuration_runtime_manager_items_changed (IdeConfiguration *self,
}
static void
-ide_configuration_environment_changed (IdeConfiguration *self,
+ide_config_environment_changed (IdeConfig *self,
IdeEnvironment *environment)
{
IDE_ENTRY;
- g_assert (IDE_IS_CONFIGURATION (self));
+ g_assert (IDE_IS_CONFIG (self));
g_assert (IDE_IS_ENVIRONMENT (environment));
if (ide_object_in_destruction (IDE_OBJECT (self)))
return;
- ide_configuration_set_dirty (self, TRUE);
- ide_configuration_emit_changed (self);
+ ide_config_set_dirty (self, TRUE);
+ ide_config_emit_changed (self);
IDE_EXIT;
}
static void
-ide_configuration_real_set_runtime (IdeConfiguration *self,
+ide_config_real_set_runtime (IdeConfig *self,
IdeRuntime *runtime)
{
const gchar *runtime_id = "host";
- g_assert (IDE_IS_CONFIGURATION (self));
+ g_assert (IDE_IS_CONFIG (self));
g_assert (!runtime || IDE_IS_RUNTIME (runtime));
if (runtime != NULL)
runtime_id = ide_runtime_get_id (runtime);
- ide_configuration_set_runtime_id (self, runtime_id);
+ ide_config_set_runtime_id (self, runtime_id);
}
static gchar *
-ide_configuration_repr (IdeObject *object)
+ide_config_repr (IdeObject *object)
{
- IdeConfiguration *self = (IdeConfiguration *)object;
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfig *self = (IdeConfig *)object;
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION (self));
+ g_assert (IDE_IS_CONFIG (self));
return g_strdup_printf ("%s id=\"%s\" name=\"%s\" runtime=\"%s\"",
G_OBJECT_TYPE_NAME (self),
@@ -277,10 +277,10 @@ ide_configuration_repr (IdeObject *object)
}
static void
-ide_configuration_finalize (GObject *object)
+ide_config_finalize (GObject *object)
{
- IdeConfiguration *self = (IdeConfiguration *)object;
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfig *self = (IdeConfig *)object;
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
g_clear_object (&priv->build_commands_dir);
g_clear_object (&priv->environment);
@@ -296,97 +296,97 @@ ide_configuration_finalize (GObject *object)
g_clear_pointer (&priv->app_id, g_free);
g_clear_pointer (&priv->toolchain_id, g_free);
- G_OBJECT_CLASS (ide_configuration_parent_class)->finalize (object);
+ G_OBJECT_CLASS (ide_config_parent_class)->finalize (object);
}
static void
-ide_configuration_get_property (GObject *object,
+ide_config_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
- IdeConfiguration *self = IDE_CONFIGURATION (object);
+ IdeConfig *self = IDE_CONFIG (object);
switch (prop_id)
{
case PROP_CONFIG_OPTS:
- g_value_set_string (value, ide_configuration_get_config_opts (self));
+ g_value_set_string (value, ide_config_get_config_opts (self));
break;
case PROP_BUILD_COMMANDS:
- g_value_set_boxed (value, ide_configuration_get_build_commands (self));
+ g_value_set_boxed (value, ide_config_get_build_commands (self));
break;
case PROP_BUILD_COMMANDS_DIR:
- g_value_set_object (value, ide_configuration_get_build_commands_dir (self));
+ g_value_set_object (value, ide_config_get_build_commands_dir (self));
break;
case PROP_DEBUG:
- g_value_set_boolean (value, ide_configuration_get_debug (self));
+ g_value_set_boolean (value, ide_config_get_debug (self));
break;
case PROP_DIRTY:
- g_value_set_boolean (value, ide_configuration_get_dirty (self));
+ g_value_set_boolean (value, ide_config_get_dirty (self));
break;
case PROP_DISPLAY_NAME:
- g_value_set_string (value, ide_configuration_get_display_name (self));
+ g_value_set_string (value, ide_config_get_display_name (self));
break;
case PROP_ENVIRON:
- g_value_set_boxed (value, ide_configuration_get_environ (self));
+ g_value_set_boxed (value, ide_config_get_environ (self));
break;
case PROP_ID:
- g_value_set_string (value, ide_configuration_get_id (self));
+ g_value_set_string (value, ide_config_get_id (self));
break;
case PROP_PARALLELISM:
- g_value_set_int (value, ide_configuration_get_parallelism (self));
+ g_value_set_int (value, ide_config_get_parallelism (self));
break;
case PROP_READY:
- g_value_set_boolean (value, ide_configuration_get_ready (self));
+ g_value_set_boolean (value, ide_config_get_ready (self));
break;
case PROP_POST_INSTALL_COMMANDS:
- g_value_set_boxed (value, ide_configuration_get_post_install_commands (self));
+ g_value_set_boxed (value, ide_config_get_post_install_commands (self));
break;
case PROP_PREFIX:
- g_value_set_string (value, ide_configuration_get_prefix (self));
+ g_value_set_string (value, ide_config_get_prefix (self));
break;
case PROP_RUNTIME:
- g_value_set_object (value, ide_configuration_get_runtime (self));
+ g_value_set_object (value, ide_config_get_runtime (self));
break;
case PROP_RUNTIME_ID:
- g_value_set_string (value, ide_configuration_get_runtime_id (self));
+ g_value_set_string (value, ide_config_get_runtime_id (self));
break;
case PROP_TOOLCHAIN:
- g_value_take_object (value, ide_configuration_get_toolchain (self));
+ g_value_take_object (value, ide_config_get_toolchain (self));
break;
case PROP_TOOLCHAIN_ID:
- g_value_set_string (value, ide_configuration_get_toolchain_id (self));
+ g_value_set_string (value, ide_config_get_toolchain_id (self));
break;
case PROP_RUN_OPTS:
- g_value_set_string (value, ide_configuration_get_run_opts (self));
+ g_value_set_string (value, ide_config_get_run_opts (self));
break;
case PROP_APP_ID:
- g_value_set_string (value, ide_configuration_get_app_id (self));
+ g_value_set_string (value, ide_config_get_app_id (self));
break;
case PROP_APPEND_PATH:
- g_value_set_string (value, ide_configuration_get_append_path (self));
+ g_value_set_string (value, ide_config_get_append_path (self));
break;
case PROP_LOCALITY:
- g_value_set_flags (value, ide_configuration_get_locality (self));
+ g_value_set_flags (value, ide_config_get_locality (self));
break;
default:
@@ -395,85 +395,85 @@ ide_configuration_get_property (GObject *object,
}
static void
-ide_configuration_set_property (GObject *object,
+ide_config_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
- IdeConfiguration *self = IDE_CONFIGURATION (object);
+ IdeConfig *self = IDE_CONFIG (object);
switch (prop_id)
{
case PROP_CONFIG_OPTS:
- ide_configuration_set_config_opts (self, g_value_get_string (value));
+ ide_config_set_config_opts (self, g_value_get_string (value));
break;
case PROP_BUILD_COMMANDS:
- ide_configuration_set_build_commands (self, g_value_get_boxed (value));
+ ide_config_set_build_commands (self, g_value_get_boxed (value));
break;
case PROP_BUILD_COMMANDS_DIR:
- ide_configuration_set_build_commands_dir (self, g_value_get_object (value));
+ ide_config_set_build_commands_dir (self, g_value_get_object (value));
break;
case PROP_DEBUG:
- ide_configuration_set_debug (self, g_value_get_boolean (value));
+ ide_config_set_debug (self, g_value_get_boolean (value));
break;
case PROP_DIRTY:
- ide_configuration_set_dirty (self, g_value_get_boolean (value));
+ ide_config_set_dirty (self, g_value_get_boolean (value));
break;
case PROP_DISPLAY_NAME:
- ide_configuration_set_display_name (self, g_value_get_string (value));
+ ide_config_set_display_name (self, g_value_get_string (value));
break;
case PROP_ID:
- ide_configuration_set_id (self, g_value_get_string (value));
+ ide_config_set_id (self, g_value_get_string (value));
break;
case PROP_POST_INSTALL_COMMANDS:
- ide_configuration_set_post_install_commands (self, g_value_get_boxed (value));
+ ide_config_set_post_install_commands (self, g_value_get_boxed (value));
break;
case PROP_PREFIX:
- ide_configuration_set_prefix (self, g_value_get_string (value));
+ ide_config_set_prefix (self, g_value_get_string (value));
break;
case PROP_PARALLELISM:
- ide_configuration_set_parallelism (self, g_value_get_int (value));
+ ide_config_set_parallelism (self, g_value_get_int (value));
break;
case PROP_RUNTIME:
- ide_configuration_set_runtime (self, g_value_get_object (value));
+ ide_config_set_runtime (self, g_value_get_object (value));
break;
case PROP_RUNTIME_ID:
- ide_configuration_set_runtime_id (self, g_value_get_string (value));
+ ide_config_set_runtime_id (self, g_value_get_string (value));
break;
case PROP_TOOLCHAIN:
- ide_configuration_set_toolchain (self, g_value_get_object (value));
+ ide_config_set_toolchain (self, g_value_get_object (value));
break;
case PROP_TOOLCHAIN_ID:
- ide_configuration_set_toolchain_id (self, g_value_get_string (value));
+ ide_config_set_toolchain_id (self, g_value_get_string (value));
break;
case PROP_RUN_OPTS:
- ide_configuration_set_run_opts (self, g_value_get_string (value));
+ ide_config_set_run_opts (self, g_value_get_string (value));
break;
case PROP_APP_ID:
- ide_configuration_set_app_id (self, g_value_get_string (value));
+ ide_config_set_app_id (self, g_value_get_string (value));
break;
case PROP_APPEND_PATH:
- ide_configuration_set_append_path (self, g_value_get_string (value));
+ ide_config_set_append_path (self, g_value_get_string (value));
break;
case PROP_LOCALITY:
- ide_configuration_set_locality (self, g_value_get_flags (value));
+ ide_config_set_locality (self, g_value_get_flags (value));
break;
default:
@@ -482,19 +482,19 @@ ide_configuration_set_property (GObject *object,
}
static void
-ide_configuration_class_init (IdeConfigurationClass *klass)
+ide_config_class_init (IdeConfigClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
IdeObjectClass *i_object_class = IDE_OBJECT_CLASS (klass);
- object_class->finalize = ide_configuration_finalize;
- object_class->get_property = ide_configuration_get_property;
- object_class->set_property = ide_configuration_set_property;
+ object_class->finalize = ide_config_finalize;
+ object_class->get_property = ide_config_get_property;
+ object_class->set_property = ide_config_set_property;
- i_object_class->repr = ide_configuration_repr;
+ i_object_class->repr = ide_config_repr;
- klass->get_runtime = ide_configuration_real_get_runtime;
- klass->set_runtime = ide_configuration_real_set_runtime;
+ klass->get_runtime = ide_config_real_get_runtime;
+ klass->set_runtime = ide_config_real_set_runtime;
properties [PROP_APPEND_PATH] =
g_param_spec_string ("append-path",
@@ -649,9 +649,9 @@ ide_configuration_class_init (IdeConfigurationClass *klass)
}
static void
-ide_configuration_init (IdeConfiguration *self)
+ide_config_init (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
g_autoptr(IdeEnvironment) env = ide_environment_new ();
priv->runtime_id = g_strdup ("host");
@@ -661,12 +661,12 @@ ide_configuration_init (IdeConfiguration *self)
priv->locality = IDE_BUILD_LOCALITY_DEFAULT;
priv->internal = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, _value_free);
- ide_configuration_set_environment (self, env);
+ ide_config_set_environment (self, env);
}
/**
- * ide_configuration_get_app_id:
- * @self: An #IdeConfiguration
+ * ide_config_get_app_id:
+ * @self: An #IdeConfig
*
* Gets the application ID for the configuration.
*
@@ -675,22 +675,22 @@ ide_configuration_init (IdeConfiguration *self)
* Since: 3.32
*/
const gchar *
-ide_configuration_get_app_id (IdeConfiguration *self)
+ide_config_get_app_id (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return priv->app_id;
}
void
-ide_configuration_set_app_id (IdeConfiguration *self,
+ide_config_set_app_id (IdeConfig *self,
const gchar *app_id)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
if (priv->app_id != app_id)
{
@@ -701,22 +701,22 @@ ide_configuration_set_app_id (IdeConfiguration *self,
}
const gchar *
-ide_configuration_get_runtime_id (IdeConfiguration *self)
+ide_config_get_runtime_id (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return priv->runtime_id;
}
void
-ide_configuration_set_runtime_id (IdeConfiguration *self,
+ide_config_set_runtime_id (IdeConfig *self,
const gchar *runtime_id)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
if (runtime_id == NULL)
runtime_id = "host";
@@ -727,7 +727,7 @@ ide_configuration_set_runtime_id (IdeConfiguration *self,
g_free (priv->runtime_id);
priv->runtime_id = g_strdup (runtime_id);
- ide_configuration_set_dirty (self, TRUE);
+ ide_config_set_dirty (self, TRUE);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_RUNTIME_ID]);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_RUNTIME]);
@@ -741,16 +741,16 @@ ide_configuration_set_runtime_id (IdeConfiguration *self,
context = ide_object_get_context (IDE_OBJECT (self));
runtime_manager = ide_runtime_manager_from_context (context);
- ide_configuration_runtime_manager_items_changed (self, 0, 0, 0, runtime_manager);
+ ide_config_runtime_manager_items_changed (self, 0, 0, 0, runtime_manager);
- ide_configuration_emit_changed (self);
+ ide_config_emit_changed (self);
}
}
}
/**
- * ide_configuration_get_toolchain_id:
- * @self: An #IdeConfiguration
+ * ide_config_get_toolchain_id:
+ * @self: An #IdeConfig
*
* Gets the toolchain id for the configuration.
*
@@ -759,18 +759,18 @@ ide_configuration_set_runtime_id (IdeConfiguration *self,
* Since: 3.32
*/
const gchar *
-ide_configuration_get_toolchain_id (IdeConfiguration *self)
+ide_config_get_toolchain_id (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return priv->toolchain_id;
}
/**
- * ide_configuration_set_toolchain_id:
- * @self: An #IdeConfiguration
+ * ide_config_set_toolchain_id:
+ * @self: An #IdeConfig
* @toolchain_id: The id of an #IdeToolchain
*
* Sets the toolchain id for the configuration.
@@ -778,12 +778,12 @@ ide_configuration_get_toolchain_id (IdeConfiguration *self)
* Since: 3.32
*/
void
-ide_configuration_set_toolchain_id (IdeConfiguration *self,
+ide_config_set_toolchain_id (IdeConfig *self,
const gchar *toolchain_id)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
if (toolchain_id == NULL)
toolchain_id = "default";
@@ -796,14 +796,14 @@ ide_configuration_set_toolchain_id (IdeConfiguration *self,
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_TOOLCHAIN_ID]);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_TOOLCHAIN]);
- ide_configuration_set_dirty (self, TRUE);
- ide_configuration_emit_changed (self);
+ ide_config_set_dirty (self, TRUE);
+ ide_config_emit_changed (self);
}
}
/**
- * ide_configuration_get_runtime:
- * @self: An #IdeConfiguration
+ * ide_config_get_runtime:
+ * @self: An #IdeConfig
*
* Gets the runtime for the configuration.
*
@@ -812,26 +812,26 @@ ide_configuration_set_toolchain_id (IdeConfiguration *self,
* Since: 3.32
*/
IdeRuntime *
-ide_configuration_get_runtime (IdeConfiguration *self)
+ide_config_get_runtime (IdeConfig *self)
{
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
- return IDE_CONFIGURATION_GET_CLASS (self)->get_runtime (self);
+ return IDE_CONFIG_GET_CLASS (self)->get_runtime (self);
}
void
-ide_configuration_set_runtime (IdeConfiguration *self,
+ide_config_set_runtime (IdeConfig *self,
IdeRuntime *runtime)
{
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (!runtime || IDE_IS_RUNTIME (runtime));
- IDE_CONFIGURATION_GET_CLASS (self)->set_runtime (self, runtime);
+ IDE_CONFIG_GET_CLASS (self)->set_runtime (self, runtime);
}
/**
- * ide_configuration_get_toolchain:
- * @self: An #IdeConfiguration
+ * ide_config_get_toolchain:
+ * @self: An #IdeConfig
*
* Gets the toolchain for the configuration.
*
@@ -840,11 +840,11 @@ ide_configuration_set_runtime (IdeConfiguration *self,
* Since: 3.32
*/
IdeToolchain *
-ide_configuration_get_toolchain (IdeConfiguration *self)
+ide_config_get_toolchain (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
if (priv->toolchain_id != NULL)
{
@@ -860,8 +860,8 @@ ide_configuration_get_toolchain (IdeConfiguration *self)
}
/**
- * ide_configuration_set_toolchain:
- * @self: An #IdeConfiguration
+ * ide_config_set_toolchain:
+ * @self: An #IdeConfig
* @toolchain: (nullable): An #IdeToolchain or %NULL to use the default one
*
* Sets the toolchain for the configuration.
@@ -869,23 +869,23 @@ ide_configuration_get_toolchain (IdeConfiguration *self)
* Since: 3.32
*/
void
-ide_configuration_set_toolchain (IdeConfiguration *self,
+ide_config_set_toolchain (IdeConfig *self,
IdeToolchain *toolchain)
{
const gchar *toolchain_id = "default";
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (!toolchain || IDE_IS_TOOLCHAIN (toolchain));
if (toolchain != NULL)
toolchain_id = ide_toolchain_get_id (toolchain);
- ide_configuration_set_toolchain_id (self, toolchain_id);
+ ide_config_set_toolchain_id (self, toolchain_id);
}
/**
- * ide_configuration_get_environ:
- * @self: An #IdeConfiguration
+ * ide_config_get_environ:
+ * @self: An #IdeConfig
*
* Gets the environment to use when spawning processes.
*
@@ -894,83 +894,83 @@ ide_configuration_set_toolchain (IdeConfiguration *self,
* Since: 3.32
*/
gchar **
-ide_configuration_get_environ (IdeConfiguration *self)
+ide_config_get_environ (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return ide_environment_get_environ (priv->environment);
}
const gchar *
-ide_configuration_getenv (IdeConfiguration *self,
+ide_config_getenv (IdeConfig *self,
const gchar *key)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
g_return_val_if_fail (key != NULL, NULL);
return ide_environment_getenv (priv->environment, key);
}
void
-ide_configuration_setenv (IdeConfiguration *self,
+ide_config_setenv (IdeConfig *self,
const gchar *key,
const gchar *value)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (key != NULL);
ide_environment_setenv (priv->environment, key, value);
}
const gchar *
-ide_configuration_get_id (IdeConfiguration *self)
+ide_config_get_id (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return priv->id;
}
const gchar *
-ide_configuration_get_prefix (IdeConfiguration *self)
+ide_config_get_prefix (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return priv->prefix;
}
void
-ide_configuration_set_prefix (IdeConfiguration *self,
+ide_config_set_prefix (IdeConfig *self,
const gchar *prefix)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
if (g_strcmp0 (prefix, priv->prefix) != 0)
{
g_free (priv->prefix);
priv->prefix = g_strdup (prefix);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_PREFIX]);
- ide_configuration_set_dirty (self, TRUE);
+ ide_config_set_dirty (self, TRUE);
}
}
gint
-ide_configuration_get_parallelism (IdeConfiguration *self)
+ide_config_get_parallelism (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), -1);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), -1);
if (priv->parallelism == -1)
{
@@ -983,12 +983,12 @@ ide_configuration_get_parallelism (IdeConfiguration *self)
}
void
-ide_configuration_set_parallelism (IdeConfiguration *self,
+ide_config_set_parallelism (IdeConfig *self,
gint parallelism)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (parallelism >= -1);
if (parallelism != priv->parallelism)
@@ -999,22 +999,22 @@ ide_configuration_set_parallelism (IdeConfiguration *self,
}
gboolean
-ide_configuration_get_debug (IdeConfiguration *self)
+ide_config_get_debug (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), FALSE);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), FALSE);
return priv->debug;
}
void
-ide_configuration_set_debug (IdeConfiguration *self,
+ide_config_set_debug (IdeConfig *self,
gboolean debug)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
debug = !!debug;
@@ -1022,56 +1022,56 @@ ide_configuration_set_debug (IdeConfiguration *self,
{
priv->debug = debug;
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_DEBUG]);
- ide_configuration_set_dirty (self, TRUE);
+ ide_config_set_dirty (self, TRUE);
}
}
const gchar *
-ide_configuration_get_display_name (IdeConfiguration *self)
+ide_config_get_display_name (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return priv->display_name;
}
void
-ide_configuration_set_display_name (IdeConfiguration *self,
+ide_config_set_display_name (IdeConfig *self,
const gchar *display_name)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
if (g_strcmp0 (display_name, priv->display_name) != 0)
{
g_free (priv->display_name);
priv->display_name = g_strdup (display_name);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_DISPLAY_NAME]);
- ide_configuration_emit_changed (self);
+ ide_config_emit_changed (self);
}
}
gboolean
-ide_configuration_get_dirty (IdeConfiguration *self)
+ide_config_get_dirty (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), FALSE);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), FALSE);
return priv->dirty;
}
void
-ide_configuration_set_dirty (IdeConfiguration *self,
+ide_config_set_dirty (IdeConfig *self,
gboolean dirty)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
IDE_ENTRY;
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
if (priv->block_changed)
IDE_EXIT;
@@ -1093,36 +1093,36 @@ ide_configuration_set_dirty (IdeConfiguration *self,
*/
priv->sequence++;
IDE_TRACE_MSG ("configuration set dirty with sequence %u", priv->sequence);
- ide_configuration_emit_changed (self);
+ ide_config_emit_changed (self);
}
IDE_EXIT;
}
/**
- * ide_configuration_get_environment:
+ * ide_config_get_environment:
*
* Returns: (transfer none): An #IdeEnvironment.
*
* Since: 3.32
*/
IdeEnvironment *
-ide_configuration_get_environment (IdeConfiguration *self)
+ide_config_get_environment (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return priv->environment;
}
void
-ide_configuration_set_environment (IdeConfiguration *self,
+ide_config_set_environment (IdeConfig *self,
IdeEnvironment *environment)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (!environment || IDE_IS_ENVIRONMENT (environment));
if (priv->environment != environment)
@@ -1130,7 +1130,7 @@ ide_configuration_set_environment (IdeConfiguration *self,
if (priv->environment != NULL)
{
g_signal_handlers_disconnect_by_func (priv->environment,
- G_CALLBACK (ide_configuration_environment_changed),
+ G_CALLBACK (ide_config_environment_changed),
self);
g_clear_object (&priv->environment);
}
@@ -1140,7 +1140,7 @@ ide_configuration_set_environment (IdeConfiguration *self,
priv->environment = g_object_ref (environment);
g_signal_connect_object (priv->environment,
"changed",
- G_CALLBACK (ide_configuration_environment_changed),
+ G_CALLBACK (ide_config_environment_changed),
self,
G_CONNECT_SWAPPED);
}
@@ -1150,49 +1150,49 @@ ide_configuration_set_environment (IdeConfiguration *self,
}
const gchar *
-ide_configuration_get_config_opts (IdeConfiguration *self)
+ide_config_get_config_opts (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return priv->config_opts;
}
void
-ide_configuration_set_config_opts (IdeConfiguration *self,
+ide_config_set_config_opts (IdeConfig *self,
const gchar *config_opts)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
if (g_strcmp0 (config_opts, priv->config_opts) != 0)
{
g_free (priv->config_opts);
priv->config_opts = g_strdup (config_opts);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_CONFIG_OPTS]);
- ide_configuration_set_dirty (self, TRUE);
+ ide_config_set_dirty (self, TRUE);
}
}
const gchar * const *
-ide_configuration_get_build_commands (IdeConfiguration *self)
+ide_config_get_build_commands (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return (const gchar * const *)priv->build_commands;
}
void
-ide_configuration_set_build_commands (IdeConfiguration *self,
+ide_config_set_build_commands (IdeConfig *self,
const gchar * const *build_commands)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
if (priv->build_commands != (gchar **)build_commands)
{
@@ -1203,22 +1203,22 @@ ide_configuration_set_build_commands (IdeConfiguration *self,
}
const gchar * const *
-ide_configuration_get_post_install_commands (IdeConfiguration *self)
+ide_config_get_post_install_commands (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return (const gchar * const *)priv->post_install_commands;
}
void
-ide_configuration_set_post_install_commands (IdeConfiguration *self,
+ide_config_set_post_install_commands (IdeConfig *self,
const gchar * const *post_install_commands)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
if (priv->post_install_commands != (gchar **)post_install_commands)
{
@@ -1229,8 +1229,8 @@ ide_configuration_set_post_install_commands (IdeConfiguration *self,
}
/**
- * ide_configuration_get_sequence:
- * @self: An #IdeConfiguration
+ * ide_config_get_sequence:
+ * @self: An #IdeConfig
*
* This returns a sequence number for the configuration. This is useful
* for build systems that want to clear the "dirty" bit on the configuration
@@ -1245,24 +1245,24 @@ ide_configuration_set_post_install_commands (IdeConfiguration *self,
* Since: 3.32
*/
guint
-ide_configuration_get_sequence (IdeConfiguration *self)
+ide_config_get_sequence (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), 0);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), 0);
return priv->sequence;
}
static GValue *
-ide_configuration_reset_internal_value (IdeConfiguration *self,
+ide_config_reset_internal_value (IdeConfig *self,
const gchar *key,
GType type)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
GValue *v;
- g_assert (IDE_IS_CONFIGURATION (self));
+ g_assert (IDE_IS_CONFIG (self));
g_assert (key != NULL);
g_assert (type != G_TYPE_INVALID);
@@ -1283,13 +1283,13 @@ ide_configuration_reset_internal_value (IdeConfiguration *self,
}
const gchar *
-ide_configuration_get_internal_string (IdeConfiguration *self,
+ide_config_get_internal_string (IdeConfig *self,
const gchar *key)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
const GValue *v;
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
g_return_val_if_fail (key != NULL, NULL);
v = g_hash_table_lookup (priv->internal, key);
@@ -1301,27 +1301,27 @@ ide_configuration_get_internal_string (IdeConfiguration *self,
}
void
-ide_configuration_set_internal_string (IdeConfiguration *self,
+ide_config_set_internal_string (IdeConfig *self,
const gchar *key,
const gchar *value)
{
GValue *v;
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (key != NULL);
- v = ide_configuration_reset_internal_value (self, key, G_TYPE_STRING);
+ v = ide_config_reset_internal_value (self, key, G_TYPE_STRING);
g_value_set_string (v, value);
}
const gchar * const *
-ide_configuration_get_internal_strv (IdeConfiguration *self,
+ide_config_get_internal_strv (IdeConfig *self,
const gchar *key)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
const GValue *v;
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
g_return_val_if_fail (key != NULL, NULL);
v = g_hash_table_lookup (priv->internal, key);
@@ -1333,27 +1333,27 @@ ide_configuration_get_internal_strv (IdeConfiguration *self,
}
void
-ide_configuration_set_internal_strv (IdeConfiguration *self,
+ide_config_set_internal_strv (IdeConfig *self,
const gchar *key,
const gchar * const *value)
{
GValue *v;
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (key != NULL);
- v = ide_configuration_reset_internal_value (self, key, G_TYPE_STRV);
+ v = ide_config_reset_internal_value (self, key, G_TYPE_STRV);
g_value_set_boxed (v, value);
}
gboolean
-ide_configuration_get_internal_boolean (IdeConfiguration *self,
+ide_config_get_internal_boolean (IdeConfig *self,
const gchar *key)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
const GValue *v;
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), FALSE);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), FALSE);
g_return_val_if_fail (key != NULL, FALSE);
v = g_hash_table_lookup (priv->internal, key);
@@ -1365,27 +1365,27 @@ ide_configuration_get_internal_boolean (IdeConfiguration *self,
}
void
-ide_configuration_set_internal_boolean (IdeConfiguration *self,
+ide_config_set_internal_boolean (IdeConfig *self,
const gchar *key,
gboolean value)
{
GValue *v;
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (key != NULL);
- v = ide_configuration_reset_internal_value (self, key, G_TYPE_BOOLEAN);
+ v = ide_config_reset_internal_value (self, key, G_TYPE_BOOLEAN);
g_value_set_boolean (v, value);
}
gint
-ide_configuration_get_internal_int (IdeConfiguration *self,
+ide_config_get_internal_int (IdeConfig *self,
const gchar *key)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
const GValue *v;
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), -1);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), -1);
g_return_val_if_fail (key != NULL, -1);
v = g_hash_table_lookup (priv->internal, key);
@@ -1397,27 +1397,27 @@ ide_configuration_get_internal_int (IdeConfiguration *self,
}
void
-ide_configuration_set_internal_int (IdeConfiguration *self,
+ide_config_set_internal_int (IdeConfig *self,
const gchar *key,
gint value)
{
GValue *v;
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (key != NULL);
- v = ide_configuration_reset_internal_value (self, key, G_TYPE_INT);
+ v = ide_config_reset_internal_value (self, key, G_TYPE_INT);
g_value_set_int (v, value);
}
gint64
-ide_configuration_get_internal_int64 (IdeConfiguration *self,
+ide_config_get_internal_int64 (IdeConfig *self,
const gchar *key)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
const GValue *v;
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), -1);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), -1);
g_return_val_if_fail (key != NULL, -1);
v = g_hash_table_lookup (priv->internal, key);
@@ -1429,22 +1429,22 @@ ide_configuration_get_internal_int64 (IdeConfiguration *self,
}
void
-ide_configuration_set_internal_int64 (IdeConfiguration *self,
+ide_config_set_internal_int64 (IdeConfig *self,
const gchar *key,
gint64 value)
{
GValue *v;
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (key != NULL);
- v = ide_configuration_reset_internal_value (self, key, G_TYPE_INT64);
+ v = ide_config_reset_internal_value (self, key, G_TYPE_INT64);
g_value_set_int64 (v, value);
}
/**
- * ide_configuration_get_internal_object:
- * @self: An #IdeConfiguration
+ * ide_config_get_internal_object:
+ * @self: An #IdeConfig
* @key: The key to get
*
* Gets the value associated with @key if it is a #GObject.
@@ -1454,13 +1454,13 @@ ide_configuration_set_internal_int64 (IdeConfiguration *self,
* Since: 3.32
*/
gpointer
-ide_configuration_get_internal_object (IdeConfiguration *self,
+ide_config_get_internal_object (IdeConfig *self,
const gchar *key)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
const GValue *v;
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
g_return_val_if_fail (key != NULL, NULL);
v = g_hash_table_lookup (priv->internal, key);
@@ -1472,8 +1472,8 @@ ide_configuration_get_internal_object (IdeConfiguration *self,
}
/**
- * ide_configuration_set_internal_object:
- * @self: an #IdeConfiguration
+ * ide_config_set_internal_object:
+ * @self: an #IdeConfig
* @key: the key to set
* @instance: (type GObject.Object) (nullable): a #GObject or %NULL
*
@@ -1482,14 +1482,14 @@ ide_configuration_get_internal_object (IdeConfiguration *self,
* Since: 3.32
*/
void
-ide_configuration_set_internal_object (IdeConfiguration *self,
+ide_config_set_internal_object (IdeConfig *self,
const gchar *key,
gpointer instance)
{
GValue *v;
GType type;
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (key != NULL);
if (instance != NULL)
@@ -1497,13 +1497,13 @@ ide_configuration_set_internal_object (IdeConfiguration *self,
else
type = G_TYPE_OBJECT;
- v = ide_configuration_reset_internal_value (self, key, type);
+ v = ide_config_reset_internal_value (self, key, type);
g_value_set_object (v, instance);
}
/**
- * ide_configuration_get_ready:
- * @self: An #IdeConfiguration
+ * ide_config_get_ready:
+ * @self: An #IdeConfig
*
* Determines if the configuration is ready for use.
*
@@ -1512,35 +1512,35 @@ ide_configuration_set_internal_object (IdeConfiguration *self,
* Since: 3.32
*/
gboolean
-ide_configuration_get_ready (IdeConfiguration *self)
+ide_config_get_ready (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), FALSE);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), FALSE);
return priv->runtime_ready;
}
gboolean
-ide_configuration_supports_runtime (IdeConfiguration *self,
+ide_config_supports_runtime (IdeConfig *self,
IdeRuntime *runtime)
{
gboolean ret = TRUE;
IDE_ENTRY;
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), FALSE);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), FALSE);
g_return_val_if_fail (IDE_IS_RUNTIME (runtime), FALSE);
- if (IDE_CONFIGURATION_GET_CLASS (self)->supports_runtime)
- ret = IDE_CONFIGURATION_GET_CLASS (self)->supports_runtime (self, runtime);
+ if (IDE_CONFIG_GET_CLASS (self)->supports_runtime)
+ ret = IDE_CONFIG_GET_CLASS (self)->supports_runtime (self, runtime);
IDE_RETURN (ret);
}
/**
- * ide_configuration_get_run_opts:
- * @self: a #IdeConfiguration
+ * ide_config_get_run_opts:
+ * @self: a #IdeConfig
*
* Gets the command line options to use when running the target application.
* The result should be parsed with g_shell_parse_argv() to convert the run
@@ -1552,32 +1552,32 @@ ide_configuration_supports_runtime (IdeConfiguration *self,
* Since: 3.32
*/
const gchar *
-ide_configuration_get_run_opts (IdeConfiguration *self)
+ide_config_get_run_opts (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return priv->run_opts;
}
/**
- * ide_configuration_set_run_opts:
- * @self: a #IdeConfiguration
+ * ide_config_set_run_opts:
+ * @self: a #IdeConfig
* @run_opts: (nullable): the run options for the target application
*
* Sets the run options to use when running the target application.
- * See ide_configuration_get_run_opts() for more information.
+ * See ide_config_get_run_opts() for more information.
*
* Since: 3.32
*/
void
-ide_configuration_set_run_opts (IdeConfiguration *self,
+ide_config_set_run_opts (IdeConfig *self,
const gchar *run_opts)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
if (g_strcmp0 (run_opts, priv->run_opts) != 0)
{
@@ -1588,22 +1588,22 @@ ide_configuration_set_run_opts (IdeConfiguration *self,
}
const gchar *
-ide_configuration_get_append_path (IdeConfiguration *self)
+ide_config_get_append_path (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return priv->append_path;
}
void
-ide_configuration_set_append_path (IdeConfiguration *self,
+ide_config_set_append_path (IdeConfig *self,
const gchar *append_path)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
if (priv->append_path != append_path)
{
@@ -1614,12 +1614,12 @@ ide_configuration_set_append_path (IdeConfiguration *self,
}
void
-ide_configuration_apply_path (IdeConfiguration *self,
+ide_config_apply_path (IdeConfig *self,
IdeSubprocessLauncher *launcher)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (IDE_IS_SUBPROCESS_LAUNCHER (launcher));
if (priv->append_path != NULL)
@@ -1627,22 +1627,22 @@ ide_configuration_apply_path (IdeConfiguration *self,
}
IdeBuildLocality
-ide_configuration_get_locality (IdeConfiguration *self)
+ide_config_get_locality (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), 0);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), 0);
return priv->locality;
}
void
-ide_configuration_set_locality (IdeConfiguration *self,
+ide_config_set_locality (IdeConfig *self,
IdeBuildLocality locality)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (locality > 0);
g_return_if_fail (locality <= IDE_BUILD_LOCALITY_DEFAULT);
@@ -1654,30 +1654,30 @@ ide_configuration_set_locality (IdeConfiguration *self,
}
/**
- * ide_configuration_get_build_commands_dir:
- * @self: a #IdeConfiguration
+ * ide_config_get_build_commands_dir:
+ * @self: a #IdeConfig
*
* Returns: (transfer none) (nullable): a #GFile or %NULL
*
* Since: 3.32
*/
GFile *
-ide_configuration_get_build_commands_dir (IdeConfiguration *self)
+ide_config_get_build_commands_dir (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (self), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (self), NULL);
return priv->build_commands_dir;
}
void
-ide_configuration_set_build_commands_dir (IdeConfiguration *self,
+ide_config_set_build_commands_dir (IdeConfig *self,
GFile *build_commands_dir)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (!build_commands_dir || G_IS_FILE (build_commands_dir));
if (g_set_object (&priv->build_commands_dir, build_commands_dir))
@@ -1685,14 +1685,14 @@ ide_configuration_set_build_commands_dir (IdeConfiguration *self,
}
void
-_ide_configuration_attach (IdeConfiguration *self)
+_ide_config_attach (IdeConfig *self)
{
- IdeConfigurationPrivate *priv = ide_configuration_get_instance_private (self);
+ IdeConfigPrivate *priv = ide_config_get_instance_private (self);
IdeRuntimeManager *runtime_manager;
IdeContext *context;
g_return_if_fail (IDE_IS_MAIN_THREAD ());
- g_return_if_fail (IDE_IS_CONFIGURATION (self));
+ g_return_if_fail (IDE_IS_CONFIG (self));
g_return_if_fail (priv->has_attached == FALSE);
priv->has_attached = TRUE;
@@ -1713,12 +1713,12 @@ _ide_configuration_attach (IdeConfiguration *self)
g_signal_connect_object (runtime_manager,
"items-changed",
- G_CALLBACK (ide_configuration_runtime_manager_items_changed),
+ G_CALLBACK (ide_config_runtime_manager_items_changed),
self,
G_CONNECT_SWAPPED);
/* Update the runtime and potentially set prefix, but do not emit changed */
- ide_configuration_block_changed (self);
- ide_configuration_runtime_manager_items_changed (self, 0, 0, 0, runtime_manager);
- ide_configuration_unblock_changed (self);
+ ide_config_block_changed (self);
+ ide_config_runtime_manager_items_changed (self, 0, 0, 0, runtime_manager);
+ ide_config_unblock_changed (self);
}
diff --git a/src/libide/foundry/ide-configuration.h b/src/libide/foundry/ide-config.h
similarity index 54%
rename from src/libide/foundry/ide-configuration.h
rename to src/libide/foundry/ide-config.h
index 62344ef48..6f1de8da3 100644
--- a/src/libide/foundry/ide-configuration.h
+++ b/src/libide/foundry/ide-config.h
@@ -1,4 +1,4 @@
-/* ide-configuration.h
+/* ide-config.h
*
* Copyright 2016-2019 Christian Hergert <chergert redhat com>
*
@@ -31,10 +31,10 @@
G_BEGIN_DECLS
-#define IDE_TYPE_CONFIGURATION (ide_configuration_get_type())
+#define IDE_TYPE_CONFIG (ide_config_get_type())
IDE_AVAILABLE_IN_3_32
-G_DECLARE_DERIVABLE_TYPE (IdeConfiguration, ide_configuration, IDE, CONFIGURATION, IdeObject)
+G_DECLARE_DERIVABLE_TYPE (IdeConfig, ide_config, IDE, CONFIG, IdeObject)
typedef enum
{
@@ -43,14 +43,14 @@ typedef enum
IDE_BUILD_LOCALITY_DEFAULT = IDE_BUILD_LOCALITY_IN_TREE | IDE_BUILD_LOCALITY_OUT_OF_TREE,
} IdeBuildLocality;
-struct _IdeConfigurationClass
+struct _IdeConfigClass
{
IdeObjectClass parent;
- IdeRuntime *(*get_runtime) (IdeConfiguration *self);
- void (*set_runtime) (IdeConfiguration *self,
+ IdeRuntime *(*get_runtime) (IdeConfig *self);
+ void (*set_runtime) (IdeConfig *self,
IdeRuntime *runtime);
- gboolean (*supports_runtime) (IdeConfiguration *self,
+ gboolean (*supports_runtime) (IdeConfig *self,
IdeRuntime *runtime);
/*< private >*/
@@ -58,156 +58,156 @@ struct _IdeConfigurationClass
};
IDE_AVAILABLE_IN_3_32
-const gchar *ide_configuration_get_append_path (IdeConfiguration *self);
+const gchar *ide_config_get_append_path (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_append_path (IdeConfiguration *self,
+void ide_config_set_append_path (IdeConfig *self,
const gchar *append_path);
IDE_AVAILABLE_IN_3_32
-const gchar *ide_configuration_get_id (IdeConfiguration *self);
+const gchar *ide_config_get_id (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-const gchar *ide_configuration_get_runtime_id (IdeConfiguration *self);
+const gchar *ide_config_get_runtime_id (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_runtime_id (IdeConfiguration *self,
+void ide_config_set_runtime_id (IdeConfig *self,
const gchar *runtime_id);
IDE_AVAILABLE_IN_3_32
-const gchar *ide_configuration_get_toolchain_id (IdeConfiguration *self);
+const gchar *ide_config_get_toolchain_id (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_toolchain_id (IdeConfiguration *self,
+void ide_config_set_toolchain_id (IdeConfig *self,
const gchar *toolchain_id);
IDE_AVAILABLE_IN_3_32
-gboolean ide_configuration_get_dirty (IdeConfiguration *self);
+gboolean ide_config_get_dirty (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_dirty (IdeConfiguration *self,
+void ide_config_set_dirty (IdeConfig *self,
gboolean dirty);
IDE_AVAILABLE_IN_3_32
-const gchar *ide_configuration_get_display_name (IdeConfiguration *self);
+const gchar *ide_config_get_display_name (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_display_name (IdeConfiguration *self,
+void ide_config_set_display_name (IdeConfig *self,
const gchar *display_name);
IDE_AVAILABLE_IN_3_32
-IdeBuildLocality ide_configuration_get_locality (IdeConfiguration *self);
+IdeBuildLocality ide_config_get_locality (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_locality (IdeConfiguration *self,
+void ide_config_set_locality (IdeConfig *self,
IdeBuildLocality locality);
IDE_AVAILABLE_IN_3_32
-gboolean ide_configuration_get_ready (IdeConfiguration *self);
+gboolean ide_config_get_ready (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-IdeRuntime *ide_configuration_get_runtime (IdeConfiguration *self);
+IdeRuntime *ide_config_get_runtime (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_runtime (IdeConfiguration *self,
+void ide_config_set_runtime (IdeConfig *self,
IdeRuntime *runtime);
IDE_AVAILABLE_IN_3_32
-IdeToolchain *ide_configuration_get_toolchain (IdeConfiguration *self);
+IdeToolchain *ide_config_get_toolchain (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_toolchain (IdeConfiguration *self,
+void ide_config_set_toolchain (IdeConfig *self,
IdeToolchain *toolchain);
IDE_AVAILABLE_IN_3_32
-gchar **ide_configuration_get_environ (IdeConfiguration *self);
+gchar **ide_config_get_environ (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-const gchar *ide_configuration_getenv (IdeConfiguration *self,
+const gchar *ide_config_getenv (IdeConfig *self,
const gchar *key);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_setenv (IdeConfiguration *self,
+void ide_config_setenv (IdeConfig *self,
const gchar *key,
const gchar *value);
IDE_AVAILABLE_IN_3_32
-gboolean ide_configuration_get_debug (IdeConfiguration *self);
+gboolean ide_config_get_debug (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_debug (IdeConfiguration *self,
+void ide_config_set_debug (IdeConfig *self,
gboolean debug);
IDE_AVAILABLE_IN_3_32
-const gchar *ide_configuration_get_prefix (IdeConfiguration *self);
+const gchar *ide_config_get_prefix (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_prefix (IdeConfiguration *self,
+void ide_config_set_prefix (IdeConfig *self,
const gchar *prefix);
IDE_AVAILABLE_IN_3_32
-const gchar *ide_configuration_get_config_opts (IdeConfiguration *self);
+const gchar *ide_config_get_config_opts (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_config_opts (IdeConfiguration *self,
+void ide_config_set_config_opts (IdeConfig *self,
const gchar *config_opts);
IDE_AVAILABLE_IN_3_32
-const gchar *ide_configuration_get_run_opts (IdeConfiguration *self);
+const gchar *ide_config_get_run_opts (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_run_opts (IdeConfiguration *self,
+void ide_config_set_run_opts (IdeConfig *self,
const gchar *run_opts);
IDE_AVAILABLE_IN_3_32
-const gchar * const *ide_configuration_get_build_commands (IdeConfiguration *self);
+const gchar * const *ide_config_get_build_commands (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_build_commands (IdeConfiguration *self,
+void ide_config_set_build_commands (IdeConfig *self,
const gchar *const *build_commands);
IDE_AVAILABLE_IN_3_32
-GFile *ide_configuration_get_build_commands_dir (IdeConfiguration *self);
+GFile *ide_config_get_build_commands_dir (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_build_commands_dir (IdeConfiguration *self,
+void ide_config_set_build_commands_dir (IdeConfig *self,
GFile
*build_commands_dir);
IDE_AVAILABLE_IN_3_32
-const gchar * const *ide_configuration_get_post_install_commands (IdeConfiguration *self);
+const gchar * const *ide_config_get_post_install_commands (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_post_install_commands (IdeConfiguration *self,
+void ide_config_set_post_install_commands (IdeConfig *self,
const gchar *const
*post_install_commands);
IDE_AVAILABLE_IN_3_32
-gint ide_configuration_get_parallelism (IdeConfiguration *self);
+gint ide_config_get_parallelism (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_parallelism (IdeConfiguration *self,
+void ide_config_set_parallelism (IdeConfig *self,
gint parallelism);
IDE_AVAILABLE_IN_3_32
-IdeEnvironment *ide_configuration_get_environment (IdeConfiguration *self);
+IdeEnvironment *ide_config_get_environment (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_environment (IdeConfiguration *self,
+void ide_config_set_environment (IdeConfig *self,
IdeEnvironment *environment);
IDE_AVAILABLE_IN_3_32
-guint ide_configuration_get_sequence (IdeConfiguration *self);
+guint ide_config_get_sequence (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-const gchar *ide_configuration_get_app_id (IdeConfiguration *self);
+const gchar *ide_config_get_app_id (IdeConfig *self);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_app_id (IdeConfiguration *self,
+void ide_config_set_app_id (IdeConfig *self,
const gchar *app_id);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_apply_path (IdeConfiguration *self,
+void ide_config_apply_path (IdeConfig *self,
IdeSubprocessLauncher *launcher);
IDE_AVAILABLE_IN_3_32
-gboolean ide_configuration_supports_runtime (IdeConfiguration *self,
+gboolean ide_config_supports_runtime (IdeConfig *self,
IdeRuntime *runtime);
IDE_AVAILABLE_IN_3_32
-const gchar *ide_configuration_get_internal_string (IdeConfiguration *self,
+const gchar *ide_config_get_internal_string (IdeConfig *self,
const gchar *key);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_internal_string (IdeConfiguration *self,
+void ide_config_set_internal_string (IdeConfig *self,
const gchar *key,
const gchar *value);
IDE_AVAILABLE_IN_3_32
-const gchar * const *ide_configuration_get_internal_strv (IdeConfiguration *self,
+const gchar * const *ide_config_get_internal_strv (IdeConfig *self,
const gchar *key);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_internal_strv (IdeConfiguration *self,
+void ide_config_set_internal_strv (IdeConfig *self,
const gchar *key,
const gchar *const *value);
IDE_AVAILABLE_IN_3_32
-gboolean ide_configuration_get_internal_boolean (IdeConfiguration *self,
+gboolean ide_config_get_internal_boolean (IdeConfig *self,
const gchar *key);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_internal_boolean (IdeConfiguration *self,
+void ide_config_set_internal_boolean (IdeConfig *self,
const gchar *key,
gboolean value);
IDE_AVAILABLE_IN_3_32
-gint ide_configuration_get_internal_int (IdeConfiguration *self,
+gint ide_config_get_internal_int (IdeConfig *self,
const gchar *key);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_internal_int (IdeConfiguration *self,
+void ide_config_set_internal_int (IdeConfig *self,
const gchar *key,
gint value);
IDE_AVAILABLE_IN_3_32
-gint64 ide_configuration_get_internal_int64 (IdeConfiguration *self,
+gint64 ide_config_get_internal_int64 (IdeConfig *self,
const gchar *key);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_internal_int64 (IdeConfiguration *self,
+void ide_config_set_internal_int64 (IdeConfig *self,
const gchar *key,
gint64 value);
IDE_AVAILABLE_IN_3_32
-gpointer ide_configuration_get_internal_object (IdeConfiguration *self,
+gpointer ide_config_get_internal_object (IdeConfig *self,
const gchar *key);
IDE_AVAILABLE_IN_3_32
-void ide_configuration_set_internal_object (IdeConfiguration *self,
+void ide_config_set_internal_object (IdeConfig *self,
const gchar *key,
gpointer instance);
diff --git a/src/libide/foundry/ide-device.c b/src/libide/foundry/ide-device.c
index a5fcb2b65..2a8690c95 100644
--- a/src/libide/foundry/ide-device.c
+++ b/src/libide/foundry/ide-device.c
@@ -25,7 +25,7 @@
#include <glib/gi18n.h>
#include <libide-threading.h>
-#include "ide-configuration.h"
+#include "ide-config.h"
#include "ide-device.h"
#include "ide-device-info.h"
@@ -309,10 +309,10 @@ ide_device_init (IdeDevice *self)
void
ide_device_prepare_configuration (IdeDevice *self,
- IdeConfiguration *configuration)
+ IdeConfig *configuration)
{
g_assert (IDE_IS_DEVICE (self));
- g_assert (IDE_IS_CONFIGURATION (configuration));
+ g_assert (IDE_IS_CONFIG (configuration));
if (IDE_DEVICE_GET_CLASS (self)->prepare_configuration)
IDE_DEVICE_GET_CLASS (self)->prepare_configuration (self, configuration);
diff --git a/src/libide/foundry/ide-device.h b/src/libide/foundry/ide-device.h
index b14a68f24..2dd73d24d 100644
--- a/src/libide/foundry/ide-device.h
+++ b/src/libide/foundry/ide-device.h
@@ -46,7 +46,7 @@ struct _IdeDeviceClass
IdeObjectClass parent;
void (*prepare_configuration) (IdeDevice *self,
- IdeConfiguration *configuration);
+ IdeConfig *configuration);
void (*get_info_async) (IdeDevice *self,
GCancellable *cancellable,
GAsyncReadyCallback callback,
@@ -78,7 +78,7 @@ void ide_device_set_id (IdeDevice *self,
const gchar *id);
IDE_AVAILABLE_IN_3_32
void ide_device_prepare_configuration (IdeDevice *self,
- IdeConfiguration *configuration);
+ IdeConfig *configuration);
IDE_AVAILABLE_IN_3_32
void ide_device_get_info_async (IdeDevice *self,
GCancellable *cancellable,
diff --git a/src/libide/foundry/ide-foundry-compat.c b/src/libide/foundry/ide-foundry-compat.c
index 04051ef46..a0f39af42 100644
--- a/src/libide/foundry/ide-foundry-compat.c
+++ b/src/libide/foundry/ide-foundry-compat.c
@@ -25,7 +25,7 @@
#include "ide-build-manager.h"
#include "ide-build-system.h"
#include "ide-device-manager.h"
-#include "ide-configuration-manager.h"
+#include "ide-config-manager.h"
#include "ide-foundry-compat.h"
#include "ide-run-manager.h"
#include "ide-runtime-manager.h"
@@ -131,19 +131,19 @@ ide_build_system_from_context (IdeContext *context)
}
/**
- * ide_configuration_manager_from_context:
+ * ide_config_manager_from_context:
* @context: a #IdeContext
*
- * Returns: (transfer none): an #IdeConfigurationManager
+ * Returns: (transfer none): an #IdeConfigManager
*
* Since: 3.32
*/
-IdeConfigurationManager *
-ide_configuration_manager_from_context (IdeContext *context)
+IdeConfigManager *
+ide_config_manager_from_context (IdeContext *context)
{
g_return_val_if_fail (IDE_IS_CONTEXT (context), NULL);
- return ensure_child_typed_borrowed (context, IDE_TYPE_CONFIGURATION_MANAGER);
+ return ensure_child_typed_borrowed (context, IDE_TYPE_CONFIG_MANAGER);
}
/**
diff --git a/src/libide/foundry/ide-foundry-init.c b/src/libide/foundry/ide-foundry-init.c
index 91a04a6ca..516bcba1b 100644
--- a/src/libide/foundry/ide-foundry-init.c
+++ b/src/libide/foundry/ide-foundry-init.c
@@ -26,7 +26,7 @@
#include "ide-build-manager.h"
#include "ide-device-manager.h"
-#include "ide-configuration-manager.h"
+#include "ide-config-manager.h"
#include "ide-foundry-init.h"
#include "ide-run-manager.h"
#include "ide-runtime-manager.h"
@@ -101,7 +101,7 @@ _ide_foundry_init_async (IdeContext *context,
IDE_TYPE_DEVICE_MANAGER,
IDE_TYPE_RUNTIME_MANAGER,
IDE_TYPE_TOOLCHAIN_MANAGER,
- IDE_TYPE_CONFIGURATION_MANAGER,
+ IDE_TYPE_CONFIG_MANAGER,
IDE_TYPE_BUILD_MANAGER,
IDE_TYPE_RUN_MANAGER,
IDE_TYPE_TEST_MANAGER,
diff --git a/src/libide/foundry/ide-foundry-types.h b/src/libide/foundry/ide-foundry-types.h
index 442f730e2..4511179a9 100644
--- a/src/libide/foundry/ide-foundry-types.h
+++ b/src/libide/foundry/ide-foundry-types.h
@@ -41,9 +41,9 @@ typedef struct _IdeBuildSystemDiscovery IdeBuildSystemDiscovery;
typedef struct _IdeBuildTarget IdeBuildTarget;
typedef struct _IdeBuildTargetProvider IdeBuildTargetProvider;
typedef struct _IdeCompileCommands IdeCompileCommands;
-typedef struct _IdeConfiguration IdeConfiguration;
-typedef struct _IdeConfigurationProvider IdeConfigurationProvider;
-typedef struct _IdeConfigurationManager IdeConfigurationManager;
+typedef struct _IdeConfig IdeConfig;
+typedef struct _IdeConfigProvider IdeConfigProvider;
+typedef struct _IdeConfigManager IdeConfigManager;
typedef struct _IdeDependencyUpdater IdeDependencyUpdater;
typedef struct _IdeDeployStrategy IdeDeployStrategy;
typedef struct _IdeDevice IdeDevice;
diff --git a/src/libide/foundry/ide-run-manager.c b/src/libide/foundry/ide-run-manager.c
index 82e254fb9..cdc754b96 100644
--- a/src/libide/foundry/ide-run-manager.c
+++ b/src/libide/foundry/ide-run-manager.c
@@ -31,8 +31,8 @@
#include "ide-build-system.h"
#include "ide-build-target-provider.h"
#include "ide-build-target.h"
-#include "ide-configuration-manager.h"
-#include "ide-configuration.h"
+#include "ide-config-manager.h"
+#include "ide-config.h"
#include "ide-foundry-compat.h"
#include "ide-run-manager-private.h"
#include "ide-run-manager.h"
@@ -423,8 +423,8 @@ do_run_async (IdeRunManager *self,
g_autofree gchar *title = NULL;
IdeBuildTarget *build_target;
IdeContext *context;
- IdeConfigurationManager *config_manager;
- IdeConfiguration *config;
+ IdeConfigManager *config_manager;
+ IdeConfig *config;
IdeEnvironment *environment;
IdeRuntime *runtime;
g_autoptr(IdeRunner) runner = NULL;
@@ -442,9 +442,9 @@ do_run_async (IdeRunManager *self,
g_assert (IDE_IS_BUILD_TARGET (build_target));
g_assert (IDE_IS_CONTEXT (context));
- config_manager = ide_configuration_manager_from_context (context);
- config = ide_configuration_manager_get_current (config_manager);
- runtime = ide_configuration_get_runtime (config);
+ config_manager = ide_config_manager_from_context (context);
+ config = ide_config_manager_get_current (config_manager);
+ runtime = ide_config_get_runtime (config);
if (runtime == NULL)
{
@@ -453,7 +453,7 @@ do_run_async (IdeRunManager *self,
IDE_RUNTIME_ERROR_NO_SUCH_RUNTIME,
"%s “%s”",
_("Failed to locate runtime"),
- ide_configuration_get_runtime_id (config));
+ ide_config_get_runtime_id (config));
IDE_EXIT;
}
@@ -464,7 +464,7 @@ do_run_async (IdeRunManager *self,
g_assert (!cancellable || G_IS_CANCELLABLE (cancellable));
/* Add our run arguments if specified in the config. */
- if (NULL != (run_opts = ide_configuration_get_run_opts (config)))
+ if (NULL != (run_opts = ide_config_get_run_opts (config)))
{
g_auto(GStrv) argv = NULL;
gint argc;
@@ -483,7 +483,7 @@ do_run_async (IdeRunManager *self,
*/
environment = ide_runner_get_environment (runner);
ide_environment_setenv (environment, "G_MESSAGES_DEBUG", "all");
- ide_environment_copy_into (ide_configuration_get_environment (config), environment, TRUE);
+ ide_environment_copy_into (ide_config_get_environment (config), environment, TRUE);
g_signal_emit (self, signals [RUN], 0, runner);
diff --git a/src/libide/foundry/ide-runner.c b/src/libide/foundry/ide-runner.c
index 239139669..25e68c826 100644
--- a/src/libide/foundry/ide-runner.c
+++ b/src/libide/foundry/ide-runner.c
@@ -31,8 +31,8 @@
#include <unistd.h>
#include "ide-build-target.h"
-#include "ide-configuration-manager.h"
-#include "ide-configuration.h"
+#include "ide-config-manager.h"
+#include "ide-config.h"
#include "ide-foundry-compat.h"
#include "ide-runner-addin.h"
#include "ide-runner.h"
@@ -187,18 +187,18 @@ static IdeSubprocessLauncher *
ide_runner_real_create_launcher (IdeRunner *self)
{
IdeRunnerPrivate *priv = ide_runner_get_instance_private (self);
- IdeConfigurationManager *config_manager;
+ IdeConfigManager *config_manager;
IdeSubprocessLauncher *ret;
- IdeConfiguration *config;
+ IdeConfig *config;
IdeContext *context;
IdeRuntime *runtime;
g_assert (IDE_IS_RUNNER (self));
context = ide_object_get_context (IDE_OBJECT (self));
- config_manager = ide_configuration_manager_from_context (context);
- config = ide_configuration_manager_get_current (config_manager);
- runtime = ide_configuration_get_runtime (config);
+ config_manager = ide_config_manager_from_context (context);
+ config = ide_config_manager_get_current (config_manager);
+ runtime = ide_config_get_runtime (config);
ret = ide_runtime_create_launcher (runtime, NULL);
@@ -218,8 +218,8 @@ ide_runner_real_run_async (IdeRunner *self,
g_autoptr(IdeTask) task = NULL;
g_autoptr(IdeSubprocessLauncher) launcher = NULL;
g_autoptr(IdeSubprocess) subprocess = NULL;
- IdeConfigurationManager *config_manager;
- IdeConfiguration *config;
+ IdeConfigManager *config_manager;
+ IdeConfig *config;
const gchar *identifier;
IdeContext *context;
IdeRuntime *runtime;
@@ -234,9 +234,9 @@ ide_runner_real_run_async (IdeRunner *self,
ide_task_set_source_tag (task, ide_runner_real_run_async);
context = ide_object_get_context (IDE_OBJECT (self));
- config_manager = ide_configuration_manager_from_context (context);
- config = ide_configuration_manager_get_current (config_manager);
- runtime = ide_configuration_get_runtime (config);
+ config_manager = ide_config_manager_from_context (context);
+ config = ide_config_manager_get_current (config_manager);
+ runtime = ide_config_get_runtime (config);
if (runtime != NULL)
launcher = IDE_RUNNER_GET_CLASS (self)->create_launcher (self);
@@ -1286,8 +1286,8 @@ ide_runner_take_fd (IdeRunner *self,
IdeRuntime *
ide_runner_get_runtime (IdeRunner *self)
{
- IdeConfigurationManager *config_manager;
- IdeConfiguration *config;
+ IdeConfigManager *config_manager;
+ IdeConfig *config;
IdeContext *context;
IdeRuntime *runtime;
@@ -1297,9 +1297,9 @@ ide_runner_get_runtime (IdeRunner *self)
return IDE_RUNNER_GET_CLASS (self)->get_runtime (self);
context = ide_object_get_context (IDE_OBJECT (self));
- config_manager = ide_configuration_manager_from_context (context);
- config = ide_configuration_manager_get_current (config_manager);
- runtime = ide_configuration_get_runtime (config);
+ config_manager = ide_config_manager_from_context (context);
+ config = ide_config_manager_get_current (config_manager);
+ runtime = ide_config_get_runtime (config);
return runtime != NULL ? g_object_ref (runtime) : NULL;
}
diff --git a/src/libide/foundry/ide-runtime-manager.c b/src/libide/foundry/ide-runtime-manager.c
index 6fbc115e3..51f979159 100644
--- a/src/libide/foundry/ide-runtime-manager.c
+++ b/src/libide/foundry/ide-runtime-manager.c
@@ -29,7 +29,7 @@
#include "ide-build-pipeline.h"
#include "ide-build-private.h"
-#include "ide-configuration.h"
+#include "ide-config.h"
#include "ide-device.h"
#include "ide-runtime.h"
#include "ide-runtime-manager.h"
@@ -340,7 +340,7 @@ _ide_runtime_manager_prepare_async (IdeRuntimeManager *self,
gpointer user_data)
{
g_autoptr(IdeTask) task = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
PrepareState *state;
const gchar *runtime_id;
InstallLookup lookup = { 0 };
@@ -352,7 +352,7 @@ _ide_runtime_manager_prepare_async (IdeRuntimeManager *self,
g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
config = ide_build_pipeline_get_configuration (pipeline);
- runtime_id = ide_configuration_get_runtime_id (config);
+ runtime_id = ide_config_get_runtime_id (config);
task = ide_task_new (self, cancellable, callback, user_data);
ide_task_set_source_tag (task, _ide_runtime_manager_prepare_async);
diff --git a/src/libide/foundry/ide-runtime-provider.c b/src/libide/foundry/ide-runtime-provider.c
index 60568ee5b..27fa3d2f1 100644
--- a/src/libide/foundry/ide-runtime-provider.c
+++ b/src/libide/foundry/ide-runtime-provider.c
@@ -25,7 +25,7 @@
#include <libide-threading.h>
#include "ide-build-pipeline.h"
-#include "ide-configuration.h"
+#include "ide-config.h"
#include "ide-foundry-compat.h"
#include "ide-runtime.h"
#include "ide-runtime-manager.h"
@@ -121,7 +121,7 @@ ide_runtime_provider_real_bootstrap_async (IdeRuntimeProvider *self,
gpointer user_data)
{
g_autoptr(IdeTask) task = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
const gchar *runtime_id;
IDE_ENTRY;
@@ -135,7 +135,7 @@ ide_runtime_provider_real_bootstrap_async (IdeRuntimeProvider *self,
ide_task_set_priority (task, G_PRIORITY_LOW);
config = ide_build_pipeline_get_configuration (pipeline);
- runtime_id = ide_configuration_get_runtime_id (config);
+ runtime_id = ide_config_get_runtime_id (config);
ide_task_set_task_data (task, g_strdup (runtime_id), g_free);
if (runtime_id == NULL)
diff --git a/src/libide/foundry/ide-runtime.c b/src/libide/foundry/ide-runtime.c
index a46b5961e..80c2227ec 100644
--- a/src/libide/foundry/ide-runtime.c
+++ b/src/libide/foundry/ide-runtime.c
@@ -28,7 +28,7 @@
#include <string.h>
#include "ide-build-target.h"
-#include "ide-configuration.h"
+#include "ide-config.h"
#include "ide-runtime.h"
#include "ide-runner.h"
#include "ide-toolchain.h"
@@ -138,14 +138,14 @@ ide_runtime_contains_program_in_path (IdeRuntime *self,
static void
ide_runtime_real_prepare_configuration (IdeRuntime *self,
- IdeConfiguration *configuration)
+ IdeConfig *configuration)
{
IdeRuntimePrivate *priv = ide_runtime_get_instance_private (self);
g_assert (IDE_IS_RUNTIME (self));
- g_assert (IDE_IS_CONFIGURATION (configuration));
+ g_assert (IDE_IS_CONFIG (configuration));
- if (NULL == ide_configuration_get_prefix (configuration))
+ if (NULL == ide_config_get_prefix (configuration))
{
g_autofree gchar *install_path = NULL;
g_autofree gchar *project_id = NULL;
@@ -161,7 +161,7 @@ ide_runtime_real_prepare_configuration (IdeRuntime *self,
priv->id,
NULL);
- ide_configuration_set_prefix (configuration, install_path);
+ ide_config_set_prefix (configuration, install_path);
}
}
@@ -519,10 +519,10 @@ ide_runtime_create_launcher (IdeRuntime *self,
void
ide_runtime_prepare_configuration (IdeRuntime *self,
- IdeConfiguration *configuration)
+ IdeConfig *configuration)
{
g_return_if_fail (IDE_IS_RUNTIME (self));
- g_return_if_fail (IDE_IS_CONFIGURATION (configuration));
+ g_return_if_fail (IDE_IS_CONFIG (configuration));
IDE_RUNTIME_GET_CLASS (self)->prepare_configuration (self, configuration);
}
diff --git a/src/libide/foundry/ide-runtime.h b/src/libide/foundry/ide-runtime.h
index 289753f23..fba1a2eda 100644
--- a/src/libide/foundry/ide-runtime.h
+++ b/src/libide/foundry/ide-runtime.h
@@ -55,7 +55,7 @@ struct _IdeRuntimeClass
IdeSubprocessLauncher *(*create_launcher) (IdeRuntime *self,
GError **error);
void (*prepare_configuration) (IdeRuntime *self,
- IdeConfiguration *configuration);
+ IdeConfig *configuration);
IdeRunner *(*create_runner) (IdeRuntime *self,
IdeBuildTarget *build_target);
GFile *(*translate_file) (IdeRuntime *self,
@@ -83,7 +83,7 @@ IdeRunner *ide_runtime_create_runner (IdeRuntime
IdeBuildTarget *build_target);
IDE_AVAILABLE_IN_3_32
void ide_runtime_prepare_configuration (IdeRuntime *self,
- IdeConfiguration *configuration);
+ IdeConfig *configuration);
IDE_AVAILABLE_IN_3_32
IdeRuntime *ide_runtime_new (const gchar *id,
const gchar *title);
diff --git a/src/libide/foundry/ide-toolchain-manager.c b/src/libide/foundry/ide-toolchain-manager.c
index 37b66e3b1..d74b8a64d 100644
--- a/src/libide/foundry/ide-toolchain-manager.c
+++ b/src/libide/foundry/ide-toolchain-manager.c
@@ -30,7 +30,7 @@
#include "ide-build-private.h"
#include "ide-build-pipeline.h"
-#include "ide-configuration.h"
+#include "ide-config.h"
#include "ide-device.h"
#include "ide-simple-toolchain.h"
#include "ide-toolchain.h"
@@ -504,7 +504,7 @@ _ide_toolchain_manager_prepare_async (IdeToolchainManager *self,
{
g_autoptr(GTask) task = NULL;
g_autoptr(IdeToolchain) toolchain = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
PrepareState *state;
const gchar *toolchain_id;
@@ -515,7 +515,7 @@ _ide_toolchain_manager_prepare_async (IdeToolchainManager *self,
g_return_if_fail (!cancellable || G_IS_CANCELLABLE (cancellable));
config = ide_build_pipeline_get_configuration (pipeline);
- toolchain_id = ide_configuration_get_toolchain_id (config);
+ toolchain_id = ide_config_get_toolchain_id (config);
task = g_task_new (self, cancellable, callback, user_data);
g_task_set_source_tag (task, _ide_toolchain_manager_prepare_async);
diff --git a/src/libide/foundry/libide-foundry.h b/src/libide/foundry/libide-foundry.h
index 066082321..477b2148b 100644
--- a/src/libide/foundry/libide-foundry.h
+++ b/src/libide/foundry/libide-foundry.h
@@ -40,9 +40,9 @@ G_BEGIN_DECLS
#include "ide-build-system.h"
#include "ide-build-target-provider.h"
#include "ide-build-target.h"
-#include "ide-configuration.h"
-#include "ide-configuration-manager.h"
-#include "ide-configuration-provider.h"
+#include "ide-config.h"
+#include "ide-config-manager.h"
+#include "ide-config-provider.h"
#include "ide-compile-commands.h"
#include "ide-dependency-updater.h"
#include "ide-deploy-strategy.h"
diff --git a/src/libide/foundry/meson.build b/src/libide/foundry/meson.build
index 173036f03..d63e2ab21 100644
--- a/src/libide/foundry/meson.build
+++ b/src/libide/foundry/meson.build
@@ -24,9 +24,9 @@ libide_foundry_public_headers = [
'ide-build-target-provider.h',
'ide-build-target.h',
'ide-compile-commands.h',
- 'ide-configuration-manager.h',
- 'ide-configuration-provider.h',
- 'ide-configuration.h',
+ 'ide-config-manager.h',
+ 'ide-config-provider.h',
+ 'ide-config.h',
'ide-dependency-updater.h',
'ide-deploy-strategy.h',
'ide-device-info.h',
@@ -56,7 +56,7 @@ libide_foundry_private_headers = [
'ide-build-log-private.h',
'ide-build-private.h',
'ide-build-stage-private.h',
- 'ide-configuration-private.h',
+ 'ide-config-private.h',
'ide-device-private.h',
'ide-foundry-init.h',
'ide-run-manager-private.h',
@@ -67,7 +67,7 @@ libide_foundry_private_headers = [
libide_foundry_enum_headers = [
'ide-build-log.h',
'ide-build-pipeline.h',
- 'ide-configuration.h',
+ 'ide-config.h',
'ide-device.h',
'ide-device-info.h',
'ide-runtime.h',
@@ -93,9 +93,9 @@ libide_foundry_public_sources = [
'ide-build-target-provider.c',
'ide-build-target.c',
'ide-compile-commands.c',
- 'ide-configuration-manager.c',
- 'ide-configuration-provider.c',
- 'ide-configuration.c',
+ 'ide-config-manager.c',
+ 'ide-config-provider.c',
+ 'ide-config.c',
'ide-dependency-updater.c',
'ide-deploy-strategy.c',
'ide-device-info.c',
diff --git a/src/libide/gui/ide-config-view-addin.c b/src/libide/gui/ide-config-view-addin.c
index eefc65ec1..65ebf1492 100644
--- a/src/libide/gui/ide-config-view-addin.c
+++ b/src/libide/gui/ide-config-view-addin.c
@@ -34,12 +34,12 @@ ide_config_view_addin_default_init (IdeConfigViewAddinInterface *iface)
void
ide_config_view_addin_load (IdeConfigViewAddin *self,
DzlPreferences *preferences,
- IdeConfiguration *configuration)
+ IdeConfig *configuration)
{
g_return_if_fail (IDE_IS_MAIN_THREAD ());
g_return_if_fail (IDE_IS_CONFIG_VIEW_ADDIN (self));
g_return_if_fail (DZL_IS_PREFERENCES (preferences));
- g_return_if_fail (IDE_IS_CONFIGURATION (configuration));
+ g_return_if_fail (IDE_IS_CONFIG (configuration));
if (IDE_CONFIG_VIEW_ADDIN_GET_IFACE (self)->load)
IDE_CONFIG_VIEW_ADDIN_GET_IFACE (self)->load (self, preferences, configuration);
diff --git a/src/libide/gui/ide-config-view-addin.h b/src/libide/gui/ide-config-view-addin.h
index 8786c80e6..0c94daa81 100644
--- a/src/libide/gui/ide-config-view-addin.h
+++ b/src/libide/gui/ide-config-view-addin.h
@@ -37,12 +37,12 @@ struct _IdeConfigViewAddinInterface
void (*load) (IdeConfigViewAddin *self,
DzlPreferences *preferences,
- IdeConfiguration *configuration);
+ IdeConfig *configuration);
};
IDE_AVAILABLE_IN_3_32
void ide_config_view_addin_load (IdeConfigViewAddin *self,
DzlPreferences *preferences,
- IdeConfiguration *configuration);
+ IdeConfig *configuration);
G_END_DECLS
diff --git a/src/libide/gui/ide-workbench.c b/src/libide/gui/ide-workbench.c
index ddd963959..f1876b1a1 100644
--- a/src/libide/gui/ide-workbench.c
+++ b/src/libide/gui/ide-workbench.c
@@ -688,7 +688,7 @@ insert_action_groups_foreach_cb (IdeWorkspace *workspace,
const gchar *name;
GType child_type;
} groups[] = {
- { "config-manager", IDE_TYPE_CONFIGURATION_MANAGER },
+ { "config-manager", IDE_TYPE_CONFIG_MANAGER },
{ "build-manager", IDE_TYPE_BUILD_MANAGER },
{ "device-manager", IDE_TYPE_DEVICE_MANAGER },
{ "run-manager", IDE_TYPE_RUN_MANAGER },
diff --git a/src/plugins/autotools/ide-autotools-make-stage.c
b/src/plugins/autotools/ide-autotools-make-stage.c
index 546101a30..6910f4401 100644
--- a/src/plugins/autotools/ide-autotools-make-stage.c
+++ b/src/plugins/autotools/ide-autotools-make-stage.c
@@ -92,8 +92,8 @@ create_launcher (IdeAutotoolsMakeStage *self,
if (self->make == NULL)
{
- IdeConfiguration *config = ide_build_pipeline_get_configuration (pipeline);
- IdeRuntime *runtime = ide_configuration_get_runtime (config);
+ IdeConfig *config = ide_build_pipeline_get_configuration (pipeline);
+ IdeRuntime *runtime = ide_config_get_runtime (config);
if (ide_runtime_contains_program_in_path (runtime, "gmake", cancellable))
self->make = "gmake";
diff --git a/src/plugins/autotools/ide-autotools-makecache-stage.c
b/src/plugins/autotools/ide-autotools-makecache-stage.c
index 81ae9743e..d5231aea3 100644
--- a/src/plugins/autotools/ide-autotools-makecache-stage.c
+++ b/src/plugins/autotools/ide-autotools-makecache-stage.c
@@ -207,7 +207,7 @@ ide_autotools_makecache_stage_new_for_pipeline (IdeBuildPipeline *pipeline,
g_autoptr(IdeSubprocessLauncher) launcher = NULL;
g_autofree gchar *cache_path = NULL;
const gchar *make = "make";
- IdeConfiguration *config;
+ IdeConfig *config;
IdeRuntime *runtime;
IDE_ENTRY;
@@ -215,7 +215,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);
- runtime = ide_configuration_get_runtime (config);
+ 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 628819828..4156065d9 100644
--- a/src/plugins/autotools/ide-autotools-pipeline-addin.c
+++ b/src/plugins/autotools/ide-autotools-pipeline-addin.c
@@ -202,7 +202,7 @@ register_configure_stage (IdeAutotoolsPipelineAddin *self,
{
g_autoptr(IdeSubprocessLauncher) launcher = NULL;
g_autoptr(IdeBuildStage) stage = NULL;
- IdeConfiguration *configuration;
+ IdeConfig *configuration;
IdeToolchain *toolchain;
g_autofree gchar *configure_path = NULL;
g_autofree gchar *host_arg = NULL;
@@ -264,8 +264,8 @@ register_configure_stage (IdeAutotoolsPipelineAddin *self,
* them to configure.
*/
- config_opts = ide_configuration_get_config_opts (configuration);
- prefix = ide_configuration_get_prefix (configuration);
+ config_opts = ide_config_get_config_opts (configuration);
+ prefix = ide_config_get_prefix (configuration);
if (prefix != NULL)
{
@@ -325,7 +325,7 @@ register_make_stage (IdeAutotoolsPipelineAddin *self,
const gchar *clean_target)
{
g_autoptr(IdeBuildStage) stage = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
guint stage_id;
gint parallel;
@@ -333,7 +333,7 @@ register_make_stage (IdeAutotoolsPipelineAddin *self,
g_assert (IDE_IS_BUILD_PIPELINE (pipeline));
config = ide_build_pipeline_get_configuration (pipeline);
- parallel = ide_configuration_get_parallelism (config);
+ parallel = ide_config_get_parallelism (config);
stage = g_object_new (IDE_TYPE_AUTOTOOLS_MAKE_STAGE,
"name", _("Building project"),
diff --git a/src/plugins/autotools/ide-makecache.c b/src/plugins/autotools/ide-makecache.c
index 3aa5ad5a6..52106a238 100644
--- a/src/plugins/autotools/ide-makecache.c
+++ b/src/plugins/autotools/ide-makecache.c
@@ -1454,8 +1454,8 @@ ide_makecache_get_build_targets_worker (GTask *task,
g_autoptr(GPtrArray) makedirs = NULL;
g_autoptr(GPtrArray) targets = NULL;
g_autofree gchar *stdout_buf = NULL;
- IdeConfigurationManager *configmgr;
- IdeConfiguration *config;
+ IdeConfigManager *configmgr;
+ IdeConfig *config;
IdeContext *context;
IdeRuntime *runtime;
GFile *build_dir = task_data;
@@ -1481,9 +1481,9 @@ ide_makecache_get_build_targets_worker (GTask *task,
*/
context = ide_object_get_context (IDE_OBJECT (self));
- configmgr = ide_configuration_manager_from_context (context);
- config = ide_configuration_manager_get_current (configmgr);
- runtime = ide_configuration_get_runtime (config);
+ configmgr = ide_config_manager_from_context (context);
+ config = ide_config_manager_get_current (configmgr);
+ runtime = ide_config_get_runtime (config);
if (runtime != NULL)
launcher = ide_runtime_create_launcher (runtime, NULL);
diff --git a/src/plugins/buildconfig/buildconfig-plugin.c b/src/plugins/buildconfig/buildconfig-plugin.c
index c85cc12ed..f7501666c 100644
--- a/src/plugins/buildconfig/buildconfig-plugin.c
+++ b/src/plugins/buildconfig/buildconfig-plugin.c
@@ -32,7 +32,7 @@ _IDE_EXTERN void
_gbp_buildconfig_register_types (PeasObjectModule *module)
{
peas_object_module_register_extension_type (module,
- IDE_TYPE_CONFIGURATION_PROVIDER,
+ IDE_TYPE_CONFIG_PROVIDER,
IDE_TYPE_BUILDCONFIG_CONFIGURATION_PROVIDER);
peas_object_module_register_extension_type (module,
IDE_TYPE_BUILD_PIPELINE_ADDIN,
diff --git a/src/plugins/buildconfig/ide-buildconfig-configuration-provider.c
b/src/plugins/buildconfig/ide-buildconfig-configuration-provider.c
index d7e087d05..fe8f29b36 100644
--- a/src/plugins/buildconfig/ide-buildconfig-configuration-provider.c
+++ b/src/plugins/buildconfig/ide-buildconfig-configuration-provider.c
@@ -93,16 +93,16 @@ add_suffix:
}
static gchar *
-get_next_id (IdeConfigurationManager *manager,
+get_next_id (IdeConfigManager *manager,
const gchar *id)
{
g_autoptr(GPtrArray) tries = NULL;
- g_assert (IDE_IS_CONFIGURATION_MANAGER (manager));
+ g_assert (IDE_IS_CONFIG_MANAGER (manager));
tries = g_ptr_array_new_with_free_func (g_free);
- while (ide_configuration_manager_get_configuration (manager, id))
+ while (ide_config_manager_get_configuration (manager, id))
{
g_autofree gchar *next = gen_next_id (id);
id = next;
@@ -113,13 +113,13 @@ get_next_id (IdeConfigurationManager *manager,
}
static void
-load_string (IdeConfiguration *config,
+load_string (IdeConfig *config,
GKeyFile *key_file,
const gchar *group,
const gchar *key,
const gchar *property)
{
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
g_assert (key_file != NULL);
g_assert (group != NULL);
g_assert (key != NULL);
@@ -135,13 +135,13 @@ load_string (IdeConfiguration *config,
}
static void
-load_strv (IdeConfiguration *config,
+load_strv (IdeConfig *config,
GKeyFile *key_file,
const gchar *group,
const gchar *key,
const gchar *property)
{
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
g_assert (key_file != NULL);
g_assert (group != NULL);
g_assert (key != NULL);
@@ -159,7 +159,7 @@ load_strv (IdeConfiguration *config,
}
static void
-load_environ (IdeConfiguration *config,
+load_environ (IdeConfig *config,
GKeyFile *key_file,
const gchar *group)
{
@@ -167,11 +167,11 @@ load_environ (IdeConfiguration *config,
g_auto(GStrv) keys = NULL;
gsize len = 0;
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
g_assert (key_file != NULL);
g_assert (group != NULL);
- environment = ide_configuration_get_environment (config);
+ environment = ide_config_get_environment (config);
keys = g_key_file_get_keys (key_file, group, &len, NULL);
for (gsize i = 0; i < len; i++)
@@ -184,11 +184,11 @@ load_environ (IdeConfiguration *config,
}
}
-static IdeConfiguration *
+static IdeConfig *
ide_buildconfig_configuration_provider_create (IdeBuildconfigConfigurationProvider *self,
const gchar *config_id)
{
- g_autoptr(IdeConfiguration) config = NULL;
+ g_autoptr(IdeConfig) config = NULL;
g_autofree gchar *env_group = NULL;
g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (self));
@@ -213,9 +213,9 @@ ide_buildconfig_configuration_provider_create (IdeBuildconfigConfigurationProvid
if (g_key_file_has_key (self->key_file, config_id, "builddir", NULL))
{
if (g_key_file_get_boolean (self->key_file, config_id, "builddir", NULL))
- ide_configuration_set_locality (config, IDE_BUILD_LOCALITY_OUT_OF_TREE);
+ ide_config_set_locality (config, IDE_BUILD_LOCALITY_OUT_OF_TREE);
else
- ide_configuration_set_locality (config, IDE_BUILD_LOCALITY_IN_TREE);
+ ide_config_set_locality (config, IDE_BUILD_LOCALITY_IN_TREE);
}
env_group = g_strdup_printf ("%s.environment", config_id);
@@ -226,13 +226,13 @@ ide_buildconfig_configuration_provider_create (IdeBuildconfigConfigurationProvid
}
static void
-ide_buildconfig_configuration_provider_load_async (IdeConfigurationProvider *provider,
+ide_buildconfig_configuration_provider_load_async (IdeConfigProvider *provider,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
{
IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
- g_autoptr(IdeConfiguration) fallback = NULL;
+ g_autoptr(IdeConfig) fallback = NULL;
g_autoptr(IdeTask) task = NULL;
g_autoptr(GError) error = NULL;
g_autofree gchar *path = NULL;
@@ -271,15 +271,15 @@ ide_buildconfig_configuration_provider_load_async (IdeConfigurationProvider *pro
for (gsize i = 0; i < len; i++)
{
- g_autoptr(IdeConfiguration) config = NULL;
+ g_autoptr(IdeConfig) config = NULL;
const gchar *group = groups[i];
if (strchr (group, '.') != NULL)
continue;
config = ide_buildconfig_configuration_provider_create (self, group);
- ide_configuration_set_dirty (config, FALSE);
- ide_configuration_provider_emit_added (provider, config);
+ ide_config_set_dirty (config, FALSE);
+ ide_config_provider_emit_added (provider, config);
}
if (self->configs->len > 0)
@@ -294,15 +294,15 @@ add_default:
"runtime-id", "host",
"toolchain-id", "default",
NULL);
- ide_configuration_set_dirty (fallback, FALSE);
- ide_configuration_provider_emit_added (provider, fallback);
+ ide_config_set_dirty (fallback, FALSE);
+ ide_config_provider_emit_added (provider, fallback);
complete:
ide_task_return_boolean (task, TRUE);
}
static gboolean
-ide_buildconfig_configuration_provider_load_finish (IdeConfigurationProvider *provider,
+ide_buildconfig_configuration_provider_load_finish (IdeConfigProvider *provider,
GAsyncResult *result,
GError **error)
{
@@ -333,7 +333,7 @@ ide_buildconfig_configuration_provider_save_cb (GObject *object,
}
static void
-ide_buildconfig_configuration_provider_save_async (IdeConfigurationProvider *provider,
+ide_buildconfig_configuration_provider_save_async (IdeConfigProvider *provider,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -347,7 +347,7 @@ ide_buildconfig_configuration_provider_save_async (IdeConfigurationProvider *pro
g_auto(GStrv) groups = NULL;
g_autofree gchar *path = NULL;
g_autofree gchar *data = NULL;
- IdeConfigurationManager *manager;
+ IdeConfigManager *manager;
IdeContext *context;
gboolean dirty = FALSE;
gsize length = 0;
@@ -365,8 +365,8 @@ ide_buildconfig_configuration_provider_save_async (IdeConfigurationProvider *pro
/* If no configs are dirty, short circuit to avoid writing any files to disk. */
for (guint i = 0; !dirty && i < self->configs->len; i++)
{
- IdeConfiguration *config = g_ptr_array_index (self->configs, i);
- dirty |= ide_configuration_get_dirty (config);
+ IdeConfig *config = g_ptr_array_index (self->configs, i);
+ dirty |= ide_config_get_dirty (config);
}
if (!dirty)
@@ -376,7 +376,7 @@ ide_buildconfig_configuration_provider_save_async (IdeConfigurationProvider *pro
}
context = ide_object_get_context (IDE_OBJECT (self));
- manager = ide_configuration_manager_from_context (context);
+ manager = ide_config_manager_from_context (context);
path = ide_context_build_filename (context, DOT_BUILDCONFIG, NULL);
file = g_file_new_for_path (path);
@@ -392,16 +392,16 @@ ide_buildconfig_configuration_provider_save_async (IdeConfigurationProvider *pro
for (guint i = 0; i < self->configs->len; i++)
{
- IdeConfiguration *config = g_ptr_array_index (self->configs, i);
+ IdeConfig *config = g_ptr_array_index (self->configs, i);
g_autofree gchar *env_group = NULL;
const gchar *config_id;
IdeEnvironment *env;
guint n_items;
- if (!ide_configuration_get_dirty (config))
+ if (!ide_config_get_dirty (config))
continue;
- config_id = ide_configuration_get_id (config);
+ config_id = ide_config_get_id (config);
env_group = g_strdup_printf ("%s.environment", config_id);
/*
@@ -413,7 +413,7 @@ ide_buildconfig_configuration_provider_save_async (IdeConfigurationProvider *pro
#define PERSIST_STRING_KEY(key, getter) \
g_key_file_set_string (self->key_file, config_id, key, \
- ide_configuration_##getter (config) ?: "")
+ 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)); \
gsize vlen = val ? g_strv_length ((gchar **)val) : 0; \
@@ -433,19 +433,19 @@ ide_buildconfig_configuration_provider_save_async (IdeConfigurationProvider *pro
#undef PERSIST_STRING_KEY
#undef PERSIST_STRV_KEY
- if (ide_configuration_get_locality (config) == IDE_BUILD_LOCALITY_IN_TREE)
+ if (ide_config_get_locality (config) == IDE_BUILD_LOCALITY_IN_TREE)
g_key_file_set_boolean (self->key_file, config_id, "builddir", FALSE);
- else if (ide_configuration_get_locality (config) == IDE_BUILD_LOCALITY_OUT_OF_TREE)
+ else if (ide_config_get_locality (config) == IDE_BUILD_LOCALITY_OUT_OF_TREE)
g_key_file_set_boolean (self->key_file, config_id, "builddir", TRUE);
else
g_key_file_remove_key (self->key_file, config_id, "builddir", NULL);
- if (config == ide_configuration_manager_get_current (manager))
+ if (config == ide_config_manager_get_current (manager))
g_key_file_set_boolean (self->key_file, config_id, "default", TRUE);
else
g_key_file_remove_key (self->key_file, config_id, "default", NULL);
- env = ide_configuration_get_environment (config);
+ env = ide_config_get_environment (config);
/*
* Remove all environment keys that are no longer specified in the
@@ -482,7 +482,7 @@ ide_buildconfig_configuration_provider_save_async (IdeConfigurationProvider *pro
g_key_file_set_string (self->key_file, env_group, key, value ?: "");
}
- ide_configuration_set_dirty (config, FALSE);
+ ide_config_set_dirty (config, FALSE);
}
/* Now truncate any old groups in the keyfile. */
@@ -524,7 +524,7 @@ ide_buildconfig_configuration_provider_save_async (IdeConfigurationProvider *pro
}
static gboolean
-ide_buildconfig_configuration_provider_save_finish (IdeConfigurationProvider *provider,
+ide_buildconfig_configuration_provider_save_finish (IdeConfigProvider *provider,
GAsyncResult *result,
GError **error)
{
@@ -536,11 +536,11 @@ ide_buildconfig_configuration_provider_save_finish (IdeConfigurationProvider *p
}
static void
-ide_buildconfig_configuration_provider_delete (IdeConfigurationProvider *provider,
- IdeConfiguration *config)
+ide_buildconfig_configuration_provider_delete (IdeConfigProvider *provider,
+ IdeConfig *config)
{
IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
- g_autoptr(IdeConfiguration) hold = NULL;
+ g_autoptr(IdeConfig) hold = NULL;
g_autofree gchar *env = NULL;
const gchar *config_id;
gboolean had_group;
@@ -555,11 +555,11 @@ ide_buildconfig_configuration_provider_delete (IdeConfigurationProvider *provide
if (!g_ptr_array_remove (self->configs, hold))
{
g_critical ("No such configuration %s",
- ide_configuration_get_id (hold));
+ ide_config_get_id (hold));
return;
}
- config_id = ide_configuration_get_id (config);
+ config_id = ide_config_get_id (config);
had_group = g_key_file_has_group (self->key_file, config_id);
env = g_strdup_printf ("%s.environment", config_id);
g_key_file_remove_group (self->key_file, config_id, NULL);
@@ -578,7 +578,7 @@ ide_buildconfig_configuration_provider_delete (IdeConfigurationProvider *provide
*/
if (self->configs->len == 0)
{
- g_autoptr(IdeConfiguration) new_config = NULL;
+ 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,
@@ -593,23 +593,23 @@ ide_buildconfig_configuration_provider_delete (IdeConfigurationProvider *provide
* Only persist this back if there was data in the keyfile
* before we were requested to delete the build-config.
*/
- ide_configuration_set_dirty (new_config, had_group);
- ide_configuration_provider_emit_added (provider, new_config);
+ ide_config_set_dirty (new_config, had_group);
+ ide_config_provider_emit_added (provider, new_config);
}
- ide_configuration_provider_emit_removed (provider, hold);
+ ide_config_provider_emit_removed (provider, hold);
}
static void
-ide_buildconfig_configuration_provider_duplicate (IdeConfigurationProvider *provider,
- IdeConfiguration *config)
+ide_buildconfig_configuration_provider_duplicate (IdeConfigProvider *provider,
+ IdeConfig *config)
{
IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
- g_autoptr(IdeConfiguration) new_config = NULL;
+ g_autoptr(IdeConfig) new_config = NULL;
g_autofree GParamSpec **pspecs = NULL;
g_autofree gchar *new_config_id = NULL;
g_autofree gchar *new_name = NULL;
- IdeConfigurationManager *manager;
+ IdeConfigManager *manager;
IdeEnvironment *env;
const gchar *config_id;
const gchar *name;
@@ -617,26 +617,26 @@ ide_buildconfig_configuration_provider_duplicate (IdeConfigurationProvider *prov
guint n_pspecs = 0;
g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (self));
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION (config));
context = ide_object_get_context (IDE_OBJECT (self));
g_assert (IDE_IS_CONTEXT (context));
- manager = ide_configuration_manager_from_context (context);
- g_assert (IDE_IS_CONFIGURATION_MANAGER (manager));
+ manager = ide_config_manager_from_context (context);
+ g_assert (IDE_IS_CONFIG_MANAGER (manager));
- config_id = ide_configuration_get_id (config);
+ config_id = ide_config_get_id (config);
g_return_if_fail (config_id != NULL);
new_config_id = get_next_id (manager, config_id);
g_return_if_fail (new_config_id != NULL);
- name = ide_configuration_get_display_name (config);
+ name = ide_config_get_display_name (config);
/* translators: %s is replaced with the name of the configuration */
new_name = g_strdup_printf (_("%s (Copy)"), name);
- env = ide_configuration_get_environment (config);
+ env = ide_config_get_environment (config);
new_config = g_object_new (IDE_TYPE_BUILDCONFIG_CONFIGURATION,
"id", new_config_id,
@@ -644,7 +644,7 @@ ide_buildconfig_configuration_provider_duplicate (IdeConfigurationProvider *prov
"parent", self,
NULL);
- ide_environment_copy_into (env, ide_configuration_get_environment (new_config), TRUE);
+ ide_environment_copy_into (env, ide_config_get_environment (new_config), TRUE);
pspecs = g_object_class_list_properties (G_OBJECT_GET_CLASS (new_config), &n_pspecs);
@@ -670,12 +670,12 @@ ide_buildconfig_configuration_provider_duplicate (IdeConfigurationProvider *prov
}
}
- ide_configuration_set_dirty (new_config, TRUE);
- ide_configuration_provider_emit_added (provider, new_config);
+ ide_config_set_dirty (new_config, TRUE);
+ ide_config_provider_emit_added (provider, new_config);
}
static void
-ide_buildconfig_configuration_provider_unload (IdeConfigurationProvider *provider)
+ide_buildconfig_configuration_provider_unload (IdeConfigProvider *provider)
{
IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
g_autoptr(GPtrArray) configs = NULL;
@@ -688,32 +688,32 @@ ide_buildconfig_configuration_provider_unload (IdeConfigurationProvider *provide
for (guint i = 0; i < configs->len; i++)
{
- IdeConfiguration *config = g_ptr_array_index (configs, i);
- ide_configuration_provider_emit_removed (provider, config);
+ IdeConfig *config = g_ptr_array_index (configs, i);
+ ide_config_provider_emit_removed (provider, config);
}
}
static void
-ide_buildconfig_configuration_provider_added (IdeConfigurationProvider *provider,
- IdeConfiguration *config)
+ide_buildconfig_configuration_provider_added (IdeConfigProvider *provider,
+ IdeConfig *config)
{
IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (self));
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
g_assert (self->configs != NULL);
g_ptr_array_add (self->configs, g_object_ref (config));
}
static void
-ide_buildconfig_configuration_provider_removed (IdeConfigurationProvider *provider,
- IdeConfiguration *config)
+ide_buildconfig_configuration_provider_removed (IdeConfigProvider *provider,
+ IdeConfig *config)
{
IdeBuildconfigConfigurationProvider *self = (IdeBuildconfigConfigurationProvider *)provider;
g_assert (IDE_IS_BUILDCONFIG_CONFIGURATION_PROVIDER (self));
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
g_assert (self->configs != NULL);
/* It's possible we already removed it by now */
@@ -723,7 +723,7 @@ ide_buildconfig_configuration_provider_removed (IdeConfigurationProvider *provid
}
static void
-configuration_provider_iface_init (IdeConfigurationProviderInterface *iface)
+configuration_provider_iface_init (IdeConfigProviderInterface *iface)
{
iface->added = ide_buildconfig_configuration_provider_added;
iface->removed = ide_buildconfig_configuration_provider_removed;
@@ -739,7 +739,7 @@ configuration_provider_iface_init (IdeConfigurationProviderInterface *iface)
G_DEFINE_TYPE_WITH_CODE (IdeBuildconfigConfigurationProvider,
ide_buildconfig_configuration_provider,
IDE_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (IDE_TYPE_CONFIGURATION_PROVIDER,
+ G_IMPLEMENT_INTERFACE (IDE_TYPE_CONFIG_PROVIDER,
configuration_provider_iface_init))
static void
diff --git a/src/plugins/buildconfig/ide-buildconfig-configuration.c
b/src/plugins/buildconfig/ide-buildconfig-configuration.c
index f4386a0c4..498dd81d0 100644
--- a/src/plugins/buildconfig/ide-buildconfig-configuration.c
+++ b/src/plugins/buildconfig/ide-buildconfig-configuration.c
@@ -26,7 +26,7 @@
struct _IdeBuildconfigConfiguration
{
- IdeConfiguration parent_instance;
+ IdeConfig parent_instance;
gchar **prebuild;
gchar **postbuild;
@@ -39,7 +39,7 @@ enum {
N_PROPS
};
-G_DEFINE_TYPE (IdeBuildconfigConfiguration, ide_buildconfig_configuration, IDE_TYPE_CONFIGURATION)
+G_DEFINE_TYPE (IdeBuildconfigConfiguration, ide_buildconfig_configuration, IDE_TYPE_CONFIG)
static GParamSpec *properties [N_PROPS];
diff --git a/src/plugins/buildconfig/ide-buildconfig-configuration.h
b/src/plugins/buildconfig/ide-buildconfig-configuration.h
index f7700e698..5a250c50d 100644
--- a/src/plugins/buildconfig/ide-buildconfig-configuration.h
+++ b/src/plugins/buildconfig/ide-buildconfig-configuration.h
@@ -26,7 +26,7 @@ G_BEGIN_DECLS
#define IDE_TYPE_BUILDCONFIG_CONFIGURATION (ide_buildconfig_configuration_get_type())
-G_DECLARE_FINAL_TYPE (IdeBuildconfigConfiguration, ide_buildconfig_configuration, IDE,
BUILDCONFIG_CONFIGURATION, IdeConfiguration)
+G_DECLARE_FINAL_TYPE (IdeBuildconfigConfiguration, ide_buildconfig_configuration, IDE,
BUILDCONFIG_CONFIGURATION, IdeConfig)
const gchar * const *ide_buildconfig_configuration_get_prebuild (IdeBuildconfigConfiguration *self);
void ide_buildconfig_configuration_set_prebuild (IdeBuildconfigConfiguration *self,
diff --git a/src/plugins/buildconfig/ide-buildconfig-pipeline-addin.c
b/src/plugins/buildconfig/ide-buildconfig-pipeline-addin.c
index f75032e68..a2d44c7f2 100644
--- a/src/plugins/buildconfig/ide-buildconfig-pipeline-addin.c
+++ b/src/plugins/buildconfig/ide-buildconfig-pipeline-addin.c
@@ -71,7 +71,7 @@ ide_buildconfig_pipeline_addin_load (IdeBuildPipelineAddin *addin,
{
const gchar * const *prebuild;
const gchar * const *postbuild;
- IdeConfiguration *config;
+ IdeConfig *config;
g_auto(GStrv) env = NULL;
IDE_ENTRY;
@@ -84,7 +84,7 @@ ide_buildconfig_pipeline_addin_load (IdeBuildPipelineAddin *addin,
if (!IDE_IS_BUILDCONFIG_CONFIGURATION (config))
return;
- env = ide_configuration_get_environ (config);
+ 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));
diff --git a/src/plugins/buildui/gbp-buildui-config-surface.c
b/src/plugins/buildui/gbp-buildui-config-surface.c
index df3646dbf..b2cd73b90 100644
--- a/src/plugins/buildui/gbp-buildui-config-surface.c
+++ b/src/plugins/buildui/gbp-buildui-config-surface.c
@@ -34,7 +34,7 @@ struct _GbpBuilduiConfigSurface
{
IdeSurface parent_instance;
- IdeConfigurationManager *config_manager;
+ IdeConfigManager *config_manager;
GtkListBox *config_list_box;
GtkPaned *paned;
@@ -47,7 +47,7 @@ struct _GbpBuilduiConfigSurface
typedef struct
{
DzlPreferences *view;
- IdeConfiguration *config;
+ IdeConfig *config;
} AddinState;
G_DEFINE_TYPE (GbpBuilduiConfigSurface, gbp_buildui_config_surface, IDE_TYPE_SURFACE)
@@ -84,7 +84,7 @@ gbp_buildui_config_surface_row_selected_cb (GbpBuilduiConfigSurface *self,
GtkListBox *list_box)
{
g_autoptr(PeasExtensionSet) set = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
AddinState state = {0};
GtkWidget *child2;
@@ -134,7 +134,7 @@ gbp_buildui_config_surface_row_selected_cb (GbpBuilduiConfigSurface *self,
gtk_container_add (GTK_CONTAINER (self->paned), GTK_WIDGET (self->preferences));
config = g_object_get_data (G_OBJECT (row), "CONFIG");
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
set = peas_extension_set_new (peas_engine_get_default (),
IDE_TYPE_CONFIG_VIEW_ADDIN,
@@ -153,16 +153,16 @@ gbp_buildui_config_surface_create_row_cb (gpointer item,
gpointer user_data)
{
GbpBuilduiConfigSurface *self = user_data;
- IdeConfiguration *config = item;
+ IdeConfig *config = item;
const gchar *title;
GtkWidget *row;
GtkWidget *label;
g_assert (IDE_IS_MAIN_THREAD ());
g_assert (GBP_IS_BUILDUI_CONFIG_SURFACE (self));
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
- title = ide_configuration_get_display_name (config);
+ title = ide_config_get_display_name (config);
row = g_object_new (GTK_TYPE_LIST_BOX_ROW,
"visible", TRUE,
@@ -185,10 +185,10 @@ gbp_buildui_config_surface_create_row_cb (gpointer item,
static void
gbp_buildui_config_surface_set_config_manager (GbpBuilduiConfigSurface *self,
- IdeConfigurationManager *config_manager)
+ IdeConfigManager *config_manager)
{
g_assert (GBP_IS_BUILDUI_CONFIG_SURFACE (self));
- g_assert (IDE_IS_CONFIGURATION_MANAGER (config_manager));
+ g_assert (IDE_IS_CONFIG_MANAGER (config_manager));
g_assert (self->config_manager == NULL);
g_set_object (&self->config_manager, config_manager);
@@ -279,7 +279,7 @@ gbp_buildui_config_surface_class_init (GbpBuilduiConfigSurfaceClass *klass)
g_param_spec_object ("config-manager",
"Config Manager",
"The configuration manager",
- IDE_TYPE_CONFIGURATION_MANAGER,
+ IDE_TYPE_CONFIG_MANAGER,
(G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, N_PROPS, properties);
@@ -307,11 +307,11 @@ static void
gbp_buildui_config_surface_set_config_cb (GtkWidget *widget,
gpointer user_data)
{
- IdeConfiguration *config = user_data;
+ IdeConfig *config = user_data;
g_assert (IDE_IS_MAIN_THREAD ());
g_assert (GTK_IS_LIST_BOX_ROW (widget));
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
if (g_object_get_data (G_OBJECT (widget), "CONFIG") == (gpointer)config)
{
@@ -323,11 +323,11 @@ gbp_buildui_config_surface_set_config_cb (GtkWidget *widget,
void
gbp_buildui_config_surface_set_config (GbpBuilduiConfigSurface *self,
- IdeConfiguration *config)
+ IdeConfig *config)
{
g_return_if_fail (IDE_IS_MAIN_THREAD ());
g_return_if_fail (GBP_IS_BUILDUI_CONFIG_SURFACE (self));
- g_return_if_fail (IDE_IS_CONFIGURATION (config));
+ g_return_if_fail (IDE_IS_CONFIG (config));
gtk_container_foreach (GTK_CONTAINER (self->config_list_box),
gbp_buildui_config_surface_set_config_cb,
diff --git a/src/plugins/buildui/gbp-buildui-config-surface.h
b/src/plugins/buildui/gbp-buildui-config-surface.h
index 0f931dba2..ee13c8aa8 100644
--- a/src/plugins/buildui/gbp-buildui-config-surface.h
+++ b/src/plugins/buildui/gbp-buildui-config-surface.h
@@ -30,6 +30,6 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (GbpBuilduiConfigSurface, gbp_buildui_config_surface, GBP, BUILDUI_CONFIG_SURFACE,
IdeSurface)
void gbp_buildui_config_surface_set_config (GbpBuilduiConfigSurface *self,
- IdeConfiguration *config);
+ IdeConfig *config);
G_END_DECLS
diff --git a/src/plugins/buildui/gbp-buildui-config-view-addin.c
b/src/plugins/buildui/gbp-buildui-config-view-addin.c
index 97d9da31b..df39474d8 100644
--- a/src/plugins/buildui/gbp-buildui-config-view-addin.c
+++ b/src/plugins/buildui/gbp-buildui-config-view-addin.c
@@ -82,11 +82,11 @@ static GtkWidget *
create_stack_list_row (gpointer item,
gpointer user_data)
{
- IdeConfiguration *config = user_data;
+ IdeConfig *config = user_data;
GtkWidget *row;
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
if (IDE_IS_RUNTIME (item))
return gbp_buildui_runtime_row_new (item, config);
@@ -136,20 +136,20 @@ on_runtime_row_activated_cb (DzlStackList *stack_list,
GtkListBoxRow *row,
gpointer user_data)
{
- IdeConfiguration *config = user_data;
+ IdeConfig *config = user_data;
gpointer item;
g_assert (IDE_IS_MAIN_THREAD ());
g_assert (DZL_IS_STACK_LIST (stack_list));
g_assert (GTK_IS_LIST_BOX_ROW (row));
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
if (GBP_IS_BUILDUI_RUNTIME_ROW (row))
{
const gchar *id;
id = gbp_buildui_runtime_row_get_id (GBP_BUILDUI_RUNTIME_ROW (row));
- ide_configuration_set_runtime_id (config, id);
+ ide_config_set_runtime_id (config, id);
{
GtkWidget *box;
@@ -185,7 +185,7 @@ on_runtime_row_activated_cb (DzlStackList *stack_list,
}
static GtkWidget *
-create_runtime_box (IdeConfiguration *config,
+create_runtime_box (IdeConfig *config,
IdeRuntimeManager *runtime_manager)
{
g_autoptr(GbpBuilduiRuntimeCategories) filter = NULL;
@@ -196,7 +196,7 @@ create_runtime_box (IdeConfiguration *config,
GtkWidget *frame;
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
g_assert (IDE_IS_RUNTIME_MANAGER (runtime_manager));
filter = gbp_buildui_runtime_categories_new (runtime_manager, NULL);
@@ -229,7 +229,7 @@ create_runtime_box (IdeConfiguration *config,
config,
0);
- if ((runtime = ide_configuration_get_runtime (config)) &&
+ if ((runtime = ide_config_get_runtime (config)) &&
(category = ide_runtime_get_category (runtime)))
{
g_autoptr(GString) prefix = g_string_new (NULL);
@@ -258,7 +258,7 @@ create_runtime_box (IdeConfiguration *config,
}
static void
-notify_toolchain_id (IdeConfiguration *config,
+notify_toolchain_id (IdeConfig *config,
GParamSpec *pspec,
GtkImage *image)
{
@@ -266,10 +266,10 @@ notify_toolchain_id (IdeConfiguration *config,
const gchar *current;
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
g_assert (GTK_IS_IMAGE (image));
- toolchain_id = ide_configuration_get_toolchain_id (config);
+ toolchain_id = ide_config_get_toolchain_id (config);
current = g_object_get_data (G_OBJECT (image), "TOOLCHAIN_ID");
gtk_widget_set_visible (GTK_WIDGET (image), ide_str_equal0 (toolchain_id, current));
@@ -280,7 +280,7 @@ create_toolchain_row (gpointer item,
gpointer user_data)
{
IdeToolchain *toolchain = item;
- IdeConfiguration *config = user_data;
+ IdeConfig *config = user_data;
const gchar *toolchain_id;
GtkWidget *label;
GtkWidget *row;
@@ -289,7 +289,7 @@ create_toolchain_row (gpointer item,
g_assert (IDE_IS_MAIN_THREAD ());
g_assert (IDE_IS_TOOLCHAIN (toolchain));
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
toolchain_id = ide_toolchain_get_id (toolchain);
@@ -332,30 +332,30 @@ create_toolchain_row (gpointer item,
static void
on_toolchain_row_activated_cb (GtkListBox *list_box,
GtkListBoxRow *row,
- IdeConfiguration *config)
+ IdeConfig *config)
{
const gchar *toolchain_id;
g_assert (IDE_IS_MAIN_THREAD ());
g_assert (GTK_IS_LIST_BOX (list_box));
g_assert (GTK_IS_LIST_BOX_ROW (row));
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
if ((toolchain_id = g_object_get_data (G_OBJECT (row), "TOOLCHAIN_ID")))
- ide_configuration_set_toolchain_id (config, toolchain_id);
+ ide_config_set_toolchain_id (config, toolchain_id);
gtk_list_box_unselect_all (list_box);
}
static GtkWidget *
-create_toolchain_box (IdeConfiguration *config,
+create_toolchain_box (IdeConfig *config,
IdeToolchainManager *toolchain_manager)
{
GtkScrolledWindow *scroller;
GtkListBox *list_box;
g_assert (IDE_IS_MAIN_THREAD ());
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
g_assert (IDE_IS_TOOLCHAIN_MANAGER (toolchain_manager));
scroller = g_object_new (GTK_TYPE_SCROLLED_WINDOW,
@@ -386,7 +386,7 @@ create_toolchain_box (IdeConfiguration *config,
static void
gbp_buildui_config_view_addin_load (IdeConfigViewAddin *addin,
DzlPreferences *preferences,
- IdeConfiguration *config)
+ IdeConfig *config)
{
GbpBuilduiConfigViewAddin *self = (GbpBuilduiConfigViewAddin *)addin;
IdeToolchainManager *toolchain_manager;
@@ -411,7 +411,7 @@ gbp_buildui_config_view_addin_load (IdeConfigViewAddin *addin,
g_assert (IDE_IS_MAIN_THREAD ());
g_assert (GBP_IS_BUILDUI_CONFIG_VIEW_ADDIN (self));
g_assert (DZL_IS_PREFERENCES (preferences));
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
/* Get manager objects */
context = ide_object_get_context (IDE_OBJECT (config));
@@ -442,7 +442,7 @@ gbp_buildui_config_view_addin_load (IdeConfigViewAddin *addin,
button = g_object_new (GTK_TYPE_BUTTON,
"visible", TRUE,
"action-name", actions[i].action,
- "action-target", g_variant_new_string (ide_configuration_get_id (config)),
+ "action-target", g_variant_new_string (ide_config_get_id (config)),
"label", g_dgettext (GETTEXT_PACKAGE, actions[i].label),
"tooltip-text", g_dgettext (GETTEXT_PACKAGE, actions[i].tooltip),
NULL);
@@ -452,7 +452,7 @@ gbp_buildui_config_view_addin_load (IdeConfigViewAddin *addin,
}
/* Add description info */
- add_description_row (preferences, "general", "general", _("Name"), ide_configuration_get_display_name
(config), NULL);
+ add_description_row (preferences, "general", "general", _("Name"), ide_config_get_display_name (config),
NULL);
add_description_row (preferences, "general", "general", _("Source Directory"), g_file_peek_path (workdir),
NULL);
add_description_row (preferences, "general", "general", _("Build System"),
ide_build_system_get_display_name (build_system), NULL);
@@ -485,7 +485,7 @@ gbp_buildui_config_view_addin_load (IdeConfigViewAddin *addin,
dzl_preferences_add_custom (preferences, "general", "toolchain", create_toolchain_box (config,
toolchain_manager), NULL, 10);
/* Add environment selector */
- environ = ide_configuration_get_environment (config);
+ environ = ide_config_get_environment (config);
dzl_preferences_add_custom (preferences, "environ", "build",
g_object_new (GTK_TYPE_FRAME,
"visible", TRUE,
diff --git a/src/plugins/buildui/gbp-buildui-omni-bar-section.c
b/src/plugins/buildui/gbp-buildui-omni-bar-section.c
index 103816dd8..97922e1fd 100644
--- a/src/plugins/buildui/gbp-buildui-omni-bar-section.c
+++ b/src/plugins/buildui/gbp-buildui-omni-bar-section.c
@@ -82,10 +82,10 @@ gbp_buildui_omni_bar_section_notify_pipeline (GbpBuilduiOmniBarSection *self,
if ((pipeline = ide_build_manager_get_pipeline (build_manager)))
{
- IdeConfiguration *config = ide_build_pipeline_get_configuration (pipeline);
- const gchar *config_id = ide_configuration_get_id (config);
- const gchar *display_name = ide_configuration_get_display_name (config);
- IdeRuntime *runtime = ide_configuration_get_runtime (config);
+ IdeConfig *config = ide_build_pipeline_get_configuration (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);
const gchar *name = NULL;
gtk_label_set_label (self->popover_config_label, display_name);
diff --git a/src/plugins/buildui/gbp-buildui-runtime-row.c b/src/plugins/buildui/gbp-buildui-runtime-row.c
index ec7bedb4f..24f770bef 100644
--- a/src/plugins/buildui/gbp-buildui-runtime-row.c
+++ b/src/plugins/buildui/gbp-buildui-runtime-row.c
@@ -86,27 +86,27 @@ gbp_buildui_runtime_row_init (GbpBuilduiRuntimeRow *self)
static void
notify_config_runtime_id (GbpBuilduiRuntimeRow *self,
GParamSpec *pspec,
- IdeConfiguration *config)
+ IdeConfig *config)
{
g_assert (GBP_IS_BUILDUI_RUNTIME_ROW (self));
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
gtk_widget_set_visible (GTK_WIDGET (self->image),
ide_str_equal0 (self->runtime_id,
- ide_configuration_get_runtime_id (config)));
+ ide_config_get_runtime_id (config)));
}
GtkWidget *
gbp_buildui_runtime_row_new (IdeRuntime *runtime,
- IdeConfiguration *config)
+ IdeConfig *config)
{
GbpBuilduiRuntimeRow *self;
gboolean sensitive;
g_return_val_if_fail (IDE_IS_RUNTIME (runtime), NULL);
- g_return_val_if_fail (IDE_IS_CONFIGURATION (config), NULL);
+ g_return_val_if_fail (IDE_IS_CONFIG (config), NULL);
- sensitive = ide_configuration_supports_runtime (config, runtime);
+ sensitive = ide_config_supports_runtime (config, runtime);
self = g_object_new (GBP_TYPE_BUILDUI_RUNTIME_ROW,
"sensitive", sensitive,
@@ -123,7 +123,7 @@ gbp_buildui_runtime_row_new (IdeRuntime *runtime,
G_CONNECT_SWAPPED);
gtk_widget_set_visible (GTK_WIDGET (self->image),
ide_str_equal0 (self->runtime_id,
- ide_configuration_get_runtime_id (config)));
+ ide_config_get_runtime_id (config)));
return GTK_WIDGET (self);
}
diff --git a/src/plugins/buildui/gbp-buildui-runtime-row.h b/src/plugins/buildui/gbp-buildui-runtime-row.h
index 64fe8b5a0..c7dfff99f 100644
--- a/src/plugins/buildui/gbp-buildui-runtime-row.h
+++ b/src/plugins/buildui/gbp-buildui-runtime-row.h
@@ -30,7 +30,7 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (GbpBuilduiRuntimeRow, gbp_buildui_runtime_row, GBP, BUILDUI_RUNTIME_ROW, GtkListBoxRow)
GtkWidget *gbp_buildui_runtime_row_new (IdeRuntime *runtime,
- IdeConfiguration *config);
+ IdeConfig *config);
const gchar *gbp_buildui_runtime_row_get_id (GbpBuilduiRuntimeRow *self);
G_END_DECLS
diff --git a/src/plugins/buildui/gbp-buildui-workspace-addin.c
b/src/plugins/buildui/gbp-buildui-workspace-addin.c
index e36cd1bd1..07d7073fb 100644
--- a/src/plugins/buildui/gbp-buildui-workspace-addin.c
+++ b/src/plugins/buildui/gbp-buildui-workspace-addin.c
@@ -177,8 +177,8 @@ on_edit_config_cb (GSimpleAction *action,
gpointer user_data)
{
GbpBuilduiWorkspaceAddin *self = user_data;
- IdeConfigurationManager *config_manager;
- IdeConfiguration *config;
+ IdeConfigManager *config_manager;
+ IdeConfig *config;
IdeContext *context;
const gchar *id;
@@ -189,9 +189,9 @@ on_edit_config_cb (GSimpleAction *action,
ide_workspace_set_visible_surface_name (self->workspace, "buildui");
context = ide_widget_get_context (GTK_WIDGET (self->workspace));
- config_manager = ide_configuration_manager_from_context (context);
+ config_manager = ide_config_manager_from_context (context);
id = g_variant_get_string (param, NULL);
- config = ide_configuration_manager_get_configuration (config_manager, id);
+ config = ide_config_manager_get_configuration (config_manager, id);
if (config != NULL)
gbp_buildui_config_surface_set_config (self->surface, config);
@@ -207,7 +207,7 @@ gbp_buildui_workspace_addin_load (IdeWorkspaceAddin *addin,
IdeWorkspace *workspace)
{
GbpBuilduiWorkspaceAddin *self = (GbpBuilduiWorkspaceAddin *)addin;
- IdeConfigurationManager *config_manager;
+ IdeConfigManager *config_manager;
PangoAttrList *small_attrs = NULL;
IdeEditorSidebar *sidebar;
IdeBuildManager *build_manager;
@@ -233,7 +233,7 @@ gbp_buildui_workspace_addin_load (IdeWorkspaceAddin *addin,
workbench = ide_widget_get_workbench (GTK_WIDGET (workspace));
context = ide_workbench_get_context (workbench);
build_manager = ide_build_manager_from_context (context);
- config_manager = ide_configuration_manager_from_context (context);
+ config_manager = ide_config_manager_from_context (context);
small_attrs = pango_attr_list_new ();
pango_attr_list_insert (small_attrs, pango_attr_scale_new (0.833333));
diff --git a/src/plugins/cmake/gbp-cmake-build-system.c b/src/plugins/cmake/gbp-cmake-build-system.c
index c2cb5bc66..3be56c4b9 100644
--- a/src/plugins/cmake/gbp-cmake-build-system.c
+++ b/src/plugins/cmake/gbp-cmake-build-system.c
@@ -441,9 +441,9 @@ gbp_cmake_build_system_get_build_flags_cb (GObject *object,
g_autoptr(GFile) directory = NULL;
g_auto(GStrv) system_includes = NULL;
g_auto(GStrv) build_flags = NULL;
- IdeConfigurationManager *config_manager;
+ IdeConfigManager *config_manager;
IdeContext *context;
- IdeConfiguration *config;
+ IdeConfig *config;
IdeRuntime *runtime;
GFile *file;
@@ -464,9 +464,9 @@ gbp_cmake_build_system_get_build_flags_cb (GObject *object,
/* Get non-standard system includes */
context = ide_object_get_context (IDE_OBJECT (self));
- config_manager = ide_configuration_manager_from_context (context);
- config = ide_configuration_manager_get_current (config_manager);
- if ((runtime = ide_configuration_get_runtime (config)))
+ config_manager = ide_config_manager_from_context (context);
+ config = ide_config_manager_get_current (config_manager);
+ if ((runtime = ide_config_get_runtime (config)))
system_includes = ide_runtime_get_system_include_dirs (runtime);
build_flags = ide_compile_commands_lookup (compile_commands,
diff --git a/src/plugins/cmake/gbp-cmake-pipeline-addin.c b/src/plugins/cmake/gbp-cmake-pipeline-addin.c
index a60fa47ef..b5abe96f4 100644
--- a/src/plugins/cmake/gbp-cmake-pipeline-addin.c
+++ b/src/plugins/cmake/gbp-cmake-pipeline-addin.c
@@ -84,7 +84,7 @@ gbp_cmake_pipeline_addin_load (IdeBuildPipelineAddin *addin,
g_autofree gchar *project_file_name = NULL;
g_autofree gchar *srcdir = NULL;
IdeBuildSystem *build_system;
- IdeConfiguration *configuration;
+ IdeConfig *configuration;
IdeContext *context;
IdeRuntime *runtime;
IdeToolchain *toolchain;
@@ -118,11 +118,11 @@ gbp_cmake_pipeline_addin_load (IdeBuildPipelineAddin *addin,
else
srcdir = g_strdup (ide_build_pipeline_get_srcdir (pipeline));
- g_assert (IDE_IS_CONFIGURATION (configuration));
+ g_assert (IDE_IS_CONFIG (configuration));
g_assert (IDE_IS_RUNTIME (runtime));
g_assert (srcdir != NULL);
- if (!(cmake = ide_configuration_getenv (configuration, "CMAKE")))
+ if (!(cmake = ide_config_getenv (configuration, "CMAKE")))
cmake = "cmake";
for (guint i = 0; i < G_N_ELEMENTS (ninja_names); i++)
@@ -146,9 +146,9 @@ gbp_cmake_pipeline_addin_load (IdeBuildPipelineAddin *addin,
NULL == (install_launcher = ide_build_pipeline_create_launcher (pipeline, &error)))
IDE_GOTO (failure);
- prefix = ide_configuration_get_prefix (configuration);
- config_opts = ide_configuration_get_config_opts (configuration);
- parallelism = ide_configuration_get_parallelism (configuration);
+ prefix = ide_config_get_prefix (configuration);
+ config_opts = ide_config_get_config_opts (configuration);
+ parallelism = ide_config_get_parallelism (configuration);
/* Create the toolchain file if required */
if (GBP_IS_CMAKE_TOOLCHAIN (toolchain))
diff --git a/src/plugins/deviced/gbp-deviced-deploy-strategy.c
b/src/plugins/deviced/gbp-deviced-deploy-strategy.c
index 46196e4a0..942cb3fee 100644
--- a/src/plugins/deviced/gbp-deviced-deploy-strategy.c
+++ b/src/plugins/deviced/gbp-deviced-deploy-strategy.c
@@ -65,7 +65,7 @@ gbp_deviced_deploy_strategy_load_async (IdeDeployStrategy *strategy,
{
GbpDevicedDeployStrategy *self = (GbpDevicedDeployStrategy *)strategy;
g_autoptr(IdeTask) task = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
IdeDevice *device;
IDE_ENTRY;
@@ -180,7 +180,7 @@ deploy_get_commit_cb (GObject *object,
g_autoptr(IdeSubprocess) subprocess = NULL;
g_autoptr(GError) error = NULL;
g_autoptr(IdeTriplet) triplet = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
IdeToolchain *toolchain;
const gchar *arch;
const gchar *app_id;
@@ -207,7 +207,7 @@ deploy_get_commit_cb (GObject *object,
arch = ide_triplet_get_arch (triplet);
staging_dir = gbp_flatpak_get_staging_dir (state->pipeline);
repo_dir = gbp_flatpak_get_repo_dir (context);
- app_id = ide_configuration_get_app_id (config);
+ app_id = ide_config_get_app_id (config);
#if 0
if (commit_id != NULL)
name = g_strdup_printf ("%s-%s.flatpak", app_id, commit_id);
@@ -308,7 +308,7 @@ gbp_deviced_deploy_strategy_deploy_async (IdeDeployStrategy *strategy,
GbpDevicedDeployStrategy *self = (GbpDevicedDeployStrategy *)strategy;
g_autoptr(IdeTask) task = NULL;
g_autoptr(IdeTriplet) triplet = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
DeployState *state;
const gchar *app_id;
const gchar *arch;
@@ -329,7 +329,7 @@ gbp_deviced_deploy_strategy_deploy_async (IdeDeployStrategy *strategy,
toolchain = ide_build_pipeline_get_toolchain (pipeline);
triplet = ide_toolchain_get_host_triplet (toolchain);
arch = ide_triplet_get_arch (triplet);
- app_id = ide_configuration_get_app_id (config);
+ app_id = ide_config_get_app_id (config);
g_assert (GBP_IS_FLATPAK_MANIFEST (config));
g_assert (GBP_IS_DEVICED_DEVICE (device));
diff --git a/src/plugins/flatpak/flatpak-plugin.c b/src/plugins/flatpak/flatpak-plugin.c
index 375e3db0c..c64b7fbe5 100644
--- a/src/plugins/flatpak/flatpak-plugin.c
+++ b/src/plugins/flatpak/flatpak-plugin.c
@@ -49,7 +49,7 @@ _gbp_flatpak_register_types (PeasObjectModule *module)
IDE_TYPE_BUILD_TARGET_PROVIDER,
GBP_TYPE_FLATPAK_BUILD_TARGET_PROVIDER);
peas_object_module_register_extension_type (module,
- IDE_TYPE_CONFIGURATION_PROVIDER,
+ IDE_TYPE_CONFIG_PROVIDER,
GBP_TYPE_FLATPAK_CONFIGURATION_PROVIDER);
peas_object_module_register_extension_type (module,
IDE_TYPE_DEPENDENCY_UPDATER,
diff --git a/src/plugins/flatpak/gbp-flatpak-build-target-provider.c
b/src/plugins/flatpak/gbp-flatpak-build-target-provider.c
index 92906226d..178423065 100644
--- a/src/plugins/flatpak/gbp-flatpak-build-target-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-build-target-provider.c
@@ -38,8 +38,8 @@ gbp_flatpak_build_target_provider_get_targets_async (IdeBuildTargetProvider *pro
GbpFlatpakBuildTargetProvider *self = (GbpFlatpakBuildTargetProvider *)provider;
g_autoptr(IdeTask) task = NULL;
g_autoptr(GPtrArray) targets = NULL;
- IdeConfigurationManager *config_manager;
- IdeConfiguration *config;
+ IdeConfigManager *config_manager;
+ IdeConfig *config;
IdeContext *context;
g_assert (GBP_IS_FLATPAK_BUILD_TARGET_PROVIDER (self));
@@ -50,8 +50,8 @@ gbp_flatpak_build_target_provider_get_targets_async (IdeBuildTargetProvider *pro
ide_task_set_priority (task, G_PRIORITY_LOW);
context = ide_object_get_context (IDE_OBJECT (self));
- config_manager = ide_configuration_manager_from_context (context);
- config = ide_configuration_manager_get_current (config_manager);
+ config_manager = ide_config_manager_from_context (context);
+ config = ide_config_manager_get_current (config_manager);
targets = g_ptr_array_new_with_free_func (g_object_unref);
diff --git a/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
b/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
index 5f2c7bfab..f73aee87a 100644
--- a/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-configuration-provider.c
@@ -88,7 +88,7 @@ manifest_save_tick (IdeTask *task)
}
static void
-gbp_flatpak_configuration_provider_save_async (IdeConfigurationProvider *provider,
+gbp_flatpak_configuration_provider_save_async (IdeConfigProvider *provider,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -121,7 +121,7 @@ gbp_flatpak_configuration_provider_save_async (IdeConfigurationProvider *provide
{
GbpFlatpakManifest *manifest = g_ptr_array_index (self->configs, i);
- if (ide_configuration_get_dirty (IDE_CONFIGURATION (manifest)))
+ if (ide_config_get_dirty (IDE_CONFIG (manifest)))
g_ptr_array_add (ar, g_object_ref (manifest));
}
@@ -133,7 +133,7 @@ gbp_flatpak_configuration_provider_save_async (IdeConfigurationProvider *provide
}
static gboolean
-gbp_flatpak_configuration_provider_save_finish (IdeConfigurationProvider *provider,
+gbp_flatpak_configuration_provider_save_finish (IdeConfigProvider *provider,
GAsyncResult *result,
GError **error)
{
@@ -221,8 +221,8 @@ reload_manifest_cb (GObject *object,
g_autoptr(GbpFlatpakManifest) old_manifest = user_data;
g_autoptr(GbpFlatpakManifest) new_manifest = NULL;
g_autoptr(GError) error = NULL;
- IdeConfigurationManager *manager;
- IdeConfiguration *current;
+ IdeConfigManager *manager;
+ IdeConfig *current;
IdeContext *context;
gboolean is_active;
@@ -249,20 +249,20 @@ reload_manifest_cb (GObject *object,
g_ptr_array_add (self->configs, g_object_ref (new_manifest));
context = ide_object_get_context (IDE_OBJECT (self));
- manager = ide_configuration_manager_from_context (context);
- current = ide_configuration_manager_get_current (manager);
+ manager = ide_config_manager_from_context (context);
+ current = ide_config_manager_get_current (manager);
- is_active = current == IDE_CONFIGURATION (old_manifest);
+ is_active = current == IDE_CONFIG (old_manifest);
- ide_configuration_provider_emit_added (IDE_CONFIGURATION_PROVIDER (self),
- IDE_CONFIGURATION (new_manifest));
+ ide_config_provider_emit_added (IDE_CONFIG_PROVIDER (self),
+ IDE_CONFIG (new_manifest));
if (is_active)
- ide_configuration_manager_set_current (manager,
- IDE_CONFIGURATION (new_manifest));
+ ide_config_manager_set_current (manager,
+ IDE_CONFIG (new_manifest));
- ide_configuration_provider_emit_removed (IDE_CONFIGURATION_PROVIDER (self),
- IDE_CONFIGURATION (old_manifest));
+ ide_config_provider_emit_removed (IDE_CONFIG_PROVIDER (self),
+ IDE_CONFIG (old_manifest));
}
static void
@@ -329,7 +329,7 @@ gbp_flatpak_configuration_provider_load_worker (IdeTask *task,
continue;
}
- g_assert (ide_configuration_get_dirty (IDE_CONFIGURATION (manifest)) == FALSE);
+ g_assert (ide_config_get_dirty (IDE_CONFIG (manifest)) == FALSE);
g_signal_connect_object (manifest,
"needs-reload",
@@ -446,14 +446,14 @@ gbp_flatpak_configuration_provider_monitor_changed (GbpFlatpakConfigurationProvi
g_ptr_array_add (self->configs, g_object_ref (manifest));
- ide_configuration_provider_emit_added (IDE_CONFIGURATION_PROVIDER (self),
- IDE_CONFIGURATION (manifest));
+ ide_config_provider_emit_added (IDE_CONFIG_PROVIDER (self),
+ IDE_CONFIG (manifest));
}
}
}
static void
-gbp_flatpak_configuration_provider_load_async (IdeConfigurationProvider *provider,
+gbp_flatpak_configuration_provider_load_async (IdeConfigProvider *provider,
GCancellable *cancellable,
GAsyncReadyCallback callback,
gpointer user_data)
@@ -496,7 +496,7 @@ gbp_flatpak_configuration_provider_load_async (IdeConfigurationProvider *provide
IDE_EXIT;
}
-static IdeConfiguration *
+static IdeConfig *
guess_best_config (GPtrArray *ar)
{
g_assert (ar != NULL);
@@ -508,7 +508,7 @@ guess_best_config (GPtrArray *ar)
g_autofree gchar *path = gbp_flatpak_manifest_get_path (config);
if (strstr (path, "-unstable.json") != NULL)
- return IDE_CONFIGURATION (config);
+ return IDE_CONFIG (config);
}
for (guint i = 0; i < ar->len; i++)
@@ -516,21 +516,21 @@ guess_best_config (GPtrArray *ar)
GbpFlatpakManifest *config = g_ptr_array_index (ar, i);
g_autofree gchar *path = gbp_flatpak_manifest_get_path (config);
g_autofree gchar *base = g_path_get_basename (path);
- const gchar *app_id = ide_configuration_get_app_id (IDE_CONFIGURATION (config));
+ const gchar *app_id = ide_config_get_app_id (IDE_CONFIG (config));
g_autofree gchar *app_id_json = g_strdup_printf ("%s.json", app_id);
/* If appid.json is the same as the filename, that is the
* best match (after unstable) we can have. Use it.
*/
if (dzl_str_equal0 (app_id_json, base))
- return IDE_CONFIGURATION (config);
+ return IDE_CONFIG (config);
}
return g_ptr_array_index (ar, 0);
}
static gboolean
-gbp_flatpak_configuration_provider_load_finish (IdeConfigurationProvider *provider,
+gbp_flatpak_configuration_provider_load_finish (IdeConfigProvider *provider,
GAsyncResult *result,
GError **error)
{
@@ -552,31 +552,31 @@ gbp_flatpak_configuration_provider_load_finish (IdeConfigurationProvider *provi
for (guint i = 0; i < configs->len; i++)
{
- IdeConfiguration *config = g_ptr_array_index (configs, i);
+ IdeConfig *config = g_ptr_array_index (configs, i);
- g_assert (IDE_IS_CONFIGURATION (config));
- g_assert (ide_configuration_get_dirty (config) == FALSE);
+ g_assert (IDE_IS_CONFIG (config));
+ g_assert (ide_config_get_dirty (config) == FALSE);
- ide_configuration_provider_emit_added (provider, config);
+ ide_config_provider_emit_added (provider, config);
}
if (configs->len > 0)
{
- IdeConfiguration *config = guess_best_config (configs);
+ IdeConfig *config = guess_best_config (configs);
IdeContext *context = ide_object_get_context (IDE_OBJECT (self));
- IdeConfigurationManager *manager = ide_configuration_manager_from_context (context);
+ IdeConfigManager *manager = ide_config_manager_from_context (context);
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
/* TODO: We should have a GSetting for this, in config-manager */
- ide_configuration_manager_set_current (manager, config);
+ ide_config_manager_set_current (manager, config);
}
return TRUE;
}
static void
-gbp_flatpak_configuration_provider_unload (IdeConfigurationProvider *provider)
+gbp_flatpak_configuration_provider_unload (IdeConfigProvider *provider)
{
GbpFlatpakConfigurationProvider *self = (GbpFlatpakConfigurationProvider *)provider;
@@ -588,7 +588,7 @@ gbp_flatpak_configuration_provider_unload (IdeConfigurationProvider *provider)
{
for (guint i = self->configs->len; i > 0; i--)
{
- g_autoptr(IdeConfiguration) config = NULL;
+ g_autoptr(IdeConfig) config = NULL;
config = g_object_ref (g_ptr_array_index (self->configs, i - 1));
g_signal_handlers_disconnect_by_func (config,
@@ -596,7 +596,7 @@ gbp_flatpak_configuration_provider_unload (IdeConfigurationProvider *provider)
self);
g_ptr_array_remove_index (self->configs, i - 1);
- ide_configuration_provider_emit_removed (provider, config);
+ ide_config_provider_emit_removed (provider, config);
}
g_clear_pointer (&self->configs, g_ptr_array_unref);
@@ -606,8 +606,8 @@ gbp_flatpak_configuration_provider_unload (IdeConfigurationProvider *provider)
}
static void
-gbp_flatpak_configuration_provider_duplicate (IdeConfigurationProvider *provider,
- IdeConfiguration *configuration)
+gbp_flatpak_configuration_provider_duplicate (IdeConfigProvider *provider,
+ IdeConfig *configuration)
{
GbpFlatpakManifest *manifest = (GbpFlatpakManifest *)configuration;
g_autofree gchar *path = NULL;
@@ -643,12 +643,12 @@ gbp_flatpak_configuration_provider_duplicate (IdeConfigurationProvider *provider
}
static void
-gbp_flatpak_configuration_provider_delete (IdeConfigurationProvider *provider,
- IdeConfiguration *configuration)
+gbp_flatpak_configuration_provider_delete (IdeConfigProvider *provider,
+ IdeConfig *configuration)
{
GbpFlatpakConfigurationProvider *self = (GbpFlatpakConfigurationProvider *)provider;
GbpFlatpakManifest *manifest = (GbpFlatpakManifest *)configuration;
- g_autoptr(IdeConfiguration) hold = NULL;
+ g_autoptr(IdeConfig) hold = NULL;
g_autoptr(GFile) file = NULL;
g_autoptr(GError) error = NULL;
g_autofree gchar *name = NULL;
@@ -662,14 +662,14 @@ gbp_flatpak_configuration_provider_delete (IdeConfigurationProvider *provider,
if (g_ptr_array_remove (self->configs, hold))
{
- ide_configuration_provider_emit_removed (provider, hold);
+ ide_config_provider_emit_removed (provider, hold);
if (!g_file_delete (file, NULL, &error))
ide_object_warning (provider, _("Failed to remove flatpak manifest: %s"), name);
}
}
static void
-configuration_provider_iface_init (IdeConfigurationProviderInterface *iface)
+configuration_provider_iface_init (IdeConfigProviderInterface *iface)
{
iface->load_async = gbp_flatpak_configuration_provider_load_async;
iface->load_finish = gbp_flatpak_configuration_provider_load_finish;
@@ -683,7 +683,7 @@ configuration_provider_iface_init (IdeConfigurationProviderInterface *iface)
G_DEFINE_TYPE_WITH_CODE (GbpFlatpakConfigurationProvider,
gbp_flatpak_configuration_provider,
IDE_TYPE_OBJECT,
- G_IMPLEMENT_INTERFACE (IDE_TYPE_CONFIGURATION_PROVIDER,
+ G_IMPLEMENT_INTERFACE (IDE_TYPE_CONFIG_PROVIDER,
configuration_provider_iface_init))
static void
diff --git a/src/plugins/flatpak/gbp-flatpak-download-stage.c
b/src/plugins/flatpak/gbp-flatpak-download-stage.c
index 5651b781e..5731765e6 100644
--- a/src/plugins/flatpak/gbp-flatpak-download-stage.c
+++ b/src/plugins/flatpak/gbp-flatpak-download-stage.c
@@ -54,7 +54,7 @@ gbp_flatpak_download_stage_query (IdeBuildStage *stage,
GCancellable *cancellable)
{
GbpFlatpakDownloadStage *self = (GbpFlatpakDownloadStage *)stage;
- IdeConfiguration *config;
+ IdeConfig *config;
g_autofree gchar *staging_dir = NULL;
g_autofree gchar *manifest_path = NULL;
g_autofree gchar *stop_at_option = NULL;
@@ -77,7 +77,7 @@ gbp_flatpak_download_stage_query (IdeBuildStage *stage,
}
config = ide_build_pipeline_get_configuration (pipeline);
- g_assert (!config || IDE_IS_CONFIGURATION (config));
+ g_assert (!config || IDE_IS_CONFIG (config));
if (!GBP_IS_FLATPAK_MANIFEST (config))
{
diff --git a/src/plugins/flatpak/gbp-flatpak-manifest.c b/src/plugins/flatpak/gbp-flatpak-manifest.c
index 2a5a02bd3..18e09c734 100644
--- a/src/plugins/flatpak/gbp-flatpak-manifest.c
+++ b/src/plugins/flatpak/gbp-flatpak-manifest.c
@@ -29,7 +29,7 @@
struct _GbpFlatpakManifest
{
- IdeConfiguration parent_instance;
+ IdeConfig parent_instance;
GFile *file;
GFileMonitor *file_monitor;
@@ -58,7 +58,7 @@ struct _GbpFlatpakManifest
static void initable_iface_init (GInitableIface *iface);
-G_DEFINE_TYPE_WITH_CODE (GbpFlatpakManifest, gbp_flatpak_manifest, IDE_TYPE_CONFIGURATION,
+G_DEFINE_TYPE_WITH_CODE (GbpFlatpakManifest, gbp_flatpak_manifest, IDE_TYPE_CONFIG,
G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE, initable_iface_init))
enum {
@@ -108,7 +108,7 @@ validate_properties (GbpFlatpakManifest *self,
branch = self->runtime_version;
runtime_id = g_strdup_printf ("flatpak:%s/%s/%s", name, arch, branch);
- ide_configuration_set_runtime_id (IDE_CONFIGURATION (self), runtime_id);
+ ide_config_set_runtime_id (IDE_CONFIG (self), runtime_id);
return TRUE;
}
@@ -214,7 +214,7 @@ discover_environ (GbpFlatpakManifest *self,
JsonObject *obj;
const gchar *str;
- g_assert (IDE_IS_CONFIGURATION (self));
+ g_assert (IDE_IS_CONFIG (self));
if (!json_object_has_member (root, "build-options"))
return;
@@ -222,7 +222,7 @@ discover_environ (GbpFlatpakManifest *self,
if (!(build_options = json_object_get_object_member (root, "build-options")))
return;
- env = ide_configuration_get_environment (IDE_CONFIGURATION (self));
+ env = ide_config_get_environment (IDE_CONFIG (self));
if (json_object_has_member (build_options, "env") &&
(obj = json_object_get_object_member (build_options, "env")))
@@ -249,7 +249,7 @@ discover_environ (GbpFlatpakManifest *self,
if (json_object_has_member (build_options, "append-path") &&
(str = json_object_get_string_member (build_options, "append-path")))
- ide_configuration_set_append_path (IDE_CONFIGURATION (self), str);
+ ide_config_set_append_path (IDE_CONFIG (self), str);
}
static JsonObject *
@@ -374,14 +374,14 @@ gbp_flatpak_manifest_initable_init (GInitable *initable,
}
display_name = g_file_get_basename (self->file);
- ide_configuration_set_display_name (IDE_CONFIGURATION (self), display_name);
+ ide_config_set_display_name (IDE_CONFIG (self), display_name);
context = ide_object_ref_context (IDE_OBJECT (self));
workdir = ide_context_ref_workdir (context);
dir_name = g_file_get_basename (workdir);
root_obj = json_node_get_object (root);
- ide_configuration_set_build_commands_dir (IDE_CONFIGURATION (self), workdir);
+ ide_config_set_build_commands_dir (IDE_CONFIG (self), workdir);
if (!(primary = discover_primary_module (self, root_obj, dir_name, TRUE, error)))
return FALSE;
@@ -402,7 +402,7 @@ gbp_flatpak_manifest_initable_init (GInitable *initable,
return FALSE;
}
- ide_configuration_set_app_id (IDE_CONFIGURATION (self), app_id);
+ ide_config_set_app_id (IDE_CONFIG (self), app_id);
discover_string_field (root_obj, "runtime", &self->runtime);
discover_string_field (root_obj, "runtime-version", &self->runtime_version);
@@ -413,7 +413,7 @@ gbp_flatpak_manifest_initable_init (GInitable *initable,
discover_strv_field (root_obj, "sdk-extensions", &self->sdk_extensions);
if (discover_strv_as_quoted (root_obj, "x-run-args", &run_args))
- ide_configuration_set_run_opts (IDE_CONFIGURATION (self), run_args);
+ ide_config_set_run_opts (IDE_CONFIG (self), run_args);
if (discover_strv_field (primary, "config-opts", &self->config_opts))
{
@@ -435,22 +435,22 @@ gbp_flatpak_manifest_initable_init (GInitable *initable,
g_string_append (gstr, opt);
}
- ide_configuration_set_config_opts (IDE_CONFIGURATION (self), gstr->str);
+ ide_config_set_config_opts (IDE_CONFIG (self), gstr->str);
}
if (discover_strv_field (primary, "build-commands", &build_commands))
- ide_configuration_set_build_commands (IDE_CONFIGURATION (self),
+ ide_config_set_build_commands (IDE_CONFIG (self),
(const gchar * const *)build_commands);
if (discover_strv_field (primary, "post-install", &post_install))
- ide_configuration_set_post_install_commands (IDE_CONFIGURATION (self),
+ ide_config_set_post_install_commands (IDE_CONFIG (self),
(const gchar * const *)post_install);
if (json_object_has_member (primary, "builddir") &&
json_object_get_boolean_member (primary, "builddir"))
- ide_configuration_set_locality (IDE_CONFIGURATION (self), IDE_BUILD_LOCALITY_OUT_OF_TREE);
+ ide_config_set_locality (IDE_CONFIG (self), IDE_BUILD_LOCALITY_OUT_OF_TREE);
else
- ide_configuration_set_locality (IDE_CONFIGURATION (self), IDE_BUILD_LOCALITY_IN_TREE);
+ ide_config_set_locality (IDE_CONFIG (self), IDE_BUILD_LOCALITY_IN_TREE);
discover_environ (self, root_obj);
@@ -460,7 +460,7 @@ gbp_flatpak_manifest_initable_init (GInitable *initable,
if (!validate_properties (self, error))
return FALSE;
- ide_configuration_set_dirty (IDE_CONFIGURATION (self), FALSE);
+ ide_config_set_dirty (IDE_CONFIG (self), FALSE);
return TRUE;
}
@@ -472,7 +472,7 @@ initable_iface_init (GInitableIface *iface)
}
static gboolean
-gbp_flatpak_manifest_supports_runtime (IdeConfiguration *config,
+gbp_flatpak_manifest_supports_runtime (IdeConfig *config,
IdeRuntime *runtime)
{
g_assert (GBP_IS_FLATPAK_MANIFEST (config));
@@ -616,7 +616,7 @@ static void
gbp_flatpak_manifest_class_init (GbpFlatpakManifestClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- IdeConfigurationClass *config_class = IDE_CONFIGURATION_CLASS (klass);
+ IdeConfigClass *config_class = IDE_CONFIG_CLASS (klass);
object_class->finalize = gbp_flatpak_manifest_finalize;
object_class->get_property = gbp_flatpak_manifest_get_property;
@@ -649,7 +649,7 @@ gbp_flatpak_manifest_class_init (GbpFlatpakManifestClass *klass)
static void
gbp_flatpak_manifest_init (GbpFlatpakManifest *self)
{
- ide_configuration_set_prefix (IDE_CONFIGURATION (self), "/app");
+ ide_config_set_prefix (IDE_CONFIG (self), "/app");
}
GbpFlatpakManifest *
@@ -778,7 +778,7 @@ apply_changes_to_tree (GbpFlatpakManifest *self)
obj = json_node_get_object (self->root);
- if ((runtime_id = ide_configuration_get_runtime_id (IDE_CONFIGURATION (self))))
+ if ((runtime_id = ide_config_get_runtime_id (IDE_CONFIG (self))))
{
g_autofree gchar *id = NULL;
g_autofree gchar *arch = NULL;
@@ -794,7 +794,7 @@ apply_changes_to_tree (GbpFlatpakManifest *self)
}
}
- if ((app_id = ide_configuration_get_app_id (IDE_CONFIGURATION (self))))
+ if ((app_id = ide_config_get_app_id (IDE_CONFIG (self))))
{
/* Be friendly to old? style "id" fields */
if (json_object_has_member (obj, "id"))
@@ -810,7 +810,7 @@ apply_changes_to_tree (GbpFlatpakManifest *self)
env_obj = json_object_new ();
json_object_set_object_member (build_options, "env", env_obj);
- env = ide_configuration_get_environment (IDE_CONFIGURATION (self));
+ env = ide_config_get_environment (IDE_CONFIG (self));
n_items = g_list_model_get_n_items (G_LIST_MODEL (env));
for (guint i = 0; i < n_items; i++)
@@ -832,12 +832,12 @@ apply_changes_to_tree (GbpFlatpakManifest *self)
json_object_set_string_member (env_obj, key, value);
}
- if (ide_configuration_get_locality (IDE_CONFIGURATION (self)) == IDE_BUILD_LOCALITY_OUT_OF_TREE)
+ if (ide_config_get_locality (IDE_CONFIG (self)) == IDE_BUILD_LOCALITY_OUT_OF_TREE)
json_object_set_boolean_member (self->primary, "builddir", TRUE);
else if (json_object_has_member (self->primary, "builddir"))
json_object_remove_member (self->primary, "builddir");
- if (!(config_opts = ide_configuration_get_config_opts (IDE_CONFIGURATION (self))))
+ if (!(config_opts = ide_config_get_config_opts (IDE_CONFIG (self))))
{
if (json_object_has_member (self->primary, "config-opts"))
json_object_remove_member (self->primary, "config-opts");
@@ -884,7 +884,7 @@ gbp_flatpak_manifest_save_cb (GObject *object,
}
self = ide_task_get_source_object (task);
- ide_configuration_set_dirty (IDE_CONFIGURATION (self), FALSE);
+ ide_config_set_dirty (IDE_CONFIG (self), FALSE);
ide_task_return_boolean (task, TRUE);
gbp_flatpak_manifest_unblock_monitor (self);
diff --git a/src/plugins/flatpak/gbp-flatpak-manifest.h b/src/plugins/flatpak/gbp-flatpak-manifest.h
index 2103ee0ed..2de59ce27 100644
--- a/src/plugins/flatpak/gbp-flatpak-manifest.h
+++ b/src/plugins/flatpak/gbp-flatpak-manifest.h
@@ -27,7 +27,7 @@ G_BEGIN_DECLS
#define GBP_TYPE_FLATPAK_MANIFEST (gbp_flatpak_manifest_get_type())
-G_DECLARE_FINAL_TYPE (GbpFlatpakManifest, gbp_flatpak_manifest, GBP, FLATPAK_MANIFEST, IdeConfiguration)
+G_DECLARE_FINAL_TYPE (GbpFlatpakManifest, gbp_flatpak_manifest, GBP, FLATPAK_MANIFEST, IdeConfig)
GbpFlatpakManifest *gbp_flatpak_manifest_new (GFile *file,
const gchar *id);
diff --git a/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
b/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
index e70f5c17e..3f541c78d 100644
--- a/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-pipeline-addin.c
@@ -271,7 +271,7 @@ register_build_init_stage (GbpFlatpakPipelineAddin *self,
g_autofree gchar *staging_dir = NULL;
g_autofree gchar *sdk = NULL;
g_autofree gchar *arch = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
IdeRuntime *runtime;
const gchar *app_id;
const gchar *platform;
@@ -298,7 +298,7 @@ register_build_init_stage (GbpFlatpakPipelineAddin *self,
arch = get_arch_option (pipeline);
staging_dir = gbp_flatpak_get_staging_dir (pipeline);
- app_id = ide_configuration_get_app_id (config);
+ app_id = ide_config_get_app_id (config);
platform = gbp_flatpak_runtime_get_platform (GBP_FLATPAK_RUNTIME (runtime));
sdk = gbp_flatpak_runtime_get_sdk_name (GBP_FLATPAK_RUNTIME (runtime));
branch = gbp_flatpak_runtime_get_branch (GBP_FLATPAK_RUNTIME (runtime));
@@ -406,7 +406,7 @@ register_dependencies_stage (GbpFlatpakPipelineAddin *self,
g_autofree gchar *manifest_path = NULL;
g_autofree gchar *staging_dir = NULL;
g_autofree gchar *stop_at_option = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
const gchar *primary_module;
const gchar *src_dir;
guint stage_id;
@@ -485,7 +485,7 @@ register_build_finish_stage (GbpFlatpakPipelineAddin *self,
g_autofree gchar *staging_dir = NULL;
const gchar * const *finish_args;
const gchar *command;
- IdeConfiguration *config;
+ IdeConfig *config;
guint stage_id;
g_assert (GBP_IS_FLATPAK_PIPELINE_ADDIN (self));
@@ -536,7 +536,7 @@ register_build_export_stage (GbpFlatpakPipelineAddin *self,
g_autofree gchar *arch = NULL;
g_autofree gchar *repo_dir = NULL;
g_autofree gchar *staging_dir = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
guint stage_id;
g_assert (GBP_IS_FLATPAK_PIPELINE_ADDIN (self));
@@ -608,7 +608,7 @@ register_build_bundle_stage (GbpFlatpakPipelineAddin *self,
g_autofree gchar *dest_path = NULL;
g_autofree gchar *arch = NULL;
g_autofree gchar *name = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
const gchar *app_id;
guint stage_id;
@@ -623,7 +623,7 @@ register_build_bundle_stage (GbpFlatpakPipelineAddin *self,
staging_dir = gbp_flatpak_get_staging_dir (pipeline);
repo_dir = gbp_flatpak_get_repo_dir (context);
- app_id = ide_configuration_get_app_id (config);
+ app_id = ide_config_get_app_id (config);
name = g_strdup_printf ("%s.flatpak", app_id);
dest_path = g_build_filename (staging_dir, name, NULL);
@@ -640,7 +640,7 @@ register_build_bundle_stage (GbpFlatpakPipelineAddin *self,
/* TODO:
*
* We probably need to provide UI/config opt to tweak the branch name
- * if (ide_configuration_get_is_release (config))
+ * if (ide_config_get_is_release (config))
*/
ide_subprocess_launcher_push_argv (launcher, "master");
@@ -673,7 +673,7 @@ gbp_flatpak_pipeline_addin_load (IdeBuildPipelineAddin *addin,
{
GbpFlatpakPipelineAddin *self = (GbpFlatpakPipelineAddin *)addin;
g_autoptr(GError) error = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
IdeContext *context;
g_assert (GBP_IS_FLATPAK_PIPELINE_ADDIN (self));
diff --git a/src/plugins/flatpak/gbp-flatpak-runner.c b/src/plugins/flatpak/gbp-flatpak-runner.c
index 2925784df..5336d996e 100644
--- a/src/plugins/flatpak/gbp-flatpak-runner.c
+++ b/src/plugins/flatpak/gbp-flatpak-runner.c
@@ -56,8 +56,8 @@ gbp_flatpak_runner_fixup_launcher (IdeRunner *runner,
{
GbpFlatpakRunner *self = (GbpFlatpakRunner *)runner;
g_autofree gchar *doc_portal = NULL;
- IdeConfigurationManager *config_manager;
- IdeConfiguration *config;
+ IdeConfigManager *config_manager;
+ IdeConfig *config;
IdeEnvironment *env;
g_auto(GStrv) environ_ = NULL;
const gchar *app_id;
@@ -68,9 +68,9 @@ gbp_flatpak_runner_fixup_launcher (IdeRunner *runner,
g_assert (IDE_IS_SUBPROCESS_LAUNCHER (launcher));
context = ide_object_get_context (IDE_OBJECT (self));
- config_manager = ide_configuration_manager_from_context (context);
- config = ide_configuration_manager_get_current (config_manager);
- app_id = ide_configuration_get_app_id (config);
+ config_manager = ide_config_manager_from_context (context);
+ config = ide_config_manager_get_current (config_manager);
+ app_id = ide_config_get_app_id (config);
doc_portal = g_strdup_printf ("--bind-mount=/run/user/%u/doc=/run/user/%u/doc/by-app/%s",
getuid (), getuid (), app_id);
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
index 3e71a0f77..bf799142d 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
+++ b/src/plugins/flatpak/gbp-flatpak-runtime-provider.c
@@ -45,7 +45,7 @@ typedef struct
typedef struct
{
- IdeConfiguration *config;
+ IdeConfig *config;
gchar *runtime_id;
gchar *name;
gchar *arch;
@@ -629,7 +629,7 @@ gbp_flatpak_runtime_provider_bootstrap_async (IdeRuntimeProvider *provider,
g_autofree gchar *branch = NULL;
g_autoptr(IdeTask) task = NULL;
g_autoptr(IdeTriplet) triplet = NULL;
- IdeConfiguration *config;
+ IdeConfig *config;
IdeToolchain *toolchain;
BootstrapState *state;
const gchar *runtime_id;
@@ -649,7 +649,7 @@ gbp_flatpak_runtime_provider_bootstrap_async (IdeRuntimeProvider *provider,
triplet = ide_toolchain_get_host_triplet (toolchain);
build_arch = ide_triplet_get_arch (triplet);
config = ide_build_pipeline_get_configuration (pipeline);
- runtime_id = ide_configuration_get_runtime_id (config);
+ runtime_id = ide_config_get_runtime_id (config);
if (runtime_id == NULL ||
!g_str_has_prefix (runtime_id, "flatpak:") ||
diff --git a/src/plugins/flatpak/gbp-flatpak-runtime.c b/src/plugins/flatpak/gbp-flatpak-runtime.c
index d53a2ef7c..b0c285753 100644
--- a/src/plugins/flatpak/gbp-flatpak-runtime.c
+++ b/src/plugins/flatpak/gbp-flatpak-runtime.c
@@ -168,14 +168,14 @@ gbp_flatpak_runtime_create_launcher (IdeRuntime *runtime,
const gchar *builddir = NULL;
const gchar *project_path = NULL;
const gchar * const *build_args = NULL;
- g_autoptr(IdeConfigurationManager) config_manager = NULL;
+ g_autoptr(IdeConfigManager) config_manager = NULL;
g_autoptr(IdeContext) context = NULL;
- IdeConfiguration *configuration;
+ IdeConfig *configuration;
IdeVcs *vcs;
context = ide_object_ref_context (IDE_OBJECT (self));
- config_manager = ide_configuration_manager_ref_from_context (context);
- configuration = ide_configuration_manager_ref_current (config_manager);
+ config_manager = ide_config_manager_ref_from_context (context);
+ configuration = ide_config_manager_ref_current (config_manager);
build_path = get_staging_directory (self);
builddir = get_builddir (self);
@@ -224,7 +224,7 @@ gbp_flatpak_runtime_create_launcher (IdeRuntime *runtime,
ide_subprocess_launcher_push_argv (ret, filesystem_option_build);
}
- new_environ = ide_configuration_get_environ (IDE_CONFIGURATION (configuration));
+ new_environ = ide_config_get_environ (IDE_CONFIG (configuration));
if (!strv_empty (new_environ))
{
@@ -273,8 +273,8 @@ get_binary_name (GbpFlatpakRuntime *self,
IdeBuildTarget *build_target)
{
IdeContext *context = ide_object_get_context (IDE_OBJECT (self));
- IdeConfigurationManager *config_manager = ide_configuration_manager_from_context (context);
- IdeConfiguration *config = ide_configuration_manager_get_current (config_manager);
+ IdeConfigManager *config_manager = ide_config_manager_from_context (context);
+ IdeConfig *config = ide_config_manager_get_current (config_manager);
g_autofree gchar *build_target_name = ide_build_target_get_name (build_target);
g_auto(GStrv) argv = ide_build_target_get_argv (build_target);
@@ -333,12 +333,12 @@ gbp_flatpak_runtime_create_runner (IdeRuntime *runtime,
static void
gbp_flatpak_runtime_prepare_configuration (IdeRuntime *runtime,
- IdeConfiguration *configuration)
+ IdeConfig *configuration)
{
g_assert (GBP_IS_FLATPAK_RUNTIME (runtime));
- g_assert (IDE_IS_CONFIGURATION (configuration));
+ g_assert (IDE_IS_CONFIG (configuration));
- ide_configuration_set_prefix (configuration, "/app");
+ ide_config_set_prefix (configuration, "/app");
}
static void
diff --git a/src/plugins/flatpak/gbp-flatpak-workbench-addin.c
b/src/plugins/flatpak/gbp-flatpak-workbench-addin.c
index 4dbceb4cd..0e3d473b8 100644
--- a/src/plugins/flatpak/gbp-flatpak-workbench-addin.c
+++ b/src/plugins/flatpak/gbp-flatpak-workbench-addin.c
@@ -189,7 +189,7 @@ gbp_flatpak_workbench_addin_install_cb (GObject *object,
else
{
IdeContext *context = ide_workbench_get_context (self->workbench);
- IdeConfigurationManager *config_manager = ide_configuration_manager_from_context (context);
+ IdeConfigManager *config_manager = ide_config_manager_from_context (context);
/* TODO: It would be nice to have a cleaner way to re-setup the pipeline
* because we know it is invalidated.
diff --git a/src/plugins/gjs-symbols/gjs_symbols.py b/src/plugins/gjs-symbols/gjs_symbols.py
index 345df5ddd..009425cef 100644
--- a/src/plugins/gjs-symbols/gjs_symbols.py
+++ b/src/plugins/gjs-symbols/gjs_symbols.py
@@ -263,7 +263,7 @@ class GjsSymbolProvider(Ide.Object, Ide.SymbolResolver):
unsaved_file = Ide.UnsavedFiles.from_context(context).get_unsaved_file(file_)
if context.has_project():
- runtime = Ide.ConfigurationManager.from_context(context).get_current().get_runtime()
+ runtime = Ide.ConfigManager.from_context(context).get_current().get_runtime()
launcher = runtime.create_launcher()
else:
launcher = Ide.SubprocessLauncher.new(0)
diff --git a/src/plugins/glade/gbp-glade-workbench-addin.c b/src/plugins/glade/gbp-glade-workbench-addin.c
index 0d499e837..2c1d60b6d 100644
--- a/src/plugins/glade/gbp-glade-workbench-addin.c
+++ b/src/plugins/glade/gbp-glade-workbench-addin.c
@@ -248,14 +248,14 @@ on_build_pipeline_changed_cb (GbpGladeWorkbenchAddin *self,
if (pipeline != NULL)
{
- IdeConfiguration *config = ide_build_pipeline_get_configuration (pipeline);
+ IdeConfig *config = ide_build_pipeline_get_configuration (pipeline);
IdeRuntime *runtime = ide_build_pipeline_get_runtime (pipeline);
g_autoptr(GFile) translated = NULL;
g_autoptr(GFile) catalog_file = NULL;
if (config != NULL)
{
- const gchar *prefix = ide_configuration_get_prefix (config);
+ const gchar *prefix = ide_config_get_prefix (config);
g_autofree gchar *path = g_build_filename (prefix, "share/glade/catalogs", NULL);
if (!g_hash_table_contains (self->catalog_paths, path))
diff --git a/src/plugins/meson/gbp-meson-build-system.c b/src/plugins/meson/gbp-meson-build-system.c
index b5b913fbf..4b7e9e9e7 100644
--- a/src/plugins/meson/gbp-meson-build-system.c
+++ b/src/plugins/meson/gbp-meson-build-system.c
@@ -448,8 +448,8 @@ gbp_meson_build_system_get_build_flags_for_files_cb (GObject *object,
g_autoptr(GError) error = NULL;
g_autoptr(GHashTable) ret = NULL;
g_auto(GStrv) system_includes = NULL;
- IdeConfigurationManager *config_manager;
- IdeConfiguration *config;
+ IdeConfigManager *config_manager;
+ IdeConfig *config;
IdeContext *context;
IdeRuntime *runtime;
GPtrArray *files;
@@ -469,9 +469,9 @@ gbp_meson_build_system_get_build_flags_for_files_cb (GObject *object,
/* Get non-standard system includes */
context = ide_object_get_context (IDE_OBJECT (self));
- config_manager = ide_configuration_manager_from_context (context);
- config = ide_configuration_manager_get_current (config_manager);
- if (NULL != (runtime = ide_configuration_get_runtime (config)))
+ config_manager = ide_config_manager_from_context (context);
+ config = ide_config_manager_get_current (config_manager);
+ if (NULL != (runtime = ide_config_get_runtime (config)))
system_includes = ide_runtime_get_system_include_dirs (runtime);
ret = g_hash_table_new_full (g_file_hash,
@@ -505,9 +505,9 @@ gbp_meson_build_system_get_build_flags_cb (GObject *object,
g_autoptr(GFile) directory = NULL;
g_auto(GStrv) system_includes = NULL;
g_auto(GStrv) ret = NULL;
- IdeConfigurationManager *config_manager;
+ IdeConfigManager *config_manager;
IdeContext *context;
- IdeConfiguration *config;
+ IdeConfig *config;
IdeRuntime *runtime;
GFile *file;
@@ -528,9 +528,9 @@ gbp_meson_build_system_get_build_flags_cb (GObject *object,
/* Get non-standard system includes */
context = ide_object_get_context (IDE_OBJECT (self));
- config_manager = ide_configuration_manager_from_context (context);
- config = ide_configuration_manager_get_current (config_manager);
- if (NULL != (runtime = ide_configuration_get_runtime (config)))
+ config_manager = ide_config_manager_from_context (context);
+ config = ide_config_manager_get_current (config_manager);
+ if (NULL != (runtime = ide_config_get_runtime (config)))
system_includes = ide_runtime_get_system_include_dirs (runtime);
ret = ide_compile_commands_lookup (compile_commands,
@@ -636,7 +636,7 @@ gbp_meson_build_system_get_builddir (IdeBuildSystem *build_system,
IdeBuildPipeline *pipeline)
{
GbpMesonBuildSystem *self = (GbpMesonBuildSystem *)build_system;
- IdeConfiguration *config;
+ IdeConfig *config;
IdeBuildLocality locality;
g_assert (GBP_IS_MESON_BUILD_SYSTEM (self));
@@ -648,7 +648,7 @@ gbp_meson_build_system_get_builddir (IdeBuildSystem *build_system,
*/
config = ide_build_pipeline_get_configuration (pipeline);
- locality = ide_configuration_get_locality (config);
+ 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 9c638faf2..88cc4c565 100644
--- a/src/plugins/meson/gbp-meson-pipeline-addin.c
+++ b/src/plugins/meson/gbp-meson-pipeline-addin.c
@@ -115,7 +115,7 @@ gbp_meson_pipeline_addin_load (IdeBuildPipelineAddin *addin,
g_autofree gchar *build_ninja = NULL;
g_autofree gchar *crossbuild_file = NULL;
IdeBuildSystem *build_system;
- IdeConfiguration *config;
+ IdeConfig *config;
IdeContext *context;
IdeRuntime *runtime;
IdeToolchain *toolchain;
@@ -143,7 +143,7 @@ gbp_meson_pipeline_addin_load (IdeBuildPipelineAddin *addin,
toolchain = ide_build_pipeline_get_toolchain (pipeline);
srcdir = ide_build_pipeline_get_srcdir (pipeline);
- g_assert (IDE_IS_CONFIGURATION (config));
+ g_assert (IDE_IS_CONFIG (config));
g_assert (IDE_IS_RUNTIME (runtime));
g_assert (srcdir != NULL);
@@ -157,7 +157,7 @@ gbp_meson_pipeline_addin_load (IdeBuildPipelineAddin *addin,
}
if (ninja == NULL)
- ninja = ide_configuration_getenv (config, "NINJA");
+ ninja = ide_config_getenv (config, "NINJA");
if (ninja == NULL)
{
@@ -173,11 +173,11 @@ gbp_meson_pipeline_addin_load (IdeBuildPipelineAddin *addin,
NULL == (install_launcher = ide_build_pipeline_create_launcher (pipeline, &error)))
IDE_GOTO (failure);
- prefix = ide_configuration_get_prefix (config);
- config_opts = ide_configuration_get_config_opts (config);
- parallel = ide_configuration_get_parallelism (config);
+ prefix = ide_config_get_prefix (config);
+ config_opts = ide_config_get_config_opts (config);
+ parallel = ide_config_get_parallelism (config);
- if (NULL == (meson = ide_configuration_getenv (config, "MESON")))
+ if (NULL == (meson = ide_config_getenv (config, "MESON")))
meson = "meson";
if (!ide_runtime_contains_program_in_path (runtime, meson, NULL))
diff --git a/src/plugins/sysprof/gbp-sysprof-workspace-addin.c
b/src/plugins/sysprof/gbp-sysprof-workspace-addin.c
index 2266cb377..6933a5ea6 100644
--- a/src/plugins/sysprof/gbp-sysprof-workspace-addin.c
+++ b/src/plugins/sysprof/gbp-sysprof-workspace-addin.c
@@ -136,16 +136,16 @@ static gchar *
get_runtime_sysroot (IdeContext *context,
const gchar *path)
{
- IdeConfigurationManager *config_manager;
- IdeConfiguration *config;
+ IdeConfigManager *config_manager;
+ IdeConfig *config;
IdeRuntime *runtime;
g_assert (IDE_IS_MAIN_THREAD ());
g_assert (IDE_IS_CONTEXT (context));
- config_manager = ide_configuration_manager_from_context (context);
- config = ide_configuration_manager_get_current (config_manager);
- runtime = ide_configuration_get_runtime (config);
+ config_manager = ide_config_manager_from_context (context);
+ config = ide_config_manager_get_current (config_manager);
+ runtime = ide_config_get_runtime (config);
if (runtime != NULL)
{
diff --git a/src/plugins/terminal/gbp-terminal-workspace-addin.c
b/src/plugins/terminal/gbp-terminal-workspace-addin.c
index 9d7b79c35..c2276199a 100644
--- a/src/plugins/terminal/gbp-terminal-workspace-addin.c
+++ b/src/plugins/terminal/gbp-terminal-workspace-addin.c
@@ -47,16 +47,16 @@ static IdeRuntime *
find_runtime (IdeWorkspace *workspace)
{
IdeContext *context;
- IdeConfigurationManager *config_manager;
- IdeConfiguration *config;
+ IdeConfigManager *config_manager;
+ IdeConfig *config;
g_assert (IDE_IS_WORKSPACE (workspace));
context = ide_workspace_get_context (workspace);
- config_manager = ide_configuration_manager_from_context (context);
- config = ide_configuration_manager_get_current (config_manager);
+ config_manager = ide_config_manager_from_context (context);
+ config = ide_config_manager_get_current (config_manager);
- return ide_configuration_get_runtime (config);
+ return ide_config_get_runtime (config);
}
static gchar *
diff --git a/src/plugins/vala-pack/ide-vala-index.vala b/src/plugins/vala-pack/ide-vala-index.vala
index f9b8bd82d..126c24d51 100644
--- a/src/plugins/vala-pack/ide-vala-index.vala
+++ b/src/plugins/vala-pack/ide-vala-index.vala
@@ -521,7 +521,7 @@ namespace Ide
string? get_versioned_vapidir ()
{
try {
- var pkgname = "libvala-%s".printf (Config.VALA_VERSION);
+ var pkgname = "libvala-%s".printf (ValaConfig.VALA_VERSION);
string outstr = null;
var subprocess = new GLib.Subprocess (GLib.SubprocessFlags.STDOUT_PIPE,
"pkg-config",
diff --git a/src/plugins/vala-pack/meson.build b/src/plugins/vala-pack/meson.build
index bc3be9d63..7df58993d 100644
--- a/src/plugins/vala-pack/meson.build
+++ b/src/plugins/vala-pack/meson.build
@@ -7,7 +7,7 @@ libvala_version = run_command(valac.cmd_array()[0], '--api-version').stdout().st
libvala = dependency('libvala-@0@'.format(libvala_version))
vala_sources = [
- 'config.vapi',
+ 'valaconfig.vapi',
'ide-vala-service.vala',
'ide-vala-code-indexer.vala',
'ide-vala-completion.vala',
diff --git a/src/plugins/vala-pack/config.vapi b/src/plugins/vala-pack/valaconfig.vapi
similarity index 86%
rename from src/plugins/vala-pack/config.vapi
rename to src/plugins/vala-pack/valaconfig.vapi
index f46b186c8..200c36c53 100644
--- a/src/plugins/vala-pack/config.vapi
+++ b/src/plugins/vala-pack/valaconfig.vapi
@@ -1,5 +1,5 @@
[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "")]
-namespace Config {
+namespace ValaConfig {
public const string PACKAGE_DATADIR;
public const string VALA_VERSION;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
