GNOME.org
 

[anjuta/symbol-db-model] libanjuta/project-manager: Renamed _get_type() methods to _type()

commit 343ebaadf7255c6ed14a41c07620e29222e3951d
Author: Johannes Schmid <jhs gnome org>
Date:   Sun Mar 14 20:55:56 2010 +0100

    libanjuta/project-manager: Renamed _get_type() methods to _type()
    
    This avoids confusion with gtk-doc

 libanjuta/anjuta-project.c                  |    4 ++--
 libanjuta/anjuta-project.h                  |    4 ++--
 plugins/project-manager/gbf-project-model.c |   10 +++++-----
 plugins/project-manager/gbf-project-util.c  |    4 ++--
 plugins/project-manager/gbf-project-view.c  |    2 +-
 plugins/project-manager/gbf-tree-data.c     |    2 +-
 plugins/project-manager/plugin.c            |   20 ++++++++++----------
 7 files changed, 23 insertions(+), 23 deletions(-)
---
diff --git a/libanjuta/anjuta-project.c b/libanjuta/anjuta-project.c
index 4b73e5e..666b72b 100644
--- a/libanjuta/anjuta-project.c
+++ b/libanjuta/anjuta-project.c
@@ -151,7 +151,7 @@ anjuta_project_node_prepend (AnjutaProjectNode *parent, AnjutaProjectNode *node)
 
 
 AnjutaProjectNodeType
-anjuta_project_node_get_type (const AnjutaProjectNode *node)
+anjuta_project_node_type (const AnjutaProjectNode *node)
 {
 	return node == NULL ? ANJUTA_PROJECT_UNKNOWN : NODE_DATA (node)->type;
 }
@@ -354,7 +354,7 @@ anjuta_project_target_get_name (const AnjutaProjectTarget *target)
 }
 
 AnjutaProjectTargetType
-anjuta_project_target_get_type (const AnjutaProjectTarget *target)
+anjuta_project_target_type (const AnjutaProjectTarget *target)
 {
 	return TARGET_DATA (target)->type;
 }
