SynaxColors.h: Use std::array instead of std::vector, since the sizes of m_colors...

diff --git a/Externals/crystaledit/editlib/SyntaxColors.cpp b/Externals/crystaledit/editlib/SyntaxColors.cpp
index beaf91f..773fe45 100644 (file)
--- a/Externals/crystaledit/editlib/SyntaxColors.cpp
+++ b/Externals/crystaledit/editlib/SyntaxColors.cpp
@@ -15,8 +15,6 @@
  */
 SyntaxColors::SyntaxColors()
 {
-       m_colors.resize(COLORINDEX_COUNT);
-       m_bolds.resize(COLORINDEX_COUNT);
        SetDefaults();
 }
 
@@ -25,11 +23,9 @@ SyntaxColors::SyntaxColors()
  * @param [in] pColors Instance to copy.
  */
 SyntaxColors::SyntaxColors(const SyntaxColors *pColors)
+       : m_colors{pColors->m_colors}
+       , m_bolds{pColors->m_bolds}
 {
-       m_colors.resize(COLORINDEX_COUNT);
-       m_bolds.resize(COLORINDEX_COUNT);
-       m_colors = pColors->m_colors;
-       m_bolds = pColors->m_bolds;
 }
 
 /**
@@ -38,8 +34,6 @@ SyntaxColors::SyntaxColors(const SyntaxColors *pColors)
  */
 void SyntaxColors::Clone(const SyntaxColors *pColors)
 {
-       m_colors.resize(COLORINDEX_COUNT);
-       m_bolds.resize(COLORINDEX_COUNT);
        m_colors = pColors->m_colors;
        m_bolds = pColors->m_bolds;
 }

diff --git a/Externals/crystaledit/editlib/SyntaxColors.h b/Externals/crystaledit/editlib/SyntaxColors.h
index 8cbd723..b8c9c5b 100644 (file)
--- a/Externals/crystaledit/editlib/SyntaxColors.h
+++ b/Externals/crystaledit/editlib/SyntaxColors.h
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <Windows.h>
-#include <vector>
+#include <array>
 
 /** 
  * @brief Indexes to color table
@@ -84,6 +84,6 @@ public:
 
 // Implementation data
 private:
-       std::vector<COLORREF> m_colors; /**< Syntax highlight colors */
-       std::vector<bool> m_bolds; /**< Bold font enable/disable */
+       std::array<COLORREF, COLORINDEX_COUNT> m_colors; /**< Syntax highlight colors */
+       std::array<bool, COLORINDEX_COUNT> m_bolds; /**< Bold font enable/disable */
 };