[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49382] branches/ge_components/source/ blender: Following existing blenkern naming conventions by putting the object name first in the function name .

[Mitchell Stokes]

Revision: 49382
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49382
Author:   moguri
Date:     2012-07-30 07:23:38 +0000 (Mon, 30 Jul 2012)
Log Message:
-----------
Following existing blenkern naming conventions by putting the object name first in the function name.

Modified Paths:
--------------
    branches/ge_components/source/blender/blenkernel/BKE_pycomponent.h
    branches/ge_components/source/blender/blenkernel/intern/object.c
    branches/ge_components/source/blender/blenkernel/intern/python_component.c
    branches/ge_components/source/blender/editors/space_logic/logic_ops.c

Modified: branches/ge_components/source/blender/blenkernel/BKE_pycomponent.h
===================================================================
--- branches/ge_components/source/blender/blenkernel/BKE_pycomponent.h	2012-07-30 07:13:42 UTC (rev 49381)
+++ branches/ge_components/source/blender/blenkernel/BKE_pycomponent.h	2012-07-30 07:23:38 UTC (rev 49382)
@@ -5,10 +5,10 @@
 extern "C" {
 #endif
 
-struct PythonComponent *new_component_from_import(char *import);
-void reload_component(struct PythonComponent *pc, char *import);
-void free_component(struct PythonComponent *pc);
-void free_components(struct ListBase *base);
+struct PythonComponent *component_new_from_import(char *import);
+void component_reload(struct PythonComponent *pc, char *import);
+void component_free(struct PythonComponent *pc);
+void components_free(struct ListBase *base);
 #ifdef __cplusplus
 }
 #endif

Modified: branches/ge_components/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/ge_components/source/blender/blenkernel/intern/object.c	2012-07-30 07:13:42 UTC (rev 49381)
+++ branches/ge_components/source/blender/blenkernel/intern/object.c	2012-07-30 07:23:38 UTC (rev 49382)
@@ -337,7 +337,7 @@
 	free_sensors(&ob->sensors);
 	free_controllers(&ob->controllers);
 	free_actuators(&ob->actuators);
-	free_components(&ob->components);
+	components_free(&ob->components);
 	
 	free_constraints(&ob->constraints);
 	

Modified: branches/ge_components/source/blender/blenkernel/intern/python_component.c
===================================================================
--- branches/ge_components/source/blender/blenkernel/intern/python_component.c	2012-07-30 07:13:42 UTC (rev 49381)
+++ branches/ge_components/source/blender/blenkernel/intern/python_component.c	2012-07-30 07:23:38 UTC (rev 49382)
@@ -363,7 +363,7 @@
 #endif /* WITH_PYTHON */
 }
 
-PythonComponent *new_component_from_import(char *import)
+PythonComponent *component_new_from_import(char *import)
 {
 	PythonComponent *pc = NULL;
 
@@ -391,7 +391,7 @@
 	return pc;
 }
 
-void reload_component(PythonComponent *pc, char *import)
+void component_reload(PythonComponent *pc, char *import)
 {
 #ifdef WITH_PYTHON
 	PyObject *pyclass;
@@ -408,19 +408,19 @@
 #endif
 }
 
-void free_component(PythonComponent *pc)
+void component_free(PythonComponent *pc)
 {
 	free_component_properties(&pc->properties);
 
 	MEM_freeN(pc);
 }
 
-void free_components(ListBase *lb)
+void components_free(ListBase *lb)
 {
 	PythonComponent *pc;
 
 	while (pc= lb->first) {
 		BLI_remlink(lb, pc);
-		free_component(pc);
+		component_free(pc);
 	}
 }

Modified: branches/ge_components/source/blender/editors/space_logic/logic_ops.c
===================================================================
--- branches/ge_components/source/blender/editors/space_logic/logic_ops.c	2012-07-30 07:13:42 UTC (rev 49381)
+++ branches/ge_components/source/blender/editors/space_logic/logic_ops.c	2012-07-30 07:23:38 UTC (rev 49382)
@@ -740,7 +740,7 @@
 	BLI_strncpy(import, slogic->import_string, sizeof(import));
 	BLI_strncpy(slogic->import_string, "", sizeof(slogic->import_string));
 
-	pycomp = new_component_from_import(import);
+	pycomp = component_new_from_import(import);
 
 	if(!pycomp)
 		return OPERATOR_CANCELLED;
@@ -781,7 +781,7 @@
 		return OPERATOR_CANCELLED;
 
 	BLI_remlink(&ob->components, pc);
-	free_component(pc);
+	component_free(pc);
 
 	WM_event_add_notifier(C,NC_LOGIC, NULL);
 
@@ -831,7 +831,7 @@
 		return OPERATOR_CANCELLED;
 
 	sprintf(import, "%s.%s", pc->module, pc->name);
-	reload_component(pc, import);
+	component_reload(pc, import);
 
 	return OPERATOR_FINISHED;
 }