From 9262278979709181414664053523657355762707 Mon Sep 17 00:00:00 2001 From: Glenn Smith Date: Thu, 24 Apr 2025 14:46:37 -0400 Subject: std::function ==> ProgressFunction --- binaryview.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'binaryview.cpp') diff --git a/binaryview.cpp b/binaryview.cpp index 7a6f3df3..9a223932 100644 --- a/binaryview.cpp +++ b/binaryview.cpp @@ -1634,7 +1634,7 @@ bool BinaryView::CreateDatabase(const string& path, Ref settings) bool BinaryView::CreateDatabase(const string& path, - const function& progressCallback, Ref settings) + const ProgressFunction& progressCallback, Ref settings) { auto parent = GetParentView(); if (parent) @@ -1650,7 +1650,7 @@ bool BinaryView::SaveAutoSnapshot(Ref settings) bool BinaryView::SaveAutoSnapshot( - const function& progressCallback, Ref settings) + const ProgressFunction& progressCallback, Ref settings) { return m_file->SaveAutoSnapshot(this, progressCallback, settings); } @@ -4217,7 +4217,7 @@ void BinaryView::DefineUserType(const QualifiedName& name, Ref type) } -std::unordered_map BinaryView::DefineTypes(const vector>& types, std::function progress) +std::unordered_map BinaryView::DefineTypes(const vector>& types, ProgressFunction progress) { BNQualifiedNameTypeAndId* apiTypes = new BNQualifiedNameTypeAndId[types.size()]; for (size_t i = 0; i < types.size(); i++) @@ -4255,7 +4255,7 @@ std::unordered_map BinaryView::DefineTypes(const vec } -void BinaryView::DefineUserTypes(const vector& types, std::function progress) +void BinaryView::DefineUserTypes(const vector& types, ProgressFunction progress) { BNQualifiedNameAndType* apiTypes = new BNQualifiedNameAndType[types.size()]; for (size_t i = 0; i < types.size(); i++) @@ -4276,7 +4276,7 @@ void BinaryView::DefineUserTypes(const vector& types, std: } -void BinaryView::DefineUserTypes(const vector& types, std::function progress) +void BinaryView::DefineUserTypes(const vector& types, ProgressFunction progress) { BNQualifiedNameAndType* apiTypes = new BNQualifiedNameAndType[types.size()]; for (size_t i = 0; i < types.size(); i++) @@ -4735,7 +4735,7 @@ static bool MatchCallbackForConstant(void* ctxt, uint64_t addr, BNLinearDisassem bool BinaryView::FindNextData(uint64_t start, uint64_t end, const DataBuffer& data, uint64_t& addr, BNFindFlag flags, - const std::function& progress) + const ProgressFunction& progress) { ProgressContext fp; fp.callback = progress; @@ -4746,7 +4746,7 @@ bool BinaryView::FindNextData(uint64_t start, uint64_t end, const DataBuffer& da bool BinaryView::FindNextText(uint64_t start, uint64_t end, const std::string& data, uint64_t& addr, Ref settings, BNFindFlag flags, const FunctionViewType& viewType, - const std::function& progress) + const ProgressFunction& progress) { ProgressContext fp; fp.callback = progress; @@ -4757,7 +4757,7 @@ bool BinaryView::FindNextText(uint64_t start, uint64_t end, const std::string& d bool BinaryView::FindNextConstant(uint64_t start, uint64_t end, uint64_t constant, uint64_t& addr, Ref settings, const FunctionViewType& viewType, - const std::function& progress) + const ProgressFunction& progress) { ProgressContext fp; fp.callback = progress; @@ -4767,7 +4767,7 @@ bool BinaryView::FindNextConstant(uint64_t start, uint64_t end, uint64_t constan bool BinaryView::FindAllData(uint64_t start, uint64_t end, const DataBuffer& data, BNFindFlag flags, - const std::function& progress, + const ProgressFunction& progress, const std::function& matchCallback) { ProgressContext fp; @@ -4780,7 +4780,7 @@ bool BinaryView::FindAllData(uint64_t start, uint64_t end, const DataBuffer& dat bool BinaryView::FindAllText(uint64_t start, uint64_t end, const std::string& data, Ref settings, - BNFindFlag flags, const FunctionViewType& viewType, const std::function& progress, + BNFindFlag flags, const FunctionViewType& viewType, const ProgressFunction& progress, const std::function& matchCallback) { @@ -4794,7 +4794,7 @@ bool BinaryView::FindAllText(uint64_t start, uint64_t end, const std::string& da bool BinaryView::FindAllConstant(uint64_t start, uint64_t end, uint64_t constant, Ref settings, - const FunctionViewType& viewType, const std::function& progress, + const FunctionViewType& viewType, const ProgressFunction& progress, const std::function& matchCallback) { ProgressContext fp; @@ -4815,7 +4815,7 @@ string BinaryView::DetectSearchMode(const string& query) } -bool BinaryView::Search(const string& query, const std::function& progressCallback, const std::function& matchCallback) +bool BinaryView::Search(const string& query, const ProgressFunction& progressCallback, const std::function& matchCallback) { ProgressContext fp; fp.callback = progressCallback; @@ -5598,14 +5598,14 @@ Ref BinaryData::CreateFromFile(FileMetadata* file, FileAccessor* acc Ref BinaryNinja::Load(const std::string& filename, bool updateAnalysis, - std::function progress, Ref options) + ProgressFunction progress, Ref options) { return Load(filename, updateAnalysis, options->GetJsonString(), progress); } Ref BinaryNinja::Load( - const DataBuffer& rawData, bool updateAnalysis, std::function progress, Ref options) + const DataBuffer& rawData, bool updateAnalysis, ProgressFunction progress, Ref options) { Ref file = new FileMetadata(); Ref view = new BinaryData(file, rawData); @@ -5614,13 +5614,13 @@ Ref BinaryNinja::Load( Ref BinaryNinja::Load(Ref view, bool updateAnalysis, - std::function progress, Ref options, bool isDatabase) + ProgressFunction progress, Ref options, bool isDatabase) { return Load(view, updateAnalysis, options->GetJsonString(), progress); } -Ref BinaryNinja::Load(const std::string& filename, bool updateAnalysis, const std::string& options, std::function progress) +Ref BinaryNinja::Load(const std::string& filename, bool updateAnalysis, const std::string& options, ProgressFunction progress) { ProgressContext cb; cb.callback = progress; @@ -5631,7 +5631,7 @@ Ref BinaryNinja::Load(const std::string& filename, bool updateAnalys } -Ref BinaryNinja::Load(const DataBuffer& rawData, bool updateAnalysis, const std::string& options, std::function progress) +Ref BinaryNinja::Load(const DataBuffer& rawData, bool updateAnalysis, const std::string& options, ProgressFunction progress) { Ref file = new FileMetadata(); Ref view = new BinaryData(file, rawData); @@ -5639,7 +5639,7 @@ Ref BinaryNinja::Load(const DataBuffer& rawData, bool updateAnalysis } -Ref BinaryNinja::Load(Ref view, bool updateAnalysis, const std::string& options, std::function progress) +Ref BinaryNinja::Load(Ref view, bool updateAnalysis, const std::string& options, ProgressFunction progress) { ProgressContext cb; cb.callback = progress; @@ -5650,7 +5650,7 @@ Ref BinaryNinja::Load(Ref view, bool updateAnalysis, con } -Ref BinaryNinja::Load(Ref projectFile, bool updateAnalysis, const std::string& options, std::function progress) +Ref BinaryNinja::Load(Ref projectFile, bool updateAnalysis, const std::string& options, ProgressFunction progress) { ProgressContext cb; cb.callback = progress; -- cgit v1.3.1