diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-04-15 11:24:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-04-15 11:24:14 +0400 |
| commit | e7f1033dcb91ea3fdc4e301efbafc84cd151e05a (patch) | |
| tree | d46474dcd20cfac34a90b4f1ef9cc32d4ca509c8 /source/blender/makesrna | |
| parent | 3f605bff4be79c642ebca58ffef5dc6b66d0858e (diff) | |
style cleanup: for loop macros, also add a config file for uncrustify source formatter (able to get very close to our own style guide).
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/RNA_access.h | 30 | ||||
| -rw-r--r-- | source/blender/makesrna/RNA_types.h | 6 |
2 files changed, 19 insertions, 17 deletions
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index 84301c8000f..da73a25d197 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -902,11 +902,11 @@ void RNA_collection_clear(PointerRNA *ptr, const char *name); #define RNA_BEGIN(sptr, itemptr, propname) \ { \ CollectionPropertyIterator rna_macro_iter; \ - for(RNA_collection_begin(sptr, propname, &rna_macro_iter); \ - rna_macro_iter.valid; \ - RNA_property_collection_next(&rna_macro_iter)) \ + for (RNA_collection_begin(sptr, propname, &rna_macro_iter); \ + rna_macro_iter.valid; \ + RNA_property_collection_next(&rna_macro_iter)) \ { \ - PointerRNA itemptr= rna_macro_iter.ptr; + PointerRNA itemptr = rna_macro_iter.ptr; #define RNA_END \ } \ @@ -916,11 +916,11 @@ void RNA_collection_clear(PointerRNA *ptr, const char *name); #define RNA_PROP_BEGIN(sptr, itemptr, prop) \ { \ CollectionPropertyIterator rna_macro_iter; \ - for(RNA_property_collection_begin(sptr, prop, &rna_macro_iter); \ - rna_macro_iter.valid; \ - RNA_property_collection_next(&rna_macro_iter)) \ + for (RNA_property_collection_begin(sptr, prop, &rna_macro_iter); \ + rna_macro_iter.valid; \ + RNA_property_collection_next(&rna_macro_iter)) \ { \ - PointerRNA itemptr= rna_macro_iter.ptr; + PointerRNA itemptr = rna_macro_iter.ptr; #define RNA_PROP_END \ } \ @@ -930,14 +930,14 @@ void RNA_collection_clear(PointerRNA *ptr, const char *name); #define RNA_STRUCT_BEGIN(sptr, prop) \ { \ CollectionPropertyIterator rna_macro_iter; \ - for(RNA_property_collection_begin( \ - sptr, \ - RNA_struct_iterator_property(sptr->type), \ - &rna_macro_iter); \ - rna_macro_iter.valid; \ - RNA_property_collection_next(&rna_macro_iter)) \ + for (RNA_property_collection_begin( \ + sptr, \ + RNA_struct_iterator_property(sptr->type), \ + &rna_macro_iter); \ + rna_macro_iter.valid; \ + RNA_property_collection_next(&rna_macro_iter)) \ { \ - PropertyRNA *prop= rna_macro_iter.ptr.data; + PropertyRNA *prop = rna_macro_iter.ptr.data; #define RNA_STRUCT_END \ } \ diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index e826b81d617..c3beffbe223 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -346,8 +346,10 @@ typedef enum StructFlag { typedef int (*StructValidateFunc)(struct PointerRNA *ptr, void *data, int *have_function); typedef int (*StructCallbackFunc)(struct bContext *C, struct PointerRNA *ptr, struct FunctionRNA *func, ParameterList *list); typedef void (*StructFreeFunc)(void *data); -typedef struct StructRNA *(*StructRegisterFunc)(struct Main *bmain, struct ReportList *reports, void *data, - const char *identifier, StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free); +typedef struct StructRNA *(*StructRegisterFunc)( + struct Main *bmain, struct ReportList *reports, void *data, const char *identifier, + StructValidateFunc validate, StructCallbackFunc call, StructFreeFunc free); + typedef void (*StructUnregisterFunc)(struct Main *bmain, struct StructRNA *type); typedef void **(*StructInstanceFunc)(PointerRNA *ptr); |