From 185ab609951ba9d9fc14cdb42e4ddb4e015d5a36 Mon Sep 17 00:00:00 2001 From: Neil Hodgson Date: Mon, 31 Jan 2022 14:39:45 +1100 Subject: Simplify Converter and avoid warnings. --- gtk/Converter.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/gtk/Converter.h b/gtk/Converter.h index 30bb781ac..0b95701f8 100755 --- a/gtk/Converter.h +++ b/gtk/Converter.h @@ -14,7 +14,7 @@ const gsize sizeFailure = static_cast(-1); * Encapsulate g_iconv safely. */ class Converter { - GIConv iconvh; + GIConv iconvh = iconvhBad; void OpenHandle(const char *fullDestination, const char *charSetSource) noexcept { iconvh = g_iconv_open(fullDestination, charSetSource); } @@ -22,11 +22,8 @@ class Converter { return iconvh != iconvhBad; } public: - Converter() noexcept { - iconvh = iconvhBad; - } + Converter() noexcept = default; Converter(const char *charSetDestination, const char *charSetSource, bool transliterations) { - iconvh = iconvhBad; Open(charSetDestination, charSetSource, transliterations); } // Deleted so Converter objects can not be copied. -- cgit v1.2.3