PangoFontInfo: Remove unused method is_fraktur

That allows removing a dirty hack which used the non-portable function strcasestr. Signed-off-by: Stefan Weil <[email protected]>
stweil · Jun 3, 2017 · 25e0c1a · 25e0c1a
1 parent 42066ce
commit 25e0c1a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/training/pango_font_info.cpp b/training/pango_font_info.cpp
@@ -26,15 +26,7 @@
 // workaround for stdlib.h and putenv
 #undef __STRICT_ANSI__
 
-#if (defined __MINGW32__)
-#include "strcasestr.h"
-#elif !defined(_GNU_SOURCE)
-// needed for strcasestr in string.h
-#define _GNU_SOURCE
-#endif
-
 #elif defined(_MSC_VER)
-#include "strcasestr.h"
 #define strncasecmp _strnicmp
 #define strcasecmp _stricmp
 #endif
@@ -234,10 +226,6 @@ bool PangoFontInfo::ParseFontDescription(const PangoFontDescription *desc) {
                    == PANGO_VARIANT_SMALL_CAPS);
 
   is_bold_ = (pango_font_description_get_weight(desc) >= PANGO_WEIGHT_BOLD);
-  // We don't have a way to detect whether a font is of type Fraktur. The fonts
-  // we currently use all have "Fraktur" in their family name, so we do a
-  // fragile but functional check for that here.
-  is_fraktur_ = (strcasestr(family, "Fraktur") != nullptr);
   return true;
 }
 

diff --git a/training/pango_font_info.h b/training/pango_font_info.h
@@ -109,7 +109,6 @@ class PangoFontInfo {
   bool is_italic() const { return is_italic_; }
   bool is_smallcaps() const { return is_smallcaps_; }
   bool is_monospace() const { return is_monospace_; }
-  bool is_fraktur() const { return is_fraktur_; }
   FontTypeEnum font_type() const { return font_type_; }
 
   int resolution() const { return resolution_; }
@@ -132,7 +131,6 @@ class PangoFontInfo {
   bool is_italic_;
   bool is_smallcaps_;
   bool is_monospace_;
-  bool is_fraktur_;
   FontTypeEnum font_type_;
   // The Pango description that was used to initialize the instance.
   PangoFontDescription* desc_;