From dbf3f6aaa4861aff6246fb7f830653d67f4d8db2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= <clement.lebihan773@gmail.com>
Date: Wed, 19 May 2021 00:56:43 +0200
Subject: [PATCH] compil issues recursive include + weird error (orcerride
 doesn't override)

---
 sources/Debugger/CPU/CPUDebug.hpp      | 1 -
 sources/Debugger/TileViewer.cpp        | 2 +-
 sources/Debugger/TileViewer.hpp        | 7 ++-----
 sources/Renderer/QtRenderer/QtSFML.hpp | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sources/Debugger/CPU/CPUDebug.hpp b/sources/Debugger/CPU/CPUDebug.hpp
index 9120cec..bcc6cab 100644
--- a/sources/Debugger/CPU/CPUDebug.hpp
+++ b/sources/Debugger/CPU/CPUDebug.hpp
@@ -7,7 +7,6 @@
 
 #include <QtWidgets/QStyledItemDelegate>
 #include "../../CPU/CPU.hpp"
-#include "../../Renderer/SFRenderer.hpp"
 #include "../../SNES.hpp"
 #include "../../../ui/ui_cpuView.h"
 #include "../ClosableWindow.hpp"
diff --git a/sources/Debugger/TileViewer.cpp b/sources/Debugger/TileViewer.cpp
index 7dad780..072254d 100644
--- a/sources/Debugger/TileViewer.cpp
+++ b/sources/Debugger/TileViewer.cpp
@@ -27,9 +27,9 @@ namespace ComSquare::Debugger
 		this->_window->setContextMenuPolicy(Qt::NoContextMenu);
 		this->_window->setAttribute(Qt::WA_QuitOnClose, false);
 		this->_window->setAttribute(Qt::WA_DeleteOnClose);
-		//this->_sfWidget = std::make_unique<Renderer::QtFullSFML>(snes, this->_ui.tab, QPoint(0, 0), QSize(this->_ui.tab->width(), this->_ui.tab->height()), 30);
 
 		this->_ui.setupUi(this->_window);
+		this->_sfWidget(this->_ui.tab);
 		this->_window->show();
 		QEvent::registerEventType();
 	}
diff --git a/sources/Debugger/TileViewer.hpp b/sources/Debugger/TileViewer.hpp
index 2295dea..5a6de45 100644
--- a/sources/Debugger/TileViewer.hpp
+++ b/sources/Debugger/TileViewer.hpp
@@ -9,14 +9,11 @@ namespace ComSquare::Renderer
 	class QtSFML;
 }
 
-#include <QtWidgets/QMainWindow>
 #include <QtCore/QSortFilterProxyModel>
 #include <QEvent>
 #include <QMouseEvent>
-#include <QTableView>
 #include "ClosableWindow.hpp"
-//#include "../Renderer/QtRenderer/QtSFML.hpp"
-#include "../PPU/PPU.hpp"
+#include "../Renderer/QtRenderer/QtSFML.hpp"
 #include "../../ui/ui_tileView.h"
 
 namespace ComSquare::Debugger
@@ -33,7 +30,7 @@ namespace ComSquare::Debugger
 		//! @brief A reference to the ppu
 		ComSquare::PPU::PPU &_ppu;
 		//! @brief the window
-		//Renderer::QtSFML _sfWidget;
+		Renderer::QtSFML _sfWidget;
 	public:
 		//! @brief Called when the window is closed. Turn off the debugger.
 		void disableViewer();
diff --git a/sources/Renderer/QtRenderer/QtSFML.hpp b/sources/Renderer/QtRenderer/QtSFML.hpp
index e68464f..565885c 100644
--- a/sources/Renderer/QtRenderer/QtSFML.hpp
+++ b/sources/Renderer/QtRenderer/QtSFML.hpp
@@ -46,7 +46,7 @@ namespace ComSquare::Renderer
 		QtFullSFML(SNES &snes, QWidget* parent, const QPoint& position, const QSize& size, int frameRate = 0);
 		QtFullSFML(const QtFullSFML &) = delete;
 		QtFullSFML &operator=(const QtFullSFML &) = delete;
-		~QtFullSFML() override = default;
+		~QtFullSFML() = default;
 	};
 
 	//! @brief A SFML renderer inside a QT widget.