diff --git a/libanjuta/anjuta-project.h b/libanjuta/anjuta-project.h
index 2776e6d..50db92d 100644
--- a/libanjuta/anjuta-project.h
+++ b/libanjuta/anjuta-project.h
@@ -114,7 +114,7 @@ AnjutaProjectNode *anjuta_project_node_insert_after (AnjutaProjectNode *parent,
 void anjuta_project_node_all_foreach (AnjutaProjectNode *node, AnjutaProjectNodeFunc func, gpointer data);
 void anjuta_project_node_children_foreach (AnjutaProjectNode *node, AnjutaProjectNodeFunc func, gpointer data);
 
-AnjutaProjectNodeType anjuta_project_node_get_type (const AnjutaProjectNode *node);
+AnjutaProjectNodeType anjuta_project_node_type (const AnjutaProjectNode *node);
 gchar *anjuta_project_node_get_name (const AnjutaProjectNode *node);
 gchar *anjuta_project_node_get_uri (AnjutaProjectNode *node);
 GFile *anjuta_project_node_get_file (AnjutaProjectNode *node);
@@ -128,7 +128,7 @@ AnjutaProjectSource *anjuta_project_source_get_node_from_uri (const AnjutaProjec
 GFile *anjuta_project_group_get_directory (const AnjutaProjectGroup *group);
 
 const gchar *anjuta_project_target_get_name (const AnjutaProjectTarget *target);
-AnjutaProjectTargetType anjuta_project_target_get_type (const AnjutaProjectTarget *target);
+AnjutaProjectTargetType anjuta_project_target_type (const AnjutaProjectTarget *target);
 
 GFile *anjuta_project_source_get_file (const AnjutaProjectSource *source);
 
diff --git a/plugins/project-manager/gbf-project-model.c b/plugins/project-manager/gbf-project-model.c
index f3ec7a9..21ac1b1 100644
--- a/plugins/project-manager/gbf-project-model.c
+++ b/plugins/project-manager/gbf-project-model.c
@@ -369,7 +369,7 @@ add_source (GbfProjectModel    	      *model,
 	GtkTreeIter iter;
 	GbfTreeData *data;
 
-	if ((!source) || (anjuta_project_node_get_type (source) != ANJUTA_PROJECT_SOURCE))
+	if ((!source) || (anjuta_project_node_type (source) != ANJUTA_PROJECT_SOURCE))
 		return;
 	
 	data = gbf_tree_data_new_source (source);
@@ -499,7 +499,7 @@ add_target (GbfProjectModel 		*model,
 	GtkTreeIter iter;	
 	GbfTreeData *data;
 	
-	if ((!target) || (anjuta_project_node_get_type (target) != ANJUTA_PROJECT_TARGET))
+	if ((!target) || (anjuta_project_node_type (target) != ANJUTA_PROJECT_TARGET))
 		return;
 	
 	data = gbf_tree_data_new_target (target);
@@ -519,7 +519,7 @@ add_target (GbfProjectModel 		*model,
 	 * set of public functions to add/remove shortcuts to save
 	 * this information in the project metadata (when that's
 	 * implemented) */
-	switch (anjuta_project_target_type_class (anjuta_project_target_get_type (target)))
+	switch (anjuta_project_target_type_class (anjuta_project_target_type (target)))
 	{
 		case ANJUTA_TARGET_SHAREDLIB:
 		case ANJUTA_TARGET_STATICLIB:
@@ -542,7 +542,7 @@ add_target_group (GbfProjectModel 	*model,
 	AnjutaProjectNode *node;
 	GbfTreeData *data;
 
-	if ((!group) || (anjuta_project_node_get_type (group) != ANJUTA_PROJECT_GROUP))
+	if ((!group) || (anjuta_project_node_type (group) != ANJUTA_PROJECT_GROUP))
 		return;
 	
 	data = gbf_tree_data_new_group (group);
@@ -629,7 +629,7 @@ update_tree (GbfProjectModel *model, AnjutaProjectNode *parent, GtkTreeIter *ite
 	/* add the remaining sources, targets and groups */
 	for (node = nodes; node; node = node->next)
 	{
-		switch (anjuta_project_node_get_type (node->data))
+		switch (anjuta_project_node_type (node->data))
 		{
 		case ANJUTA_PROJECT_GROUP:
 			add_target_group (model, node->data, iter);
diff --git a/plugins/project-manager/gbf-project-util.c b/plugins/project-manager/gbf-project-util.c
index 078f092..d815aa4 100644
--- a/plugins/project-manager/gbf-project-util.c
+++ b/plugins/project-manager/gbf-project-util.c
@@ -775,7 +775,7 @@ gbf_project_util_all_child (AnjutaProjectNode *parent, AnjutaProjectNodeType typ
  
     for (node = anjuta_project_node_first_child (parent); node != NULL; node = anjuta_project_node_next_sibling (node))
     {
-        if ((type == ANJUTA_PROJECT_UNKNOWN) || (anjuta_project_node_get_type (node) == type))
+        if ((type == ANJUTA_PROJECT_UNKNOWN) || (anjuta_project_node_type (node) == type))
         {
             list = g_list_prepend (list, node);
         }
@@ -796,7 +796,7 @@ gbf_project_util_node_all (AnjutaProjectNode *parent, AnjutaProjectNodeType type
     {
         GList *child_list;
         
-        if (anjuta_project_node_get_type (node) == type)
+        if (anjuta_project_node_type (node) == type)
         {
             list = g_list_prepend (list, node);
         }
diff --git a/plugins/project-manager/gbf-project-view.c b/plugins/project-manager/gbf-project-view.c
index 9a712ce..a7f1c10 100644
--- a/plugins/project-manager/gbf-project-view.c
+++ b/plugins/project-manager/gbf-project-view.c
@@ -392,7 +392,7 @@ gbf_project_view_find_selected (GbfProjectView *view, AnjutaProjectNodeType type
 		node = gbf_project_model_get_node (GBF_PROJECT_MODEL (model), &iter);
 		
 		/* walk up the hierarchy searching for a node of the given type */
-		while ((node != NULL) && (anjuta_project_node_get_type (node) != type))
+		while ((node != NULL) && (anjuta_project_node_type (node) != type))
 		{
 			node = anjuta_project_node_parent (node);
 		}
diff --git a/plugins/project-manager/gbf-tree-data.c b/plugins/project-manager/gbf-tree-data.c
index bc5a864..734890a 100644
--- a/plugins/project-manager/gbf-tree-data.c
+++ b/plugins/project-manager/gbf-tree-data.c
@@ -448,7 +448,7 @@ gbf_tree_data_new_source (AnjutaProjectSource *source)
 	}
 
 	parent = anjuta_project_node_parent (source);
-	if (anjuta_project_node_get_type (parent) == ANJUTA_PROJECT_GROUP)
+	if (anjuta_project_node_type (parent) == ANJUTA_PROJECT_GROUP)
 	{
 		data->group = g_object_ref (anjuta_project_group_get_directory (parent));
 	}
diff --git a/plugins/project-manager/plugin.c b/plugins/project-manager/plugin.c
index 7128160..1f40d07 100644
--- a/plugins/project-manager/plugin.c
+++ b/plugins/project-manager/plugin.c
@@ -1054,7 +1054,7 @@ on_treeview_selection_changed (GtkTreeSelection *sel,
 		caps = ianjuta_project_get_capabilities (plugin->project, NULL);
 	node = gbf_project_view_find_selected (GBF_PROJECT_VIEW (plugin->view),
 										   ANJUTA_PROJECT_SOURCE);
-	if (node && anjuta_project_node_get_type (node) == ANJUTA_PROJECT_SOURCE)
+	if (node && anjuta_project_node_type (node) == ANJUTA_PROJECT_SOURCE)
 	{
 		if (caps & IANJUTA_PROJECT_CAN_ADD_SOURCE)
 		{
@@ -1070,7 +1070,7 @@ on_treeview_selection_changed (GtkTreeSelection *sel,
 	
 	node = gbf_project_view_find_selected (GBF_PROJECT_VIEW (plugin->view),
 										   ANJUTA_PROJECT_TARGET);
-	if (node && anjuta_project_node_get_type (node) == ANJUTA_PROJECT_TARGET)
+	if (node && anjuta_project_node_type (node) == ANJUTA_PROJECT_TARGET)
 	{
 		if (caps & IANJUTA_PROJECT_CAN_ADD_SOURCE)
 		{
@@ -1086,7 +1086,7 @@ on_treeview_selection_changed (GtkTreeSelection *sel,
 	
 	node = gbf_project_view_find_selected (GBF_PROJECT_VIEW (plugin->view),
 										   ANJUTA_PROJECT_GROUP);
-	if (node && anjuta_project_node_get_type (node) == ANJUTA_PROJECT_GROUP)
+	if (node && anjuta_project_node_type (node) == ANJUTA_PROJECT_GROUP)
 	{
 		if (caps & IANJUTA_PROJECT_CAN_ADD_GROUP)
 		{
@@ -1875,7 +1875,7 @@ get_element_file_from_node (ProjectManagerPlugin *plugin, AnjutaProjectNode *nod
 					  NULL);
 	}
 
-	switch (anjuta_project_node_get_type (node))
+	switch (anjuta_project_node_type (node))
 	{
 		case ANJUTA_PROJECT_GROUP:
 			file = g_object_ref (anjuta_project_group_get_directory (node));
@@ -1964,7 +1964,7 @@ get_element_type (ProjectManagerPlugin *plugin, GFile *element)
 	
 	node = get_project_node_from_file (plugin, element, ANJUTA_PROJECT_UNKNOWN);
 
-	return node == NULL ? ANJUTA_PROJECT_UNKNOWN : anjuta_project_node_get_type (node);
+	return node == NULL ? ANJUTA_PROJECT_UNKNOWN : anjuta_project_node_type (node);
 }
 
 static GList*
@@ -2004,7 +2004,7 @@ iproject_manager_get_target_type (IAnjutaProjectManager *project_manager,
 
 	if (target != NULL)
 	{
-		AnjutaProjectTargetType type = anjuta_project_target_get_type (target);
+		AnjutaProjectTargetType type = anjuta_project_target_type (target);
 
 		return anjuta_project_target_type_class (type);
 	}
@@ -2035,7 +2035,7 @@ iproject_manager_get_targets (IAnjutaProjectManager *project_manager,
 	{
 		AnjutaProjectTargetType type;
 
-		type = anjuta_project_target_get_type (node->data);
+		type = anjuta_project_target_type (node->data);
 		if (anjuta_project_target_type_class (type) != target_type)
 		{
 			GList *next = g_list_next (node);
@@ -2106,21 +2106,21 @@ iproject_manager_get_selected (IAnjutaProjectManager *project_manager,
 	
 	node = gbf_project_view_find_selected (GBF_PROJECT_VIEW (plugin->view),
 										   ANJUTA_PROJECT_SOURCE);
-	if (node && anjuta_project_node_get_type (node) == ANJUTA_PROJECT_SOURCE)
+	if (node && anjuta_project_node_type (node) == ANJUTA_PROJECT_SOURCE)
 	{
 		return g_object_ref (anjuta_project_source_get_file (node));
 	}
 
 	node = gbf_project_view_find_selected (GBF_PROJECT_VIEW (plugin->view),
 										   ANJUTA_PROJECT_TARGET);
-	if (node && anjuta_project_node_get_type (node) == ANJUTA_PROJECT_TARGET)
+	if (node && anjuta_project_node_type (node) == ANJUTA_PROJECT_TARGET)
 	{
 		return get_element_file_from_node (plugin, node, IANJUTA_BUILDER_ROOT_URI);
 	}
 
 	node = gbf_project_view_find_selected (GBF_PROJECT_VIEW (plugin->view),
 										   ANJUTA_PROJECT_GROUP);
-	if (node && anjuta_project_node_get_type (node) == GBF_TREE_NODE_GROUP)
+	if (node && anjuta_project_node_type (node) == GBF_TREE_NODE_GROUP)
 	{
 		return g_object_ref (anjuta_project_group_get_directory (node));
 	}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]