zoriya/ComSquare
1
0
Fork 0
mirror of https://github.com/zoriya/ComSquare.git synced 2026-06-01 09:45:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

compil issues recursive include + weird error (orcerride doesn't override)

Browse Source
This commit is contained in:
Clément Le Bihan
2021-05-19 00:56:43 +02:00
parent e5ce5efb25
commit dbf3f6aaa4
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Debugger/CPU/CPUDebug.hpp
-1
View File
@@ -7,7 +7,6 @@
#include <QtWidgets/QStyledItemDelegate> #include <QtWidgets/QStyledItemDelegate>
#include "../../CPU/CPU.hpp" #include "../../CPU/CPU.hpp"
#include "../../Renderer/SFRenderer.hpp"
#include "../../SNES.hpp" #include "../../SNES.hpp"
#include "../../../ui/ui_cpuView.h" #include "../../../ui/ui_cpuView.h"
#include "../ClosableWindow.hpp" #include "../ClosableWindow.hpp"
sources/Debugger/TileViewer.cpp
+1 -1
View File
@@ -27,9 +27,9 @@ namespace ComSquare::Debugger
this->_window->setContextMenuPolicy(Qt::NoContextMenu); this->_window->setContextMenuPolicy(Qt::NoContextMenu);
this->_window->setAttribute(Qt::WA_QuitOnClose, false); this->_window->setAttribute(Qt::WA_QuitOnClose, false);
this->_window->setAttribute(Qt::WA_DeleteOnClose); 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->_ui.setupUi(this->_window);
this->_sfWidget(this->_ui.tab);
this->_window->show(); this->_window->show();
QEvent::registerEventType(); QEvent::registerEventType();
} }
sources/Debugger/TileViewer.hpp
+2 -5
View File
@@ -9,14 +9,11 @@ namespace ComSquare::Renderer
class QtSFML; class QtSFML;
} }
#include <QtWidgets/QMainWindow>
#include <QtCore/QSortFilterProxyModel> #include <QtCore/QSortFilterProxyModel>
#include <QEvent> #include <QEvent>
#include <QMouseEvent> #include <QMouseEvent>
#include <QTableView>
#include "ClosableWindow.hpp" #include "ClosableWindow.hpp"
//#include "../Renderer/QtRenderer/QtSFML.hpp" #include "../Renderer/QtRenderer/QtSFML.hpp"
#include "../PPU/PPU.hpp"
#include "../../ui/ui_tileView.h" #include "../../ui/ui_tileView.h"
namespace ComSquare::Debugger namespace ComSquare::Debugger
@@ -33,7 +30,7 @@ namespace ComSquare::Debugger
//! @brief A reference to the ppu //! @brief A reference to the ppu
ComSquare::PPU::PPU &_ppu; ComSquare::PPU::PPU &_ppu;
//! @brief the window //! @brief the window
//Renderer::QtSFML _sfWidget; Renderer::QtSFML _sfWidget;
public: public:
//! @brief Called when the window is closed. Turn off the debugger. //! @brief Called when the window is closed. Turn off the debugger.
void disableViewer(); void disableViewer();
sources/Renderer/QtRenderer/QtSFML.hpp
+1 -1
View File
@@ -46,7 +46,7 @@ namespace ComSquare::Renderer
QtFullSFML(SNES &snes, QWidget* parent, const QPoint& position, const QSize& size, int frameRate = 0); QtFullSFML(SNES &snes, QWidget* parent, const QPoint& position, const QSize& size, int frameRate = 0);
QtFullSFML(const QtFullSFML &) = delete; QtFullSFML(const QtFullSFML &) = delete;
QtFullSFML &operator=(const QtFullSFML &) = delete; QtFullSFML &operator=(const QtFullSFML &) = delete;
~QtFullSFML() override = default; ~QtFullSFML() = default;
}; };
//! @brief A SFML renderer inside a QT widget. //! @brief A SFML renderer inside a QT widget.