From 5f8dfcea15ac19b88a539b3cb8faa37d64093ed0 Mon Sep 17 00:00:00 2001
From: Torusrxxx <torusrxxx@users.noreply.github.com>
Date: Sat, 13 Aug 2016 11:59:26 +0000
Subject: [PATCH] clean up (#926)

---
 src/gui/Src/BasicView/Disassembly.cpp     | 3 +++
 src/gui/Src/Disassembler/QBeaEngine.cpp   | 2 ++
 src/gui/Src/Disassembler/QBeaEngine.h     | 8 +++-----
 src/gui/Src/Gui/AssembleDialog.cpp        | 1 +
 src/gui/Src/Gui/AssembleDialog.h          | 3 ++-
 src/gui/Src/Gui/CPUDisassembly.cpp        | 9 +++++----
 src/gui/Src/Gui/CPUSideBar.cpp            | 1 +
 src/gui/Src/Gui/CPUSideBar.h              | 7 ++++++-
 src/gui/Src/Gui/DisassemblerGraphView.cpp | 9 +++++++++
 src/gui/Src/Gui/DisassemblerGraphView.h   | 8 +++++---
 src/gui/Src/Gui/DisassemblyPopup.cpp      | 1 +
 src/gui/Src/Gui/DisassemblyPopup.h        | 3 +--
 src/gui/Src/Gui/EditFloatRegister.h       | 2 +-
 src/gui/Src/Gui/GotoDialog.cpp            | 1 +
 src/gui/Src/Gui/GotoDialog.h              | 3 ++-
 src/gui/Src/Gui/HexEditDialog.cpp         | 1 +
 src/gui/Src/Gui/SymbolView.h              | 1 -
 src/gui/Src/Gui/WatchView.h               | 1 -
 src/gui/Src/Gui/WordEditDialog.h          | 1 -
 src/gui/Src/Utils/CodeFolding.h           | 2 --
 src/gui/Src/Utils/MiscUtil.h              | 6 +-----
 src/gui/Src/main.cpp                      | 2 ++
 src/gui/Src/main.h                        | 2 --
 23 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/src/gui/Src/BasicView/Disassembly.cpp b/src/gui/Src/BasicView/Disassembly.cpp
index 96f1aa0e..4c6d3036 100644
--- a/src/gui/Src/BasicView/Disassembly.cpp
+++ b/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"
 
diff --git a/src/gui/Src/Disassembler/QBeaEngine.cpp b/src/gui/Src/Disassembler/QBeaEngine.cpp
index 50a50afb..f3439db4 100644
--- a/src/gui/Src/Disassembler/QBeaEngine.cpp
+++ b/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)
diff --git a/src/gui/Src/Disassembler/QBeaEngine.h b/src/gui/Src/Disassembler/QBeaEngine.h
index 18a0a7cd..3d5b4eed 100644
--- a/src/gui/Src/Disassembler/QBeaEngine.h
+++ b/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;
 };
 
diff --git a/src/gui/Src/Gui/AssembleDialog.cpp b/src/gui/Src/Gui/AssembleDialog.cpp
index d0ab19cb..884bc118 100644
--- a/src/gui/Src/Gui/AssembleDialog.cpp
+++ b/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;
diff --git a/src/gui/Src/Gui/AssembleDialog.h b/src/gui/Src/Gui/AssembleDialog.h
index 4929613f..90ade931 100644
--- a/src/gui/Src/Gui/AssembleDialog.h
+++ b/src/gui/Src/Gui/AssembleDialog.h
@@ -4,7 +4,8 @@
 #include <QDialog>
 #include <functional>
 #include "Bridge.h"
