Various improvements & Cleanups

Some ported from ANightly's work

src/qt/qt_harddiskdialog.cpp

@@ -230,7 +230,11 @@ static HarddiskDialog *callbackPtr = nullptr;
 static MVHDGeom
 create_drive_vhd_fixed(const QString &fileName, HarddiskDialog *p, uint16_t cyl, uint8_t heads, uint8_t spt)
 {
-    MVHDGeom _86box_geometry = { .cyl = cyl, .heads = heads, .spt = spt };
+    MVHDGeom _86box_geometry = {
+        .cyl   = cyl,
+        .heads = heads,
+        .spt   = spt
+    };
     MVHDGeom vhd_geometry;
     adjust_86box_geometry_for_vhd(&_86box_geometry, &vhd_geometry);
 
@@ -256,7 +260,11 @@ create_drive_vhd_fixed(const QString &fileName, HarddiskDialog *p, uint16_t cyl,
 static MVHDGeom
 create_drive_vhd_dynamic(const QString &fileName, uint16_t cyl, uint8_t heads, uint8_t spt, int blocksize)
 {
-    MVHDGeom _86box_geometry = { .cyl = cyl, .heads = heads, .spt = spt };
+    MVHDGeom _86box_geometry = {
+        .cyl   = cyl,
+        .heads = heads,
+        .spt   = spt
+    };
     MVHDGeom vhd_geometry;
     adjust_86box_geometry_for_vhd(&_86box_geometry, &vhd_geometry);
     int                 vhd_error     = 0;

src/qt/qt_vulkanrenderer.cpp

@@ -30,10 +30,11 @@
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
 ****************************************************************************/
+#include "qt_vulkanrenderer.hpp"
 
 #include <QCoreApplication>
 #include <QFile>
-#include "qt_vulkanrenderer.hpp"
+
 #if QT_CONFIG(vulkan)
 #    include <QVulkanFunctions>
 
@@ -676,7 +677,7 @@ VulkanRenderer2::initResources()
         v_texcoord = texcoord;
         gl_Position = ubuf.mvp * position;
     }
-#endif
+#endif /* 0 */
     VkShaderModule vertShaderModule = createShader(QStringLiteral(":/texture_vert.spv"));
 #if 0
     #version 440
@@ -691,7 +692,7 @@ VulkanRenderer2::initResources()
     {
         fragColor = texture(tex, v_texcoord);
     }
-#endif
+#endif /* 0 */
     VkShaderModule fragShaderModule = createShader(QStringLiteral(":/texture_frag.spv"));
 
     // Graphics pipeline
@@ -1009,4 +1010,4 @@ VulkanRenderer2::startNextFrame()
     m_window->frameReady();
     m_window->requestUpdate(); // render continuously, throttled by the presentation rate
 }
-#endif
+#endif /* QT_CONFIG(vulkan) */

src/qt/qt_vulkanrenderer.hpp

@@ -31,6 +31,8 @@
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 **
 ****************************************************************************/
+#ifndef VULKANRENDERER_HPP
+#define VULKANRENDERER_HPP
 
 #include <QVulkanWindow>
 #include <QImage>
@@ -90,4 +92,6 @@ private:
 
     QMatrix4x4 m_proj;
 };
-#endif
+#endif // QT_CONFIG(vulkan)
+
+#endif // VULKANRENDERER_HPP

src/qt/qt_vulkanwindowrenderer.cpp

@@ -1,3 +1,35 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 Cacodemon345
+** Copyright (C) 2017 The Qt Company Ltd.
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+****************************************************************************/
 #include "qt_vulkanwindowrenderer.hpp"
 
 #include <QMessageBox>
@@ -697,7 +729,7 @@ public:
 #        if VK_HEADER_VERSION >= 135 && VK_HEADER_VERSION < 162
             case VK_ERROR_INCOMPATIBLE_VERSION_KHR:
                 return "VK_ERROR_INCOMPATIBLE_VERSION_KHR";
