From ee981ac59c76fd9f83175efd7b149e1a44075271 Mon Sep 17 00:00:00 2001
From: Jake Turner <jake@unity3d.com>
Date: Sun, 1 Jan 2017 19:52:54 +0000
Subject: [PATCH] Fixed some clang compiler warnings

---
 qrenderdoc/Widgets/CustomPaintWidget.h | 4 ++--
 qrenderdoc/Windows/MainWindow.h        | 6 +++---
 renderdoc/api/replay/d3d12_pipestate.h | 6 +++---
 renderdoc/api/replay/vk_pipestate.h    | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/qrenderdoc/Widgets/CustomPaintWidget.h b/qrenderdoc/Widgets/CustomPaintWidget.h
index 92f97f1f4..f8d6a9a8e 100644
--- a/qrenderdoc/Widgets/CustomPaintWidget.h
+++ b/qrenderdoc/Widgets/CustomPaintWidget.h
@@ -70,8 +70,8 @@ private:
 public slots:
 
 protected:
-  void paintEvent(QPaintEvent *e);
-  QPaintEngine *paintEngine() const { return m_Ctx ? NULL : QWidget::paintEngine(); }
+  void paintEvent(QPaintEvent *e) override;
+  QPaintEngine *paintEngine() const override { return m_Ctx ? NULL : QWidget::paintEngine(); }
   CaptureContext *m_Ctx;
   IReplayOutput *m_Output;
   QColor m_Dark;
diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h
index 894152a09..55e2b58f6 100644
--- a/qrenderdoc/Windows/MainWindow.h
+++ b/qrenderdoc/Windows/MainWindow.h
@@ -50,9 +50,9 @@ public:
   explicit MainWindow(CaptureContext *ctx);
   ~MainWindow();
 
-  void OnLogfileLoaded();
-  void OnLogfileClosed();
-  void OnEventSelected(uint32_t eventID);
+  void OnLogfileLoaded() override;
+  void OnLogfileClosed() override;
+  void OnEventSelected(uint32_t eventID) override;
 
   void setProgress(float val);
   void takeLogOwnership() { m_OwnTempLog = true; }
diff --git a/renderdoc/api/replay/d3d12_pipestate.h b/renderdoc/api/replay/d3d12_pipestate.h
index 041b2f049..4ca014d77 100644
--- a/renderdoc/api/replay/d3d12_pipestate.h
+++ b/renderdoc/api/replay/d3d12_pipestate.h
@@ -56,7 +56,7 @@ struct D3D12PipelineState
 
     struct VertexBuffer
     {
-      VertexBuffer() : Buffer(), Stride(0), Offset(0) {}
+      VertexBuffer() : Buffer(), Offset(0), Stride(0) {}
       ResourceId Buffer;
       uint64_t Offset;
       uint32_t Size;
@@ -290,8 +290,8 @@ struct D3D12PipelineState
     struct DepthStencilState
     {
       DepthStencilState()
-          : DepthWrites(false),
-            DepthEnable(false),
+          : DepthEnable(false),
+            DepthWrites(false),
             StencilEnable(false),
             StencilReadMask(0),
             StencilWriteMask(0),
diff --git a/renderdoc/api/replay/vk_pipestate.h b/renderdoc/api/replay/vk_pipestate.h
index 1e75e7c74..b756df729 100644
--- a/renderdoc/api/replay/vk_pipestate.h
+++ b/renderdoc/api/replay/vk_pipestate.h
@@ -153,7 +153,7 @@ struct VulkanPipelineState
 
   struct ShaderStage
   {
-    ShaderStage() : Shader(), ShaderDetails(NULL), customName(false), stage(eShaderStage_Vertex) {}
+    ShaderStage() : Shader(), customName(false), ShaderDetails(NULL), stage(eShaderStage_Vertex) {}
     ResourceId Shader;
     rdctype::str entryPoint;