[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43944] branches/bmesh/blender/source/ blender/bmesh: Style Cleanup: capitalize struct names

Campbell Barton ideasman42 at gmail.com
Tue Feb 7 04:56:49 CET 2012


Revision: 43944
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43944
Author:   campbellbarton
Date:     2012-02-07 03:56:35 +0000 (Tue, 07 Feb 2012)
Log Message:
-----------
Style Cleanup: capitalize struct names

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
    branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c

Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h	2012-02-07 03:03:09 UTC (rev 43943)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operator_api.h	2012-02-07 03:56:35 UTC (rev 43944)
@@ -127,14 +127,14 @@
 
 #define MAX_SLOTNAME	32
 
-typedef struct slottype {
+typedef struct BMOSlotType {
 	int type;
 	char name[MAX_SLOTNAME];
-} slottype;
+} BMOSlotType;
 
 typedef struct BMOpDefine {
 	const char *name;
-	slottype slottypes[BMOP_MAX_SLOTS];
+	BMOSlotType slottypes[BMOP_MAX_SLOTS];
 	void (*exec)(BMesh *bm, BMOperator *op);
 	int flag; 
 } BMOpDefine;
@@ -420,22 +420,22 @@
 
 /* mappings map elements to data, which
  * follows the mapping struct in memory. */
-typedef struct element_mapping {
+typedef struct BMOElemMapping {
 	BMHeader *element;
 	int len;
-} element_mapping;
+} BMOElemMapping;
 
 extern const int BMOP_OPSLOT_TYPEINFO[];
 
 BM_INLINE void BMO_Insert_Mapping(BMesh *UNUSED(bm), BMOperator *op, const char *slotname, 
                                   void *element, void *data, int len) {
-	element_mapping *mapping;
+	BMOElemMapping *mapping;
 	BMOpSlot *slot = BMO_GetSlot(op, slotname);
 
 	/*sanity check*/
 	if (slot->slottype != BMOP_OPSLOT_MAPPING) return;
 	
-	mapping = (element_mapping*) BLI_memarena_alloc(op->arena, sizeof(*mapping) + len);
+	mapping = (BMOElemMapping *) BLI_memarena_alloc(op->arena, sizeof(*mapping) + len);
 
 	mapping->element = (BMHeader*) element;
 	mapping->len = len;
@@ -481,14 +481,14 @@
 BM_INLINE void *BMO_Get_MapData(BMesh *UNUSED(bm), BMOperator *op, const char *slotname,
                                 void *element)
 {
-	element_mapping *mapping;
+	BMOElemMapping *mapping;
 	BMOpSlot *slot = BMO_GetSlot(op, slotname);
 
 	/*sanity check*/
 	if (slot->slottype != BMOP_OPSLOT_MAPPING) return NULL;
 	if (!slot->data.ghash) return NULL;
 
-	mapping = (element_mapping*) BLI_ghash_lookup(slot->data.ghash, element);
+	mapping = (BMOElemMapping *) BLI_ghash_lookup(slot->data.ghash, element);
 	
 	if (!mapping) return NULL;
 

Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c	2012-02-07 03:03:09 UTC (rev 43943)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c	2012-02-07 03:56:35 UTC (rev 43944)
@@ -75,7 +75,7 @@
 	0, /* unused */
 	0, /* unused */
 	sizeof(void *),	/* pointer buffer */
-	sizeof(element_mapping)
+	sizeof(BMOElemMapping)
 };
 
 /* Dummy slot so there is something to return when slot name lookup fails */
@@ -273,7 +273,7 @@
 		}
 		else {
 			GHashIterator it;
-			element_mapping *srcmap, *dstmap;
+			BMOElemMapping *srcmap, *dstmap;
 
 			/* sanity check */
 			if (!source_slot->data.ghash) return;
@@ -1007,7 +1007,7 @@
 		return h;
 	}
 	else if (iter->slot->slottype == BMOP_OPSLOT_MAPPING) {
-		struct element_mapping *map; 
+		struct BMOElemMapping *map;
 		void *ret = BLI_ghashIterator_getKey(&iter->giter);
 		map = BLI_ghashIterator_getValue(&iter->giter);
 		
@@ -1038,12 +1038,12 @@
 }
 
 /* error syste */
-typedef struct bmop_error {
-       struct bmop_error *next, *prev;
+typedef struct BMOpError {
+       struct BMOpError *next, *prev;
        int errorcode;
        BMOperator *op;
        const char *msg;
-} bmop_error;
+} BMOpError;
 
 void BMO_ClearStack(BMesh *bm)
 {
@@ -1052,7 +1052,7 @@
 
 void BMO_RaiseError(BMesh *bm, BMOperator *owner, int errcode, const char *msg)
 {
-	bmop_error *err = MEM_callocN(sizeof(bmop_error), "bmop_error");
+	BMOpError *err = MEM_callocN(sizeof(BMOpError), "bmop_error");
 	
 	err->errorcode = errcode;
 	if (!msg) msg = bmop_error_messages[errcode];
@@ -1070,7 +1070,7 @@
 /* returns error code or 0 if no erro */
 int BMO_GetError(BMesh *bm, const char **msg, BMOperator **op)
 {
-	bmop_error *err = bm->errorstack.first;
+	BMOpError *err = bm->errorstack.first;
 	if (!err) {
 		return 0;
 	}
@@ -1086,7 +1086,7 @@
 	int errorcode = BMO_GetError(bm, msg, op);
 	
 	if (errorcode) {
-		bmop_error *err = bm->errorstack.first;
+		BMOpError *err = bm->errorstack.first;
 		
 		BLI_remlink(&bm->errorstack, bm->errorstack.first);
 		MEM_freeN(err);
@@ -1096,10 +1096,10 @@
 }
 
 #if 0
-typedef struct bflag {
+typedef struct BMOFlag {
 	const char *str;
 	int flag;
-} bflag;
+} BMOFlag;
 
 #define PAIR(f) {#f, f},
 static const char *bmesh_flags = {




More information about the Bf-blender-cvs mailing list