[anjuta] am-project: Rename node types, by example anjuta_am_group to amp_group_node
- From: Sebastien Granjoux <sgranjoux src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta] am-project: Rename node types, by example anjuta_am_group to amp_group_node
- Date: Fri, 31 Dec 2010 19:15:44 +0000 (UTC)
commit 0251b1fee372226e85d11b41a18591b82c59f4df
Author: Sébastien Granjoux <seb sfo free fr>
Date: Sun Dec 26 19:59:54 2010 +0100
am-project: Rename node types, by example anjuta_am_group to amp_group_node
plugins/am-project/ac-writer.c | 30 +++---
plugins/am-project/ac-writer.h | 8 +-
plugins/am-project/am-project.c | 229 +++++++++++++++++------------------
plugins/am-project/am-project.h | 52 ++++----
plugins/am-project/am-properties.c | 12 +-
plugins/am-project/am-scanner.h | 4 +-
plugins/am-project/am-scanner.l | 10 +-
plugins/am-project/am-writer.c | 118 +++++++++---------
plugins/am-project/am-writer.h | 12 +-
plugins/am-project/amp-group.c | 72 ++++++------
plugins/am-project/amp-group.h | 40 +++---
plugins/am-project/amp-module.c | 42 ++++----
plugins/am-project/amp-module.h | 18 ++--
plugins/am-project/amp-package.c | 44 ++++----
plugins/am-project/amp-package.h | 20 ++--
plugins/am-project/amp-source.c | 42 ++++----
plugins/am-project/amp-source.h | 20 ++--
plugins/am-project/amp-target.c | 50 ++++----
plugins/am-project/amp-target.h | 30 +++---
19 files changed, 423 insertions(+), 430 deletions(-)
---
diff --git a/plugins/am-project/ac-writer.c b/plugins/am-project/ac-writer.c
index d179096..1c137a0 100644
--- a/plugins/am-project/ac-writer.c
+++ b/plugins/am-project/ac-writer.c
@@ -261,7 +261,7 @@ amp_project_write_module_list (AmpProject *project, const gchar *name, gboolean
gboolean
-amp_module_create_token (AmpProject *project, AnjutaAmModuleNode *module, GError **error)
+amp_module_node_create_token (AmpProject *project, AmpModuleNode *module, GError **error)
{
gboolean after;
AnjutaToken *token;
@@ -277,7 +277,7 @@ amp_module_create_token (AmpProject *project, AnjutaAmModuleNode *module, GErro
{
if (anjuta_project_node_get_node_type (sibling) == ANJUTA_PROJECT_MODULE)
{
- prev = amp_module_get_token (ANJUTA_AM_MODULE_NODE (sibling));
+ prev = amp_module_node_get_token (AMP_MODULE_NODE (sibling));
if (prev != NULL)
{
prev = anjuta_token_list (prev);
@@ -292,7 +292,7 @@ amp_module_create_token (AmpProject *project, AnjutaAmModuleNode *module, GErro
{
if (anjuta_project_node_get_node_type (sibling) == ANJUTA_PROJECT_MODULE)
{
- prev = amp_module_get_token (ANJUTA_AM_MODULE_NODE (sibling));
+ prev = amp_module_node_get_token (AMP_MODULE_NODE (sibling));
if (prev != NULL)
{
prev = anjuta_token_list (prev);
@@ -306,7 +306,7 @@ amp_module_create_token (AmpProject *project, AnjutaAmModuleNode *module, GErro
next = anjuta_token_next (token);
next = anjuta_token_next (next);
next = anjuta_token_next (next);
- amp_module_add_token (module, next);
+ amp_module_node_add_token (module, next);
amp_project_update_configure (project, token);
@@ -314,11 +314,11 @@ amp_module_create_token (AmpProject *project, AnjutaAmModuleNode *module, GErro
}
gboolean
-amp_module_delete_token (AmpProject *project, AnjutaAmModuleNode *module, GError **error)
+amp_module_node_delete_token (AmpProject *project, AmpModuleNode *module, GError **error)
{
AnjutaToken *token;
- token = amp_module_get_token (module);
+ token = amp_module_node_get_token (module);
if (token != NULL)
{
token = anjuta_token_list (token);
@@ -334,9 +334,9 @@ amp_module_delete_token (AmpProject *project, AnjutaAmModuleNode *module, GErro
*---------------------------------------------------------------------------*/
gboolean
-amp_package_create_token (AmpProject *project, AnjutaAmPackageNode *package, GError **error)
+amp_package_node_create_token (AmpProject *project, AmpPackageNode *package, GError **error)
{
- AnjutaAmModuleNode *module;
+ AmpModuleNode *module;
AnjutaProjectNode *sibling;
gboolean after;
AnjutaToken *token;
@@ -345,7 +345,7 @@ amp_package_create_token (AmpProject *project, AnjutaAmPackageNode *package, GE
/* Get parent module */
- module = ANJUTA_AM_MODULE_NODE (anjuta_project_node_parent (ANJUTA_PROJECT_NODE (package)));
+ module = AMP_MODULE_NODE (anjuta_project_node_parent (ANJUTA_PROJECT_NODE (package)));
if ((module == NULL) || (anjuta_project_node_get_node_type (ANJUTA_PROJECT_NODE (module)) != ANJUTA_PROJECT_MODULE)) return FALSE;
@@ -353,13 +353,13 @@ amp_package_create_token (AmpProject *project, AnjutaAmPackageNode *package, GE
/* Find a sibling if possible */
if ((sibling = anjuta_project_node_prev_sibling (ANJUTA_PROJECT_NODE (package))) != NULL)
{
- prev = amp_package_get_token (ANJUTA_AM_PACKAGE_NODE (sibling));
+ prev = amp_package_node_get_token (AMP_PACKAGE_NODE (sibling));
after = TRUE;
args = anjuta_token_list (prev);
}
else if ((sibling = anjuta_project_node_next_sibling (ANJUTA_PROJECT_NODE (package))) != NULL)
{
- prev = amp_package_get_token (ANJUTA_AM_PACKAGE_NODE (sibling));
+ prev = amp_package_node_get_token (AMP_PACKAGE_NODE (sibling));
after = FALSE;
args = anjuta_token_list (prev);
}
@@ -372,7 +372,7 @@ amp_package_create_token (AmpProject *project, AnjutaAmPackageNode *package, GE
/* Check if a valid source variable is already defined */
if (args == NULL)
{
- args = amp_module_get_token (module);
+ args = amp_module_node_get_token (module);
}
if (args != NULL)
@@ -401,14 +401,14 @@ amp_package_create_token (AmpProject *project, AnjutaAmPackageNode *package, GE
amp_project_update_configure (project, token);
- amp_package_add_token (package, token);
+ amp_package_node_add_token (package, token);
}
return TRUE;
}
gboolean
-amp_package_delete_token (AmpProject *project, AnjutaAmPackageNode *package, GError **error)
+amp_package_node_delete_token (AmpProject *project, AmpPackageNode *package, GError **error)
{
AnjutaProjectNode *module;
AnjutaToken *token;
@@ -420,7 +420,7 @@ amp_package_delete_token (AmpProject *project, AnjutaAmPackageNode *package, GE
return FALSE;
}
- token = amp_package_get_token (package);
+ token = amp_package_node_get_token (package);
if (token != NULL)
{
AnjutaToken *args;
diff --git a/plugins/am-project/ac-writer.h b/plugins/am-project/ac-writer.h
index 67cd9bf..0ddd5eb 100644
--- a/plugins/am-project/ac-writer.h
+++ b/plugins/am-project/ac-writer.h
@@ -31,11 +31,11 @@ G_BEGIN_DECLS
gboolean amp_project_update_ac_property (AmpProject *project, AnjutaProjectProperty *property);
-gboolean amp_module_create_token (AmpProject *project, AnjutaAmModuleNode *module, GError **error);
-gboolean amp_module_delete_token (AmpProject *project, AnjutaAmModuleNode *module, GError **error);
+gboolean amp_module_node_create_token (AmpProject *project, AmpModuleNode *module, GError **error);
+gboolean amp_module_node_delete_token (AmpProject *project, AmpModuleNode *module, GError **error);
-gboolean amp_package_create_token (AmpProject *project, AnjutaAmPackageNode *package, GError **error);
-gboolean amp_package_delete_token (AmpProject *project, AnjutaAmPackageNode *package, GError **error);
+gboolean amp_package_node_create_token (AmpProject *project, AmpPackageNode *package, GError **error);
+gboolean amp_package_node_delete_token (AmpProject *project, AmpPackageNode *package, GError **error);
G_END_DECLS
diff --git a/plugins/am-project/am-project.c b/plugins/am-project/am-project.c
index 83ac031..4838af1 100644
--- a/plugins/am-project/am-project.c
+++ b/plugins/am-project/am-project.c
@@ -69,13 +69,6 @@
static const gchar *valid_am_makefiles[] = {"GNUmakefile.am", "makefile.am", "Makefile.am", NULL};
-/* convenient shortcut macro the get the AnjutaProjectNode from a GNode */
-#define AMP_NODE_DATA(node) ((AnjutaProjectNode *)node)
-#define AMP_GROUP_DATA(node) ((AnjutaAmGroupNode *)node)
-#define AMP_TARGET_DATA(node) ((AnjutaAmTargetNode *)node)
-#define AMP_SOURCE_DATA(node) ((AnjutaAmSourceNode *)node)
-#define AMP_PACKAGE_DATA(node) ((AnjutaAmPackageNode *)node)
-#define AMP_MODULE_DATA(node) ((AnjutaAmModuleNode *)node)
#define STR_REPLACE(target, source) \
{ g_free (target); target = source == NULL ? NULL : g_strdup (source);}
@@ -625,7 +618,7 @@ amp_project_update_root (AmpProject *project, AmpProject *new_project)
static gboolean
find_target (AnjutaProjectNode *node, gpointer data)
{
- if ((AMP_NODE_DATA (node)->type & ANJUTA_PROJECT_TYPE_MASK) == ANJUTA_PROJECT_TARGET)
+ if (anjuta_project_node_get_node_type (node) == ANJUTA_PROJECT_TARGET)
{
if (strcmp (anjuta_project_node_get_name (node), *(gchar **)data) == 0)
{
@@ -642,7 +635,7 @@ find_target (AnjutaProjectNode *node, gpointer data)
static gboolean
find_canonical_target (AnjutaProjectNode *node, gpointer data)
{
- if ((AMP_NODE_DATA (node)->type & ANJUTA_PROJECT_TYPE_MASK) == ANJUTA_PROJECT_TARGET)
+ if (anjuta_project_node_get_node_type (node) == ANJUTA_PROJECT_TARGET)
{
gchar *canon_name = canonicalize_automake_variable (anjuta_project_node_get_name (node));
DEBUG_PRINT ("compare canon %s vs %s node %p", canon_name, *(gchar **)data, node);
@@ -669,7 +662,7 @@ amp_dump_node (AnjutaProjectNode *g_node)
{
gchar *name = NULL;
- switch (AMP_NODE_DATA (g_node)->type & ANJUTA_PROJECT_TYPE_MASK) {
+ switch (anjuta_project_node_get_node_type (g_node)) {
case ANJUTA_PROJECT_GROUP:
name = g_file_get_uri (anjuta_project_node_get_file (g_node));
DEBUG_PRINT ("GROUP: %s", name);
@@ -693,21 +686,21 @@ static void
foreach_node_destroy (AnjutaProjectNode *g_node,
gpointer data)
{
- switch (AMP_NODE_DATA (g_node)->type & ANJUTA_PROJECT_TYPE_MASK) {
+ switch (anjuta_project_node_get_node_type (g_node)) {
case ANJUTA_PROJECT_GROUP:
- amp_group_free ((AnjutaAmGroupNode *)g_node);
+ amp_group_node_free ((AmpGroupNode *)g_node);
break;
case ANJUTA_PROJECT_TARGET:
- amp_target_free ((AnjutaAmTargetNode *)g_node);
+ amp_target_node_free ((AmpTargetNode *)g_node);
break;
case ANJUTA_PROJECT_SOURCE:
- amp_source_free ((AnjutaAmSourceNode *)g_node);
+ amp_source_node_free ((AmpSourceNode *)g_node);
break;
case ANJUTA_PROJECT_MODULE:
- amp_module_free ((AnjutaAmModuleNode *)g_node);
+ amp_module_node_free ((AmpModuleNode *)g_node);
break;
case ANJUTA_PROJECT_PACKAGE:
- amp_package_free ((AnjutaAmPackageNode *)g_node);
+ amp_package_node_free ((AmpPackageNode *)g_node);
break;
case ANJUTA_PROJECT_ROOT:
amp_project_clear ((AmpProject *)g_node);
@@ -747,16 +740,16 @@ project_node_new (AmpProject *project, AnjutaProjectNode *parent, AnjutaProjectN
if ((file == NULL) && (name != NULL))
{
file = g_file_get_child (anjuta_project_node_get_file (parent), name);
- node = ANJUTA_PROJECT_NODE (amp_group_new (file, FALSE, error));
+ node = ANJUTA_PROJECT_NODE (amp_group_node_new (file, FALSE, error));
g_object_unref (file);
}
else
{
- node = ANJUTA_PROJECT_NODE (amp_group_new (file, FALSE, error));
+ node = ANJUTA_PROJECT_NODE (amp_group_node_new (file, FALSE, error));
}
break;
case ANJUTA_PROJECT_TARGET:
- node = ANJUTA_PROJECT_NODE (amp_target_new (name, 0, NULL, 0, error));
+ node = ANJUTA_PROJECT_NODE (amp_target_node_new (name, 0, NULL, 0, error));
break;
case ANJUTA_PROJECT_SOURCE:
if (file == NULL)
@@ -774,25 +767,25 @@ project_node_new (AmpProject *project, AnjutaProjectNode *parent, AnjutaProjectN
{
file = g_file_new_for_commandline_arg (name);
}
- node = ANJUTA_PROJECT_NODE (amp_source_new (file, error));
+ node = ANJUTA_PROJECT_NODE (amp_source_node_new (file, error));
g_object_unref (file);
}
else
{
- node = ANJUTA_PROJECT_NODE (amp_source_new (file, error));
+ node = ANJUTA_PROJECT_NODE (amp_source_node_new (file, error));
}
break;
case ANJUTA_PROJECT_MODULE:
- node = ANJUTA_PROJECT_NODE (amp_module_new (name, error));
+ node = ANJUTA_PROJECT_NODE (amp_module_node_new (name, error));
break;
case ANJUTA_PROJECT_PACKAGE:
- node = ANJUTA_PROJECT_NODE (amp_package_new (name, error));
+ node = ANJUTA_PROJECT_NODE (amp_package_node_new (name, error));
break;
default:
g_assert_not_reached ();
break;
}
- if (node != NULL) AMP_NODE_DATA (node)->type = type;
+ if (node != NULL) node->type = type;
return node;
}
@@ -816,15 +809,15 @@ project_node_save (AmpProject *project, AnjutaProjectNode *node, GError **error)
* avoid duplicate, not sure if it is really necessary */
files = g_hash_table_new_full (g_direct_hash, g_direct_equal, NULL, NULL);
- switch (AMP_NODE_DATA (node)->type & ANJUTA_PROJECT_TYPE_MASK) {
+ switch (anjuta_project_node_get_node_type (node)) {
case ANJUTA_PROJECT_GROUP:
- g_hash_table_insert (files, amp_group_get_make_token_file (ANJUTA_AM_GROUP_NODE (node)), NULL);
+ g_hash_table_insert (files, amp_group_node_get_make_token_file (AMP_GROUP_NODE (node)), NULL);
g_hash_table_insert (files, project->configure_file, NULL);
break;
case ANJUTA_PROJECT_TARGET:
case ANJUTA_PROJECT_SOURCE:
for (parent = node; anjuta_project_node_get_node_type (parent) != ANJUTA_PROJECT_GROUP; parent = anjuta_project_node_parent (parent));
- g_hash_table_insert (files, amp_group_get_make_token_file (ANJUTA_AM_GROUP_NODE (parent)), NULL);
+ g_hash_table_insert (files, amp_group_node_get_make_token_file (AMP_GROUP_NODE (parent)), NULL);
break;
case ANJUTA_PROJECT_MODULE:
case ANJUTA_PROJECT_PACKAGE:
@@ -901,15 +894,15 @@ amp_project_load_module (AmpProject *project, AnjutaToken *module_token)
AnjutaToken *list;
AnjutaToken *item;
gchar *value;
- AnjutaAmModuleNode *module;
- AnjutaAmPackageNode *package;
+ AmpModuleNode *module;
+ AmpPackageNode *package;
gchar *compare;
/* Module name */
arg = anjuta_token_first_item (module_token);
value = anjuta_token_evaluate (arg);
- module = amp_module_new (value, NULL);
- amp_module_add_token (module, module_token);
+ module = amp_module_node_new (value, NULL);
+ amp_module_node_add_token (module, module_token);
anjuta_project_node_append (ANJUTA_PROJECT_NODE (project), ANJUTA_PROJECT_NODE (module));
/* Package list */
@@ -938,7 +931,7 @@ amp_project_load_module (AmpProject *project, AnjutaToken *module_token)
if ((package != NULL) && (compare != NULL))
{
- amp_package_set_version (package, compare, value);
+ amp_package_node_set_version (package, compare, value);
g_free (value);
g_free (compare);
package = NULL;
@@ -950,8 +943,8 @@ amp_project_load_module (AmpProject *project, AnjutaToken *module_token)
}
else
{
- package = amp_package_new (value, NULL);
- amp_package_add_token (package, item);
+ package = amp_package_node_new (value, NULL);
+ amp_package_node_add_token (package, item);
anjuta_project_node_append (ANJUTA_PROJECT_NODE (module), ANJUTA_PROJECT_NODE (package));
anjuta_project_node_set_state (ANJUTA_PROJECT_NODE (package), ANJUTA_PROJECT_INCOMPLETE);
g_free (value);
@@ -1018,14 +1011,14 @@ project_load_target (AmpProject *project, AnjutaToken *name, AnjutaTokenType tok
value = anjuta_token_evaluate (name);
split_automake_variable (value, &flags, &install, NULL);
- amp_group_add_token (ANJUTA_AM_GROUP_NODE (parent), name, AM_GROUP_TARGET);
+ amp_group_node_add_token (AMP_GROUP_NODE (parent), name, AM_GROUP_TARGET);
for (arg = anjuta_token_first_word (list); arg != NULL; arg = anjuta_token_next_word (arg))
{
gchar *value;
gchar *canon_id;
- AnjutaAmTargetNode *target;
- AnjutaAmTargetNode *orphan;
+ AmpTargetNode *target;
+ AmpTargetNode *orphan;
gchar *orig_key;
gpointer find;
@@ -1047,10 +1040,10 @@ project_load_target (AmpProject *project, AnjutaToken *name, AnjutaTokenType tok
}
/* Create target */
- target = amp_target_new (value, info->base.type, install, flags, NULL);
+ target = amp_target_node_new (value, info->base.type, install, flags, NULL);
if (target != NULL)
{
- amp_target_add_token (target, ANJUTA_TOKEN_ARGUMENT, arg);
+ amp_target_node_add_token (target, ANJUTA_TOKEN_ARGUMENT, arg);
anjuta_project_node_append (parent, ANJUTA_PROJECT_NODE (target));
DEBUG_PRINT ("create target %p name %s", target, value);
@@ -1064,16 +1057,16 @@ project_load_target (AmpProject *project, AnjutaToken *name, AnjutaTokenType tok
g_hash_table_steal (orphan_properties, canon_id);
/* Copy all token */
- for (type = amp_target_get_first_token_type (orphan); type != 0; type = amp_target_get_next_token_type (orphan, type))
+ for (type = amp_target_node_get_first_token_type (orphan); type != 0; type = amp_target_node_get_next_token_type (orphan, type))
{
GList *tokens;
- tokens = amp_target_get_token (orphan, type);
+ tokens = amp_target_node_get_token (orphan, type);
for (tokens = g_list_first (tokens); tokens != NULL; tokens = g_list_next (tokens))
{
AnjutaToken *token = (AnjutaToken *)tokens->data;
- amp_target_add_token (target, type, token);
+ amp_target_node_add_token (target, type, token);
}
}
@@ -1095,7 +1088,7 @@ project_load_target (AmpProject *project, AnjutaToken *name, AnjutaTokenType tok
g_object_unref (child);
}
g_free (orig_key);
- amp_target_free (orphan);
+ amp_target_node_free (orphan);
}
/* Set target properties */
@@ -1175,7 +1168,7 @@ project_load_sources (AmpProject *project, AnjutaToken *name, AnjutaToken *list,
}
else
{
- parent = ANJUTA_PROJECT_NODE (amp_target_new ("dummy", 0, NULL, 0, NULL));
+ parent = ANJUTA_PROJECT_NODE (amp_target_node_new ("dummy", 0, NULL, 0, NULL));
}
g_hash_table_insert (orphan_properties, target_id, parent);
}
@@ -1183,7 +1176,7 @@ project_load_sources (AmpProject *project, AnjutaToken *name, AnjutaToken *list,
{
g_free (target_id);
}
- amp_target_add_token (ANJUTA_AM_TARGET_NODE (parent), AM_TOKEN__SOURCES, name);
+ amp_target_node_add_token (AMP_TARGET_NODE (parent), AM_TOKEN__SOURCES, name);
for (arg = anjuta_token_first_word (list); arg != NULL; arg = anjuta_token_next_word (arg))
{
@@ -1198,7 +1191,7 @@ project_load_sources (AmpProject *project, AnjutaToken *name, AnjutaToken *list,
src_file = g_file_get_child (parent_file, value);
source = project_node_new (project, NULL, ANJUTA_PROJECT_SOURCE | ANJUTA_PROJECT_PROJECT, src_file, NULL, NULL);
g_object_unref (src_file);
- amp_source_add_token (ANJUTA_AM_SOURCE_NODE(source), arg);
+ amp_source_node_add_token (AMP_SOURCE_NODE (source), arg);
DEBUG_PRINT ("add target child %p", parent);
/* Add as target child */
@@ -1217,7 +1210,7 @@ static AnjutaToken*
project_load_data (AmpProject *project, AnjutaToken *name, AnjutaToken *list, AnjutaProjectNode *parent, GHashTable *orphan_properties)
{
gchar *install = NULL;
- AnjutaAmTargetNode *target;
+ AmpTargetNode *target;
gchar *target_id;
gpointer find;
gint flags = 0;
@@ -1244,7 +1237,7 @@ project_load_data (AmpProject *project, AnjutaToken *name, AnjutaToken *list, An
}
}*/
- amp_group_add_token (ANJUTA_AM_GROUP_NODE (parent), name, AM_GROUP_TARGET);
+ amp_group_node_add_token (AMP_GROUP_NODE (parent), name, AM_GROUP_TARGET);
/* Check if target already exists */
find = target_id;
@@ -1252,13 +1245,13 @@ project_load_data (AmpProject *project, AnjutaToken *name, AnjutaToken *list, An
if ((gchar *)find == target_id)
{
/* Create target */
- target = amp_target_new (target_id, info->base.type, install, flags, NULL);
+ target = amp_target_node_new (target_id, info->base.type, install, flags, NULL);
anjuta_project_node_append (parent, ANJUTA_PROJECT_NODE (target));
DEBUG_PRINT ("create target %p name %s", target, target_id);
}
else
{
- target = ANJUTA_AM_TARGET_NODE (find);
+ target = AMP_TARGET_NODE (find);
}
if (target != NULL)
@@ -1278,7 +1271,7 @@ project_load_data (AmpProject *project, AnjutaToken *name, AnjutaToken *list, An
src_file = g_file_get_child (parent_file, value);
source = project_node_new (project, NULL, ANJUTA_PROJECT_SOURCE | ANJUTA_PROJECT_PROJECT, src_file, NULL, NULL);
g_object_unref (src_file);
- amp_source_add_token (ANJUTA_AM_SOURCE_NODE(source), arg);
+ amp_source_node_add_token (AMP_SOURCE_NODE(source), arg);
/* Add as target child */
DEBUG_PRINT ("add target child %p", target);
@@ -1357,7 +1350,7 @@ project_load_target_properties (AmpProject *project, AnjutaToken *name, AnjutaTo
else
{
/* Create dummy target */
- parent = ANJUTA_PROJECT_NODE (amp_target_new ("dummy", 0, NULL, 0, NULL));
+ parent = ANJUTA_PROJECT_NODE (amp_target_node_new ("dummy", 0, NULL, 0, NULL));
}
g_hash_table_insert (orphan_properties, target_id, parent);
}
@@ -1369,7 +1362,7 @@ project_load_target_properties (AmpProject *project, AnjutaToken *name, AnjutaTo
/* Add property to target */
amp_node_property_add (parent, prop);
- amp_target_add_token (ANJUTA_AM_TARGET_NODE (parent), type, name);
+ amp_target_node_add_token (AMP_TARGET_NODE (parent), type, name);
}
return NULL;
@@ -1397,7 +1390,7 @@ project_load_group_properties (AmpProject *project, AnjutaToken *token, AnjutaTo
/* Find if pkg-config modules are used in group targets */
static gboolean
-project_load_group_module (AmpProject *project, AnjutaAmGroupNode *group)
+project_load_group_module (AmpProject *project, AmpGroupNode *group)
{
AnjutaProjectNode *target;
AnjutaProjectProperty *prop;
@@ -1499,12 +1492,12 @@ project_load_group_module (AmpProject *project, AnjutaAmGroupNode *group)
}
-static AnjutaAmGroupNode* project_load_makefile (AmpProject *project, AnjutaAmGroupNode *group);
+static AmpGroupNode* project_load_makefile (AmpProject *project, AmpGroupNode *group);
static gboolean
find_group (AnjutaProjectNode *node, gpointer data)
{
- if ((AMP_NODE_DATA (node)->type & ANJUTA_PROJECT_TYPE_MASK) == ANJUTA_PROJECT_GROUP)
+ if (anjuta_project_node_get_node_type (node) == ANJUTA_PROJECT_GROUP)
{
if (g_file_equal (anjuta_project_node_get_file (node), (GFile *)data))
{
@@ -1532,35 +1525,35 @@ project_load_subdirs (AmpProject *project, AnjutaToken *list, AnjutaProjectNode
if (strcmp (value, ".") != 0)
{
GFile *subdir;
- AnjutaAmGroupNode *group;
+ AmpGroupNode *group;
subdir = g_file_resolve_relative_path (anjuta_project_node_get_file (parent), value);
/* Look for already existing group */
- group = ANJUTA_AM_GROUP_NODE (anjuta_project_node_children_traverse (parent, find_group, subdir));
+ group = AMP_GROUP_NODE (anjuta_project_node_children_traverse (parent, find_group, subdir));
if (group != NULL)
{
/* Already existing group, mark for built if needed */
- if (!dist_only) amp_group_set_dist_only (group, FALSE);
+ if (!dist_only) amp_group_node_set_dist_only (group, FALSE);
}
else
{
/* Create new group */
- group = amp_group_new (subdir, dist_only, NULL);
+ group = amp_group_node_new (subdir, dist_only, NULL);
g_hash_table_insert (project->groups, g_file_get_uri (subdir), group);
anjuta_project_node_append (parent, ANJUTA_PROJECT_NODE (group));
group = project_load_makefile (project, group);
}
- amp_group_add_token (group, arg, dist_only ? AM_GROUP_TOKEN_DIST_SUBDIRS : AM_GROUP_TOKEN_SUBDIRS);
+ amp_group_node_add_token (group, arg, dist_only ? AM_GROUP_TOKEN_DIST_SUBDIRS : AM_GROUP_TOKEN_SUBDIRS);
g_object_unref (subdir);
}
g_free (value);
}
}
-static AnjutaAmGroupNode*
-project_load_makefile (AmpProject *project, AnjutaAmGroupNode *group)
+static AmpGroupNode*
+project_load_makefile (AmpProject *project, AmpGroupNode *group)
{
const gchar **filename;
AnjutaTokenFile *tfile;
@@ -1588,7 +1581,7 @@ project_load_makefile (AmpProject *project, AnjutaAmGroupNode *group)
g_object_unref (final_file);
if (config != NULL)
{
- amp_group_add_token (group, config->token, AM_GROUP_TOKEN_CONFIGURE);
+ amp_group_node_add_token (group, config->token, AM_GROUP_TOKEN_CONFIGURE);
break;
}
}
@@ -1603,7 +1596,7 @@ project_load_makefile (AmpProject *project, AnjutaAmGroupNode *group)
/* Parse makefile.am */
DEBUG_PRINT ("Parse: %s", g_file_get_uri (makefile));
- tfile = amp_group_set_makefile (group, makefile, project);
+ tfile = amp_group_node_set_makefile (group, makefile, project);
project_load_group_module (project, group);
@@ -1611,7 +1604,7 @@ project_load_makefile (AmpProject *project, AnjutaAmGroupNode *group)
}
void
-amp_project_set_am_variable (AmpProject* project, AnjutaAmGroupNode* group, AnjutaTokenType variable, AnjutaToken *name, AnjutaToken *list, GHashTable *orphan_properties)
+amp_project_set_am_variable (AmpProject* project, AmpGroupNode* group, AnjutaTokenType variable, AnjutaToken *name, AnjutaToken *list, GHashTable *orphan_properties)
{
switch (variable)
{
@@ -1777,19 +1770,19 @@ amp_project_update_node (AnjutaProjectNode *key, AnjutaProjectNode *value, GHash
switch (anjuta_project_node_get_node_type (node))
{
case ANJUTA_PROJECT_GROUP:
- amp_group_update_node (ANJUTA_AM_GROUP_NODE (node), ANJUTA_AM_GROUP_NODE (new_node));
+ amp_group_node_update_node (AMP_GROUP_NODE (node), AMP_GROUP_NODE (new_node));
break;
case ANJUTA_PROJECT_TARGET:
- amp_target_update_node (ANJUTA_AM_TARGET_NODE (node), ANJUTA_AM_TARGET_NODE (new_node));
+ amp_target_node_update_node (AMP_TARGET_NODE (node), AMP_TARGET_NODE (new_node));
break;
case ANJUTA_PROJECT_SOURCE:
- amp_source_update_node (ANJUTA_AM_SOURCE_NODE (node), ANJUTA_AM_SOURCE_NODE (new_node));
+ amp_source_node_update_node (AMP_SOURCE_NODE (node), AMP_SOURCE_NODE (new_node));
break;
case ANJUTA_PROJECT_MODULE:
- amp_module_update_node (ANJUTA_AM_MODULE_NODE (node), ANJUTA_AM_MODULE_NODE (new_node));
+ amp_module_node_update_node (AMP_MODULE_NODE (node), AMP_MODULE_NODE (new_node));
break;
case ANJUTA_PROJECT_PACKAGE:
- amp_package_update_node (ANJUTA_AM_PACKAGE_NODE (node), ANJUTA_AM_PACKAGE_NODE (new_node));
+ amp_package_node_update_node (AMP_PACKAGE_NODE (node), AMP_PACKAGE_NODE (new_node));
break;
case ANJUTA_PROJECT_ROOT:
amp_project_update_root (AMP_PROJECT (node), AMP_PROJECT (new_node));
@@ -1855,7 +1848,7 @@ amp_project_duplicate_node (AnjutaProjectNode *old_node)
if (old_node->name != NULL) new_node->name = g_strdup (old_node->name);
if (anjuta_project_node_get_node_type (old_node) == ANJUTA_PROJECT_TARGET)
{
- amp_target_set_type (ANJUTA_AM_TARGET_NODE (new_node), anjuta_project_node_get_full_type (old_node));
+ amp_target_node_set_type (AMP_TARGET_NODE (new_node), anjuta_project_node_get_full_type (old_node));
}
return new_node;
@@ -1882,7 +1875,7 @@ amp_project_load_root (AmpProject *project, GError **error)
{
AmpAcScanner *scanner;
AnjutaToken *arg;
- AnjutaAmGroupNode *group;
+ AmpGroupNode *group;
GFile *root_file;
GFile *configure_file;
AnjutaTokenFile *configure_token_file;
@@ -1934,7 +1927,7 @@ amp_project_load_root (AmpProject *project, GError **error)
}
/* Load all makefiles recursively */
- group = amp_group_new (root_file, FALSE, NULL);
+ group = amp_group_node_new (root_file, FALSE, NULL);
g_hash_table_insert (project->groups, g_file_get_uri (root_file), group);
anjuta_project_node_append (ANJUTA_PROJECT_NODE (project), ANJUTA_PROJECT_NODE (group));
@@ -2045,8 +2038,8 @@ amp_project_load_package (AmpProject *project, AnjutaProjectNode *node, GError *
return node;
}
-static AnjutaAmGroupNode *
-amp_project_load_group (AmpProject *project, AnjutaAmGroupNode *group, GError **error)
+static AmpGroupNode *
+amp_project_load_group (AmpProject *project, AmpGroupNode *group, GError **error)
{
if (project_load_makefile (project, group) == NULL)
{
@@ -2076,7 +2069,7 @@ amp_project_load_node (AmpProject *project, AnjutaProjectNode *node, AnjutaProje
loaded = amp_project_load_package (project, node, error);
break;
case ANJUTA_PROJECT_GROUP:
- loaded = ANJUTA_PROJECT_NODE (amp_project_load_group (project, ANJUTA_AM_GROUP_NODE (node), error));
+ loaded = ANJUTA_PROJECT_NODE (amp_project_load_group (project, AMP_GROUP_NODE (node), error));
break;
default:
break;
@@ -2178,39 +2171,39 @@ amp_project_get_token_location (AmpProject *project, AnjutaTokenFileLocation *lo
void
amp_project_remove_group (AmpProject *project,
- AnjutaAmGroupNode *group,
+ AmpGroupNode *group,
GError **error)
{
GList *token_list;
if (anjuta_project_node_get_node_type (ANJUTA_PROJECT_NODE (group)) != ANJUTA_PROJECT_GROUP) return;
- for (token_list = amp_group_get_token (group, AM_GROUP_TOKEN_CONFIGURE); token_list != NULL; token_list = g_list_next (token_list))
+ for (token_list = amp_group_node_get_token (group, AM_GROUP_TOKEN_CONFIGURE); token_list != NULL; token_list = g_list_next (token_list))
{
anjuta_token_remove_word ((AnjutaToken *)token_list->data);
}
- for (token_list = amp_group_get_token (group, AM_GROUP_TOKEN_SUBDIRS); token_list != NULL; token_list = g_list_next (token_list))
+ for (token_list = amp_group_node_get_token (group, AM_GROUP_TOKEN_SUBDIRS); token_list != NULL; token_list = g_list_next (token_list))
{
anjuta_token_remove_word ((AnjutaToken *)token_list->data);
}
- for (token_list = amp_group_get_token (group, AM_GROUP_TOKEN_DIST_SUBDIRS); token_list != NULL; token_list = g_list_next (token_list))
+ for (token_list = amp_group_node_get_token (group, AM_GROUP_TOKEN_DIST_SUBDIRS); token_list != NULL; token_list = g_list_next (token_list))
{
anjuta_token_remove_word ((AnjutaToken *)token_list->data);
}
- amp_group_free (group);
+ amp_group_node_free (group);
}
void
amp_project_remove_source (AmpProject *project,
- AnjutaAmSourceNode *source,
+ AmpSourceNode *source,
GError **error)
{
if (anjuta_project_node_get_node_type (ANJUTA_PROJECT_NODE (source)) != ANJUTA_PROJECT_SOURCE) return;
- anjuta_token_remove_word (amp_source_get_token (source));
+ anjuta_token_remove_word (amp_source_node_get_token (source));
- amp_source_free (source);
+ amp_source_node_free (source);
}
const GList *
@@ -2274,7 +2267,7 @@ foreach_node_move (AnjutaProjectNode *g_node, gpointer data)
relative = get_relative_path (old_root_file, anjuta_project_node_get_file (g_node));
new_file = g_file_resolve_relative_path (root_file, relative);
g_free (relative);
- amp_group_set_file (ANJUTA_AM_GROUP_NODE (g_node), new_file);
+ amp_group_node_set_file (AMP_GROUP_NODE (g_node), new_file);
g_object_unref (new_file);
g_hash_table_insert (project->groups, g_file_get_uri (new_file), g_node);
@@ -2283,7 +2276,7 @@ foreach_node_move (AnjutaProjectNode *g_node, gpointer data)
relative = get_relative_path (old_root_file, anjuta_project_node_get_file (g_node));
new_file = g_file_resolve_relative_path (root_file, relative);
g_free (relative);
- amp_source_set_file (ANJUTA_AM_SOURCE_NODE (g_node), new_file);
+ amp_source_node_set_file (AMP_SOURCE_NODE (g_node), new_file);
g_object_unref (new_file);
break;
default:
@@ -2360,7 +2353,7 @@ amp_project_dump (AmpProject *project, AnjutaProjectNode *node)
switch (anjuta_project_node_get_node_type (node))
{
case ANJUTA_PROJECT_GROUP:
- anjuta_token_dump (amp_group_get_makefile_token (ANJUTA_AM_GROUP_NODE (node)));
+ anjuta_token_dump (amp_group_node_get_makefile_token (AMP_GROUP_NODE (node)));
break;
case ANJUTA_PROJECT_ROOT:
anjuta_token_dump (AMP_PROJECT (node)->configure_token);
@@ -2393,34 +2386,34 @@ amp_project_get_root (AmpProject *project)
return AMP_PROJECT (project);
}
-AnjutaAmGroupNode *
+AmpGroupNode *
amp_project_get_group (AmpProject *project, const gchar *id)
{
- return (AnjutaAmGroupNode *)g_hash_table_lookup (project->groups, id);
+ return (AmpGroupNode *)g_hash_table_lookup (project->groups, id);
}
-AnjutaAmTargetNode *
+AmpTargetNode *
amp_project_get_target (AmpProject *project, const gchar *id)
{
- AnjutaAmTargetNode **buffer;
- AnjutaAmTargetNode *target;
+ AmpTargetNode **buffer;
+ AmpTargetNode *target;
gsize dummy;
- buffer = (AnjutaAmTargetNode **)g_base64_decode (id, &dummy);
+ buffer = (AmpTargetNode **)g_base64_decode (id, &dummy);
target = *buffer;
g_free (buffer);
return target;
}
-AnjutaAmSourceNode *
+AmpSourceNode *
amp_project_get_source (AmpProject *project, const gchar *id)
{
- AnjutaAmSourceNode **buffer;
- AnjutaAmSourceNode *source;
+ AmpSourceNode **buffer;
+ AmpSourceNode *source;
gsize dummy;
- buffer = (AnjutaAmSourceNode **)g_base64_decode (id, &dummy);
+ buffer = (AmpSourceNode **)g_base64_decode (id, &dummy);
source = *buffer;
g_free (buffer);
@@ -2616,13 +2609,13 @@ amp_add_work (PmJob *job)
switch (anjuta_project_node_get_node_type (job->node))
{
case ANJUTA_PROJECT_GROUP:
- amp_group_create_token (AMP_PROJECT (job->user_data), ANJUTA_AM_GROUP_NODE (job->node), &job->error);
+ amp_group_node_create_token (AMP_PROJECT (job->user_data), AMP_GROUP_NODE (job->node), &job->error);
break;
case ANJUTA_PROJECT_TARGET:
- amp_target_create_token (AMP_PROJECT (job->user_data), ANJUTA_AM_TARGET_NODE (job->node), &job->error);
+ amp_target_node_create_token (AMP_PROJECT (job->user_data), AMP_TARGET_NODE (job->node), &job->error);
break;
case ANJUTA_PROJECT_SOURCE:
- amp_source_create_token (AMP_PROJECT (job->user_data), ANJUTA_AM_SOURCE_NODE (job->node), &job->error);
+ amp_source_node_create_token (AMP_PROJECT (job->user_data), AMP_SOURCE_NODE (job->node), &job->error);
break;
case ANJUTA_PROJECT_MODULE:
if ((job->parent != NULL) && (anjuta_project_node_get_node_type (job->parent) == ANJUTA_PROJECT_TARGET))
@@ -2675,11 +2668,11 @@ amp_add_work (PmJob *job)
}
else
{
- amp_module_create_token (AMP_PROJECT (job->user_data), ANJUTA_AM_MODULE_NODE (job->node), &job->error);
+ amp_module_node_create_token (AMP_PROJECT (job->user_data), AMP_MODULE_NODE (job->node), &job->error);
}
break;
case ANJUTA_PROJECT_PACKAGE:
- amp_package_create_token (AMP_PROJECT (job->user_data), ANJUTA_AM_PACKAGE_NODE (job->node), &job->error);
+ amp_package_node_create_token (AMP_PROJECT (job->user_data), AMP_PACKAGE_NODE (job->node), &job->error);
break;
default:
break;
@@ -2719,13 +2712,13 @@ amp_remove_work (PmJob *job)
switch (anjuta_project_node_get_node_type (job->node))
{
case ANJUTA_PROJECT_GROUP:
- amp_group_delete_token (AMP_PROJECT (job->user_data), ANJUTA_AM_GROUP_NODE (job->node), &job->error);
+ amp_group_node_delete_token (AMP_PROJECT (job->user_data), AMP_GROUP_NODE (job->node), &job->error);
break;
case ANJUTA_PROJECT_TARGET:
- amp_target_delete_token (AMP_PROJECT (job->user_data), ANJUTA_AM_TARGET_NODE (job->node), &job->error);
+ amp_target_node_delete_token (AMP_PROJECT (job->user_data), AMP_TARGET_NODE (job->node), &job->error);
break;
case ANJUTA_PROJECT_SOURCE:
- amp_source_delete_token (AMP_PROJECT (job->user_data), ANJUTA_AM_SOURCE_NODE (job->node), &job->error);
+ amp_source_node_delete_token (AMP_PROJECT (job->user_data), AMP_SOURCE_NODE (job->node), &job->error);
break;
case ANJUTA_PROJECT_MODULE:
if ((job->parent != NULL) && (anjuta_project_node_get_node_type (job->parent) == ANJUTA_PROJECT_TARGET))
@@ -2804,11 +2797,11 @@ amp_remove_work (PmJob *job)
}
else
{
- amp_module_delete_token (AMP_PROJECT (job->user_data), ANJUTA_AM_MODULE_NODE (job->node), &job->error);
+ amp_module_node_delete_token (AMP_PROJECT (job->user_data), AMP_MODULE_NODE (job->node), &job->error);
}
break;
case ANJUTA_PROJECT_PACKAGE:
- amp_package_delete_token (AMP_PROJECT (job->user_data), ANJUTA_AM_PACKAGE_NODE (job->node), &job->error);
+ amp_package_node_delete_token (AMP_PROJECT (job->user_data), AMP_PACKAGE_NODE (job->node), &job->error);
break;
default:
break;
@@ -2879,19 +2872,19 @@ amp_remove_property_work (PmJob *job)
switch (anjuta_project_node_get_node_type (job->node))
{
case ANJUTA_PROJECT_GROUP:
- amp_group_delete_token (AMP_PROJECT (job->user_data), ANJUTA_AM_GROUP_NODE (job->node), &job->error);
+ amp_group_node_delete_token (AMP_PROJECT (job->user_data), AMP_GROUP_NODE (job->node), &job->error);
break;
case ANJUTA_PROJECT_TARGET:
- amp_target_delete_token (AMP_PROJECT (job->user_data), ANJUTA_AM_TARGET_NODE (job->node), &job->error);
+ amp_target_node_delete_token (AMP_PROJECT (job->user_data), AMP_TARGET_NODE (job->node), &job->error);
break;
case ANJUTA_PROJECT_SOURCE:
- amp_source_delete_token (AMP_PROJECT (job->user_data), ANJUTA_AM_SOURCE_NODE (job->node), &job->error);
+ amp_source_node_delete_token (AMP_PROJECT (job->user_data), AMP_SOURCE_NODE (job->node), &job->error);
break;
case ANJUTA_PROJECT_MODULE:
- amp_module_delete_token (AMP_PROJECT (job->user_data), ANJUTA_AM_MODULE_NODE (job->node), &job->error);
+ amp_module_node_delete_token (AMP_PROJECT (job->user_data), AMP_MODULE_NODE (job->node), &job->error);
break;
case ANJUTA_PROJECT_PACKAGE:
- amp_package_delete_token (AMP_PROJECT (job->user_data), ANJUTA_AM_PACKAGE_NODE (job->node), &job->error);
+ amp_package_node_delete_token (AMP_PROJECT (job->user_data), AMP_PACKAGE_NODE (job->node), &job->error);
break;
default:
break;
@@ -3147,10 +3140,10 @@ void
amp_project_register_project (GTypeModule *module)
{
amp_node_register (module);
- anjuta_am_module_node_register (module);
- anjuta_am_package_node_register (module);
- anjuta_am_group_node_register (module);
- anjuta_am_target_node_register (module);
- anjuta_am_source_node_register (module);
+ amp_module_node_register (module);
+ amp_package_node_register (module);
+ amp_group_node_register (module);
+ amp_target_node_register (module);
+ amp_source_node_register (module);
amp_project_register_type (module);
}
diff --git a/plugins/am-project/am-project.h b/plugins/am-project/am-project.h
index 28e07f8..36cac18 100644
--- a/plugins/am-project/am-project.h
+++ b/plugins/am-project/am-project.h
@@ -47,11 +47,11 @@ struct _AmpProjectClass {
};
typedef struct _AnjutaAmRootNode AnjutaAmRootNode;
-typedef struct _AnjutaAmModuleNode AnjutaAmModuleNode;
-typedef struct _AnjutaAmPackageNode AnjutaAmPackageNode;
-typedef struct _AnjutaAmGroupNode AnjutaAmGroupNode;
-typedef struct _AnjutaAmTargetNode AnjutaAmTargetNode;
-typedef struct _AnjutaAmSourceNode AnjutaAmSourceNode;
+typedef struct _AmpModuleNode AmpModuleNode;
+typedef struct _AmpPackageNode AmpPackageNode;
+typedef struct _AmpGroupNode AmpGroupNode;
+typedef struct _AmpTargetNode AmpTargetNode;
+typedef struct _AmpSourceNode AmpSourceNode;
typedef struct _AmpProperty AmpProperty;
@@ -78,9 +78,9 @@ AnjutaToken* amp_project_get_configure_token (AmpProject *project);
void amp_project_update_root (AmpProject *project, AmpProject *new_project);
AmpProject *amp_project_get_root (AmpProject *project);
-AnjutaAmGroupNode *amp_project_get_group (AmpProject *project, const gchar *id);
-AnjutaAmTargetNode *amp_project_get_target (AmpProject *project, const gchar *id);
-AnjutaAmSourceNode *amp_project_get_source (AmpProject *project, const gchar *id);
+AmpGroupNode *amp_project_get_group (AmpProject *project, const gchar *id);
+AmpTargetNode *amp_project_get_target (AmpProject *project, const gchar *id);
+AmpSourceNode *amp_project_get_source (AmpProject *project, const gchar *id);
gboolean amp_project_get_token_location (AmpProject *project, AnjutaTokenFileLocation *location, AnjutaToken *token);
gboolean amp_project_move (AmpProject *project, const gchar *path);
@@ -95,17 +95,17 @@ gboolean amp_project_is_busy (AmpProject *project);
void amp_project_add_file (AmpProject *project, GFile *file, AnjutaTokenFile* token);
-AnjutaAmGroupNode* amp_project_add_group (AmpProject *project, AnjutaAmGroupNode *parent, const gchar *name, GError **error);
-AnjutaAmGroupNode* amp_project_add_sibling_group (AmpProject *project, AnjutaAmGroupNode *parent, const gchar *name, gboolean after, AnjutaAmGroupNode *sibling, GError **error);
-void amp_project_remove_group (AmpProject *project, AnjutaAmGroupNode *group, GError **error);
+AmpGroupNode* amp_project_add_group (AmpProject *project, AmpGroupNode *parent, const gchar *name, GError **error);
+AmpGroupNode* amp_project_add_sibling_group (AmpProject *project, AmpGroupNode *parent, const gchar *name, gboolean after, AmpGroupNode *sibling, GError **error);
+void amp_project_remove_group (AmpProject *project, AmpGroupNode *group, GError **error);
-AnjutaAmTargetNode* amp_project_add_target (AmpProject *project, AnjutaAmGroupNode *parent, const gchar *name, AnjutaProjectNodeType type, GError **error);
-AnjutaAmTargetNode* amp_project_add_sibling_target (AmpProject *project, AnjutaAmGroupNode *parent, const gchar *name, AnjutaProjectNodeType type, gboolean after, AnjutaAmTargetNode *sibling, GError **error);
-void amp_project_remove_target (AmpProject *project, AnjutaAmTargetNode *target, GError **error);
+AmpTargetNode* amp_project_add_target (AmpProject *project, AmpGroupNode *parent, const gchar *name, AnjutaProjectNodeType type, GError **error);
+AmpTargetNode* amp_project_add_sibling_target (AmpProject *project, AmpGroupNode *parent, const gchar *name, AnjutaProjectNodeType type, gboolean after, AmpTargetNode *sibling, GError **error);
+void amp_project_remove_target (AmpProject *project, AmpTargetNode *target, GError **error);
-AnjutaAmSourceNode* amp_project_add_source (AmpProject *project, AnjutaAmTargetNode *parent, GFile *file, GError **error);
-AnjutaAmSourceNode* amp_project_add_sibling_source (AmpProject *project, AnjutaAmTargetNode *parent, GFile *file, gboolean after, AnjutaAmSourceNode *sibling, GError **error);
-void amp_project_remove_source (AmpProject *project, AnjutaAmSourceNode *source, GError **error);
+AmpSourceNode* amp_project_add_source (AmpProject *project, AmpTargetNode *parent, GFile *file, GError **error);
+AmpSourceNode* amp_project_add_sibling_source (AmpProject *project, AmpTargetNode *parent, GFile *file, gboolean after, AmpSourceNode *sibling, GError **error);
+void amp_project_remove_source (AmpProject *project, AmpSourceNode *source, GError **error);
AnjutaProjectNodeInfo *amp_project_get_type_info (AmpProject *project, AnjutaProjectNodeType type);
const GList *amp_project_get_node_info (AmpProject *project, GError **error);
@@ -124,17 +124,17 @@ AnjutaProjectNode *amp_node_next_sibling (AnjutaProjectNode *node);
AnjutaProjectNode *amp_node_prev_sibling (AnjutaProjectNode *node);
//void amp_node_all_foreach (AnjutaProjectNode *node, AnjutaProjectNodeFunc func, gpointer data);
-GFile *amp_group_get_directory (AnjutaAmGroupNode *group);
-gchar *amp_group_get_id (AnjutaAmGroupNode *group);
-void amp_group_update_variable (AnjutaAmGroupNode *group, AnjutaToken *variable);
-AnjutaToken* amp_group_get_variable_token (AnjutaAmGroupNode *group, AnjutaToken *variable);
+GFile *amp_group_node_get_directory (AmpGroupNode *group);
+gchar *amp_group_node_get_id (AmpGroupNode *group);
+void amp_group_node_update_variable (AmpGroupNode *group, AnjutaToken *variable);
+AnjutaToken* amp_group_node_get_variable_token (AmpGroupNode *group, AnjutaToken *variable);
-const gchar *amp_target_get_name (AnjutaAmTargetNode *target);
-gchar *amp_target_get_id (AnjutaAmTargetNode *target);
+const gchar *amp_target_node_get_name (AmpTargetNode *target);
+gchar *amp_target_node_get_id (AmpTargetNode *target);
-void amp_source_free (AnjutaAmSourceNode *node);
-gchar *amp_source_get_id (AnjutaAmSourceNode *source);
-GFile *amp_source_get_file (AnjutaAmSourceNode *source);
+void amp_source_node_free (AmpSourceNode *node);
+gchar *amp_source_node_get_id (AmpSourceNode *source);
+GFile *amp_source_node_get_file (AmpSourceNode *source);
gchar* canonicalize_automake_variable (const gchar *name);
diff --git a/plugins/am-project/am-properties.c b/plugins/am-project/am-properties.c
index 03f89ea..dea2fd2 100644
--- a/plugins/am-project/am-properties.c
+++ b/plugins/am-project/am-properties.c
@@ -91,7 +91,7 @@ static AmpProperty AmpProjectProperties[] =
static GList* AmpProjectPropertyList = NULL;
-static AmpProperty AmpGroupProperties[] =
+static AmpProperty AmpGroupNodeProperties[] =
{
{
{N_("Linker flags:"),
@@ -184,10 +184,10 @@ static AmpProperty AmpGroupProperties[] =
{}
};
-static GList* AmpGroupPropertyList = NULL;
+static GList* AmpGroupNodePropertyList = NULL;
-static AmpProperty AmpTargetProperties[] = {
+static AmpProperty AmpTargetNodeProperties[] = {
{
{N_("Do not install:"),
ANJUTA_PROJECT_PROPERTY_BOOLEAN,
@@ -346,7 +346,7 @@ static AmpProperty AmpTargetProperties[] = {
{}
};
-static GList* AmpTargetPropertyList = NULL;
+static GList* AmpTargetNodePropertyList = NULL;
static AmpProperty AmpProgramTargetProperties[] = {
@@ -1077,7 +1077,7 @@ amp_get_project_property_list (void)
GList*
amp_get_group_property_list (void)
{
- return amp_create_property_list (&AmpGroupPropertyList, AmpGroupProperties);
+ return amp_create_property_list (&AmpGroupNodePropertyList, AmpGroupNodeProperties);
}
GList*
@@ -1095,7 +1095,7 @@ amp_get_target_property_list (AnjutaProjectNodeType type)
case ANJUTA_PROJECT_DATA:
return amp_create_property_list (&AmpDataTargetPropertyList, AmpDataTargetProperties);
default:
- return amp_create_property_list (&AmpTargetPropertyList, AmpTargetProperties);
+ return amp_create_property_list (&AmpTargetNodePropertyList, AmpTargetNodeProperties);
}
}
diff --git a/plugins/am-project/am-scanner.h b/plugins/am-project/am-scanner.h
index 97f51d6..1d7ec48 100644
--- a/plugins/am-project/am-scanner.h
+++ b/plugins/am-project/am-scanner.h
@@ -36,7 +36,7 @@ G_BEGIN_DECLS
typedef struct _AmpAmScanner AmpAmScanner;
-AmpAmScanner *amp_am_scanner_new (AmpProject *project, AnjutaAmGroupNode *group);
+AmpAmScanner *amp_am_scanner_new (AmpProject *project, AmpGroupNode *group);
void amp_am_scanner_free (AmpAmScanner *scanner);
AnjutaToken *amp_am_scanner_parse_token (AmpAmScanner *scanner, AnjutaToken *root, AnjutaToken *content, GFile *filename, GError **error);
@@ -45,7 +45,7 @@ void amp_am_scanner_set_am_variable (AmpAmScanner *scanner, AnjutaTokenType vari
void amp_am_scanner_include (AmpAmScanner *scanner, AnjutaToken *name);
void amp_am_scanner_update_variable (AmpAmScanner *scanner, AnjutaToken *variable);
-void amp_project_set_am_variable (AmpProject* project, AnjutaAmGroupNode* group, AnjutaTokenType variable, AnjutaToken *name, AnjutaToken *list, GHashTable *orphan_properties);
+void amp_project_set_am_variable (AmpProject* project, AmpGroupNode* group, AnjutaTokenType variable, AnjutaToken *name, AnjutaToken *list, GHashTable *orphan_properties);
void amp_am_yyerror (YYLTYPE *loc, AmpAmScanner *scanner, char const *s);
diff --git a/plugins/am-project/am-scanner.l b/plugins/am-project/am-scanner.l
index 5d17bd4..0f25c05 100644
--- a/plugins/am-project/am-scanner.l
+++ b/plugins/am-project/am-scanner.l
@@ -51,7 +51,7 @@ struct _AmpAmScanner
AnjutaTokenStream *stream;
AmpProject *project;
- AnjutaAmGroupNode *group;
+ AmpGroupNode *group;
GHashTable *orphan_properties;
gboolean eof; /* TRUE to emit EOF at the end */
};
@@ -291,7 +291,7 @@ amp_am_scanner_include (AmpAmScanner *scanner, AnjutaToken *list)
void
amp_am_scanner_update_variable (AmpAmScanner *scanner, AnjutaToken *variable)
{
- amp_group_update_variable (scanner->group, variable);
+ amp_group_node_update_variable (scanner->group, variable);
}
@@ -302,7 +302,7 @@ amp_am_scanner_parse_variable (AmpAmScanner *scanner, AnjutaToken *variable)
anjuta_token_set_type (variable, ANJUTA_TOKEN_VARIABLE);
- value = amp_group_get_variable_token (scanner->group, variable);
+ value = amp_group_node_get_variable_token (scanner->group, variable);
if (value != NULL)
{
amp_am_scanner_parse_token (scanner, variable, value, NULL, NULL);
@@ -359,7 +359,7 @@ amp_am_scanner_parse_token (AmpAmScanner *scanner, AnjutaToken *root, AnjutaToke
*---------------------------------------------------------------------------*/
AmpAmScanner *
-amp_am_scanner_new (AmpProject *project, AnjutaAmGroupNode *group)
+amp_am_scanner_new (AmpProject *project, AmpGroupNode *group)
{
AmpAmScanner *scanner;
@@ -370,7 +370,7 @@ amp_am_scanner_new (AmpProject *project, AnjutaAmGroupNode *group)
scanner->eof = FALSE;
/* Create hash table for sources list */
- scanner->orphan_properties = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)amp_target_free);
+ scanner->orphan_properties = g_hash_table_new_full (g_str_hash, g_str_equal, (GDestroyNotify)g_free, (GDestroyNotify)amp_target_node_free);
yylex_init(&scanner->scanner);
yyset_extra (scanner, scanner->scanner);
diff --git a/plugins/am-project/am-writer.c b/plugins/am-project/am-writer.c
index e161f8d..0f7ec43 100644
--- a/plugins/am-project/am-writer.c
+++ b/plugins/am-project/am-writer.c
@@ -132,7 +132,7 @@ amp_project_write_config_file (AmpProject *project, AnjutaToken *list, gboolean
*---------------------------------------------------------------------------*/
gboolean
-amp_group_create_token (AmpProject *project, AnjutaAmGroupNode *group, GError **error)
+amp_group_node_create_token (AmpProject *project, AmpGroupNode *group, GError **error)
{
GFile *directory;
GFile *makefile;
@@ -140,12 +140,12 @@ amp_group_create_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
gchar *basename;
AnjutaTokenFile* tfile;
AnjutaProjectNode *sibling;
- AnjutaAmGroupNode *parent;
+ AmpGroupNode *parent;
gboolean after;
const gchar *name;
/* Get parent target */
- parent = ANJUTA_AM_GROUP_NODE (anjuta_project_node_parent(ANJUTA_PROJECT_NODE (group)));
+ parent = AMP_GROUP_NODE (anjuta_project_node_parent(ANJUTA_PROJECT_NODE (group)));
name = anjuta_project_node_get_name (ANJUTA_PROJECT_NODE (group));
directory = g_file_get_child (anjuta_project_node_get_file (ANJUTA_PROJECT_NODE (parent)), name);
@@ -169,7 +169,7 @@ amp_group_create_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
g_file_make_directory (directory, NULL, NULL);
/* Create Makefile.am */
- basename = amp_group_get_makefile_name (parent);
+ basename = amp_group_node_get_makefile_name (parent);
if (basename != NULL)
{
makefile = g_file_get_child (directory, basename);
@@ -184,8 +184,8 @@ amp_group_create_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
/* Add in configure */
list = NULL;
- if (sibling) list = amp_group_get_first_token (ANJUTA_AM_GROUP_NODE (sibling), AM_GROUP_TOKEN_CONFIGURE);
- if (list == NULL) list= amp_group_get_first_token (parent, AM_GROUP_TOKEN_CONFIGURE);
+ if (sibling) list = amp_group_node_get_first_token (AMP_GROUP_NODE (sibling), AM_GROUP_TOKEN_CONFIGURE);
+ if (list == NULL) list= amp_group_node_get_first_token (parent, AM_GROUP_TOKEN_CONFIGURE);
if (list != NULL) list = anjuta_token_list (list);
if (list == NULL)
{
@@ -201,7 +201,7 @@ amp_group_create_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
if (sibling)
{
- prev = amp_group_get_first_token (ANJUTA_AM_GROUP_NODE (sibling), AM_GROUP_TOKEN_CONFIGURE);
+ prev = amp_group_node_get_first_token (AMP_GROUP_NODE (sibling), AM_GROUP_TOKEN_CONFIGURE);
/*if ((prev != NULL) && after)
{
prev = anjuta_token_next_word (prev);
@@ -216,7 +216,7 @@ amp_group_create_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
*ext = '\0';
}
token = amp_project_write_config_file (project, list, after, prev, relative_make);
- amp_group_add_token (ANJUTA_AM_GROUP_NODE (group), token, AM_GROUP_TOKEN_CONFIGURE);
+ amp_group_node_add_token (AMP_GROUP_NODE (group), token, AM_GROUP_TOKEN_CONFIGURE);
g_free (relative_make);
}
@@ -227,7 +227,7 @@ amp_group_create_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
AnjutaToken *makefile;
static gint eol_type[] = {ANJUTA_TOKEN_EOL, ANJUTA_TOKEN_SPACE, ANJUTA_TOKEN_COMMENT, 0};
- makefile = amp_group_get_makefile_token (parent);
+ makefile = amp_group_node_get_makefile_token (parent);
pos = anjuta_token_find_type (makefile, ANJUTA_TOKEN_SEARCH_NOT, eol_type);
if (pos == NULL)
{
@@ -236,7 +236,7 @@ amp_group_create_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
list = anjuta_token_new_string (ANJUTA_TOKEN_EOL | ANJUTA_TOKEN_ADDED, "\n");
anjuta_token_insert_after (pos, list);
- amp_group_update_makefile (parent, list);
+ amp_group_node_update_makefile (parent, list);
list = anjuta_token_insert_token_list (FALSE, pos,
AM_TOKEN_SUBDIRS, "SUBDIRS",
@@ -251,7 +251,7 @@ amp_group_create_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
{
AnjutaToken *prev;
- prev = amp_group_get_first_token (ANJUTA_AM_GROUP_NODE (sibling), AM_GROUP_TOKEN_SUBDIRS);
+ prev = amp_group_node_get_first_token (AMP_GROUP_NODE (sibling), AM_GROUP_TOKEN_SUBDIRS);
list = anjuta_token_list (prev);
}
@@ -266,7 +266,7 @@ amp_group_create_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
if (sibling)
{
- prev = amp_group_get_first_token (ANJUTA_AM_GROUP_NODE (sibling), AM_GROUP_TOKEN_SUBDIRS);
+ prev = amp_group_node_get_first_token (AMP_GROUP_NODE (sibling), AM_GROUP_TOKEN_SUBDIRS);
}
token = anjuta_token_new_string (ANJUTA_TOKEN_NAME | ANJUTA_TOKEN_ADDED, name);
@@ -283,19 +283,19 @@ amp_group_create_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
anjuta_token_style_format (style, list);
anjuta_token_style_free (style);
- amp_group_update_makefile (parent, token);
+ amp_group_node_update_makefile (parent, token);
- amp_group_add_token (group, token, AM_GROUP_TOKEN_SUBDIRS);
+ amp_group_node_add_token (group, token, AM_GROUP_TOKEN_SUBDIRS);
}
- tfile = amp_group_set_makefile (group, makefile, project);
+ tfile = amp_group_node_set_makefile (group, makefile, project);
amp_project_add_file (project, makefile, tfile);
return TRUE;
}
gboolean
-amp_group_delete_token (AmpProject *project, AnjutaAmGroupNode *group, GError **error)
+amp_group_node_delete_token (AmpProject *project, AmpGroupNode *group, GError **error)
{
GList *item;
AnjutaProjectNode *parent;
@@ -304,7 +304,7 @@ amp_group_delete_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
parent = anjuta_project_node_parent (ANJUTA_PROJECT_NODE (group));
if (anjuta_project_node_get_node_type (parent) != ANJUTA_PROJECT_GROUP) return FALSE;
- for (item = amp_group_get_token (group, AM_GROUP_TOKEN_SUBDIRS); item != NULL; item = g_list_next (item))
+ for (item = amp_group_node_get_token (group, AM_GROUP_TOKEN_SUBDIRS); item != NULL; item = g_list_next (item))
{
AnjutaToken *token = (AnjutaToken *)item->data;
AnjutaToken *args;
@@ -321,11 +321,11 @@ amp_group_delete_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
anjuta_token_style_format (style, args);
anjuta_token_style_free (style);
- amp_group_update_makefile (ANJUTA_AM_GROUP_NODE (parent), args);
+ amp_group_node_update_makefile (AMP_GROUP_NODE (parent), args);
}
/* Remove from configure file */
- for (item = amp_group_get_token (group, AM_GROUP_TOKEN_CONFIGURE); item != NULL; item = g_list_next (item))
+ for (item = amp_group_node_get_token (group, AM_GROUP_TOKEN_CONFIGURE); item != NULL; item = g_list_next (item))
{
AnjutaToken *token = (AnjutaToken *)item->data;
AnjutaToken *args;
@@ -353,7 +353,7 @@ amp_group_delete_token (AmpProject *project, AnjutaAmGroupNode *group, GError *
*---------------------------------------------------------------------------*/
static AnjutaToken *
-amp_project_write_target (AnjutaAmGroupNode *group, gint type, const gchar *name, gboolean after, AnjutaToken* sibling)
+amp_project_write_target (AmpGroupNode *group, gint type, const gchar *name, gboolean after, AnjutaToken* sibling)
{
AnjutaToken *pos;
AnjutaToken *token;
@@ -363,14 +363,14 @@ amp_project_write_target (AnjutaAmGroupNode *group, gint type, const gchar *name
if (sibling == NULL)
{
- makefile = amp_group_get_makefile_token (group);
+ makefile = amp_group_node_get_makefile_token (group);
pos = anjuta_token_first_item (makefile);
if (pos == NULL)
{
/* Empty file */
token = anjuta_token_new_string (ANJUTA_TOKEN_COMMENT | ANJUTA_TOKEN_ADDED, "## Process this file with automake to produce Makefile.in\n");
anjuta_token_append_child (makefile, token);
- amp_group_update_makefile (group, token);
+ amp_group_node_update_makefile (group, token);
pos = token;
}
else
@@ -389,7 +389,7 @@ amp_project_write_target (AnjutaAmGroupNode *group, gint type, const gchar *name
token = anjuta_token_new_string (ANJUTA_TOKEN_EOL | ANJUTA_TOKEN_ADDED, "\n");
anjuta_token_insert_after (pos, token);
- amp_group_update_makefile (group, token);
+ amp_group_node_update_makefile (group, token);
pos = token;
token = anjuta_token_insert_token_list (after, pos,
@@ -406,7 +406,7 @@ amp_project_write_target (AnjutaAmGroupNode *group, gint type, const gchar *name
}
gboolean
-amp_target_create_token (AmpProject *project, AnjutaAmTargetNode *target, GError **error)
+amp_target_node_create_token (AmpProject *project, AmpTargetNode *target, GError **error)
{
AnjutaToken* token;
AnjutaToken *args;
@@ -417,11 +417,11 @@ amp_target_create_token (AmpProject *project, AnjutaAmTargetNode *target, GErro
const gchar *name;
GList *last;
AnjutaProjectNode *sibling;
- AnjutaAmGroupNode *parent;
+ AmpGroupNode *parent;
gboolean after;
/* Get parent target */
- parent = ANJUTA_AM_GROUP_NODE (anjuta_project_node_parent (ANJUTA_PROJECT_NODE (target)));
+ parent = AMP_GROUP_NODE (anjuta_project_node_parent (ANJUTA_PROJECT_NODE (target)));
info = (AmpNodeInfo *)amp_project_get_type_info (project, anjuta_project_node_get_full_type (ANJUTA_PROJECT_NODE (target)));
name = anjuta_project_node_get_name (ANJUTA_PROJECT_NODE (target));
@@ -451,7 +451,7 @@ amp_target_create_token (AmpProject *project, AnjutaAmTargetNode *target, GErro
prev = NULL;
if (sibling != NULL)
{
- last = amp_target_get_token (ANJUTA_AM_TARGET_NODE (sibling), ANJUTA_TOKEN_ARGUMENT);
+ last = amp_target_node_get_token (AMP_TARGET_NODE (sibling), ANJUTA_TOKEN_ARGUMENT);
if (last != NULL)
{
@@ -488,7 +488,7 @@ amp_target_create_token (AmpProject *project, AnjutaAmTargetNode *target, GErro
/* Check if a valid target variable is already defined */
if (args == NULL)
{
- for (last = amp_group_get_token (parent, AM_GROUP_TARGET); last != NULL; last = g_list_next (last))
+ for (last = amp_group_node_get_token (parent, AM_GROUP_TARGET); last != NULL; last = g_list_next (last))
{
gchar *value = anjuta_token_evaluate ((AnjutaToken *)last->data);
@@ -530,24 +530,24 @@ amp_target_create_token (AmpProject *project, AnjutaAmTargetNode *target, GErro
anjuta_token_style_format (style, args);
anjuta_token_style_free (style);
- amp_group_update_makefile (parent, token);
+ amp_group_node_update_makefile (parent, token);
- amp_target_add_token (target, ANJUTA_TOKEN_ARGUMENT, token);
+ amp_target_node_add_token (target, ANJUTA_TOKEN_ARGUMENT, token);
}
return TRUE;
}
gboolean
-amp_target_delete_token (AmpProject *project, AnjutaAmTargetNode *target, GError **error)
+amp_target_node_delete_token (AmpProject *project, AmpTargetNode *target, GError **error)
{
GList *item;
- AnjutaAmGroupNode *parent;
+ AmpGroupNode *parent;
/* Get parent target */
- parent = ANJUTA_AM_GROUP_NODE (anjuta_project_node_parent (ANJUTA_PROJECT_NODE (target)));
+ parent = AMP_GROUP_NODE (anjuta_project_node_parent (ANJUTA_PROJECT_NODE (target)));
- for (item = amp_target_get_token (target, ANJUTA_TOKEN_ARGUMENT); item != NULL; item = g_list_next (item))
+ for (item = amp_target_node_get_token (target, ANJUTA_TOKEN_ARGUMENT); item != NULL; item = g_list_next (item))
{
AnjutaToken *token = (AnjutaToken *)item->data;
AnjutaToken *args;
@@ -564,14 +564,14 @@ amp_target_delete_token (AmpProject *project, AnjutaAmTargetNode *target, GErro
anjuta_token_style_format (style, args);
anjuta_token_style_free (style);
- amp_group_update_makefile (parent, args);
+ amp_group_node_update_makefile (parent, args);
}
return TRUE;
}
static AnjutaToken *
-amp_project_write_source_list (AnjutaAmGroupNode *group, const gchar *name, gboolean after, AnjutaToken* sibling)
+amp_project_write_source_list (AmpGroupNode *group, const gchar *name, gboolean after, AnjutaToken* sibling)
{
AnjutaToken *pos;
AnjutaToken *token;
@@ -580,7 +580,7 @@ amp_project_write_source_list (AnjutaAmGroupNode *group, const gchar *name, gboo
if (sibling == NULL)
{
- makefile = amp_group_get_makefile_token (group);
+ makefile = amp_group_node_get_makefile_token (group);
pos = anjuta_token_first_item (makefile);
/* Add at the end of the file */
@@ -606,14 +606,14 @@ amp_project_write_source_list (AnjutaAmGroupNode *group, const gchar *name, gboo
pos = anjuta_token_insert_token_list (after, pos,
ANJUTA_TOKEN_EOL, "\n",
NULL);
- amp_group_update_makefile (group, pos);
+ amp_group_node_update_makefile (group, pos);
}
}
pos = anjuta_token_insert_token_list (after, pos,
ANJUTA_TOKEN_EOL, "\n",
NULL);
- amp_group_update_makefile (group, pos);
+ amp_group_node_update_makefile (group, pos);
token = anjuta_token_insert_token_list (after, pos,
ANJUTA_TOKEN_LIST, NULL,
@@ -632,10 +632,10 @@ amp_project_write_source_list (AnjutaAmGroupNode *group, const gchar *name, gboo
*---------------------------------------------------------------------------*/
gboolean
-amp_source_create_token (AmpProject *project, AnjutaAmSourceNode *source, GError **error)
+amp_source_node_create_token (AmpProject *project, AmpSourceNode *source, GError **error)
{
- AnjutaAmGroupNode *group;
- AnjutaAmTargetNode *target;
+ AmpGroupNode *group;
+ AmpTargetNode *target;
AnjutaProjectNode *sibling;
gboolean after;
AnjutaToken *token;
@@ -644,10 +644,10 @@ amp_source_create_token (AmpProject *project, AnjutaAmSourceNode *source, GErro
gchar *relative_name;
/* Get parent target */
- target = ANJUTA_AM_TARGET_NODE (anjuta_project_node_parent (ANJUTA_PROJECT_NODE (source)));
+ target = AMP_TARGET_NODE (anjuta_project_node_parent (ANJUTA_PROJECT_NODE (source)));
if ((target == NULL) || (anjuta_project_node_get_node_type (ANJUTA_PROJECT_NODE (target)) != ANJUTA_PROJECT_TARGET)) return FALSE;
- group = ANJUTA_AM_GROUP_NODE (anjuta_project_node_parent (ANJUTA_PROJECT_NODE (target)));
+ group = AMP_GROUP_NODE (anjuta_project_node_parent (ANJUTA_PROJECT_NODE (target)));
relative_name = g_file_get_relative_path (anjuta_project_node_get_file (ANJUTA_PROJECT_NODE (group)), anjuta_project_node_get_file (ANJUTA_PROJECT_NODE (source)));
/* Add in Makefile.am */
@@ -673,7 +673,7 @@ amp_source_create_token (AmpProject *project, AnjutaAmSourceNode *source, GErro
}
else
{
- prev = amp_source_get_token (ANJUTA_AM_SOURCE_NODE (sibling));
+ prev = amp_source_node_get_token (AMP_SOURCE_NODE (sibling));
args = anjuta_token_list (prev);
}
@@ -681,7 +681,7 @@ amp_source_create_token (AmpProject *project, AnjutaAmSourceNode *source, GErro
if (args == NULL)
{
GList *last;
- for (last = amp_target_get_token (target, AM_TOKEN__SOURCES); last != NULL; last = g_list_next (last))
+ for (last = amp_target_node_get_token (target, AM_TOKEN__SOURCES); last != NULL; last = g_list_next (last))
{
args = anjuta_token_last_item (anjuta_token_list ((AnjutaToken *)last->data));
break;
@@ -700,7 +700,7 @@ amp_source_create_token (AmpProject *project, AnjutaAmSourceNode *source, GErro
/* Search where the target is declared */
var = NULL;
- list = amp_target_get_token (target, ANJUTA_TOKEN_ARGUMENT);
+ list = amp_target_node_get_token (target, ANJUTA_TOKEN_ARGUMENT);
if (list != NULL)
{
var = (AnjutaToken *)list->data;
@@ -739,16 +739,16 @@ amp_source_create_token (AmpProject *project, AnjutaAmSourceNode *source, GErro
anjuta_token_style_format (style, args);
anjuta_token_style_free (style);
- amp_group_update_makefile (group, token);
+ amp_group_node_update_makefile (group, token);
- amp_source_add_token (source, token);
+ amp_source_node_add_token (source, token);
}
return TRUE;
}
gboolean
-amp_source_delete_token (AmpProject *project, AnjutaAmSourceNode *source, GError **error)
+amp_source_node_delete_token (AmpProject *project, AmpSourceNode *source, GError **error)
{
AnjutaProjectNode *group;
AnjutaToken *token;
@@ -761,7 +761,7 @@ amp_source_delete_token (AmpProject *project, AnjutaAmSourceNode *source, GErro
}
if (group == NULL) return FALSE;
- token = amp_source_get_token (source);
+ token = amp_source_node_get_token (source);
if (token != NULL)
{
AnjutaToken *args;
@@ -778,7 +778,7 @@ amp_source_delete_token (AmpProject *project, AnjutaAmSourceNode *source, GErro
anjuta_token_style_format (style, args);
anjuta_token_style_free (style);
- amp_group_update_makefile (ANJUTA_AM_GROUP_NODE (group), args);
+ amp_group_node_update_makefile (AMP_GROUP_NODE (group), args);
}
return TRUE;
@@ -803,13 +803,13 @@ amp_property_delete_token (AmpProject *project, AnjutaToken *token)
}
static AnjutaToken *
-amp_project_write_property_list (AnjutaAmGroupNode *group, AnjutaProjectNode *node, const gchar *name)
+amp_project_write_property_list (AmpGroupNode *group, AnjutaProjectNode *node, const gchar *name)
{
AnjutaToken *pos;
AnjutaToken *makefile;
AnjutaToken *token;
- makefile = amp_group_get_makefile_token (group);
+ makefile = amp_group_node_get_makefile_token (group);
pos = anjuta_token_first_item (makefile);
/* Add at the end of the file */
@@ -821,7 +821,7 @@ amp_project_write_property_list (AnjutaAmGroupNode *group, AnjutaProjectNode *no
pos = anjuta_token_insert_token_list (TRUE, pos,
ANJUTA_TOKEN_EOL, "\n",
NULL);
- amp_group_update_makefile (group, pos);
+ amp_group_node_update_makefile (group, pos);
token = anjuta_token_insert_token_list (TRUE, pos,
ANJUTA_TOKEN_LIST, NULL,
@@ -885,7 +885,7 @@ gboolean amp_project_update_am_property (AmpProject *project, AnjutaProjectNode
canon_name = canonicalize_automake_variable (anjuta_project_node_get_name (ANJUTA_PROJECT_NODE (node)));
prop_name = g_strconcat (canon_name, ((AmpProperty *)property->native)->suffix, NULL);
}
- args = amp_project_write_property_list (ANJUTA_AM_GROUP_NODE (group), node, prop_name);
+ args = amp_project_write_property_list (AMP_GROUP_NODE (group), node, prop_name);
((AmpProperty *)property)->token = args;
g_free (canon_name);
g_free (prop_name);
@@ -971,14 +971,14 @@ gboolean amp_project_update_am_property (AmpProject *project, AnjutaProjectNode
if (property->value != property->native->value) g_free (property->value);
property->value = g_string_free (new_value, FALSE);
-
+
break;
- default:
+ default:
break;
}
}
- if (args != NULL) amp_group_update_makefile (ANJUTA_AM_GROUP_NODE (group), args);
+ if (args != NULL) amp_group_node_update_makefile (AMP_GROUP_NODE (group), args);
return args != NULL ? TRUE : FALSE;
}
diff --git a/plugins/am-project/am-writer.h b/plugins/am-project/am-writer.h
index a9a6a19..15c77fc 100644
--- a/plugins/am-project/am-writer.h
+++ b/plugins/am-project/am-writer.h
@@ -31,14 +31,14 @@ G_BEGIN_DECLS
gboolean amp_project_update_am_property (AmpProject *project, AnjutaProjectNode *node, AnjutaProjectProperty *property);
-gboolean amp_group_create_token (AmpProject *project, AnjutaAmGroupNode *group, GError **error);
-gboolean amp_group_delete_token (AmpProject *project, AnjutaAmGroupNode *group, GError **error);
+gboolean amp_group_node_create_token (AmpProject *project, AmpGroupNode *group, GError **error);
+gboolean amp_group_node_delete_token (AmpProject *project, AmpGroupNode *group, GError **error);
-gboolean amp_target_create_token (AmpProject *project, AnjutaAmTargetNode *target, GError **error);
-gboolean amp_target_delete_token (AmpProject *project, AnjutaAmTargetNode *target, GError **error);
+gboolean amp_target_node_create_token (AmpProject *project, AmpTargetNode *target, GError **error);
+gboolean amp_target_node_delete_token (AmpProject *project, AmpTargetNode *target, GError **error);
-gboolean amp_source_create_token (AmpProject *project, AnjutaAmSourceNode *source, GError **error);
-gboolean amp_source_delete_token (AmpProject *project, AnjutaAmSourceNode *source, GError **error);
+gboolean amp_source_node_create_token (AmpProject *project, AmpSourceNode *source, GError **error);
+gboolean amp_source_node_delete_token (AmpProject *project, AmpSourceNode *source, GError **error);
G_END_DECLS
diff --git a/plugins/am-project/amp-group.c b/plugins/am-project/amp-group.c
index 55ea058..718b9b7 100644
--- a/plugins/am-project/amp-group.c
+++ b/plugins/am-project/amp-group.c
@@ -44,7 +44,7 @@
/* Types
*---------------------------------------------------------------------------*/
-struct _AnjutaAmGroupNode {
+struct _AmpGroupNode {
AnjutaProjectNode base;
gboolean dist_only; /* TRUE if the group is distributed but not built */
GFile *makefile; /* GFile corresponding to group makefile */
@@ -115,30 +115,30 @@ amp_variable_free (AmpVariable *variable)
void
-amp_group_add_token (AnjutaAmGroupNode *group, AnjutaToken *token, AmpGroupTokenCategory category)
+amp_group_node_add_token (AmpGroupNode *group, AnjutaToken *token, AmpGroupNodeTokenCategory category)
{
group->tokens[category] = g_list_prepend (group->tokens[category], token);
}
GList *
-amp_group_get_token (AnjutaAmGroupNode *group, AmpGroupTokenCategory category)
+amp_group_node_get_token (AmpGroupNode *group, AmpGroupNodeTokenCategory category)
{
return group->tokens[category];
}
AnjutaToken*
-amp_group_get_first_token (AnjutaAmGroupNode *group, AmpGroupTokenCategory category)
+amp_group_node_get_first_token (AmpGroupNode *group, AmpGroupNodeTokenCategory category)
{
GList *list;
- list = amp_group_get_token (group, category);
+ list = amp_group_node_get_token (group, category);
if (list == NULL) return NULL;
return (AnjutaToken *)list->data;
}
void
-amp_group_set_dist_only (AnjutaAmGroupNode *group, gboolean dist_only)
+amp_group_node_set_dist_only (AmpGroupNode *group, gboolean dist_only)
{
group->dist_only = dist_only;
}
@@ -168,7 +168,7 @@ on_group_monitor_changed (GFileMonitor *monitor,
}
AnjutaTokenFile*
-amp_group_set_makefile (AnjutaAmGroupNode *group, GFile *makefile, AmpProject *project)
+amp_group_node_set_makefile (AmpGroupNode *group, GFile *makefile, AmpProject *project)
{
if (group->makefile != NULL) g_object_unref (group->makefile);
if (group->tfile != NULL) anjuta_token_file_free (group->tfile);
@@ -212,25 +212,25 @@ amp_group_set_makefile (AnjutaAmGroupNode *group, GFile *makefile, AmpProject *p
}
AnjutaToken*
-amp_group_get_makefile_token (AnjutaAmGroupNode *group)
+amp_group_node_get_makefile_token (AmpGroupNode *group)
{
return group->make_token;
}
AnjutaTokenFile *
-amp_group_get_make_token_file (AnjutaAmGroupNode *group)
+amp_group_node_get_make_token_file (AmpGroupNode *group)
{
return group->tfile;
}
gboolean
-amp_group_update_makefile (AnjutaAmGroupNode *group, AnjutaToken *token)
+amp_group_node_update_makefile (AmpGroupNode *group, AnjutaToken *token)
{
return anjuta_token_file_update (group->tfile, token);
}
gchar *
-amp_group_get_makefile_name (AnjutaAmGroupNode *group)
+amp_group_node_get_makefile_name (AmpGroupNode *group)
{
gchar *basename = NULL;
@@ -243,7 +243,7 @@ amp_group_get_makefile_name (AnjutaAmGroupNode *group)
}
void
-amp_group_update_node (AnjutaAmGroupNode *group, AnjutaAmGroupNode *new_group)
+amp_group_node_update_node (AmpGroupNode *group, AmpGroupNode *new_group)
{
gint i;
GHashTable *hash;
@@ -293,7 +293,7 @@ amp_group_update_node (AnjutaAmGroupNode *group, AnjutaAmGroupNode *new_group)
}
void
-amp_group_update_variable (AnjutaAmGroupNode *group, AnjutaToken *variable)
+amp_group_node_update_variable (AmpGroupNode *group, AnjutaToken *variable)
{
AnjutaToken *arg;
char *name = NULL;
@@ -320,7 +320,7 @@ amp_group_update_variable (AnjutaAmGroupNode *group, AnjutaToken *variable)
}
AnjutaToken*
-amp_group_get_variable_token (AnjutaAmGroupNode *group, AnjutaToken *variable)
+amp_group_node_get_variable_token (AmpGroupNode *group, AnjutaToken *variable)
{
guint length;
const gchar *string;
@@ -344,7 +344,7 @@ amp_group_get_variable_token (AnjutaAmGroupNode *group, AnjutaToken *variable)
}
gboolean
-amp_group_set_file (AnjutaAmGroupNode *group, GFile *new_file)
+amp_group_node_set_file (AmpGroupNode *group, GFile *new_file)
{
g_object_unref (group->base.file);
group->base.file = g_object_ref (new_file);
@@ -352,10 +352,10 @@ amp_group_set_file (AnjutaAmGroupNode *group, GFile *new_file)
return TRUE;
}
-AnjutaAmGroupNode*
-amp_group_new (GFile *file, gboolean dist_only, GError **error)
+AmpGroupNode*
+amp_group_node_new (GFile *file, gboolean dist_only, GError **error)
{
- AnjutaAmGroupNode *node = NULL;
+ AmpGroupNode *node = NULL;
gchar *name;
/* Validate group name */
@@ -384,7 +384,7 @@ amp_group_new (GFile *file, gboolean dist_only, GError **error)
}
g_free (name);
- node = g_object_new (ANJUTA_TYPE_AM_GROUP_NODE, NULL);
+ node = g_object_new (AMP_TYPE_GROUP_NODE, NULL);
node->base.file = g_object_ref (file);
node->dist_only = dist_only;
@@ -392,7 +392,7 @@ amp_group_new (GFile *file, gboolean dist_only, GError **error)
}
void
-amp_group_free (AnjutaAmGroupNode *node)
+amp_group_node_free (AmpGroupNode *node)
{
g_object_unref (G_OBJECT (node));
}
@@ -402,16 +402,16 @@ amp_group_free (AnjutaAmGroupNode *node)
*---------------------------------------------------------------------------*/
-typedef struct _AnjutaAmGroupNodeClass AnjutaAmGroupNodeClass;
+typedef struct _AmpGroupNodeClass AmpGroupNodeClass;
-struct _AnjutaAmGroupNodeClass {
+struct _AmpGroupNodeClass {
AmpNodeClass parent_class;
};
-G_DEFINE_DYNAMIC_TYPE (AnjutaAmGroupNode, anjuta_am_group_node, AMP_TYPE_NODE);
+G_DEFINE_DYNAMIC_TYPE (AmpGroupNode, amp_group_node, AMP_TYPE_NODE);
static void
-anjuta_am_group_node_init (AnjutaAmGroupNode *node)
+amp_group_node_init (AmpGroupNode *node)
{
node->base.type = ANJUTA_PROJECT_GROUP;
node->base.native_properties = amp_get_group_property_list();
@@ -429,20 +429,20 @@ anjuta_am_group_node_init (AnjutaAmGroupNode *node)
}
static void
-anjuta_am_group_node_dispose (GObject *object)
+amp_group_node_dispose (GObject *object)
{
- AnjutaAmGroupNode *node = ANJUTA_AM_GROUP_NODE (object);
+ AmpGroupNode *node = AMP_GROUP_NODE (object);
if (node->monitor) g_object_unref (node->monitor);
node->monitor = NULL;
- G_OBJECT_CLASS (anjuta_am_group_node_parent_class)->dispose (object);
+ G_OBJECT_CLASS (amp_group_node_parent_class)->dispose (object);
}
static void
-anjuta_am_group_node_finalize (GObject *object)
+amp_group_node_finalize (GObject *object)
{
- AnjutaAmGroupNode *node = ANJUTA_AM_GROUP_NODE (object);
+ AmpGroupNode *node = AMP_GROUP_NODE (object);
gint i;
g_list_foreach (node->base.custom_properties, (GFunc)amp_property_free, NULL);
@@ -455,25 +455,25 @@ anjuta_am_group_node_finalize (GObject *object)
}
if (node->variables) g_hash_table_destroy (node->variables);
- G_OBJECT_CLASS (anjuta_am_group_node_parent_class)->finalize (object);
+ G_OBJECT_CLASS (amp_group_node_parent_class)->finalize (object);
}
static void
-anjuta_am_group_node_class_init (AnjutaAmGroupNodeClass *klass)
+amp_group_node_class_init (AmpGroupNodeClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = anjuta_am_group_node_finalize;
- object_class->dispose = anjuta_am_group_node_dispose;
+ object_class->finalize = amp_group_node_finalize;
+ object_class->dispose = amp_group_node_dispose;
}
static void
-anjuta_am_group_node_class_finalize (AnjutaAmGroupNodeClass *klass)
+amp_group_node_class_finalize (AmpGroupNodeClass *klass)
{
}
void
-anjuta_am_group_node_register (GTypeModule *module)
+amp_group_node_register (GTypeModule *module)
{
- anjuta_am_group_node_register_type (module);
+ amp_group_node_register_type (module);
}
diff --git a/plugins/am-project/amp-group.h b/plugins/am-project/amp-group.h
index 2889320..c125725 100644
--- a/plugins/am-project/amp-group.h
+++ b/plugins/am-project/amp-group.h
@@ -36,10 +36,10 @@ G_BEGIN_DECLS
/* Type macros
*---------------------------------------------------------------------------*/
-#define ANJUTA_TYPE_AM_GROUP_NODE (anjuta_am_group_node_get_type ())
-#define ANJUTA_AM_GROUP_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_AM_GROUP_NODE, AnjutaAmGroupNode))
+#define AMP_TYPE_GROUP_NODE (amp_group_node_get_type ())
+#define AMP_GROUP_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMP_TYPE_GROUP_NODE, AmpGroupNode))
-GType anjuta_am_group_node_get_type (void) G_GNUC_CONST;
+GType amp_group_node_get_type (void) G_GNUC_CONST;
typedef enum {
AM_GROUP_TOKEN_CONFIGURE,
@@ -47,7 +47,7 @@ typedef enum {
AM_GROUP_TOKEN_DIST_SUBDIRS,
AM_GROUP_TARGET,
AM_GROUP_TOKEN_LAST
-} AmpGroupTokenCategory;
+} AmpGroupNodeTokenCategory;
typedef struct _AmpVariable AmpVariable;
@@ -57,26 +57,26 @@ struct _AmpVariable {
AnjutaToken *value;
};
-void anjuta_am_group_node_register (GTypeModule *module);
+void amp_group_node_register (GTypeModule *module);
AmpVariable* amp_variable_new (gchar *name, AnjutaTokenType assign, AnjutaToken *value);
-void amp_group_add_token (AnjutaAmGroupNode *group, AnjutaToken *token, AmpGroupTokenCategory category);
-GList * amp_group_get_token (AnjutaAmGroupNode *group, AmpGroupTokenCategory category);
-AnjutaToken* amp_group_get_first_token (AnjutaAmGroupNode *group, AmpGroupTokenCategory category);
-void amp_group_set_dist_only (AnjutaAmGroupNode *group, gboolean dist_only);
-AnjutaTokenFile* amp_group_set_makefile (AnjutaAmGroupNode *group, GFile *makefile, AmpProject *project);
-AnjutaToken* amp_group_get_makefile_token (AnjutaAmGroupNode *group);
-AnjutaTokenFile *amp_group_get_make_token_file (AnjutaAmGroupNode *group);
-gchar *amp_group_get_makefile_name (AnjutaAmGroupNode *group);
-gboolean amp_group_update_makefile (AnjutaAmGroupNode *group, AnjutaToken *token);
-void amp_group_update_variable (AnjutaAmGroupNode *group, AnjutaToken *variable);
-AnjutaToken* amp_group_get_variable_token (AnjutaAmGroupNode *group, AnjutaToken *variable);
-AnjutaAmGroupNode* amp_group_new (GFile *file, gboolean dist_only, GError **error);
-void amp_group_free (AnjutaAmGroupNode *node);
-void amp_group_update_node (AnjutaAmGroupNode *node, AnjutaAmGroupNode *new_node);
-gboolean amp_group_set_file (AnjutaAmGroupNode *group, GFile *new_file);
+void amp_group_node_add_token (AmpGroupNode *group, AnjutaToken *token, AmpGroupNodeTokenCategory category);
+GList * amp_group_node_get_token (AmpGroupNode *group, AmpGroupNodeTokenCategory category);
+AnjutaToken* amp_group_node_get_first_token (AmpGroupNode *group, AmpGroupNodeTokenCategory category);
+void amp_group_node_set_dist_only (AmpGroupNode *group, gboolean dist_only);
+AnjutaTokenFile* amp_group_node_set_makefile (AmpGroupNode *group, GFile *makefile, AmpProject *project);
+AnjutaToken* amp_group_node_get_makefile_token (AmpGroupNode *group);
+AnjutaTokenFile *amp_group_node_get_make_token_file (AmpGroupNode *group);
+gchar *amp_group_node_get_makefile_name (AmpGroupNode *group);
+gboolean amp_group_node_update_makefile (AmpGroupNode *group, AnjutaToken *token);
+void amp_group_node_update_variable (AmpGroupNode *group, AnjutaToken *variable);
+AnjutaToken* amp_group_node_get_variable_token (AmpGroupNode *group, AnjutaToken *variable);
+AmpGroupNode* amp_group_node_new (GFile *file, gboolean dist_only, GError **error);
+void amp_group_node_free (AmpGroupNode *node);
+void amp_group_node_update_node (AmpGroupNode *node, AmpGroupNode *new_node);
+gboolean amp_group_node_set_file (AmpGroupNode *group, GFile *new_file);
G_END_DECLS
diff --git a/plugins/am-project/amp-module.c b/plugins/am-project/amp-module.c
index a9b1274..2cebc68 100644
--- a/plugins/am-project/amp-module.c
+++ b/plugins/am-project/amp-module.c
@@ -44,7 +44,7 @@
/* Types
*---------------------------------------------------------------------------*/
-struct _AnjutaAmModuleNode {
+struct _AmpModuleNode {
AnjutaProjectNode base;
AnjutaToken *module;
};
@@ -54,7 +54,7 @@ struct _AnjutaAmModuleNode {
*---------------------------------------------------------------------------*/
void
-amp_module_add_token (AnjutaAmModuleNode *module, AnjutaToken *token)
+amp_module_node_add_token (AmpModuleNode *module, AnjutaToken *token)
{
gchar *name;
@@ -68,30 +68,30 @@ amp_module_add_token (AnjutaAmModuleNode *module, AnjutaToken *token)
}
AnjutaToken *
-amp_module_get_token (AnjutaAmModuleNode *node)
+amp_module_node_get_token (AmpModuleNode *node)
{
return node->module;
}
void
-amp_module_update_node (AnjutaAmModuleNode *node, AnjutaAmModuleNode *new_node)
+amp_module_node_update_node (AmpModuleNode *node, AmpModuleNode *new_node)
{
node->module = new_node->module;
}
-AnjutaAmModuleNode*
-amp_module_new (const gchar *name, GError **error)
+AmpModuleNode*
+amp_module_node_new (const gchar *name, GError **error)
{
- AnjutaAmModuleNode *module = NULL;
+ AmpModuleNode *module = NULL;
- module = g_object_new (ANJUTA_TYPE_AM_MODULE_NODE, NULL);
+ module = g_object_new (AMP_TYPE_MODULE_NODE, NULL);
module->base.name = g_strdup (name);;
return module;
}
void
-amp_module_free (AnjutaAmModuleNode *node)
+amp_module_node_free (AmpModuleNode *node)
{
g_object_unref (G_OBJECT (node));
}
@@ -100,16 +100,16 @@ amp_module_free (AnjutaAmModuleNode *node)
/* GObjet implementation
*---------------------------------------------------------------------------*/
-typedef struct _AnjutaAmModuleNodeClass AnjutaAmModuleNodeClass;
+typedef struct _AmpModuleNodeClass AmpModuleNodeClass;
-struct _AnjutaAmModuleNodeClass {
+struct _AmpModuleNodeClass {
AmpNodeClass parent_class;
};
-G_DEFINE_DYNAMIC_TYPE (AnjutaAmModuleNode, anjuta_am_module_node, AMP_TYPE_NODE);
+G_DEFINE_DYNAMIC_TYPE (AmpModuleNode, amp_module_node, AMP_TYPE_NODE);
static void
-anjuta_am_module_node_init (AnjutaAmModuleNode *node)
+amp_module_node_init (AmpModuleNode *node)
{
node->base.type = ANJUTA_PROJECT_MODULE;
node->base.native_properties = amp_get_module_property_list();
@@ -119,30 +119,30 @@ anjuta_am_module_node_init (AnjutaAmModuleNode *node)
}
static void
-anjuta_am_module_node_finalize (GObject *object)
+amp_module_node_finalize (GObject *object)
{
- AnjutaAmModuleNode *module = ANJUTA_AM_MODULE_NODE (object);
+ AmpModuleNode *module = AMP_MODULE_NODE (object);
g_list_foreach (module->base.custom_properties, (GFunc)amp_property_free, NULL);
- G_OBJECT_CLASS (anjuta_am_module_node_parent_class)->finalize (object);
+ G_OBJECT_CLASS (amp_module_node_parent_class)->finalize (object);
}
static void
-anjuta_am_module_node_class_init (AnjutaAmModuleNodeClass *klass)
+amp_module_node_class_init (AmpModuleNodeClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = anjuta_am_module_node_finalize;
+ object_class->finalize = amp_module_node_finalize;
}
static void
-anjuta_am_module_node_class_finalize (AnjutaAmModuleNodeClass *klass)
+amp_module_node_class_finalize (AmpModuleNodeClass *klass)
{
}
void
-anjuta_am_module_node_register (GTypeModule *module)
+amp_module_node_register (GTypeModule *module)
{
- anjuta_am_module_node_register_type (module);
+ amp_module_node_register_type (module);
}
diff --git a/plugins/am-project/amp-module.h b/plugins/am-project/amp-module.h
index f819663..bac3c8f 100644
--- a/plugins/am-project/amp-module.h
+++ b/plugins/am-project/amp-module.h
@@ -35,19 +35,19 @@ G_BEGIN_DECLS
/* Type macros
*---------------------------------------------------------------------------*/
-#define ANJUTA_TYPE_AM_MODULE_NODE (anjuta_am_module_node_get_type ())
-#define ANJUTA_AM_MODULE_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_AM_MODULE_NODE, AnjutaAmModuleNode))
+#define AMP_TYPE_MODULE_NODE (amp_module_node_get_type ())
+#define AMP_MODULE_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMP_TYPE_MODULE_NODE, AmpModuleNode))
-GType anjuta_am_module_node_get_type (void) G_GNUC_CONST;
+GType amp_module_node_get_type (void) G_GNUC_CONST;
-void anjuta_am_module_node_register (GTypeModule *module);
+void amp_module_node_register (GTypeModule *module);
-AnjutaAmModuleNode* amp_module_new (const gchar *name, GError **error);
-void amp_module_free (AnjutaAmModuleNode *node);
-AnjutaToken *amp_module_get_token (AnjutaAmModuleNode *node);
-void amp_module_add_token (AnjutaAmModuleNode *group, AnjutaToken *token);
-void amp_module_update_node (AnjutaAmModuleNode *node, AnjutaAmModuleNode *new_node);
+AmpModuleNode* amp_module_node_new (const gchar *name, GError **error);
+void amp_module_node_free (AmpModuleNode *node);
+AnjutaToken *amp_module_node_get_token (AmpModuleNode *node);
+void amp_module_node_add_token (AmpModuleNode *group, AnjutaToken *token);
+void amp_module_node_update_node (AmpModuleNode *node, AmpModuleNode *new_node);
G_END_DECLS
diff --git a/plugins/am-project/amp-package.c b/plugins/am-project/amp-package.c
index 41abd10..4968e9f 100644
--- a/plugins/am-project/amp-package.c
+++ b/plugins/am-project/amp-package.c
@@ -44,7 +44,7 @@
/* Types
*---------------------------------------------------------------------------*/
-struct _AnjutaAmPackageNode {
+struct _AmpPackageNode {
AnjutaProjectNode base;
gchar *version;
AnjutaToken *token;
@@ -55,25 +55,25 @@ struct _AnjutaAmPackageNode {
/* Package objects
*---------------------------------------------------------------------------*/
-AnjutaAmPackageNode*
-amp_package_new (const gchar *name, GError **error)
+AmpPackageNode*
+amp_package_node_new (const gchar *name, GError **error)
{
- AnjutaAmPackageNode *node = NULL;
+ AmpPackageNode *node = NULL;
- node = g_object_new (ANJUTA_TYPE_AM_PACKAGE_NODE, NULL);
+ node = g_object_new (AMP_TYPE_PACKAGE_NODE, NULL);
node->base.name = g_strdup (name);
return node;
}
void
-amp_package_free (AnjutaAmPackageNode *node)
+amp_package_node_free (AmpPackageNode *node)
{
g_object_unref (G_OBJECT (node));
}
void
-amp_package_set_version (AnjutaAmPackageNode *node, const gchar *compare, const gchar *version)
+amp_package_node_set_version (AmpPackageNode *node, const gchar *compare, const gchar *version)
{
g_return_if_fail (node != NULL);
g_return_if_fail ((version == NULL) || (compare != NULL));
@@ -83,19 +83,19 @@ amp_package_set_version (AnjutaAmPackageNode *node, const gchar *compare, const
}
AnjutaToken *
-amp_package_get_token (AnjutaAmPackageNode *node)
+amp_package_node_get_token (AmpPackageNode *node)
{
return node->token;
}
void
-amp_package_add_token (AnjutaAmPackageNode *node, AnjutaToken *token)
+amp_package_node_add_token (AmpPackageNode *node, AnjutaToken *token)
{
node->token = token;
}
void
-amp_package_update_node (AnjutaAmPackageNode *node, AnjutaAmPackageNode *new_node)
+amp_package_node_update_node (AmpPackageNode *node, AmpPackageNode *new_node)
{
g_return_if_fail (new_node != NULL);
@@ -109,16 +109,16 @@ amp_package_update_node (AnjutaAmPackageNode *node, AnjutaAmPackageNode *new_nod
/* GObjet implementation
*---------------------------------------------------------------------------*/
-typedef struct _AnjutaAmPackageNodeClass AnjutaAmPackageNodeClass;
+typedef struct _AmpPackageNodeClass AmpPackageNodeClass;
-struct _AnjutaAmPackageNodeClass {
+struct _AmpPackageNodeClass {
AmpNodeClass parent_class;
};
-G_DEFINE_DYNAMIC_TYPE (AnjutaAmPackageNode, anjuta_am_package_node, AMP_TYPE_NODE);
+G_DEFINE_DYNAMIC_TYPE (AmpPackageNode, amp_package_node, AMP_TYPE_NODE);
static void
-anjuta_am_package_node_init (AnjutaAmPackageNode *node)
+amp_package_node_init (AmpPackageNode *node)
{
node->base.type = ANJUTA_PROJECT_PACKAGE;
node->base.native_properties = amp_get_package_property_list();
@@ -127,30 +127,30 @@ anjuta_am_package_node_init (AnjutaAmPackageNode *node)
}
static void
-anjuta_am_package_node_finalize (GObject *object)
+amp_package_node_finalize (GObject *object)
{
- AnjutaAmPackageNode *node = ANJUTA_AM_PACKAGE_NODE (object);
+ AmpPackageNode *node = AMP_PACKAGE_NODE (object);
g_list_foreach (node->base.custom_properties, (GFunc)amp_property_free, NULL);
- G_OBJECT_CLASS (anjuta_am_package_node_parent_class)->finalize (object);
+ G_OBJECT_CLASS (amp_package_node_parent_class)->finalize (object);
}
static void
-anjuta_am_package_node_class_init (AnjutaAmPackageNodeClass *klass)
+amp_package_node_class_init (AmpPackageNodeClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = anjuta_am_package_node_finalize;
+ object_class->finalize = amp_package_node_finalize;
}
static void
-anjuta_am_package_node_class_finalize (AnjutaAmPackageNodeClass *klass)
+amp_package_node_class_finalize (AmpPackageNodeClass *klass)
{
}
void
-anjuta_am_package_node_register (GTypeModule *module)
+amp_package_node_register (GTypeModule *module)
{
- anjuta_am_package_node_register_type (module);
+ amp_package_node_register_type (module);
}
diff --git a/plugins/am-project/amp-package.h b/plugins/am-project/amp-package.h
index bcaa624..3e1f9b1 100644
--- a/plugins/am-project/amp-package.h
+++ b/plugins/am-project/amp-package.h
@@ -35,20 +35,20 @@ G_BEGIN_DECLS
/* Type macros
*---------------------------------------------------------------------------*/
-#define ANJUTA_TYPE_AM_PACKAGE_NODE (anjuta_am_package_node_get_type ())
-#define ANJUTA_AM_PACKAGE_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_AM_PACKAGE_NODE, AnjutaAmPackageNode))
+#define AMP_TYPE_PACKAGE_NODE (amp_package_node_get_type ())
+#define AMP_PACKAGE_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMP_TYPE_PACKAGE_NODE, AmpPackageNode))
-GType anjuta_am_package_node_get_type (void) G_GNUC_CONST;
+GType amp_package_node_get_type (void) G_GNUC_CONST;
-void anjuta_am_package_node_register (GTypeModule *module);
+void amp_package_node_register (GTypeModule *module);
-AnjutaAmPackageNode* amp_package_new (const gchar *name, GError **error);
-void amp_package_free (AnjutaAmPackageNode *node);
-void amp_package_set_version (AnjutaAmPackageNode *node, const gchar *compare, const gchar *version);
-AnjutaToken *amp_package_get_token (AnjutaAmPackageNode *node);
-void amp_package_add_token (AnjutaAmPackageNode *node, AnjutaToken *token);
-void amp_package_update_node (AnjutaAmPackageNode *node, AnjutaAmPackageNode *new_node);
+AmpPackageNode* amp_package_node_new (const gchar *name, GError **error);
+void amp_package_node_free (AmpPackageNode *node);
+void amp_package_node_set_version (AmpPackageNode *node, const gchar *compare, const gchar *version);
+AnjutaToken *amp_package_node_get_token (AmpPackageNode *node);
+void amp_package_node_add_token (AmpPackageNode *node, AnjutaToken *token);
+void amp_package_node_update_node (AmpPackageNode *node, AmpPackageNode *new_node);
G_END_DECLS
diff --git a/plugins/am-project/amp-source.c b/plugins/am-project/amp-source.c
index 69859b7..b0cff09 100644
--- a/plugins/am-project/amp-source.c
+++ b/plugins/am-project/amp-source.c
@@ -44,7 +44,7 @@
/* Types
*---------------------------------------------------------------------------*/
-struct _AnjutaAmSourceNode {
+struct _AmpSourceNode {
AnjutaProjectNode base;
AnjutaToken* token;
};
@@ -56,36 +56,36 @@ struct _AnjutaAmSourceNode {
*---------------------------------------------------------------------------*/
AnjutaToken *
-amp_source_get_token (AnjutaAmSourceNode *node)
+amp_source_node_get_token (AmpSourceNode *node)
{
return node->token;
}
void
-amp_source_add_token (AnjutaAmSourceNode *node, AnjutaToken *token)
+amp_source_node_add_token (AmpSourceNode *node, AnjutaToken *token)
{
node->token = token;
}
void
-amp_source_update_node (AnjutaAmSourceNode *node, AnjutaAmSourceNode *new_node)
+amp_source_node_update_node (AmpSourceNode *node, AmpSourceNode *new_node)
{
node->token = new_node->token;
}
AnjutaProjectNode*
-amp_source_new (GFile *file, GError **error)
+amp_source_node_new (GFile *file, GError **error)
{
- AnjutaAmSourceNode *node = NULL;
+ AmpSourceNode *node = NULL;
- node = g_object_new (ANJUTA_TYPE_AM_SOURCE_NODE, NULL);
+ node = g_object_new (AMP_TYPE_SOURCE_NODE, NULL);
node->base.file = g_object_ref (file);
return ANJUTA_PROJECT_NODE (node);
}
gboolean
-amp_source_set_file (AnjutaAmSourceNode *source, GFile *new_file)
+amp_source_node_set_file (AmpSourceNode *source, GFile *new_file)
{
g_object_unref (source->base.file);
source->base.file = g_object_ref (new_file);
@@ -94,7 +94,7 @@ amp_source_set_file (AnjutaAmSourceNode *source, GFile *new_file)
}
void
-amp_source_free (AnjutaAmSourceNode *node)
+amp_source_node_free (AmpSourceNode *node)
{
g_object_unref (G_OBJECT (node));
}
@@ -103,16 +103,16 @@ amp_source_free (AnjutaAmSourceNode *node)
/* GObjet implementation
*---------------------------------------------------------------------------*/
-typedef struct _AnjutaAmSourceNodeClass AnjutaAmSourceNodeClass;
+typedef struct _AmpSourceNodeClass AmpSourceNodeClass;
-struct _AnjutaAmSourceNodeClass {
+struct _AmpSourceNodeClass {
AmpNodeClass parent_class;
};
-G_DEFINE_DYNAMIC_TYPE (AnjutaAmSourceNode, anjuta_am_source_node, AMP_TYPE_NODE);
+G_DEFINE_DYNAMIC_TYPE (AmpSourceNode, amp_source_node, AMP_TYPE_NODE);
static void
-anjuta_am_source_node_init (AnjutaAmSourceNode *node)
+amp_source_node_init (AmpSourceNode *node)
{
node->base.type = ANJUTA_PROJECT_SOURCE;
node->base.native_properties = amp_get_source_property_list();
@@ -121,30 +121,30 @@ anjuta_am_source_node_init (AnjutaAmSourceNode *node)
}
static void
-anjuta_am_source_node_finalize (GObject *object)
+amp_source_node_finalize (GObject *object)
{
- AnjutaAmSourceNode *node = ANJUTA_AM_SOURCE_NODE (object);
+ AmpSourceNode *node = AMP_SOURCE_NODE (object);
g_list_foreach (node->base.custom_properties, (GFunc)amp_property_free, NULL);
- G_OBJECT_CLASS (anjuta_am_source_node_parent_class)->finalize (object);
+ G_OBJECT_CLASS (amp_source_node_parent_class)->finalize (object);
}
static void
-anjuta_am_source_node_class_init (AnjutaAmSourceNodeClass *klass)
+amp_source_node_class_init (AmpSourceNodeClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = anjuta_am_source_node_finalize;
+ object_class->finalize = amp_source_node_finalize;
}
static void
-anjuta_am_source_node_class_finalize (AnjutaAmSourceNodeClass *klass)
+amp_source_node_class_finalize (AmpSourceNodeClass *klass)
{
}
void
-anjuta_am_source_node_register (GTypeModule *module)
+amp_source_node_register (GTypeModule *module)
{
- anjuta_am_source_node_register_type (module);
+ amp_source_node_register_type (module);
}
diff --git a/plugins/am-project/amp-source.h b/plugins/am-project/amp-source.h
index d50b954..12a5db6 100644
--- a/plugins/am-project/amp-source.h
+++ b/plugins/am-project/amp-source.h
@@ -36,21 +36,21 @@ G_BEGIN_DECLS
/* Type macros
*---------------------------------------------------------------------------*/
-#define ANJUTA_TYPE_AM_SOURCE_NODE (anjuta_am_source_node_get_type ())
-#define ANJUTA_AM_SOURCE_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_AM_SOURCE_NODE, AnjutaAmSourceNode))
+#define AMP_TYPE_SOURCE_NODE (amp_source_node_get_type ())
+#define AMP_SOURCE_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMP_TYPE_SOURCE_NODE, AmpSourceNode))
-GType anjuta_am_source_node_get_type (void) G_GNUC_CONST;
+GType amp_source_node_get_type (void) G_GNUC_CONST;
-void anjuta_am_source_node_register (GTypeModule *module);
+void amp_source_node_register (GTypeModule *module);
-AnjutaProjectNode* amp_source_new (GFile *file, GError **error);
-void amp_source_free (AnjutaAmSourceNode *node);
-AnjutaToken *amp_source_get_token (AnjutaAmSourceNode *node);
-void amp_source_add_token (AnjutaAmSourceNode *node, AnjutaToken *token);
-void amp_source_update_node (AnjutaAmSourceNode *node, AnjutaAmSourceNode *new_node);
-gboolean amp_source_set_file (AnjutaAmSourceNode *source, GFile *new_file);
+AnjutaProjectNode* amp_source_node_new (GFile *file, GError **error);
+void amp_source_node_free (AmpSourceNode *node);
+AnjutaToken *amp_source_node_get_token (AmpSourceNode *node);
+void amp_source_node_add_token (AmpSourceNode *node, AnjutaToken *token);
+void amp_source_node_update_node (AmpSourceNode *node, AmpSourceNode *new_node);
+gboolean amp_source_node_set_file (AmpSourceNode *source, GFile *new_file);
G_END_DECLS
diff --git a/plugins/am-project/amp-target.c b/plugins/am-project/amp-target.c
index eea355e..ec16bc9 100644
--- a/plugins/am-project/amp-target.c
+++ b/plugins/am-project/amp-target.c
@@ -45,7 +45,7 @@
/* Types
*---------------------------------------------------------------------------*/
-struct _AnjutaAmTargetNode {
+struct _AmpTargetNode {
AnjutaProjectNode base;
gchar *install;
gint flags;
@@ -188,38 +188,38 @@ tagged_token_list_free (GList *list)
*---------------------------------------------------------------------------*/
void
-amp_target_set_type (AnjutaAmTargetNode *target, AmTokenType type)
+amp_target_node_set_type (AmpTargetNode *target, AmTokenType type)
{
target->base.type = ANJUTA_PROJECT_TARGET | type;
target->base.native_properties = amp_get_target_property_list(type);
}
void
-amp_target_add_token (AnjutaAmTargetNode *target, AmTokenType type, AnjutaToken *token)
+amp_target_node_add_token (AmpTargetNode *target, AmTokenType type, AnjutaToken *token)
{
target->tokens = tagged_token_list_insert (target->tokens, type, token);
}
GList *
-amp_target_get_token (AnjutaAmTargetNode *target, AmTokenType type)
+amp_target_node_get_token (AmpTargetNode *target, AmTokenType type)
{
return tagged_token_list_get (target->tokens, type);
}
AnjutaTokenType
-amp_target_get_first_token_type (AnjutaAmTargetNode *target)
+amp_target_node_get_first_token_type (AmpTargetNode *target)
{
return tagged_token_list_next (target->tokens, 0);
}
AnjutaTokenType
-amp_target_get_next_token_type (AnjutaAmTargetNode *target, AnjutaTokenType type)
+amp_target_node_get_next_token_type (AmpTargetNode *target, AnjutaTokenType type)
{
return tagged_token_list_next (target->tokens, type);
}
void
-amp_target_update_node (AnjutaAmTargetNode *node, AnjutaAmTargetNode *new_node)
+amp_target_node_update_node (AmpTargetNode *node, AmpTargetNode *new_node)
{
g_free (node->install);
g_list_free (node->tokens);
@@ -231,10 +231,10 @@ amp_target_update_node (AnjutaAmTargetNode *node, AnjutaAmTargetNode *new_node)
new_node->tokens = NULL;
}
-AnjutaAmTargetNode*
-amp_target_new (const gchar *name, AnjutaProjectNodeType type, const gchar *install, gint flags, GError **error)
+AmpTargetNode*
+amp_target_node_new (const gchar *name, AnjutaProjectNodeType type, const gchar *install, gint flags, GError **error)
{
- AnjutaAmTargetNode *node = NULL;
+ AmpTargetNode *node = NULL;
const gchar *basename;
/* Validate target name */
@@ -284,8 +284,8 @@ amp_target_new (const gchar *name, AnjutaProjectNodeType type, const gchar *inst
}
}
- node = g_object_new (ANJUTA_TYPE_AM_TARGET_NODE, NULL);
- amp_target_set_type (node, type);
+ node = g_object_new (AMP_TYPE_TARGET_NODE, NULL);
+ amp_target_node_set_type (node, type);
node->base.name = g_strdup (name);
node->install = g_strdup (install);
node->flags = flags;
@@ -294,7 +294,7 @@ amp_target_new (const gchar *name, AnjutaProjectNodeType type, const gchar *inst
}
void
-amp_target_free (AnjutaAmTargetNode *node)
+amp_target_node_free (AmpTargetNode *node)
{
g_object_unref (G_OBJECT (node));
}
@@ -303,16 +303,16 @@ amp_target_free (AnjutaAmTargetNode *node)
/* GObjet implementation
*---------------------------------------------------------------------------*/
-typedef struct _AnjutaAmTargetNodeClass AnjutaAmTargetNodeClass;
+typedef struct _AmpTargetNodeClass AmpTargetNodeClass;
-struct _AnjutaAmTargetNodeClass {
+struct _AmpTargetNodeClass {
AmpNodeClass parent_class;
};
-G_DEFINE_DYNAMIC_TYPE (AnjutaAmTargetNode, anjuta_am_target_node, AMP_TYPE_NODE);
+G_DEFINE_DYNAMIC_TYPE (AmpTargetNode, amp_target_node, AMP_TYPE_NODE);
static void
-anjuta_am_target_node_init (AnjutaAmTargetNode *node)
+amp_target_node_init (AmpTargetNode *node)
{
node->base.type = ANJUTA_PROJECT_TARGET;
node->base.state = ANJUTA_PROJECT_CAN_ADD_SOURCE |
@@ -324,32 +324,32 @@ anjuta_am_target_node_init (AnjutaAmTargetNode *node)
}
static void
-anjuta_am_target_node_finalize (GObject *object)
+amp_target_node_finalize (GObject *object)
{
- AnjutaAmTargetNode *node = ANJUTA_AM_TARGET_NODE (object);
+ AmpTargetNode *node = AMP_TARGET_NODE (object);
g_list_foreach (node->base.custom_properties, (GFunc)amp_property_free, NULL);
tagged_token_list_free (node->tokens);
node->tokens = NULL;
- G_OBJECT_CLASS (anjuta_am_target_node_parent_class)->finalize (object);
+ G_OBJECT_CLASS (amp_target_node_parent_class)->finalize (object);
}
static void
-anjuta_am_target_node_class_init (AnjutaAmTargetNodeClass *klass)
+amp_target_node_class_init (AmpTargetNodeClass *klass)
{
GObjectClass* object_class = G_OBJECT_CLASS (klass);
- object_class->finalize = anjuta_am_target_node_finalize;
+ object_class->finalize = amp_target_node_finalize;
}
static void
-anjuta_am_target_node_class_finalize (AnjutaAmTargetNodeClass *klass)
+amp_target_node_class_finalize (AmpTargetNodeClass *klass)
{
}
void
-anjuta_am_target_node_register (GTypeModule *module)
+amp_target_node_register (GTypeModule *module)
{
- anjuta_am_target_node_register_type (module);
+ amp_target_node_register_type (module);
}
diff --git a/plugins/am-project/amp-target.h b/plugins/am-project/amp-target.h
index 5dd739e..816fe1c 100644
--- a/plugins/am-project/amp-target.h
+++ b/plugins/am-project/amp-target.h
@@ -36,18 +36,18 @@ G_BEGIN_DECLS
/* Type macros
*---------------------------------------------------------------------------*/
-#define ANJUTA_TYPE_AM_TARGET_NODE (anjuta_am_target_node_get_type ())
-#define ANJUTA_AM_TARGET_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ANJUTA_TYPE_AM_TARGET_NODE, AnjutaAmTargetNode))
+#define AMP_TYPE_TARGET_NODE (amp_target_node_get_type ())
+#define AMP_TARGET_NODE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AMP_TYPE_TARGET_NODE, AmpTargetNode))
-GType anjuta_am_target_node_get_type (void) G_GNUC_CONST;
+GType amp_target_node_get_type (void) G_GNUC_CONST;
typedef enum {
AM_TARGET_TOKEN_TARGET,
AM_TARGET_TOKEN_SOURCES,
AM_TARGET_TOKEN_LAST
-} AmpTargetTokenCategory;
+} AmpTargetNodeTokenCategory;
-typedef enum _AmpTargetFlag
+typedef enum _AmpTargetNodeFlag
{
AM_TARGET_CHECK = 1 << 0,
AM_TARGET_NOINST = 1 << 1,
@@ -57,18 +57,18 @@ typedef enum _AmpTargetFlag
AM_TARGET_NOTRANS = 1 << 5,
AM_TARGET_MAN = 1 << 6,
AM_TARGET_MAN_SECTION = 31 << 7
-} AmpTargetFlag;
+} AmpTargetNodeFlag;
-void anjuta_am_target_node_register (GTypeModule *module);
+void amp_target_node_register (GTypeModule *module);
-void amp_target_add_token (AnjutaAmTargetNode *target, AmTokenType type, AnjutaToken *token);
-GList * amp_target_get_token (AnjutaAmTargetNode *target, AmTokenType type);
-void amp_target_set_type (AnjutaAmTargetNode *target, AmTokenType type);
-AnjutaTokenType amp_target_get_first_token_type (AnjutaAmTargetNode *target);
-AnjutaTokenType amp_target_get_next_token_type (AnjutaAmTargetNode *target, AnjutaTokenType type);
-AnjutaAmTargetNode* amp_target_new (const gchar *name, AnjutaProjectNodeType type, const gchar *install, gint flags, GError **error);
-void amp_target_free (AnjutaAmTargetNode *node);
-void amp_target_update_node (AnjutaAmTargetNode *node, AnjutaAmTargetNode *new_node);
+void amp_target_node_add_token (AmpTargetNode *target, AmTokenType type, AnjutaToken *token);
+GList * amp_target_node_get_token (AmpTargetNode *target, AmTokenType type);
+void amp_target_node_set_type (AmpTargetNode *target, AmTokenType type);
+AnjutaTokenType amp_target_node_get_first_token_type (AmpTargetNode *target);
+AnjutaTokenType amp_target_node_get_next_token_type (AmpTargetNode *target, AnjutaTokenType type);
+AmpTargetNode* amp_target_node_new (const gchar *name, AnjutaProjectNodeType type, const gchar *install, gint flags, GError **error);
+void amp_target_node_free (AmpTargetNode *node);
+void amp_target_node_update_node (AmpTargetNode *node, AmpTargetNode *new_node);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
