From aa407ca14f6a99c5a953ff564461ec8dac1e0a84 Mon Sep 17 00:00:00 2001 From: Xusheng Date: Mon, 31 Aug 2020 17:53:02 +0800 Subject: allow redefining an existing type --- ui/createtypedialog.h | 4 +++- ui/typeview.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'ui') diff --git a/ui/createtypedialog.h b/ui/createtypedialog.h index 552f2076..19880bc8 100644 --- a/ui/createtypedialog.h +++ b/ui/createtypedialog.h @@ -14,9 +14,11 @@ class BINARYNINJAUIAPI CreateTypeDialog: public QDialog BinaryViewRef m_data; std::map m_results; + std::set m_typesAllowRedefinition; public: - CreateTypeDialog(QWidget* parent, BinaryViewRef data, const QString& title, const QString& definition); + CreateTypeDialog(QWidget* parent, BinaryViewRef data, const QString& title, + const QString& definition, const std::set& typesAllowRedefinition = {}); std::map getResults() { return m_results; } private Q_SLOTS: diff --git a/ui/typeview.h b/ui/typeview.h index 1e3b1c25..bc2fcc10 100644 --- a/ui/typeview.h +++ b/ui/typeview.h @@ -140,7 +140,7 @@ class BINARYNINJAUIAPI TypeView: public QAbstractScrollArea, public View, public void goToAddress(bool selecting); void moveCursorToMouse(QMouseEvent* event, bool selecting); - void createNewTypes(const QString& definition = ""); + void createNewTypes(const QString& definition = "", const std::set& typesAllowRedefinition = {}); void bindActions(); void checkForValidSelection(); -- cgit v1.3.1