-#include "ValidateExpressionThread.h"
+
+class ValidateExpressionThread;
 
 namespace Ui
 {
diff --git a/src/gui/Src/Gui/CPUDisassembly.cpp b/src/gui/Src/Gui/CPUDisassembly.cpp
index 1a4c57bd..5fc635be 100644
--- a/src/gui/Src/Gui/CPUDisassembly.cpp
+++ b/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"
diff --git a/src/gui/Src/Gui/CPUSideBar.cpp b/src/gui/Src/Gui/CPUSideBar.cpp
index 1bf00d77..5ffd2c3f 100644
--- a/src/gui/Src/Gui/CPUSideBar.cpp
+++ b/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)
diff --git a/src/gui/Src/Gui/CPUSideBar.h b/src/gui/Src/Gui/CPUSideBar.h
index 10c7a863..39e6a652 100644
--- a/src/gui/Src/Gui/CPUSideBar.h
+++ b/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
 {
diff --git a/src/gui/Src/Gui/DisassemblerGraphView.cpp b/src/gui/Src/Gui/DisassemblerGraphView.cpp
index 81f49b4d..7decdc04 100644
--- a/src/gui/Src/Gui/DisassemblerGraphView.cpp
+++ b/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
diff --git a/src/gui/Src/Gui/DisassemblerGraphView.h b/src/gui/Src/Gui/DisassemblerGraphView.h
index 2b1b3ff9..8cfc9af7 100644
--- a/src/gui/Src/Gui/DisassemblerGraphView.h
+++ b/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);
diff --git a/src/gui/Src/Gui/DisassemblyPopup.cpp b/src/gui/Src/Gui/DisassemblyPopup.cpp
index f0cc3736..c76912b3 100644
--- a/src/gui/Src/Gui/DisassemblyPopup.cpp
+++ b/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>
diff --git a/src/gui/Src/Gui/DisassemblyPopup.h b/src/gui/Src/Gui/DisassemblyPopup.h
index aa993472..3df7e63d 100644
--- a/src/gui/Src/Gui/DisassemblyPopup.h
+++ b/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
 {
diff --git a/src/gui/Src/Gui/EditFloatRegister.h b/src/gui/Src/Gui/EditFloatRegister.h
index d6dbdd29..d8100839 100644
--- a/src/gui/Src/Gui/EditFloatRegister.h
+++ b/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>
 
diff --git a/src/gui/Src/Gui/GotoDialog.cpp b/src/gui/Src/Gui/GotoDialog.cpp
index 61b2da30..ec35c072 100644
--- a/src/gui/Src/Gui/GotoDialog.cpp
+++ b/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)
diff --git a/src/gui/Src/Gui/GotoDialog.h b/src/gui/Src/Gui/GotoDialog.h
index 67b91379..e4fedd6c 100644
--- a/src/gui/Src/Gui/GotoDialog.h
+++ b/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;
diff --git a/src/gui/Src/Gui/HexEditDialog.cpp b/src/gui/Src/Gui/HexEditDialog.cpp
index 2f46ce84..90a138c2 100644
--- a/src/gui/Src/Gui/HexEditDialog.cpp
+++ b/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"
diff --git a/src/gui/Src/Gui/SymbolView.h b/src/gui/Src/Gui/SymbolView.h
index 8f45d0a1..79ef5b53 100644
--- a/src/gui/Src/Gui/SymbolView.h
+++ b/src/gui/Src/Gui/SymbolView.h
@@ -2,7 +2,6 @@
 #define SYMBOLVIEW_H
 
 #include <QWidget>
-//#include <QVBoxLayout>
 #include "Bridge.h"
 
 class QMenu;
diff --git a/src/gui/Src/Gui/WatchView.h b/src/gui/Src/Gui/WatchView.h
index a2950e15..1119f46f 100644
--- a/src/gui/Src/Gui/WatchView.h
+++ b/src/gui/Src/Gui/WatchView.h
@@ -1,7 +1,6 @@
 #ifndef WATCHVIEW_H
 #define WATCHVIEW_H
 #include "StdTable.h"
-#include "MenuBuilder.h"
 
 class CPUMultiDump;
 
diff --git a/src/gui/Src/Gui/WordEditDialog.h b/src/gui/Src/Gui/WordEditDialog.h
index ae7d5e12..887626ba 100644
--- a/src/gui/Src/Gui/WordEditDialog.h
+++ b/src/gui/Src/Gui/WordEditDialog.h
@@ -3,7 +3,6 @@
 
 #include <QDialog>
 #include <QPushButton>
-//#include "ValidateExpressionThread.h"
 #include "Imports.h"
 
 class ValidateExpressionThread;
diff --git a/src/gui/Src/Utils/CodeFolding.h b/src/gui/Src/Utils/CodeFolding.h
index 790cd00e..e2daf0a1 100644
--- a/src/gui/Src/Utils/CodeFolding.h
+++ b/src/gui/Src/Utils/CodeFolding.h
@@ -2,8 +2,6 @@
 #define CODEFOLDING_H
 #include "Imports.h"
 #include <map>
-#include <forward_list>
-
 
 class CodeFoldingHelper
 {
diff --git a/src/gui/Src/Utils/MiscUtil.h b/src/gui/Src/Utils/MiscUtil.h
index acbdb570..d55f87e3 100644
--- a/src/gui/Src/Utils/MiscUtil.h
+++ b/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
diff --git a/src/gui/Src/main.cpp b/src/gui/Src/main.cpp
index a3552036..42d6baae 100644
--- a/src/gui/Src/main.cpp
+++ b/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>
diff --git a/src/gui/Src/main.h b/src/gui/Src/main.h
index 69182d5b..49a0ccb6 100644
--- a/src/gui/Src/main.h
+++ b/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