Renaming QRCore and QRDisasm to IaitoRCore and IaitoRDisasm (hteso#187)

* Renaming QRCore and QRDisasm to IaitoRCore and IaitoRDisasm * Included AStyle formatting changes
519984307 · Jul 2, 2017 · 771eccc · 771eccc
1 parent 6d90a98
commit 771eccc
Show file tree

Hide file tree

Showing 31 changed files with 147 additions and 146 deletions.
diff --git a/src/analthread.cpp b/src/analthread.cpp
@@ -1,5 +1,5 @@
 #include "analthread.h"
-#include "qrcore.h"
+#include "iaitorcore.h"
 #include <QDebug>
 
 AnalThread::AnalThread(QWidget *parent) :
@@ -18,7 +18,7 @@ AnalThread::~AnalThread()
     }
 }
 
-void AnalThread::start(QRCore *core, int level)
+void AnalThread::start(IaitoRCore *core, int level)
 {
     this->core = core;
     this->level = level;

diff --git a/src/analthread.h b/src/analthread.h
@@ -3,7 +3,7 @@
 
 #include <QThread>
 
-class QRCore;
+class IaitoRCore;
 
 class AnalThread : public QThread
 {
@@ -12,15 +12,15 @@ class AnalThread : public QThread
     explicit AnalThread(QWidget *parent = 0);
     ~AnalThread();
 
-    void start(QRCore *core, int level);
+    void start(IaitoRCore *core, int level);
 
 protected:
     void run();
 
     using QThread::start;
 
 private:
-    QRCore *core;
+    IaitoRCore *core;
     int level;
 };
 

diff --git a/src/dialogs/xrefsdialog.cpp b/src/dialogs/xrefsdialog.cpp
@@ -80,7 +80,7 @@ void XrefsDialog::fillRefs(QList<XrefDescription> refs, QList<XrefDescription> x
 
 void XrefsDialog::on_fromTreeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column)
 {
-    QNOTUSED(column);
+    IAITONOTUSED(column);
 
     XrefDescription xref = item->data(0, Qt::UserRole).value<XrefDescription>();
     RAnalFunction *fcn = this->main->core->functionAt(xref.to);
@@ -91,7 +91,7 @@ void XrefsDialog::on_fromTreeWidget_itemDoubleClicked(QTreeWidgetItem *item, int
 
 void XrefsDialog::on_toTreeWidget_itemDoubleClicked(QTreeWidgetItem *item, int column)
 {
-    QNOTUSED(column);
+    IAITONOTUSED(column);
 
     XrefDescription xref = item->data(0, Qt::UserRole).value<XrefDescription>();
     RAnalFunction *fcn = this->main->core->functionAt(xref.from);

diff --git a/src/dialogs/xrefsdialog.h b/src/dialogs/xrefsdialog.h
@@ -2,7 +2,7 @@
 #define XREFSDIALOG_H
 
 #include "highlighter.h"
-#include "qrcore.h"
+#include "iaitorcore.h"
 
 #include <QDialog>
 #include <QTreeWidgetItem>

diff --git a/src/iaito.pro b/src/iaito.pro
@@ -73,7 +73,6 @@ HEADERS  += \
     newfiledialog.h \
     optionsdialog.h \
     highlighter.h \
-    qrcore.h \
     createnewdialog.h \
     hexascii_highlighter.h \
     widgets/pieview.h \
@@ -92,7 +91,6 @@ HEADERS  += \
     widgets/flagswidget.h \
     widgets/memorywidget.h \
     widgets/exportswidget.h \
-    qrdisasm.h \
     widgets/sdbdock.h \
     analthread.h \
     dialogs/commentsdialog.h \
@@ -106,7 +104,9 @@ HEADERS  += \
     widgets/dockwidget.h \
     widgets/consolewidget.h \
     radarewebserver.h \
-    settings.h
+    settings.h \
+    iaitorcore.h \
+    iaitordisasm.h
 
 FORMS    += \
     mainwindow.ui \

diff --git a/src/qrcore.h → src/iaitorcore.h b/src/qrcore.h → src/iaitorcore.h
@@ -1,5 +1,5 @@
-#ifndef QRCORE_H
-#define QRCORE_H
+#ifndef IAITORCORE_H
+#define IAITORCORE_H
 
 #include <QMap>
 #include <QDebug>
@@ -22,7 +22,7 @@
 
 #define HAVE_LATEST_LIBR2 false
 
-#define QRListForeach(list, it, type, x) \
+#define IaitoRListForeach(list, it, type, x) \
     if (list) for (it = list->head; it && ((x=(type*)it->data)); it = it->n)
 
 #define __alert(x) QMessageBox::question (this, "Alert", QString(x), QMessageBox::Ok)
@@ -42,7 +42,7 @@ class RCoreLocked
     RCore *operator->() const;
 };
 
-#define QNOTUSED(x) do { (void)(x); } while ( 0 );
+#define IAITONOTUSED(x) do { (void)(x); } while ( 0 );
 
 typedef ut64 RVA;
 
@@ -152,15 +152,15 @@ Q_DECLARE_METATYPE(FlagspaceDescription)
 Q_DECLARE_METATYPE(FlagDescription)
 Q_DECLARE_METATYPE(XrefDescription)
 
-class QRCore : public QObject
+class IaitoRCore : public QObject
 {
     Q_OBJECT
 
 public:
     QString projectPath;
 
-    explicit QRCore(QObject *parent = 0);
-    ~QRCore();
+    explicit IaitoRCore(QObject *parent = 0);
+    ~IaitoRCore();
 
     RVA getOffset() const                           { return core_->offset; }
     int getCycloComplex(ut64 addr);
@@ -255,4 +255,4 @@ public slots:
     RCore *core_;
 };
 
-#endif // QRCORE_H
+#endif // IAITORCORE_H
diff --git a/src/qrdisasm.h → src/iaitordisasm.h b/src/qrdisasm.h → src/iaitordisasm.h
@@ -1,17 +1,17 @@
-#ifndef QRDISASM_H
-#define QRDISASM_H
+#ifndef IAITORDISASM_H
+#define IAITORDISASM_H
 
-#include <qrcore.h>
+#include <iaitorcore.h>
 
-enum QRDisasmDataType
+enum IaitoRDisasmDataType
 {
     STRING = 'z',
     STRUCT = 's',
     DATA = 'd',
 
 };
 
-enum QRDisasmOption
+enum IaitoRDisasmOption
 {
     DWARF = 1 << 1,
     REFS = 1 << 2,
@@ -20,10 +20,10 @@ enum QRDisasmOption
     COMMENT = 1 << 5,
 };
 
-class QRDisasmRow
+class IaitoRDisasmRow
 {
 private:
-    QRCore *core;
+    IaitoRCore *core;
 public:
     ut64 vaddr;
     ut64 paddr;
@@ -46,7 +46,7 @@ class QRDisasmRow
     QString esil;
 
     // if data
-    QRDisasmDataType datatype;
+    IaitoRDisasmDataType datatype;
     QString dataopt; // struct name, aliased name, string, etc
     // data type
     // string/struct/hex/word
@@ -60,17 +60,17 @@ class QRDisasmRow
 };
 
 
-class QRDisasm
+class IaitoRDisasm
 {
-    QRCore *core;
+    IaitoRCore *core;
     Sdb *db;
 public:
-    explicit QRDisasm(QRCore *core);
-    bool disassembleAt(ut64 addr, QRDisasmOption opt, QRDisasmRow &dr);
+    explicit IaitoRDisasm(IaitoRCore *core);
+    bool disassembleAt(ut64 addr, IaitoRDisasmOption opt, IaitoRDisasmRow &dr);
     // high level api for the disasm thing to manage comments, xrefs, etc
     //next();
     //prev();
 
 };
 
-#endif // QRDISASM_H
+#endif // IAITORDISASM_H
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -82,7 +82,7 @@ static void registerCustomFonts()
 
 MainWindow::MainWindow(QWidget *parent) :
     QMainWindow(parent),
-    core(new QRCore()),
+    core(new IaitoRCore()),
     memoryDock(nullptr),
     notepadDock(nullptr),
     asmDock(nullptr),

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -2,12 +2,12 @@
 #define MAINWINDOW_H
 
 #include "radarewebserver.h"
-#include "qrcore.h" // only needed for ut64
+#include "iaitorcore.h" // only needed for ut64
 
 #include <QMainWindow>
 #include <QList>
 
-class QRCore;
+class IaitoRCore;
 class DockWidget;
 class Omnibar;
 class MemoryWidget;
@@ -44,7 +44,7 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    QRCore *core;
+    IaitoRCore *core;
     MemoryWidget    *memoryDock;
     Notepad         *notepadDock;
 

diff --git a/src/newfiledialog.cpp b/src/newfiledialog.cpp
@@ -12,7 +12,7 @@ const int NewFileDialog::MaxRecentFiles;
 
 static QColor getColorFor(QString str, int pos)
 {
-    QNOTUSED(str);
+    IAITONOTUSED(str);
 
     QList<QColor> Colors;
     Colors << QColor(29, 188, 156); // Turquoise

diff --git a/src/optionsdialog.h b/src/optionsdialog.h
@@ -4,7 +4,7 @@
 #include <QDialog>
 #include <QStringList>
 
-#include "qrcore.h"
+#include "iaitorcore.h"
 #include "analthread.h"
 
 class MainWindow;