Update to Qt 5.15

4 files changed, 15 insertions, 19 deletions

diff --git a/examples/triage/byte.cpp b/examples/triage/byte.cpp
index cac2c587..db614dec 100644
--- a/examples/triage/byte.cpp
+++ b/examples/triage/byte.cpp
@@ -145,16 +145,17 @@ uint64_t ByteView::getCurrentOffset()
 }
 
 
-void ByteView::getSelectionOffsets(uint64_t& start, uint64_t& end)
+BNAddressRange ByteView::getSelectionOffsets()
 {
-	start = m_selectionStartAddr;
-	end = m_cursorAddr;
+	uint64_t start = m_selectionStartAddr;
+	uint64_t end = m_cursorAddr;
 	if (end < start)
 	{
 		uint64_t t = start;
 		start = end;
 		end = t;
 	}
+	return { start, end };
 }
 
 
@@ -580,9 +581,8 @@ void ByteView::paintEvent(QPaintEvent* event)
 
 	// Compute selection range
 	bool selection = false;
-	uint64_t selStart, selEnd;
-	getSelectionOffsets(selStart, selEnd);
-	if (selStart != selEnd)
+	BNAddressRange selectionRange = getSelectionOffsets();
+	if (selectionRange.start != selectionRange.end)
 		selection = true;
 
 	// Draw selection
@@ -596,18 +596,18 @@ void ByteView::paintEvent(QPaintEvent* event)
 		int endX = 0;
 		for (size_t i = 0; i < m_lines.size(); i++)
 		{
-			if (selStart >= m_lines[i].address)
+			if (selectionRange.start >= m_lines[i].address)
 			{
 				startY = (int)(i - m_topLine);
-				startX = (int)(selStart - m_lines[i].address);
+				startX = (int)(selectionRange.start - m_lines[i].address);
 				if (startX > (int)m_cols)
 					startX = (int)m_cols;
 				startValid = true;
 			}
-			if (selEnd >= m_lines[i].address)
+			if (selectionRange.end >= m_lines[i].address)
 			{
 				endY = (int)(i - m_topLine);
-				endX = (int)(selEnd - m_lines[i].address);
+				endX = (int)(selectionRange.end - m_lines[i].address);
 				if (endX > (int)m_cols)
 					endX = (int)m_cols;
 				endValid = true;
diff --git a/examples/triage/byte.h b/examples/triage/byte.h
index 226ccd5e..f98e7472 100644
--- a/examples/triage/byte.h
+++ b/examples/triage/byte.h
@@ -82,7 +82,7 @@ public:
 	virtual BinaryViewRef getData() override;
 	virtual QFont getFont() override;
 	virtual uint64_t getCurrentOffset() override;
-	virtual void getSelectionOffsets(uint64_t& begin, uint64_t& end) override;
+	virtual BNAddressRange getSelectionOffsets() override;
 	virtual bool navigate(uint64_t addr) override;
 	virtual void updateFonts() override;
 	virtual void selectAll();
diff --git a/examples/triage/view.cpp b/examples/triage/view.cpp
index 246e94f7..7e771d70 100644
--- a/examples/triage/view.cpp
+++ b/examples/triage/view.cpp
@@ -118,15 +118,11 @@ uint64_t TriageView::getCurrentOffset()
 }
 
 
-void TriageView::getSelectionOffsets(uint64_t& begin, uint64_t& end)
+BNAddressRange TriageView::getSelectionOffsets()
 {
 	if (m_byteView)
-	{
-		m_byteView->getSelectionOffsets(begin, end);
-		return;
-	}
-	begin = m_currentOffset;
-	end = m_currentOffset;
+		return m_byteView->getSelectionOffsets();
+	return { m_currentOffset, m_currentOffset };
 }
 
 
diff --git a/examples/triage/view.h b/examples/triage/view.h
index 8c33c7b2..973ab83a 100644
--- a/examples/triage/view.h
+++ b/examples/triage/view.h
@@ -18,7 +18,7 @@ public:
 
 	virtual BinaryViewRef getData() override;
 	virtual uint64_t getCurrentOffset() override;
-	virtual void getSelectionOffsets(uint64_t& begin, uint64_t& end) override;
+	virtual BNAddressRange getSelectionOffsets() override;
 	virtual QFont getFont() override;
 	virtual bool navigate(uint64_t addr) override;