From 0054b641431df562e8238880be37f6b2335ad932 Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Mon, 13 Nov 2023 20:13:29 -0500
Subject: [PATCH] Fix warning due to NONE enum member mixing

---
 .../dialogs/dialog_lib_symbol_properties.cpp     | 16 +++++++++-------
 eeschema/dialogs/dialog_lib_symbol_properties.h  |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/eeschema/dialogs/dialog_lib_symbol_properties.cpp b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
index 6f3d980f25..ca7b6cc1b9 100644
--- a/eeschema/dialogs/dialog_lib_symbol_properties.cpp
+++ b/eeschema/dialogs/dialog_lib_symbol_properties.cpp
@@ -44,8 +44,8 @@
 
 
 int DIALOG_LIB_SYMBOL_PROPERTIES::m_lastOpenedPage = 0;
-DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT
-    DIALOG_LIB_SYMBOL_PROPERTIES::m_lastLayout = DIALOG_LIB_SYMBOL_PROPERTIES::NONE;
+DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT DIALOG_LIB_SYMBOL_PROPERTIES::m_lastLayout =
+        DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT::NONE;
 
 
 DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* aParent,
@@ -104,17 +104,19 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a
                      wxGridEventHandler( DIALOG_LIB_SYMBOL_PROPERTIES::OnGridCellChanging ),
                      nullptr, this );
 
-    if( m_lastLayout != DIALOG_LIB_SYMBOL_PROPERTIES::NONE )
+    if( m_lastLayout != DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT::NONE )
     {
-        if( ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::ALIAS && aLibEntry->IsRoot() )
-          || ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::PARENT && aLibEntry->IsAlias() ) )
+        if( ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT::ALIAS
+              && aLibEntry->IsRoot() )
+            || ( m_lastLayout == DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT::PARENT
+                 && aLibEntry->IsAlias() ) )
         {
             resetSize();
         }
     }
 
-    m_lastLayout = ( aLibEntry->IsAlias() ) ? DIALOG_LIB_SYMBOL_PROPERTIES::ALIAS
-                                            : DIALOG_LIB_SYMBOL_PROPERTIES::PARENT;
+    m_lastLayout = ( aLibEntry->IsAlias() ) ? DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT::ALIAS
+                                            : DIALOG_LIB_SYMBOL_PROPERTIES::LAST_LAYOUT::PARENT;
 
     m_grid->GetParent()->Layout();
     syncControlStates( m_libEntry->IsAlias() );
diff --git a/eeschema/dialogs/dialog_lib_symbol_properties.h b/eeschema/dialogs/dialog_lib_symbol_properties.h
index 930379721c..eb3659089e 100644
--- a/eeschema/dialogs/dialog_lib_symbol_properties.h
+++ b/eeschema/dialogs/dialog_lib_symbol_properties.h
@@ -95,7 +95,7 @@ public:
 private:
     static int m_lastOpenedPage;    // To remember the last notebook selection
 
-    enum LAST_LAYOUT {
+    enum class LAST_LAYOUT {
         NONE,
         ALIAS,
         PARENT