-#        endif
+#        endif /* VK_HEADER_VERSION >= 135 && VK_HEADER_VERSION < 162 */
             case VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT:
                 return "VK_ERROR_INVALID_DRM_FORMAT_MODIFIER_PLANE_LAYOUT_EXT";
             case VK_ERROR_NOT_PERMITTED_EXT:
@@ -788,7 +820,7 @@ public:
         m_devFuncs->vkDeviceWaitIdle(m_window->device());
     }
 };
-#    endif
+#    endif /* 0*/
 
 VulkanWindowRenderer::VulkanWindowRenderer(QWidget *parent)
     : QVulkanWindow(parent->windowHandle())
@@ -851,4 +883,4 @@ VulkanWindowRenderer::getBuffers()
 {
     return std::vector { std::make_tuple((uint8_t *) renderer->mappedPtr, &this->buf_usage[0]) };
 }
-#endif
+#endif /* QT_CONFIG(vulkan) */

src/qt/qt_vulkanwindowrenderer.hpp

@@ -35,6 +35,6 @@ private:
 
     VulkanRenderer2 *renderer;
 };
-#endif
+#endif // QT_CONFIG(vulkan)
 
 #endif // VULKANWINDOWRENDERER_HPP

src/qt/qt_winrawinputfilter.cpp

@@ -56,14 +56,18 @@ std::unique_ptr<WindowsRawInputFilter>
 WindowsRawInputFilter::Register(MainWindow *window)
 {
     RAWINPUTDEVICE rid[2] = {
-        {.usUsagePage = 0x01,
-         .usUsage     = 0x06,
-         .dwFlags     = RIDEV_NOHOTKEYS,
-         .hwndTarget  = nullptr},
-        { .usUsagePage = 0x01,
-         .usUsage     = 0x02,
-         .dwFlags     = 0,
-         .hwndTarget  = nullptr}
+        {
+            .usUsagePage = 0x01,
+            .usUsage     = 0x06,
+            .dwFlags     = RIDEV_NOHOTKEYS,
+            .hwndTarget  = nullptr
+        },
+        {
+            .usUsagePage = 0x01,
+            .usUsage     = 0x02,
+            .dwFlags     = 0,
+            .hwndTarget  = nullptr
+        }
     };
 
     if (hook_enabled && (RegisterRawInputDevices(&(rid[1]), 1, sizeof(rid[0])) == FALSE))
@@ -89,14 +93,18 @@ WindowsRawInputFilter::WindowsRawInputFilter(MainWindow *window)
 WindowsRawInputFilter::~WindowsRawInputFilter()
 {
     RAWINPUTDEVICE rid[2] = {
-        {.usUsagePage = 0x01,
-         .usUsage     = 0x06,
-         .dwFlags     = RIDEV_REMOVE,
-         .hwndTarget  = NULL},
-        { .usUsagePage = 0x01,
-         .usUsage     = 0x02,
-         .dwFlags     = RIDEV_REMOVE,
-         .hwndTarget  = NULL}
+        {
+            .usUsagePage = 0x01,
+            .usUsage     = 0x06,
+            .dwFlags     = RIDEV_REMOVE,
+            .hwndTarget  = NULL
+        },
+        {
+             .usUsagePage = 0x01,
+             .usUsage     = 0x02,
+             .dwFlags     = RIDEV_REMOVE,
+             .hwndTarget  = NULL
+        }
     };
 
     if (hook_enabled)

src/qt/win_serial_passthrough.c

@@ -88,7 +88,7 @@ plat_serpt_set_params(void *priv)
     const serial_passthrough_t *dev = (serial_passthrough_t *) priv;
 
     if (dev->mode == SERPT_MODE_HOSTSER) {
-        DCB serialattr = {};
+        DCB serialattr = { 0 };
         GetCommState((HANDLE) dev->master_fd, &serialattr);
 #define BAUDRATE_RANGE(baud_rate, min, max)    \
     if (baud_rate >= min && baud_rate < max) { \