From d3960164163c910d5031a8f076c41b39e0a5503d Mon Sep 17 00:00:00 2001
From: Jacques Lucke <jacques@blender.org>
Date: Mon, 15 Feb 2021 15:30:17 +0100
Subject: Cleanup: clang tidy

---
 source/blender/editors/interface/interface_utils.c | 38 ++++++++++------------
 source/blender/editors/space_clip/clip_utils.c     | 13 ++++----
 source/blender/editors/util/ed_util_ops.cc         |  2 +-
 3 files changed, 24 insertions(+), 29 deletions(-)

(limited to 'source/blender/editors')

diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c
index f9eba9eeb6f..af058264f25 100644
--- a/source/blender/editors/interface/interface_utils.c
+++ b/source/blender/editors/interface/interface_utils.c
@@ -546,19 +546,19 @@ int UI_icon_from_report_type(int type)
   if (type & RPT_ERROR_ALL) {
     return ICON_CANCEL;
   }
-  else if (type & RPT_WARNING_ALL) {
+  if (type & RPT_WARNING_ALL) {
     return ICON_ERROR;
   }
-  else if (type & RPT_INFO_ALL) {
+  if (type & RPT_INFO_ALL) {
     return ICON_INFO;
   }
-  else if (type & RPT_DEBUG_ALL) {
+  if (type & RPT_DEBUG_ALL) {
     return ICON_SYSTEM;
   }
-  else if (type & RPT_PROPERTY) {
+  if (type & RPT_PROPERTY) {
     return ICON_OPTIONS;
   }
-  else if (type & RPT_OPERATOR) {
+  if (type & RPT_OPERATOR) {
     return ICON_CHECKMARK;
   }
   return ICON_INFO;
@@ -569,24 +569,22 @@ int UI_icon_colorid_from_report_type(int type)
   if (type & RPT_ERROR_ALL) {
     return TH_INFO_ERROR;
   }
-  else if (type & RPT_WARNING_ALL) {
+  if (type & RPT_WARNING_ALL) {
     return TH_INFO_WARNING;
   }
-  else if (type & RPT_INFO_ALL) {
+  if (type & RPT_INFO_ALL) {
     return TH_INFO_INFO;
   }
-  else if (type & RPT_DEBUG_ALL) {
+  if (type & RPT_DEBUG_ALL) {
     return TH_INFO_DEBUG;
   }
-  else if (type & RPT_PROPERTY) {
+  if (type & RPT_PROPERTY) {
     return TH_INFO_PROPERTY;
   }
-  else if (type & RPT_OPERATOR) {
+  if (type & RPT_OPERATOR) {
     return TH_INFO_OPERATOR;
   }
-  else {
-    return TH_INFO_WARNING;
-  }
+  return TH_INFO_WARNING;
 }
 
 int UI_text_colorid_from_report_type(int type)
@@ -594,24 +592,22 @@ int UI_text_colorid_from_report_type(int type)
   if (type & RPT_ERROR_ALL) {
     return TH_INFO_ERROR_TEXT;
   }
-  else if (type & RPT_WARNING_ALL) {
+  if (type & RPT_WARNING_ALL) {
     return TH_INFO_WARNING_TEXT;
   }
-  else if (type & RPT_INFO_ALL) {
+  if (type & RPT_INFO_ALL) {
     return TH_INFO_INFO_TEXT;
   }
-  else if (type & RPT_DEBUG_ALL) {
+  if (type & RPT_DEBUG_ALL) {
     return TH_INFO_DEBUG_TEXT;
   }
-  else if (type & RPT_PROPERTY) {
+  if (type & RPT_PROPERTY) {
     return TH_INFO_PROPERTY_TEXT;
   }
-  else if (type & RPT_OPERATOR) {
+  if (type & RPT_OPERATOR) {
     return TH_INFO_OPERATOR_TEXT;
   }
-  else {
-    return TH_INFO_WARNING_TEXT;
-  }
+  return TH_INFO_WARNING_TEXT;
 }
 
 /********************************** Misc **************************************/
diff --git a/source/blender/editors/space_clip/clip_utils.c b/source/blender/editors/space_clip/clip_utils.c
index bb79eb34129..dbf733413e5 100644
--- a/source/blender/editors/space_clip/clip_utils.c
+++ b/source/blender/editors/space_clip/clip_utils.c
@@ -509,13 +509,12 @@ static bool mask_has_selection(const bContext *C)
         if (BKE_mask_point_handles_mode_get(point) == MASK_HANDLE_MODE_STICK) {
           return true;
         }
-        else {
-          if ((bezt->f1 & SELECT) && (bezt->h1 != HD_VECT)) {
-            return true;
-          }
-          if ((bezt->f3 & SELECT) && (bezt->h2 != HD_VECT)) {
-            return true;
-          }
+
+        if ((bezt->f1 & SELECT) && (bezt->h1 != HD_VECT)) {
+          return true;
+        }
+        if ((bezt->f3 & SELECT) && (bezt->h2 != HD_VECT)) {
+          return true;
         }
       }
     }
diff --git a/source/blender/editors/util/ed_util_ops.cc b/source/blender/editors/util/ed_util_ops.cc
index cb7ff9f3a63..5b2e1a16bc2 100644
--- a/source/blender/editors/util/ed_util_ops.cc
+++ b/source/blender/editors/util/ed_util_ops.cc
@@ -20,7 +20,7 @@
  * Utility operators for UI data or for the UI to use.
  */
 
-#include <string.h>
+#include <cstring>
 
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
-- 
cgit v1.2.3