Backport: Avoid warnings where const reasonable.

Backport of changeset 7760:372f84867e9d.

1 files changed, 14 insertions, 4 deletions

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()
 {