From d24d9ad03c0c4f0933dd68c8a1900fe959a8e420 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Mon, 4 Nov 2019 08:40:07 +1100
Subject: Backport: Avoid warnings where const reasonable.

Backport of changeset 7760:372f84867e9d.
---
 qt/ScintillaEditBase/PlatQt.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'qt/ScintillaEditBase/PlatQt.cpp')

diff --git a/qt/ScintillaEditBase/PlatQt.cpp b/qt/ScintillaEditBase/PlatQt.cpp
index cce9c0802..b4ea7a7d0 100644
--- a/qt/ScintillaEditBase/PlatQt.cpp
+++ b/qt/ScintillaEditBase/PlatQt.cpp
@@ -105,15 +105,25 @@ public:
 		pfont = nullptr;
 	}
 };
-static int FontCharacterSet(Font &f)
+
+namespace {
+
+FontAndCharacterSet *AsFontAndCharacterSet(const Font &f) {
+	return reinterpret_cast<FontAndCharacterSet *>(f.GetID());
+}
+
+int FontCharacterSet(const Font &f)
 {
-	return reinterpret_cast<FontAndCharacterSet *>(f.GetID())->characterSet;
+	return AsFontAndCharacterSet(f)->characterSet;
 }
 
-static QFont *FontPointer(Font &f)
+QFont *FontPointer(const Font &f)
 {
-	return reinterpret_cast<FontAndCharacterSet *>(f.GetID())->pfont;
+	return AsFontAndCharacterSet(f)->pfont;
+}
+
 }
+
 Font::Font() noexcept : fid(nullptr) {}
 Font::~Font()
 {
-- 
cgit v1.2.3