From 9510137d1237f0bb493313cb65a79479ec77e4ce Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 7 Apr 2015 11:25:42 +1000 Subject: Cleanup: brace placement /w structs --- source/blender/blenfont/BLF_translation.h | 3 +-- source/blender/blenkernel/BKE_node.h | 3 +-- .../blender/blenkernel/intern/outliner_treehash.c | 3 +-- source/blender/blenlib/intern/freetypefont.c | 3 +-- source/blender/blenlib/intern/hash_md5.c | 3 +-- .../COM_VariableSizeBokehBlurOperation.cpp | 3 +-- source/blender/editors/space_view3d/view3d_walk.c | 3 +-- source/blender/ikplugin/intern/itasc_plugin.cpp | 3 +-- source/blender/imbuf/intern/cineon/logImageCore.h | 6 ++---- source/blender/imbuf/intern/dds/BlockDXT.h | 24 ++++++++-------------- source/blender/imbuf/intern/dds/ColorBlock.h | 3 +-- .../blender/imbuf/intern/dds/DirectDrawSurface.cpp | 3 +-- .../blender/imbuf/intern/dds/DirectDrawSurface.h | 12 ++++------- source/blender/imbuf/intern/dds/Stream.h | 3 +-- source/blender/makesdna/DNA_brush_types.h | 12 ++++------- source/blender/makesdna/DNA_node_types.h | 3 +-- source/blender/makesdna/DNA_space_types.h | 3 +-- .../blender/python/intern/bpy_app_translations.c | 3 +-- .../blender/render/intern/include/render_types.h | 3 +-- 19 files changed, 33 insertions(+), 66 deletions(-) (limited to 'source') diff --git a/source/blender/blenfont/BLF_translation.h b/source/blender/blenfont/BLF_translation.h index b42e6f80022..49bfdbfe877 100644 --- a/source/blender/blenfont/BLF_translation.h +++ b/source/blender/blenfont/BLF_translation.h @@ -180,8 +180,7 @@ const char *BLF_translate_do_new_dataname(const char *msgctxt, const char *msgid #define BLF_I18NCONTEXT_ID_MASK "Mask" /* Helper for bpy.app.i18n object... */ -typedef struct -{ +typedef struct { const char *c_id; const char *py_id; const char *value; diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index eca15a62c70..d3a8687c615 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -507,8 +507,7 @@ const struct ListBase *BKE_node_clipboard_get_links(void); int BKE_node_clipboard_get_type(void); /* Node Instance Hash */ -typedef struct bNodeInstanceHash -{ +typedef struct bNodeInstanceHash { GHash *ghash; /* XXX should be made a direct member, GHash allocation needs to support it */ } bNodeInstanceHash; diff --git a/source/blender/blenkernel/intern/outliner_treehash.c b/source/blender/blenkernel/intern/outliner_treehash.c index 1cce61561e0..21664bfd285 100644 --- a/source/blender/blenkernel/intern/outliner_treehash.c +++ b/source/blender/blenkernel/intern/outliner_treehash.c @@ -38,8 +38,7 @@ #include "MEM_guardedalloc.h" -typedef struct TseGroup -{ +typedef struct TseGroup { TreeStoreElem **elems; int size; int allocated; diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index b3392e28223..8719c92a2a6 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -507,8 +507,7 @@ VChar *BLI_vfontchar_from_freetypefont(VFont *vfont, unsigned long character) /* Freetype2 Outline struct */ -typedef struct FT_Outline_ -{ +typedef struct FT_Outline_ { short n_contours; /* number of contours in glyph */ short n_points; /* number of points in the glyph */ diff --git a/source/blender/blenlib/intern/hash_md5.c b/source/blender/blenlib/intern/hash_md5.c index 4eec38278e9..d98b915983c 100644 --- a/source/blender/blenlib/intern/hash_md5.c +++ b/source/blender/blenlib/intern/hash_md5.c @@ -81,8 +81,7 @@ * 'BLI_hash_md5_stream' and 'BLI_hash_md5_buffer'. */ /* Structure to save state of computation between the single steps. */ -struct md5_ctx -{ +struct md5_ctx { md5_uint32 A; md5_uint32 B; md5_uint32 C; diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp index e4883d91bc3..1ec52571be8 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp @@ -62,8 +62,7 @@ void VariableSizeBokehBlurOperation::initExecution() #endif QualityStepHelper::initExecution(COM_QH_INCREASE); } -struct VariableSizeBokehBlurTileData -{ +struct VariableSizeBokehBlurTileData { MemoryBuffer *color; MemoryBuffer *bokeh; MemoryBuffer *size; diff --git a/source/blender/editors/space_view3d/view3d_walk.c b/source/blender/editors/space_view3d/view3d_walk.c index 191eeb05c71..11756e4feca 100644 --- a/source/blender/editors/space_view3d/view3d_walk.c +++ b/source/blender/editors/space_view3d/view3d_walk.c @@ -220,8 +220,7 @@ void walk_modal_keymap(wmKeyConfig *keyconf) } -typedef struct WalkTeleport -{ +typedef struct WalkTeleport { eWalkTeleportState state; float duration; /* from user preferences */ float origin[3]; diff --git a/source/blender/ikplugin/intern/itasc_plugin.cpp b/source/blender/ikplugin/intern/itasc_plugin.cpp index afff97a8409..d4814a4e3a2 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.cpp +++ b/source/blender/ikplugin/intern/itasc_plugin.cpp @@ -89,8 +89,7 @@ struct IK_Target; typedef void (*ErrorCallback)(const iTaSC::ConstraintValues *values, unsigned int nvalues, IK_Target *iktarget); // one structure for each target in the scene -struct IK_Target -{ +struct IK_Target { struct Scene *blscene; iTaSC::MovingFrame* target; iTaSC::ConstraintSet* constraint; diff --git a/source/blender/imbuf/intern/cineon/logImageCore.h b/source/blender/imbuf/intern/cineon/logImageCore.h index 6b1435817d2..389e88a24de 100644 --- a/source/blender/imbuf/intern/cineon/logImageCore.h +++ b/source/blender/imbuf/intern/cineon/logImageCore.h @@ -52,8 +52,7 @@ enum format { format_Cineon }; -typedef struct LogImageElement -{ +typedef struct LogImageElement { int depth; int bitsPerSample; int dataOffset; @@ -67,8 +66,7 @@ typedef struct LogImageElement float maxValue; /* = 2^bitsPerSample - 1 (used internally, doesn't come from the file header) */ } LogImageElement; -typedef struct LogImageFile -{ +typedef struct LogImageFile { /* specified in header */ int width; int height; diff --git a/source/blender/imbuf/intern/dds/BlockDXT.h b/source/blender/imbuf/intern/dds/BlockDXT.h index 7e5a1e504b8..6aae9c9817c 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.h +++ b/source/blender/imbuf/intern/dds/BlockDXT.h @@ -64,8 +64,7 @@ #include /// DXT1 block. -struct BlockDXT1 -{ +struct BlockDXT1 { Color16 col0; Color16 col1; union { @@ -98,8 +97,7 @@ inline bool BlockDXT1::isFourColorMode() const /// DXT3 alpha block with explicit alpha. -struct AlphaBlockDXT3 -{ +struct AlphaBlockDXT3 { union { struct { uint alpha0 : 4; @@ -130,8 +128,7 @@ struct AlphaBlockDXT3 /// DXT3 block. -struct BlockDXT3 -{ +struct BlockDXT3 { AlphaBlockDXT3 alpha; BlockDXT1 color; @@ -144,8 +141,7 @@ struct BlockDXT3 /// DXT5 alpha block. -struct AlphaBlockDXT5 -{ +struct AlphaBlockDXT5 { // uint64 unions do not compile on all platforms #if 0 union { @@ -208,8 +204,7 @@ struct AlphaBlockDXT5 /// DXT5 block. -struct BlockDXT5 -{ +struct BlockDXT5 { AlphaBlockDXT5 alpha; BlockDXT1 color; @@ -221,8 +216,7 @@ struct BlockDXT5 }; /// ATI1 block. -struct BlockATI1 -{ +struct BlockATI1 { AlphaBlockDXT5 alpha; void decodeBlock(ColorBlock * block) const; @@ -232,8 +226,7 @@ struct BlockATI1 }; /// ATI2 block. -struct BlockATI2 -{ +struct BlockATI2 { AlphaBlockDXT5 x; AlphaBlockDXT5 y; @@ -244,8 +237,7 @@ struct BlockATI2 }; /// CTX1 block. -struct BlockCTX1 -{ +struct BlockCTX1 { uint8 col0[2]; uint8 col1[2]; union { diff --git a/source/blender/imbuf/intern/dds/ColorBlock.h b/source/blender/imbuf/intern/dds/ColorBlock.h index 730a19d84fd..8d5031aa603 100644 --- a/source/blender/imbuf/intern/dds/ColorBlock.h +++ b/source/blender/imbuf/intern/dds/ColorBlock.h @@ -41,8 +41,7 @@ #include /// Uncompressed 4x4 color block. -struct ColorBlock -{ +struct ColorBlock { ColorBlock(); ColorBlock(const uint * linearImage); ColorBlock(const ColorBlock & block); diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp index 028026527dc..15c8d86d61c 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp @@ -496,8 +496,7 @@ void mem_read(Stream & mem, DDSHeader & header) namespace { -struct FormatDescriptor -{ +struct FormatDescriptor { uint format; uint bitcount; uint rmask; diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h index 3d308ba1ff1..44c27a98c1d 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h @@ -63,8 +63,7 @@ #include #include -struct DDSPixelFormat -{ +struct DDSPixelFormat { uint size; uint flags; uint fourcc; @@ -75,8 +74,7 @@ struct DDSPixelFormat uint amask; }; -struct DDSCaps -{ +struct DDSCaps { uint caps1; uint caps2; uint caps3; @@ -84,8 +82,7 @@ struct DDSCaps }; /// DDS file header for DX10. -struct DDSHeader10 -{ +struct DDSHeader10 { uint dxgiFormat; uint resourceDimension; uint miscFlag; @@ -94,8 +91,7 @@ struct DDSHeader10 }; /// DDS file header. -struct DDSHeader -{ +struct DDSHeader { uint fourcc; uint size; uint flags; diff --git a/source/blender/imbuf/intern/dds/Stream.h b/source/blender/imbuf/intern/dds/Stream.h index a1ac49b58da..6557fb4f063 100644 --- a/source/blender/imbuf/intern/dds/Stream.h +++ b/source/blender/imbuf/intern/dds/Stream.h @@ -30,8 +30,7 @@ #ifndef __STREAM_H__ #define __STREAM_H__ -struct Stream -{ +struct Stream { unsigned char *mem; // location in memory unsigned int size; // size unsigned int pos; // current position diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h index dd66acf2781..6d6d33a6f1b 100644 --- a/source/blender/makesdna/DNA_brush_types.h +++ b/source/blender/makesdna/DNA_brush_types.h @@ -137,16 +137,14 @@ typedef struct Brush { float mask_stencil_dimension[2]; } Brush; -typedef struct PaletteColor -{ +typedef struct PaletteColor { struct PaletteColor *next, *prev; /* two values, one to store rgb, other to store values for sculpt/weight */ float rgb[3]; float value; } PaletteColor; -typedef struct Palette -{ +typedef struct Palette { ID id; /* pointer to individual colours */ @@ -156,14 +154,12 @@ typedef struct Palette int pad; } Palette; -typedef struct PaintCurvePoint -{ +typedef struct PaintCurvePoint { BezTriple bez; /* bezier handle */ float pressure; /* pressure on that point */ } PaintCurvePoint; -typedef struct PaintCurve -{ +typedef struct PaintCurve { ID id; PaintCurvePoint *points; /* points of curve */ int tot_points; diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 2a1a35d158a..ead822053b3 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -268,8 +268,7 @@ typedef struct bNode { /* Unique hash key for identifying node instances * Defined as a struct because DNA does not support other typedefs. */ -typedef struct bNodeInstanceKey -{ +typedef struct bNodeInstanceKey { unsigned int value; } bNodeInstanceKey; diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 05127f176b4..c2f49ea92b5 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -554,8 +554,7 @@ typedef enum eSpaceSeq_Proxy_RenderSize { SEQ_PROXY_RENDER_SIZE_FULL = 100 } eSpaceSeq_Proxy_RenderSize; -typedef struct MaskSpaceInfo -{ +typedef struct MaskSpaceInfo { /* **** mask editing **** */ struct Mask *mask; /* draw options */ diff --git a/source/blender/python/intern/bpy_app_translations.c b/source/blender/python/intern/bpy_app_translations.c index ae5ea88abdf..72133badbbb 100644 --- a/source/blender/python/intern/bpy_app_translations.c +++ b/source/blender/python/intern/bpy_app_translations.c @@ -47,8 +47,7 @@ #include "../generic/python_utildefines.h" -typedef struct -{ +typedef struct { PyObject_HEAD /* The string used to separate context from actual message in PY_TRANSLATE RNA props. */ const char *context_separator; diff --git a/source/blender/render/intern/include/render_types.h b/source/blender/render/intern/include/render_types.h index 8fe12015e87..e12a1575992 100644 --- a/source/blender/render/intern/include/render_types.h +++ b/source/blender/render/intern/include/render_types.h @@ -122,8 +122,7 @@ enum { }; /* controls state of render, everything that's read-only during render stage */ -struct Render -{ +struct Render { struct Render *next, *prev; char name[RE_MAXNAME]; int slot; -- cgit v1.2.3