clean up (#926)

src/gui/Src/BasicView/Disassembly.cpp

@@ -1,7 +1,10 @@
 #include "Disassembly.h"
 #include "Configuration.h"
+#include "CodeFolding.h"
+#include "EncodeMap.h"
 #include "Bridge.h"
 #include "MainWindow.h"
+#include "CachedFontMetrics.h"
 #include "QBeaEngine.h"
 #include "MemoryPage.h"
 

src/gui/Src/Disassembler/QBeaEngine.cpp

@@ -1,5 +1,7 @@
 #include "QBeaEngine.h"
 #include "StringUtil.h"
+#include "EncodeMap.h"
+#include "CodeFolding.h"
 
 QBeaEngine::QBeaEngine(int maxModuleSize)
     : _tokenizer(maxModuleSize), mCodeFoldingManager(nullptr)

src/gui/Src/Disassembler/QBeaEngine.h

@@ -2,10 +2,10 @@
 #define QBEAENGINE_H
 
 #include <QString>
-#include "Imports.h"
 #include "capstone_gui.h"
-#include "EncodeMap.h"
-#include "CodeFolding.h"
+
+class EncodeMap;
+class CodeFoldingHelper;
 
 struct Instruction_t
 {
@@ -65,8 +65,6 @@ private:
     QHash<ENCODETYPE, DataInstructionInfo> dataInstMap;
     bool _bLongDataInst;
     EncodeMap* mEncodeMap;
-
-
     CodeFoldingHelper* mCodeFoldingManager;
 };
 

src/gui/Src/Gui/AssembleDialog.cpp

@@ -1,5 +1,6 @@
 #include "AssembleDialog.h"
 #include "ui_AssembleDialog.h"
+#include "ValidateExpressionThread.h"
 #include <QMessageBox>
 
 bool AssembleDialog::bWarningShowedOnce = false;

src/gui/Src/Gui/AssembleDialog.h

@@ -4,7 +4,8 @@
 #include <QDialog>
 #include <functional>
 #include "Bridge.h"
-#include "ValidateExpressionThread.h"
+
+class ValidateExpressionThread;
 
 namespace Ui
 {

src/gui/Src/Gui/CPUDisassembly.cpp

@@ -1,10 +1,11 @@
-#include "CPUDisassembly.h"
-#include "CPUSideBar.h"
-#include "CPUWidget.h"
-#include "CPUMultiDump.h"
 #include <QMessageBox>
 #include <QDesktopServices>
 #include <QClipboard>
+#include "CPUDisassembly.h"
+#include "CPUSideBar.h"
+#include "CPUWidget.h"
+#include "EncodeMap.h"
+#include "CPUMultiDump.h"
 #include "Configuration.h"
 #include "Bridge.h"
 #include "Imports.h"

src/gui/Src/Gui/CPUSideBar.cpp

@@ -1,6 +1,7 @@
 #include "CPUSideBar.h"
 #include "Configuration.h"
 #include "Breakpoints.h"
+#include "CPUDisassembly.h"
 #include <QToolTip>
 
 CPUSideBar::CPUSideBar(CPUDisassembly* Ptr, QWidget* parent) : QAbstractScrollArea(parent)

src/gui/Src/Gui/CPUSideBar.h

@@ -2,7 +2,12 @@
 #define CPUSIDEBAR_H
 
 #include <QAbstractScrollArea>
-#include "CPUDisassembly.h"
+#include <QPen>
+#include "QBeaEngine.h"
+#include "CodeFolding.h"
+#include "Imports.h"
+
+class CPUDisassembly;
 
 class CPUSideBar : public QAbstractScrollArea
 {

src/gui/Src/Gui/DisassemblerGraphView.cpp

@@ -1,4 +1,7 @@
 #include "DisassemblerGraphView.h"
+#include "MenuBuilder.h"
+#include "CachedFontMetrics.h"
+#include "QBeaEngine.h"
 #include <vector>
 #include <QPainter>
 #include <QScrollBar>
@@ -60,6 +63,11 @@ DisassemblerGraphView::DisassemblerGraphView(QWidget* parent)
     colorsUpdatedSlot();
 }
 
+DisassemblerGraphView::~DisassemblerGraphView()
+{
+    delete this->highlight_token;
+}
+
 void DisassemblerGraphView::initFont()
 {
     setFont(ConfigFont("Disassembly"));
@@ -477,6 +485,7 @@ void DisassemblerGraphView::mousePressEvent(QMouseEvent* event)
     {
         //Check for click on a token and highlight it
         Token token;
+        delete this->highlight_token;
         if(this->getTokenForMouseEvent(event, token))
             this->highlight_token = HighlightToken::fromToken(token);
         else

src/gui/Src/Gui/DisassemblerGraphView.h

@@ -15,9 +15,10 @@
 #include <algorithm>
 #include <QMutex>
 #include "Bridge.h"
-#include "QBeaEngine.h"
-#include "CachedFontMetrics.h"
-#include "MenuBuilder.h"
+#include "RichTextPainter.h"
+
+class MenuBuilder;
+class CachedFontMetrics;
 
 class DisassemblerGraphView : public QAbstractScrollArea
 {
@@ -207,6 +208,7 @@ public:
     };
 
     DisassemblerGraphView(QWidget* parent = nullptr);
+    ~DisassemblerGraphView();
     void initFont();
     void adjustSize(int width, int height);
     void resizeEvent(QResizeEvent* event);

src/gui/Src/Gui/DisassemblyPopup.cpp

@@ -1,5 +1,6 @@
 #include "DisassemblyPopup.h"
 #include "Disassembly.h"
+#include "CachedFontMetrics.h"
 #include "Configuration.h"
 #include "StringUtil.h"
 #include <QPainter>

src/gui/Src/Gui/DisassemblyPopup.h

@@ -2,11 +2,10 @@
 #define DISASSEMBLYPOPUP_H
 #include <QFrame>
 #include "Imports.h"
-#include "RichTextPainter.h"
-#include "CachedFontMetrics.h"
 #include "QBeaEngine.h"
 
 class Disassembly;
+class CachedFontMetrics;
 
 class DisassemblyPopup : public QFrame
 {

src/gui/Src/Gui/EditFloatRegister.h

@@ -3,7 +3,7 @@
 
 #include <QDialog>
 #include <QLineEdit>
-#include <HexValidator.h>
+#include "HexValidator.h"
 #include "LongLongValidator.h"
 #include <QDoubleValidator>
 

src/gui/Src/Gui/GotoDialog.cpp

@@ -1,4 +1,5 @@
 #include "GotoDialog.h"
+#include "ValidateExpressionThread.h"
 #include "ui_GotoDialog.h"
 
 GotoDialog::GotoDialog(QWidget* parent, bool allowInvalidExpression, bool allowInvalidAddress)

src/gui/Src/Gui/GotoDialog.h

@@ -2,9 +2,10 @@
 #define GOTODIALOG_H
 
 #include <QDialog>
-#include "ValidateExpressionThread.h"
 #include "Imports.h"
 
+class ValidateExpressionThread;
+
 namespace Ui
 {
     class GotoDialog;

src/gui/Src/Gui/HexEditDialog.cpp

@@ -1,5 +1,6 @@
 #include <QTextCodec>
 #include "HexEditDialog.h"
+#include "QHexEdit/QHexEdit.h"
 #include "ui_HexEditDialog.h"
 #include "Configuration.h"
 #include "Bridge.h"

src/gui/Src/Gui/SymbolView.h

@@ -2,7 +2,6 @@
 #define SYMBOLVIEW_H
 
 #include <QWidget>
-//#include <QVBoxLayout>
 #include "Bridge.h"
 
 class QMenu;

src/gui/Src/Gui/WatchView.h

@@ -1,7 +1,6 @@
 #ifndef WATCHVIEW_H
 #define WATCHVIEW_H
 #include "StdTable.h"
-#include "MenuBuilder.h"
 
 class CPUMultiDump;
 

src/gui/Src/Gui/WordEditDialog.h

@@ -3,7 +3,6 @@
 
 #include <QDialog>
 #include <QPushButton>
-//#include "ValidateExpressionThread.h"
 #include "Imports.h"
 
 class ValidateExpressionThread;

src/gui/Src/Utils/CodeFolding.h

@@ -2,8 +2,6 @@
 #define CODEFOLDING_H
 #include "Imports.h"
 #include <map>
-#include <forward_list>
-
 
 class CodeFoldingHelper
 {

src/gui/Src/Utils/MiscUtil.h

@@ -12,9 +12,5 @@ bool SimpleInputBox(QWidget* parent, const QString & title, QString defaultValue
 void SimpleErrorBox(QWidget* parent, const QString & title, const QString & text);
 void SimpleWarningBox(QWidget* parent, const QString & title, const QString & text);
 
-struct DIcon : QIcon
-{
-    inline explicit DIcon(const QString & file) : QIcon(QString(":/icons/images/%1").arg(file)) {}
-};
-
+#define DIcon(file) QIcon(QString(":/icons/images/").append(file))
 #endif // MISCUTIL_H

src/gui/Src/main.cpp

@@ -1,5 +1,7 @@
 #include "main.h"
 #include "capstone_wrapper.h"
+#include "MainWindow.h"
+#include "Configuration.h"
 #include <QTextCodec>
 #include <QFile>
 #include <QTranslator>

src/gui/Src/main.h

@@ -5,8 +5,6 @@
 #include <QAbstractEventDispatcher>
 #include <QMessageBox>
 #include "Bridge.h"
-#include "Configuration.h"
-#include "MainWindow.h"
 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
 #include <QAbstractNativeEventFilter>
 #endif