diff --git a/argcracker/src/main.cpp b/argcracker/src/main.cpp index d334ed6..86c27f3 100644 --- a/argcracker/src/main.cpp +++ b/argcracker/src/main.cpp @@ -18,7 +18,7 @@ inline char GetChecksum(unsigned int key) uint32_t TickCount(); -inline QString encryptGameArg(QString arg) +inline QString encryptGameArg(const QString &arg) { unsigned int rawTicks = TickCount(); unsigned int ticks = rawTicks & 0xFFFFFFFFu; diff --git a/armoury/include/boneeditor.h b/armoury/include/boneeditor.h index fec1e5e..dacab26 100644 --- a/armoury/include/boneeditor.h +++ b/armoury/include/boneeditor.h @@ -15,5 +15,5 @@ public: explicit BoneEditor(GearView *gearView, QWidget *parent = nullptr); private: - GearView *gearView; + GearView *gearView = nullptr; }; diff --git a/armoury/include/gearview.h b/armoury/include/gearview.h index 89944f0..d170df8 100644 --- a/armoury/include/gearview.h +++ b/armoury/include/gearview.h @@ -96,9 +96,9 @@ private: struct LoadedGear { GearInfo info; - physis_MDL mdl; + physis_MDL mdl{}; QLatin1String path; - int bodyId; + int bodyId = 0; }; std::vector loadedGears; diff --git a/armoury/src/mainwindow.cpp b/armoury/src/mainwindow.cpp index 7030836..1166d6e 100644 --- a/armoury/src/mainwindow.cpp +++ b/armoury/src/mainwindow.cpp @@ -4,12 +4,10 @@ #include "mainwindow.h" #include -#include #include #include #include -#include #include #include #include diff --git a/common/include/vec3edit.h b/common/include/vec3edit.h index ffbe18a..38ee7d5 100644 --- a/common/include/vec3edit.h +++ b/common/include/vec3edit.h @@ -13,7 +13,7 @@ class Vector3Edit : public QWidget public: explicit Vector3Edit(glm::vec3 &vec, QWidget *parent = nullptr); - ~Vector3Edit(); + ~Vector3Edit() override; void setVector(glm::vec3 &vec); @@ -22,9 +22,9 @@ Q_SIGNALS: private: struct { - QDoubleSpinBox *x, *y, *z; + QDoubleSpinBox *x = nullptr, *y = nullptr, *z = nullptr; } spinBoxes; glm::vec3 &vec; - QTimer *updateTimer; + QTimer *updateTimer = nullptr; }; diff --git a/extern/dxbc b/extern/dxbc index 190c185..9db1273 160000 --- a/extern/dxbc +++ b/extern/dxbc @@ -1 +1 @@ -Subproject commit 190c185d983609b0887c5d2d8f0e8af84d507ee7 +Subproject commit 9db12735951da73adb2818c492ce70c80b663f75 diff --git a/parts/mdl/mdlimport.cpp b/parts/mdl/mdlimport.cpp index 1409c83..ed64c0c 100644 --- a/parts/mdl/mdlimport.cpp +++ b/parts/mdl/mdlimport.cpp @@ -74,7 +74,7 @@ void importModel(physis_MDL &existingModel, const QString &filename) + vertexAccessor.byteOffset); // Replace position data - Vertex vertex; + Vertex vertex{}; if (i < existingModel.lods[lodNumber].parts[partNumber].num_vertices) { vertex = existingModel.lods[lodNumber].parts[partNumber].vertices[i]; } diff --git a/parts/mdl/vulkanwindow.h b/parts/mdl/vulkanwindow.h index ef4109e..d9b8ceb 100644 --- a/parts/mdl/vulkanwindow.h +++ b/parts/mdl/vulkanwindow.h @@ -13,9 +13,9 @@ class VulkanWindow : public QWindow public: VulkanWindow(MDLPart *part, Renderer *renderer, QVulkanInstance *instance); - void exposeEvent(QExposeEvent *); + void exposeEvent(QExposeEvent *) override; - bool event(QEvent *e); + bool event(QEvent *e) override; void render(); diff --git a/renderer/src/imguipass.h b/renderer/src/imguipass.h index 7ad3c97..8f942c7 100644 --- a/renderer/src/imguipass.h +++ b/renderer/src/imguipass.h @@ -7,7 +7,6 @@ #include class Renderer; -struct RenderTarget; class ImGuiPass { diff --git a/sagasu/include/mainwindow.h b/sagasu/include/mainwindow.h index 968520d..19b207a 100644 --- a/sagasu/include/mainwindow.h +++ b/sagasu/include/mainwindow.h @@ -18,8 +18,6 @@ public: MainWindow(const QString &gamePath, GameData *data); private: - QMdiArea *mdiArea = nullptr; - GameData *data = nullptr; QTabWidget *partHolder = nullptr; FileCache fileCache;