From 4832565e1034b7b747d0252289698e2d47e73ce6 Mon Sep 17 00:00:00 2001 From: Pavel Tyunin Date: Mon, 5 Oct 2020 15:21:35 +0300 Subject: [PATCH] Rename IsFallbackEncoding() to IsUsingFallbackEncoding() --- include/wx/convauto.h | 2 +- interface/wx/convauto.h | 2 +- tests/mbconv/convautotest.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/wx/convauto.h b/include/wx/convauto.h index 57212ab1ad..d7ed45592f 100644 --- a/include/wx/convauto.h +++ b/include/wx/convauto.h @@ -96,7 +96,7 @@ public: wxFontEncoding GetEncoding() const; // Return true if the fall-back encoding is used - bool IsFallbackEncoding() const + bool IsUsingFallbackEncoding() const { return m_ownsConv && m_bomType == wxBOM_None; } diff --git a/interface/wx/convauto.h b/interface/wx/convauto.h index 788d6ec2b9..324b5b24e7 100644 --- a/interface/wx/convauto.h +++ b/interface/wx/convauto.h @@ -160,7 +160,7 @@ public: @since 3.1.5 */ - bool IsFallbackEncoding() const; + bool IsUsingFallbackEncoding() const; /** Return a pointer to the characters that makes up this BOM. diff --git a/tests/mbconv/convautotest.cpp b/tests/mbconv/convautotest.cpp index 789e7582aa..6eaa24b155 100644 --- a/tests/mbconv/convautotest.cpp +++ b/tests/mbconv/convautotest.cpp @@ -69,7 +69,7 @@ private: { CPPUNIT_ASSERT( conv.GetBOM() == m_bom ); CPPUNIT_ASSERT( conv.GetEncoding() == m_enc ); - CPPUNIT_ASSERT( conv.IsFallbackEncoding() == m_fallback ); + CPPUNIT_ASSERT( conv.IsUsingFallbackEncoding() == m_fallback ); CPPUNIT_ASSERT( conv.IsUTF8() == (m_enc == wxFONTENCODING_UTF8) ); }