From 362125e933eb5203af0e88fcd5c0fb9a86822338 Mon Sep 17 00:00:00 2001
From: WerWolv <werwolv98@gmail.com>
Date: Wed, 11 Nov 2020 09:28:44 +0100
Subject: [PATCH] Cleanup view classes

---
 include/providers/provider.hpp      |  4 ++--
 include/views/view_hashes.hpp       | 12 ++++++------
 include/views/view_hexeditor.hpp    | 10 +++++-----
 include/views/view_pattern.hpp      |  8 ++++----
 include/views/view_pattern_data.hpp | 10 +++++-----
 source/main.cpp                     |  4 +++-
 6 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/include/providers/provider.hpp b/include/providers/provider.hpp
index 572282bda..a52a3a712 100644
--- a/include/providers/provider.hpp
+++ b/include/providers/provider.hpp
@@ -6,8 +6,8 @@ namespace hex::prv {
 
     class Provider {
     public:
-        Provider() { }
-        virtual ~Provider() { }
+        Provider() = default;
+        virtual ~Provider() = default;
 
         virtual bool isAvailable() = 0;
         virtual bool isReadable() = 0;
diff --git a/include/views/view_hashes.hpp b/include/views/view_hashes.hpp
index c6a1abe75..d692e45a7 100644
--- a/include/views/view_hashes.hpp
+++ b/include/views/view_hashes.hpp
@@ -4,17 +4,17 @@
 
 #include <cstdio>
 
-#include "providers/provider.hpp"
-
 namespace hex {
 
+    namespace prv { class Provider; }
+
     class ViewHashes : public View {
     public:
-        ViewHashes(prv::Provider* &dataProvider);
-        virtual ~ViewHashes();
+        explicit ViewHashes(prv::Provider* &dataProvider);
+        ~ViewHashes() override;
 
-        virtual void createView() override;
-        virtual void createMenu() override;
+        void createView() override;
+        void createMenu() override;
 
     private:
         prv::Provider* &m_dataProvider;
diff --git a/include/views/view_hexeditor.hpp b/include/views/view_hexeditor.hpp
index 7cc48cd8b..6c883d67c 100644
--- a/include/views/view_hexeditor.hpp
+++ b/include/views/view_hexeditor.hpp
@@ -14,17 +14,17 @@
 
 #include "views/highlight.hpp"
 
-#include "providers/provider.hpp"
-
 namespace hex {
 
+    namespace prv { class Provider; }
+
     class ViewHexEditor : public View {
     public:
         ViewHexEditor(prv::Provider* &dataProvider, std::vector<Highlight> &highlights);
-        virtual ~ViewHexEditor();
+        ~ViewHexEditor() override;
 
-        virtual void createView() override;
-        virtual void createMenu() override;
+        void createView() override;
+        void createMenu() override;
 
     private:
         MemoryEditor m_memoryEditor;
diff --git a/include/views/view_pattern.hpp b/include/views/view_pattern.hpp
index 2c013b872..42041a97c 100644
--- a/include/views/view_pattern.hpp
+++ b/include/views/view_pattern.hpp
@@ -14,11 +14,11 @@ namespace hex {
 
     class ViewPattern : public View {
     public:
-        ViewPattern(std::vector<Highlight> &highlights);
-        virtual ~ViewPattern();
+        explicit ViewPattern(std::vector<Highlight> &highlights);
+        ~ViewPattern() override;
 
-        virtual void createMenu() override;
-        virtual void createView() override;
+        void createMenu() override;
+        void createView() override;
 
     private:
         char *m_buffer;
diff --git a/include/views/view_pattern_data.hpp b/include/views/view_pattern_data.hpp
index 8fd6064e1..07cb456fb 100644
--- a/include/views/view_pattern_data.hpp
+++ b/include/views/view_pattern_data.hpp
@@ -10,17 +10,17 @@
 #include <tuple>
 #include <cstdio>
 
-#include "providers/provider.hpp"
-
 namespace hex {
 
+    namespace prv { class Provider; }
+
     class ViewPatternData : public View {
     public:
         ViewPatternData(prv::Provider* &dataProvider, std::vector<Highlight> &highlights);
-        virtual ~ViewPatternData();
+        ~ViewPatternData() override;
 
-        virtual void createView() override;
-        virtual void createMenu() override;
+        void createView() override;
+        void createMenu() override;
 
     private:
         prv::Provider* &m_dataProvider;
diff --git a/source/main.cpp b/source/main.cpp
index 4829f2f0e..30e56e2f2 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -8,7 +8,6 @@
 
 #include "providers/provider.hpp"
 
-#include <tuple>
 #include <vector>
 
 int main() {
@@ -26,5 +25,8 @@ int main() {
 
     window.loop();
 
+    if (dataProvider != nullptr)
+        delete dataProvider;
+
     return 0;
 }