std::function<bool(size_t,size_t)> ==> ProgressFunction

4 files changed, 12 insertions, 12 deletions

diff --git a/ui/historyview.h b/ui/historyview.h
index 0db0318d..80e356f6 100644
--- a/ui/historyview.h
+++ b/ui/historyview.h
@@ -88,7 +88,7 @@ class BINARYNINJAUIAPI HistorySidebarWidget : public SidebarWidget
 	void scrollBarValueChanged(int value);
 	void scrollBarRangeChanged(int min, int max);
 
-	void resetToSelectedEntry(std::function<bool(size_t, size_t)> progress);
+	void resetToSelectedEntry(BinaryNinja::ProgressFunction progress);
 
   public:
 	virtual void copy();
diff --git a/ui/progresstask.h b/ui/progresstask.h
index a1a375cb..6765ec2d 100644
--- a/ui/progresstask.h
+++ b/ui/progresstask.h
@@ -88,7 +88,7 @@ class BINARYNINJAUIAPI ProgressDialog : public QDialog
  	\code{.cpp}
 	// Starts task
 	ProgressTask* task = new ProgressTask("Long Operation", "Long Operation", "Cancel",
-		[](std::function<bool(size_t, size_t)> progress) {
+		[](ProgressFunction progress) {
 			doLongOperationWithProgress(progress);
 
 			// Report progress by calling the progress function
@@ -107,7 +107,7 @@ class BINARYNINJAUIAPI ProgressTask : public QObject
 	Q_OBJECT
 
 	ProgressDialog* m_dialog;
-	std::function<void(std::function<bool(size_t, size_t)>)> m_func;
+	std::function<void(BinaryNinja::ProgressFunction)> m_func;
 	std::thread m_thread;
 	std::mutex m_mutex;
 	std::condition_variable m_cv;
@@ -133,7 +133,7 @@ class BINARYNINJAUIAPI ProgressTask : public QObject
 	   cancellation.
 	 */
 	ProgressTask(QWidget* parent, const QString& name, const QString& text, const QString& cancel,
-	    std::function<void(std::function<bool(size_t, size_t)>)> func);
+	    std::function<void(BinaryNinja::ProgressFunction)> func);
 	virtual ~ProgressTask();
 
 	/*!
@@ -279,7 +279,7 @@ class BINARYNINJAUIAPI BackgroundThread : public QObject
 	Q_OBJECT
 
   public:
-	typedef std::function<bool(size_t, size_t)> ProgressFunction;
+	typedef BinaryNinja::ProgressFunction ProgressFunction;
 
 	typedef std::function<QVariant(QVariant value)> ThenFunction;
 	typedef std::function<void(std::exception_ptr exc)> CatchFunction;
diff --git a/ui/projectbrowser.h b/ui/projectbrowser.h
index 5e69f332..b76aa3d8 100644
--- a/ui/projectbrowser.h
+++ b/ui/projectbrowser.h
@@ -87,7 +87,7 @@ public:
 
 	QStandardItem* ItemForId(const std::string& id);
 
-	void reloadData(const std::function<bool(size_t, size_t)>& progress = [](size_t, size_t){ return true; });
+	void reloadData(const BinaryNinja::ProgressFunction& progress = [](size_t, size_t){ return true; });
 
 	virtual QMimeData* mimeData(const QModelIndexList& indexes) const override;
 	virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
diff --git a/ui/viewframe.h b/ui/viewframe.h
index 3d15cfee..e0235603 100644
--- a/ui/viewframe.h
+++ b/ui/viewframe.h
@@ -138,23 +138,23 @@ class BINARYNINJAUIAPI View
 	virtual bool canCompile() { return false; }
 
 	virtual bool findNextData(uint64_t start, uint64_t end, const BinaryNinja::DataBuffer& data, uint64_t& addr,
-	    BNFindFlag flags, const std::function<bool(size_t current, size_t total)>& cb);
+	    BNFindFlag flags, const BinaryNinja::ProgressFunction& cb);
 	virtual bool findNextText(uint64_t start, uint64_t end, const std::string& text, uint64_t& addr,
 	    DisassemblySettingsRef settings, BNFindFlag flags, const BinaryNinja::FunctionViewType& graph,
-	    const std::function<bool(size_t current, size_t total)>& cb);
+	    const BinaryNinja::ProgressFunction& cb);
 	virtual bool findNextConstant(uint64_t start, uint64_t end, uint64_t constant, uint64_t& addr,
 	    DisassemblySettingsRef settings, const BinaryNinja::FunctionViewType& graph,
-	    const std::function<bool(size_t current, size_t total)>& cb);
+	    const BinaryNinja::ProgressFunction& cb);
 
 	virtual bool findAllData(uint64_t start, uint64_t end, const BinaryNinja::DataBuffer& data, BNFindFlag flags,
-	    const std::function<bool(size_t current, size_t total)>& cb,
+	    const BinaryNinja::ProgressFunction& cb,
 	    const std::function<bool(uint64_t addr, const BinaryNinja::DataBuffer& match)>& matchCallback);
 	virtual bool findAllText(uint64_t start, uint64_t end, const std::string& data, DisassemblySettingsRef settings,
-	    BNFindFlag flags, const BinaryNinja::FunctionViewType& graph, const std::function<bool(size_t current, size_t total)>& cb,
+	    BNFindFlag flags, const BinaryNinja::FunctionViewType& graph, const BinaryNinja::ProgressFunction& cb,
 	    const std::function<bool(
 	        uint64_t addr, const std::string& match, const BinaryNinja::LinearDisassemblyLine& line)>& matchCallback);
 	virtual bool findAllConstant(uint64_t start, uint64_t end, uint64_t constant, DisassemblySettingsRef settings,
-	    const BinaryNinja::FunctionViewType& graph, const std::function<bool(size_t current, size_t total)>& cb,
+	    const BinaryNinja::FunctionViewType& graph, const BinaryNinja::ProgressFunction& cb,
 	    const std::function<bool(uint64_t addr, const BinaryNinja::LinearDisassemblyLine& line)>& matchCallback);
 
 	virtual BinaryViewRef getData() = 0;