From 039b6e6d3055e77c8592296b30913d0e02f2f3da Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Sun, 10 Dec 2023 08:39:45 -0500 Subject: [PATCH] More small code improvements/cleanup --- argcracker/src/main.cpp | 2 +- armoury/src/gearview.cpp | 2 +- common/src/vec3edit.cpp | 2 +- karuku/src/mainwindow.cpp | 4 ---- mdlviewer/src/mainwindow.cpp | 4 ---- parts/exd/exdpart.cpp | 1 - parts/exl/exlpart.cpp | 1 - parts/mdl/vulkanwindow.cpp | 4 ++-- renderer/include/renderer.hpp | 6 +++--- renderer/src/renderer.cpp | 2 +- sagasu/src/filepropertieswindow.cpp | 2 -- 11 files changed, 9 insertions(+), 21 deletions(-) diff --git a/argcracker/src/main.cpp b/argcracker/src/main.cpp index 86c27f3..b9f5bc9 100644 --- a/argcracker/src/main.cpp +++ b/argcracker/src/main.cpp @@ -44,7 +44,7 @@ inline QString encryptGameArg(const QString &arg) return QStringLiteral("//**sqex0003%1%2**//").arg(base64, QLatin1String(&checksum, 1)); } -inline QString decryptGameArg(uint32_t tickCount, QString sqexString) +inline QString decryptGameArg(uint32_t tickCount, const QString &sqexString) { unsigned int ticks = tickCount & 0xFFFFFFFFu; unsigned int key = ticks & 0xFFFF0000u; diff --git a/armoury/src/gearview.cpp b/armoury/src/gearview.cpp index 7c098bf..78103b7 100644 --- a/armoury/src/gearview.cpp +++ b/armoury/src/gearview.cpp @@ -52,7 +52,7 @@ GearView::GearView(GameData *data, FileCache &cache, QWidget *parent) Q_UNUSED(QtConcurrent::run(QThreadPool::globalInstance(), [this] { updatePart(); Q_EMIT loadingChanged(false); - })); + })) } }; } diff --git a/common/src/vec3edit.cpp b/common/src/vec3edit.cpp index 5faeb4b..fe2788c 100644 --- a/common/src/vec3edit.cpp +++ b/common/src/vec3edit.cpp @@ -10,7 +10,7 @@ Vector3Edit::Vector3Edit(glm::vec3 &vec, QWidget *parent) : QWidget(parent) , vec(vec) { - QHBoxLayout *itemsLayout = new QHBoxLayout(this); + auto itemsLayout = new QHBoxLayout(this); spinBoxes.x = new QDoubleSpinBox(); spinBoxes.y = new QDoubleSpinBox(); diff --git a/karuku/src/mainwindow.cpp b/karuku/src/mainwindow.cpp index d2eeae0..b474b0b 100644 --- a/karuku/src/mainwindow.cpp +++ b/karuku/src/mainwindow.cpp @@ -3,15 +3,11 @@ #include "mainwindow.h" -#include -#include -#include #include #include #include #include #include -#include #include #include diff --git a/mdlviewer/src/mainwindow.cpp b/mdlviewer/src/mainwindow.cpp index 03f7fa3..72838dc 100644 --- a/mdlviewer/src/mainwindow.cpp +++ b/mdlviewer/src/mainwindow.cpp @@ -3,8 +3,6 @@ #include "mainwindow.h" -#include -#include #include #include #include @@ -12,8 +10,6 @@ #include #include #include -#include -#include #include #include "mdlpart.h" diff --git a/parts/exd/exdpart.cpp b/parts/exd/exdpart.cpp index e7d61cf..162f7ca 100644 --- a/parts/exd/exdpart.cpp +++ b/parts/exd/exdpart.cpp @@ -3,7 +3,6 @@ #include "exdpart.h" -#include #include #include #include diff --git a/parts/exl/exlpart.cpp b/parts/exl/exlpart.cpp index 155a5f5..4412832 100644 --- a/parts/exl/exlpart.cpp +++ b/parts/exl/exlpart.cpp @@ -3,7 +3,6 @@ #include "exlpart.h" -#include #include #include #include diff --git a/parts/mdl/vulkanwindow.cpp b/parts/mdl/vulkanwindow.cpp index 790b62c..e9daa84 100644 --- a/parts/mdl/vulkanwindow.cpp +++ b/parts/mdl/vulkanwindow.cpp @@ -44,7 +44,7 @@ bool VulkanWindow::event(QEvent *e) render(); break; case QEvent::Resize: { - QResizeEvent *resizeEvent = (QResizeEvent *)e; + auto resizeEvent = (QResizeEvent *)e; auto surface = m_instance->surfaceForWindow(this); if (surface != nullptr) { m_renderer->resize(surface, @@ -53,7 +53,7 @@ bool VulkanWindow::event(QEvent *e) } } break; case QEvent::PlatformSurface: - if (static_cast(e)->surfaceEventType() == QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed && m_initialized) { + if (dynamic_cast(e)->surfaceEventType() == QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed && m_initialized) { m_renderer->destroySwapchain(); } break; diff --git a/renderer/include/renderer.hpp b/renderer/include/renderer.hpp index 1a7f0d2..92b997d 100644 --- a/renderer/include/renderer.hpp +++ b/renderer/include/renderer.hpp @@ -74,7 +74,7 @@ public: void reloadModel(RenderModel &model, uint32_t lod); RenderTexture addTexture(uint32_t width, uint32_t height, const uint8_t *data, uint32_t data_size); - void render(std::vector models); + void render(const std::vector &models); VkInstance instance = VK_NULL_HANDLE; VkPhysicalDevice physicalDevice = VK_NULL_HANDLE; @@ -114,9 +114,9 @@ public: uint32_t findMemoryType(uint32_t typeFilter, VkMemoryPropertyFlags properties); - VkShaderModule createShaderModule(const uint32_t *code, const int length); + VkShaderModule createShaderModule(const uint32_t *code, int length); - VkShaderModule loadShaderFromDisk(const std::string_view path); + VkShaderModule loadShaderFromDisk(std::string_view path); VkCommandBuffer beginSingleTimeCommands(); diff --git a/renderer/src/renderer.cpp b/renderer/src/renderer.cpp index 83f73ba..5646b89 100644 --- a/renderer/src/renderer.cpp +++ b/renderer/src/renderer.cpp @@ -434,7 +434,7 @@ void Renderer::destroySwapchain() } } -void Renderer::render(std::vector models) +void Renderer::render(const std::vector &models) { vkWaitForFences(device, 1, &inFlightFences[currentFrame], VK_TRUE, std::numeric_limits::max()); diff --git a/sagasu/src/filepropertieswindow.cpp b/sagasu/src/filepropertieswindow.cpp index 501db69..7783263 100644 --- a/sagasu/src/filepropertieswindow.cpp +++ b/sagasu/src/filepropertieswindow.cpp @@ -1,9 +1,7 @@ // SPDX-FileCopyrightText: 2023 Joshua Goins // SPDX-License-Identifier: GPL-3.0-or-later -#include #include -#include #include #include