Added MINIMAL compiler option

Author: echo-devim

fhex.pro

@@ -31,8 +31,8 @@ SOURCES += \
     src/chunks.cpp \
     src/commands.cpp \
     src/core/patternmatching.cpp \
-        src/main.cpp \
-        src/fhex.cpp \
+    src/main.cpp \
+    src/fhex.cpp \
     src/core/hexeditor.cpp \
     src/qhexedit.cpp
 
@@ -42,7 +42,7 @@ HEADERS += \
     src/commands.h \
     src/core/json.h \
     src/core/patternmatching.h \
-        src/fhex.h \
+    src/fhex.h \
     src/core/hexeditor.h \
     src/qhexedit.h
 

src/core/hexeditor.cpp

@@ -1,9 +1,5 @@
 #include "hexeditor.h"
 
-/*
- * REMOVED HARDCODED PATTERNS FILE PATH
- */
-
 HexEditor::HexEditor()
 {
     this->fileSize = 0;

src/core/patternmatching.cpp

@@ -5,7 +5,7 @@ PatternMatching::PatternMatching(string path)
     std::ifstream configFile(path);
 
     if (!configFile.good()) {
-        cerr << "The file '" << path << "' is not accessible." << endl;
+        cerr << "The pattern config file '" << path << "' is not accessible." << endl;
         return;
     }
 

src/fhex.cpp

@@ -196,13 +196,15 @@ Fhex::Fhex(QWidget *parent, QApplication *app, QString filepath)
     QAction *escapeHex = new QAction("Hex Strin&g Manipulation", this);
     escapeHex->setShortcut(QKeySequence(Qt::Key_F3));
     tools->addAction(escapeHex);
+#ifndef MINIMAL
     QAction *fasm = new QAction(QIcon::fromTheme("map-flat"), "&Assembler/Disassembler", this);
     fasm->setShortcut(QKeySequence(Qt::Key_F4));
     tools->addAction(fasm);
-
+    connect(fasm, &QAction::triggered, this, &Fhex::on_menu_fasm_click);
+#endif
     connect(hexDec, &QAction::triggered, this, &Fhex::on_menu_hex_dec_converter_click);
     connect(escapeHex, &QAction::triggered, this, &Fhex::on_menu_escape_hex_click);
-    connect(fasm, &QAction::triggered, this, &Fhex::on_menu_fasm_click);
+
 
     QMenu *help;
     help = menuBar()->addMenu("&Help");
@@ -351,8 +353,9 @@ Fhex::Fhex(QWidget *parent, QApplication *app, QString filepath)
 
     this->statusBar.setText("Fhex loaded");
     this->setCentralWidget(mainWidget);
+#ifndef MINIMAL
     this->fasm = nullptr;
-
+#endif
     //If a filepath was passed as argument, open it
     if (filepath != "") {
         this->loadFile(filepath);
@@ -368,9 +371,11 @@ Fhex::Fhex(QWidget *parent, QApplication *app, QString filepath)
 Fhex::~Fhex()
 {
     delete this->hexEditor;
+#ifndef MINIMAL
     if (this->fasm != nullptr) {
         delete this->fasm;
     }
+#endif
 }
 
 void Fhex::on_menu_find_patterns_click() {
@@ -499,6 +504,7 @@ void Fhex::on_menu_about_click() {
     newWindow->show();
 }
 
+#ifndef MINIMAL
 void Fhex::on_menu_fasm_click() {
     if (fasm != nullptr) {
         delete fasm;
@@ -507,6 +513,7 @@ void Fhex::on_menu_fasm_click() {
     fasm = new Fasm(this->qhex->selectedData());
     fasm->show();
 }
+#endif
 
 void Fhex::on_menu_offset_list_click() {
     this->listOffsets->setVisible(!this->listOffsets->isVisible());

src/fhex.h

@@ -53,8 +53,9 @@
 
 #include "qhexedit.h"
 #include "core/hexeditor.h"
+#ifndef MINIMAL
 #include "fasm.h"
-
+#endif
 #define MAX_DIFF_BYTES 3000
 #define DEFAULT_UNPRINTABLE_CHAR "."
 #define CHUNK_SIZE 1024
@@ -93,8 +94,9 @@ class Fhex : public QMainWindow
 
     // PATTERNS
     bool patternsEnabled;
-
+#ifndef MINIMAL
     Fasm *fasm;
+#endif
     unsigned long file_size_limit = 1073741824; //1GB is the maximum amount of bytes that the hex editor can load into memory (configurable)
     qint64 lastCursorPos = 0;
     qint64 currentCursorPos = 0;
@@ -181,7 +183,9 @@ public slots:
     void on_menu_escape_hex_click();
     void on_binchart_click(const QPointF &p);
     void on_menu_binchart_click();
+#ifndef MINIMAL
     void on_menu_fasm_click();
+#endif
     void on_menu_about_click();
     void on_regex_checkbox_changed(int);