Fix possible value set query for token inputs.

1 files changed, 10 insertions, 12 deletions

diff --git a/ui/util.h b/ui/util.h
index e434b28e..7b2f97d6 100644
--- a/ui/util.h
+++ b/ui/util.h
@@ -6,23 +6,21 @@
 #include <QtWidgets/QWidget>
 #include <QtCore/QFileInfo>
 
-std::string BINARYNINJAUIAPI getStringForLocalVariable(
-    ArchitectureRef arch, FunctionRef func, BinaryNinja::Variable localVar);
+#include <optional>
+
+std::string BINARYNINJAUIAPI getStringForLocalVariable(ArchitectureRef arch, FunctionRef func, BinaryNinja::Variable localVar);
 std::string BINARYNINJAUIAPI getStringForRegisterValue(ArchitectureRef arch, BinaryNinja::RegisterValue value);
 std::string BINARYNINJAUIAPI getPossibleValueSetStateName(BNRegisterValueType state);
 std::string BINARYNINJAUIAPI getStringForIntegerValue(int64_t value);
 std::string BINARYNINJAUIAPI getStringForIntegerValue(uint64_t value);
-std::string BINARYNINJAUIAPI getStringForPossibleValueSet(
-    ArchitectureRef arch, const BinaryNinja::PossibleValueSet& values);
-std::string BINARYNINJAUIAPI getStringForInstructionDataflowDetails(
-    BinaryViewRef data, ArchitectureRef arch, FunctionRef func, uint64_t address);
-BinaryNinja::PossibleValueSet BINARYNINJAUIAPI getPossibleValueSetForToken(
-    View* view, BinaryViewRef data, ArchitectureRef arch, FunctionRef func, HighlightTokenState token, size_t instrIdx);
+std::string BINARYNINJAUIAPI getStringForPossibleValueSet(ArchitectureRef arch, const BinaryNinja::PossibleValueSet& values);
+std::string BINARYNINJAUIAPI getStringForInstructionDataflowDetails(BinaryViewRef data, ArchitectureRef arch, FunctionRef func, uint64_t address);
+std::optional<BinaryNinja::PossibleValueSet> BINARYNINJAUIAPI getPossibleValueSetForToken(View* view, BinaryViewRef data, ArchitectureRef arch,
+    FunctionRef func, HighlightTokenState token, size_t instrIdx);
 
-void BINARYNINJAUIAPI showHexPreview(
-    QWidget* parent, ViewFrame* frame, const QPoint& previewPos, BinaryViewRef data, uint64_t address);
-bool BINARYNINJAUIAPI showDisassemblyPreview(QWidget* parent, ViewFrame* frame, const QPoint& previewPos,
-    BinaryViewRef data, FunctionRef func, const ViewLocation& location);
+void BINARYNINJAUIAPI showHexPreview(QWidget* parent, ViewFrame* frame, const QPoint& previewPos, BinaryViewRef data, uint64_t address);
+bool BINARYNINJAUIAPI showDisassemblyPreview(QWidget* parent, ViewFrame* frame, const QPoint& previewPos,BinaryViewRef data, FunctionRef func,
+    const ViewLocation& location);
 void BINARYNINJAUIAPI showTextTooltip(QWidget* parent, const QPoint& previewPos, const QString& text);
 
 bool BINARYNINJAUIAPI isBinaryNinjaDataBase(QFileInfo& info, QFileAccessor& accessor);