Apply suggestions from code review

OpenXRay · Jun 7, 2024 · caec557 · caec557
1 parent 98c7c61
commit caec557
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/src/xrUICore/Static/UIStaticItem.cpp b/src/xrUICore/Static/UIStaticItem.cpp
@@ -6,7 +6,6 @@ CUIStaticItem::CUIStaticItem()
     uFlags.zero();
     vSize.set(0, 0);
     TextureRect.set(0, 0, 0, 0);
-    eMirrorMode = tmNone;
     vHeadingPivot.set(0, 0);
     vHeadingOffset.set(0, 0);
     dwColor = 0xffffffff;

diff --git a/src/xrUICore/Static/UIStaticItem.h b/src/xrUICore/Static/UIStaticItem.h
@@ -6,12 +6,12 @@
 #include "xrCore/xrstring.h"
 #endif
 
-enum EUIMirroring
+enum cls EUIMirroring
 {
-    tmNone,
-    tmMirrorHorisontal,
-    tmMirrorVertical,
-    tmMirrorBoth
+    None,
+    Horisontal,
+    Vertical,
+    Both
 };
 
 class XRUICORE_API CUIStaticItem
@@ -30,7 +30,7 @@ class XRUICORE_API CUIStaticItem
     Fvector2 vHeadingPivot;
     Fvector2 vHeadingOffset;
     Flags8 uFlags;
-    EUIMirroring eMirrorMode;
+    EUIMirroring eMirrorMode{};
 
     ui_shader hShader;
     Fvector2 vPos;

diff --git a/src/xrUICore/XML/UIXmlInitBase.cpp b/src/xrUICore/XML/UIXmlInitBase.cpp
@@ -143,13 +143,13 @@ bool CUIXmlInitBase::InitStatic(CUIXml& xml_doc, pcstr path, int index, CUIStati
     InitTexture(xml_doc, path, index, pWnd);
     InitTextureOffset(xml_doc, path, index, pWnd);
 
-    shared_str mirroring = xml_doc.ReadAttrib(path, index, "mirror", "");
+    cpcstr mirroring = xml_doc.ReadAttrib(path, index, "mirror", "");
     if (0 == xr_strcmp(mirroring, "h"))
-        pWnd->GetStaticItem()->SetMirrorMode(tmMirrorHorisontal);
+        pWnd->GetStaticItem()->SetMirrorMode(EUIMirroring::Horisontal);
     else if (0 == xr_strcmp(mirroring, "v"))
-        pWnd->GetStaticItem()->SetMirrorMode(tmMirrorVertical);
+        pWnd->GetStaticItem()->SetMirrorMode(EUIMirroring::Vertical);
     else if (0 == xr_strcmp(mirroring, "b"))
-        pWnd->GetStaticItem()->SetMirrorMode(tmMirrorBoth);
+        pWnd->GetStaticItem()->SetMirrorMode(EUIMirroring::Both);
 
     const int flag = xml_doc.ReadAttribInt(path, index, "heading", 0);
     pWnd->EnableHeading((flag) ? true : false);