From fd0977284bc2c8e625120f75dd99ff018055ee51 Mon Sep 17 00:00:00 2001
From: Campbell Barton <campbell@blender.org>
Date: Sun, 30 Jul 2023 16:14:09 +1000
Subject: [PATCH] Cleanup: simplify typedefs

Also remove unused `buffer_struct`.
---
 source/blender/blendthumb/src/blendthumb_win32.cc       | 4 ++--
 source/blender/draw/engines/eevee/eevee_materials.cc    | 4 ++--
 source/blender/draw/engines/overlay/overlay_armature.cc | 4 ++--
 source/blender/editors/interface/interface_layout.cc    | 4 ++--
 source/blender/imbuf/intern/jpeg.cc                     | 7 -------
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/source/blender/blendthumb/src/blendthumb_win32.cc b/source/blender/blendthumb/src/blendthumb_win32.cc
index d42886f5b39..8b7c5b98e6e 100644
--- a/source/blender/blendthumb/src/blendthumb_win32.cc
+++ b/source/blender/blendthumb/src/blendthumb_win32.cc
@@ -96,11 +96,11 @@ IFACEMETHODIMP CBlendThumb::Initialize(IStream *pStream, DWORD)
 /**
  * #FileReader compatible wrapper around the Windows stream that gives access to the .blend file.
  */
-typedef struct {
+struct StreamReader {
   FileReader reader;
 
   IStream *_pStream;
-} StreamReader;
+};
 
 static ssize_t stream_read(FileReader *reader, void *buffer, size_t size)
 {
diff --git a/source/blender/draw/engines/eevee/eevee_materials.cc b/source/blender/draw/engines/eevee/eevee_materials.cc
index 9d8721fde27..af2d9bb4b88 100644
--- a/source/blender/draw/engines/eevee/eevee_materials.cc
+++ b/source/blender/draw/engines/eevee/eevee_materials.cc
@@ -43,7 +43,7 @@ static struct {
   float noise_offsets[3];
 } e_data = {nullptr}; /* Engine data */
 
-typedef struct EeveeMaterialCache {
+struct EeveeMaterialCache {
   DRWShadingGroup *depth_grp;
   DRWShadingGroup *shading_grp;
   DRWShadingGroup *shadow_grp;
@@ -53,7 +53,7 @@ typedef struct EeveeMaterialCache {
   DRWShadingGroup **depth_grp_p;
   DRWShadingGroup **shading_grp_p;
   DRWShadingGroup **shadow_grp_p;
-} EeveeMaterialCache;
+};
 
 /* *********** FUNCTIONS *********** */
 
diff --git a/source/blender/draw/engines/overlay/overlay_armature.cc b/source/blender/draw/engines/overlay/overlay_armature.cc
index 864841e0b63..a3d13765735 100644
--- a/source/blender/draw/engines/overlay/overlay_armature.cc
+++ b/source/blender/draw/engines/overlay/overlay_armature.cc
@@ -50,11 +50,11 @@
 
 using namespace blender;
 
-typedef enum eArmatureDrawMode {
+enum eArmatureDrawMode {
   ARM_DRAW_MODE_OBJECT,
   ARM_DRAW_MODE_POSE,
   ARM_DRAW_MODE_EDIT,
-} eArmatureDrawMode;
+};
 
 struct ArmatureDrawContext {
   /* Current armature object */
diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc
index c92cbd6d600..e3b07ca7fff 100644
--- a/source/blender/editors/interface/interface_layout.cc
+++ b/source/blender/editors/interface/interface_layout.cc
@@ -111,7 +111,7 @@ enum uiItemType {
 #endif
 };
 
-typedef enum uiItemInternalFlag {
+enum uiItemInternalFlag {
   UI_ITEM_AUTO_FIXED_SIZE = 1 << 0,
   UI_ITEM_FIXED_SIZE = 1 << 1,
 
@@ -122,7 +122,7 @@ typedef enum uiItemInternalFlag {
    * Enabled by default, depends on 'UI_ITEM_PROP_SEP'. */
   UI_ITEM_PROP_DECORATE = 1 << 5,
   UI_ITEM_PROP_DECORATE_NO_PAD = 1 << 6,
-} uiItemInternalFlag;
+};
 ENUM_OPERATORS(uiItemInternalFlag, UI_ITEM_PROP_DECORATE_NO_PAD)
 
 struct uiItem {
diff --git a/source/blender/imbuf/intern/jpeg.cc b/source/blender/imbuf/intern/jpeg.cc
index 466e61cdb79..3eb1ae0ba47 100644
--- a/source/blender/imbuf/intern/jpeg.cc
+++ b/source/blender/imbuf/intern/jpeg.cc
@@ -86,13 +86,6 @@ static void jpeg_error(j_common_ptr cinfo)
  * INPUT HANDLER FROM MEMORY
  *---------------------------------------------------------- */
 
-#if 0
-typedef struct {
-  uchar *buffer;
-  int filled;
-} buffer_struct;
-#endif
-
 struct my_source_mgr {
   jpeg_source_mgr pub; /* public fields */