From 3d784c510a00121753dddda9c656bf06cab3d0ed Mon Sep 17 00:00:00 2001 From: Neil Date: Mon, 4 Nov 2019 08:40:07 +1100 Subject: Avoid warnings where const reasonable. --- 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 c1417b29b..515052a48 100644 --- a/qt/ScintillaEditBase/PlatQt.cpp +++ b/qt/ScintillaEditBase/PlatQt.cpp @@ -109,15 +109,25 @@ public: pfont = nullptr; } }; -static int FontCharacterSet(Font &f) + +namespace { + +FontAndCharacterSet *AsFontAndCharacterSet(const Font &f) { + return reinterpret_cast(f.GetID()); +} + +int FontCharacterSet(const Font &f) { - return reinterpret_cast(f.GetID())->characterSet; + return AsFontAndCharacterSet(f)->characterSet; } -static QFont *FontPointer(Font &f) +QFont *FontPointer(const Font &f) { - return reinterpret_cast(f.GetID())->pfont; + return AsFontAndCharacterSet(f)->pfont; +} + } + Font::Font() noexcept : fid(nullptr) {} Font::~Font() { -- cgit v1.2.3