From 1bb356c14265190db7070266e15a1fcbdad4033a Mon Sep 17 00:00:00 2001 From: Peter LaFosse Date: Tue, 13 Dec 2022 10:13:23 -0500 Subject: Support multiple files and importing function in header import dialog --- ui/headerimportdialog.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/headerimportdialog.h b/ui/headerimportdialog.h index 90ce495d..31493a2d 100644 --- a/ui/headerimportdialog.h +++ b/ui/headerimportdialog.h @@ -31,9 +31,10 @@ class BINARYNINJAUIAPI HeaderImportDialog : public QDialog QPushButton* m_importButton; BinaryViewRef m_data; - std::string m_filePath; + std::vector m_filePaths; BinaryNinja::TypeParserResult m_result; std::vector m_errors; + LoggerRef m_logger; protected Q_SLOTS: void browseFile(); @@ -46,8 +47,9 @@ protected: private: bool loadTypes(); - bool isExistingType(const BinaryNinja::QualifiedName& name) const; + bool isExistingType(const BinaryNinja::QualifiedName& name, bool function) const; bool isBuiltinType(const BinaryNinja::QualifiedName& name) const; + void ApplyFunctionTypes(const std::vector& functions); public: HeaderImportDialog(QWidget* parent, BinaryViewRef view); -- cgit v1.3.1