Revert "Cleanup: Cleanup: style, use braces for GHOST (X11/SDL)"

This reverts commit 935c9ab0de1ce3d36f93ce5aeee5d0f82d6f2591.

Clang-tidy was making unrelated *fixes*.

4 files changed, 24 insertions, 48 deletions

diff --git a/intern/ghost/test/gears/GHOST_C-Test.c b/intern/ghost/test/gears/GHOST_C-Test.c
index f5218923f9a..80675ac5e3d 100644
--- a/intern/ghost/test/gears/GHOST_C-Test.c
+++ b/intern/ghost/test/gears/GHOST_C-Test.c
@@ -412,9 +412,8 @@ int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData)
       break;
     case GHOST_kEventWindowUpdate: {
       GHOST_WindowHandle window2 = GHOST_GetEventWindow(hEvent);
-      if (!GHOST_ValidWindow(shSystem, window2)) {
+      if (!GHOST_ValidWindow(shSystem, window2))
         break;
-      }
       setViewPortGL(window2);
       drawGL();
       GHOST_SwapWindowBuffers(window2);
diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp
index af82c21eeb9..47eddbcfb83 100644
--- a/intern/ghost/test/gears/GHOST_Test.cpp
+++ b/intern/ghost/test/gears/GHOST_Test.cpp
@@ -578,12 +578,10 @@ bool Application::processEvent(GHOST_IEvent *event)
           break;
 
         case GHOST_kKeyS:  // toggle mono and stereo
-          if (stereo) {
+          if (stereo)
             stereo = false;
-          }
-          else {
+          else
             stereo = true;
-          }
           break;
 
         case GHOST_kKeyT:
@@ -632,9 +630,8 @@ bool Application::processEvent(GHOST_IEvent *event)
 
     case GHOST_kEventWindowUpdate: {
       GHOST_IWindow *window2 = event->getWindow();
-      if (!m_system->validWindow(window2)) {
+      if (!m_system->validWindow(window2))
         break;
-      }
 
       glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
@@ -691,24 +688,20 @@ int main(int /*argc*/, char ** /*argv*/)
                           "SOFTWARE\\NVIDIA Corporation\\Global\\Stereo3D\\StereoEnable",
                           KEY_ALL_ACCESS);
 
-    if (lresult == ERROR_SUCCESS) {
+    if (lresult == ERROR_SUCCESS)
       printf("Successfully opened key\n");
-    }
 #  if 0
     lresult = regkey.QueryValue(&keyValue, "StereoEnable");
-    if (lresult == ERROR_SUCCESS) {
+    if (lresult == ERROR_SUCCESS)
       printf("Successfully queried key\n");
-    }
 #  endif
     lresult = regkey.SetValue(
         HKEY_LOCAL_MACHINE, "SOFTWARE\\NVIDIA Corporation\\Global\\Stereo3D\\StereoEnable", "1");
-    if (lresult == ERROR_SUCCESS) {
+    if (lresult == ERROR_SUCCESS)
       printf("Successfully set value for key\n");
-    }
     regkey.Close();
-    if (lresult == ERROR_SUCCESS) {
+    if (lresult == ERROR_SUCCESS)
       printf("Successfully closed key\n");
-    }
     //      regkey.Write("2");
   }
 #endif  // WIN32
diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c
index 0829169260d..5aee8a50a8d 100644
--- a/intern/ghost/test/multitest/EventToBuf.c
+++ b/intern/ghost/test/multitest/EventToBuf.c
@@ -234,9 +234,8 @@ void event_to_buf(GHOST_EventHandle evt, char buf[128])
     case GHOST_kEventKeyUp: {
       GHOST_TEventKeyData *kd = data;
       pos += sprintf(pos, " - key: %s (%d)", keytype_to_string(kd->key), kd->key);
-      if (kd->ascii) {
+      if (kd->ascii)
         pos += sprintf(pos, " ascii: '%c' (%d)", kd->ascii, kd->ascii);
-      }
       break;
     }
   }
diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c
index 504a11b5aa3..25e9f6b2bf1 100644
--- a/intern/ghost/test/multitest/MultiTest.c
+++ b/intern/ghost/test/multitest/MultiTest.c
@@ -84,12 +84,10 @@ void rect_bevel_side(int rect[2][2], int side, float *lt, float *dk, const float
       int x = (corner == 0 || corner == 1) ? (rect[0][0] + i) : (rect[1][0] - i - 1);
       int y = (corner == 0 || corner == 3) ? (rect[0][1] + i) : (rect[1][1] - i - 1);
 
-      if (ltidx == corner) {
+      if (ltidx == corner)
         glColor3f(col[0] * ltf, col[1] * ltf, col[2] * ltf);
-      }
-      if (dkidx == corner) {
+      if (dkidx == corner)
         glColor3f(col[0] * dkf, col[1] * dkf, col[2] * dkf);
-      }
 
       glVertex2i(lx, ly);
       glVertex2i(lx = x, ly = y);
@@ -185,44 +183,37 @@ static void mainwindow_do_key(MainWindow *mw, GHOST_TKey key, int press)
 {
   switch (key) {
     case GHOST_kKeyC:
-      if (press) {
+      if (press)
         GHOST_SetCursorShape(mw->win,
                              (GHOST_TStandardCursor)(rand() % (GHOST_kStandardCursorNumCursors)));
-      }
       break;
     case GHOST_kKeyLeftBracket:
-      if (press) {
+      if (press)
         GHOST_SetCursorVisibility(mw->win, 0);
-      }
       break;
     case GHOST_kKeyRightBracket:
-      if (press) {
+      if (press)
         GHOST_SetCursorVisibility(mw->win, 1);
-      }
       break;
     case GHOST_kKeyE:
-      if (press) {
+      if (press)
         multitestapp_toggle_extra_window(mw->app);
-      }
       break;
     case GHOST_kKeyQ:
-      if (press) {
+      if (press)
         multitestapp_exit(mw->app);
-      }
       break;
     case GHOST_kKeyT:
-      if (press) {
+      if (press)
         mainwindow_log(mw, "TextTest~|`hello`\"world\",<>/");
-      }
       break;
     case GHOST_kKeyR:
       if (press) {
         int i;
 
         mainwindow_log(mw, "Invalidating window 10 times");
-        for (i = 0; i < 10; i++) {
+        for (i = 0; i < 10; i++)
           GHOST_InvalidateWindow(mw->win);
-        }
       }
       break;
     case GHOST_kKeyF11:
@@ -538,9 +529,8 @@ static void loggerwindow_do_key(LoggerWindow *lw, GHOST_TKey key, int press)
 {
   switch (key) {
     case GHOST_kKeyQ:
-      if (press) {
+      if (press)
         multitestapp_exit(lw->app);
-      }
       break;
   }
 }
@@ -710,9 +700,8 @@ static void extrawindow_do_key(ExtraWindow *ew, GHOST_TKey key, int press)
 {
   switch (key) {
     case GHOST_kKeyE:
-      if (press) {
+      if (press)
         multitestapp_toggle_extra_window(ew->app);
-      }
       break;
   }
 }
@@ -882,23 +871,19 @@ MultiTestApp *multitestapp_new(void)
   GHOST_EventConsumerHandle consumer = GHOST_CreateEventConsumer(multitest_event_handler, app);
 
   app->sys = GHOST_CreateSystem();
-  if (!app->sys) {
+  if (!app->sys)
     fatal("Unable to create ghost system");
-  }
 
-  if (!GHOST_AddEventConsumer(app->sys, consumer)) {
+  if (!GHOST_AddEventConsumer(app->sys, consumer))
     fatal("Unable to add multitest event consumer ");
-  }
 
   app->main = mainwindow_new(app);
-  if (!app->main) {
+  if (!app->main)
     fatal("Unable to create main window");
-  }
 
   app->logger = loggerwindow_new(app);
-  if (!app->logger) {
+  if (!app->logger)
     fatal("Unable to create logger window");
-  }
 
   app->extra = NULL;
   app->exit = 0;