[freetype2-demos] gsoc-2022-chariri-3 ed68c56 04/36: [ftinspect] Fix compilation on GCC.

[Werner Lemberg]

branch: gsoc-2022-chariri-3
commit ed68c5683c2345bffe50bd20877438b6574eed2e
Author: Charlie Jiang <w@chariri.moe>
Commit: Charlie Jiang <w@chariri.moe>

    [ftinspect] Fix compilation on GCC.
    
    * src/ftinspect/panels/continuous.hpp, src/ftinspect/panels/continuous.cpp,
      use `std::vector` over `QVector` because the latter requires default
      `constructor`; Fix signedness because of `std::vector`;
    
    * src/ftinspect/models/ttsettingscomboboxmodel.hpp: Fix enum inconsistency.
    
    * src/ftinspect/engine/engine.hpp, src/ftinspect/engine/engine.cpp: Fix
    missing include; use `std::vector`;
    
    * src/ftinspect/CMakeLists.txt: Fix MinGW: g++ doesn't need `/utf-8` switch.
---
 src/ftinspect/CMakeLists.txt                     | 2 +-
 src/ftinspect/engine/engine.cpp                  | 2 +-
 src/ftinspect/engine/engine.hpp                  | 5 +++--
 src/ftinspect/models/ttsettingscomboboxmodel.hpp | 2 +-
 src/ftinspect/panels/continuous.cpp              | 9 +++++----
 src/ftinspect/panels/continuous.hpp              | 6 +++---
 src/ftinspect/rendering/grid.hpp                 | 1 +
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/ftinspect/CMakeLists.txt b/src/ftinspect/CMakeLists.txt
index 92d6b34..fda5ef3 100644
--- a/src/ftinspect/CMakeLists.txt
+++ b/src/ftinspect/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD 11)
 
 project("ftinspect")
 
-if (WIN32)
+if (MSVC)
   add_compile_options("/utf-8")
 endif ()
 
diff --git a/src/ftinspect/engine/engine.cpp b/src/ftinspect/engine/engine.cpp
index e4e7e42..d6c9428 100644
--- a/src/ftinspect/engine/engine.cpp
+++ b/src/ftinspect/engine/engine.cpp
@@ -309,7 +309,7 @@ Engine::loadFont(int fontIndex,
     curCharMaps_.clear();
     curCharMaps_.reserve(face->num_charmaps);
     for (int i = 0; i < face->num_charmaps; i++)
-      curCharMaps_.append(CharMapInfo(i, face->charmaps[i]));
+      curCharMaps_.emplace_back(i, face->charmaps[i]);
   }
 
   curNumGlyphs_ = numGlyphs;
diff --git a/src/ftinspect/engine/engine.hpp b/src/ftinspect/engine/engine.hpp
index 80ac9ed..50be300 100644
--- a/src/ftinspect/engine/engine.hpp
+++ b/src/ftinspect/engine/engine.hpp
@@ -7,6 +7,7 @@
 
 #include "fontfilemanager.hpp"
 
+#include <vector>
 #include <QString>
 #include <QMap>
 
@@ -121,7 +122,7 @@ public:
   unsigned glyphIndexFromCharCode(int code, int charMapIndex);
   FT_Size_Metrics const& currentFontMetrics();
 
-  QVector<CharMapInfo>& currentFontCharMaps() { return curCharMaps_; }
+  std::vector<CharMapInfo>& currentFontCharMaps() { return curCharMaps_; }
   FontFileManager& fontFileManager() { return fontFileManager_; }
   EngineDefaultValues& engineDefaults() { return engineDefaults_; }
   bool antiAliasingEnabled() { return antiAliasingEnabled_; }
@@ -174,7 +175,7 @@ private:
   QString curFamilyName_;
   QString curStyleName_;
   int curNumGlyphs_ = -1;
-  QVector<CharMapInfo> curCharMaps_;
+  std::vector<CharMapInfo> curCharMaps_;
 
   FT_Library library_;
   FTC_Manager cacheManager_;
diff --git a/src/ftinspect/models/ttsettingscomboboxmodel.hpp 
b/src/ftinspect/models/ttsettingscomboboxmodel.hpp
index 0669583..9bf1666 100644
--- a/src/ftinspect/models/ttsettingscomboboxmodel.hpp
+++ b/src/ftinspect/models/ttsettingscomboboxmodel.hpp
@@ -112,7 +112,7 @@ public:
   virtual ~LCDFilterComboBoxModel() = default;
 
 public:
-  enum LCDFilter
+  enum LCDFilter : int
   {
     LCDFilter_Default,
     LCDFilter_Light,
diff --git a/src/ftinspect/panels/continuous.cpp 
b/src/ftinspect/panels/continuous.cpp
index 58f75a3..a79f06a 100644
--- a/src/ftinspect/panels/continuous.cpp
+++ b/src/ftinspect/panels/continuous.cpp
@@ -145,7 +145,7 @@ ContinousAllGlyphsTab::ContinousAllGlyphsTab(QWidget* 
parent)
 {
   createLayout();
 
-  QVector<CharMapInfo> tempCharMaps;
+  std::vector<CharMapInfo> tempCharMaps;
   setCharMaps(tempCharMaps); // pass in an empty one
 
   checkSubMode();
@@ -210,7 +210,7 @@ ContinousAllGlyphsTab::charMapIndex()
   auto index = charMapSelector_->currentIndex() - 1;
   if (index <= -1)
     return -1;
-  if (index >= charMaps_.size())
+  if (static_cast<unsigned>(index) >= charMaps_.size())
     return -1;
   return index;
 }
@@ -240,7 +240,7 @@ ContinousAllGlyphsTab::setDisplayingCount(int count)
 
 #define EncodingRole (Qt::UserRole + 10)
 void
-ContinousAllGlyphsTab::setCharMaps(QVector<CharMapInfo>& charMaps)
+ContinousAllGlyphsTab::setCharMaps(std::vector<CharMapInfo>& charMaps)
 {
   charMaps_ = charMaps;
   int oldIndex = charMapSelector_->currentIndex();
@@ -419,7 +419,8 @@ ContinousAllGlyphsTab::charMapChanged()
   int newIndex = charMapSelector_->currentIndex();
   if (newIndex != lastCharMapIndex_)
   {
-    if (newIndex <= 0 || charMaps_.size() <= newIndex - 1)
+    if (newIndex <= 0
+        || charMaps_.size() <= static_cast<unsigned>(newIndex - 1))
       setGlyphBeginindex(0);
     else if (charMaps_[newIndex - 1].maxIndex <= 20)
       setGlyphBeginindex(charMaps_[newIndex - 1].maxIndex - 1);
diff --git a/src/ftinspect/panels/continuous.hpp 
b/src/ftinspect/panels/continuous.hpp
index 657e3af..9eff04d 100644
--- a/src/ftinspect/panels/continuous.hpp
+++ b/src/ftinspect/panels/continuous.hpp
@@ -12,10 +12,10 @@
 #include "../rendering/glyphcontinuous.hpp"
 #include "../engine/engine.hpp"
 
+#include <vector>
 #include <QWidget>
 #include <QLabel>
 #include <QComboBox>
-#include <QVector>
 #include <QGridLayout>
 #include <QBoxLayout>
 
@@ -92,7 +92,7 @@ public:
   void setGlyphCount(int count);
   void setDisplayingCount(int count);
 
-  void setCharMaps(QVector<CharMapInfo>& charMaps);
+  void setCharMaps(std::vector<CharMapInfo>& charMaps);
   // This doesn't trigger either.
   void updateLimitIndex();
 
@@ -124,7 +124,7 @@ private:
 
   QGridLayout* layout_;
 
-  QVector<CharMapInfo> charMaps_;
+  std::vector<CharMapInfo> charMaps_;
 
   void createLayout();
   void createConnections();
diff --git a/src/ftinspect/rendering/grid.hpp b/src/ftinspect/rendering/grid.hpp
index 2786b45..b1e9826 100644
--- a/src/ftinspect/rendering/grid.hpp
+++ b/src/ftinspect/rendering/grid.hpp
@@ -6,6 +6,7 @@
 #pragma once
 
 #include <QGraphicsItem>
+#include <QGraphicsView>
 #include <QPen>
 
 class Grid