From 4bf3f2cec45fa776a57f66ed401fb07eab85acbb Mon Sep 17 00:00:00 2001
From: Arthur Bols <arthur@bols.dev>
Date: Sun, 18 Dec 2022 17:25:08 +0100
Subject: [PATCH] [Piece] Format

---
 Piece.cpp | 39 ++++++++++++++++-----------------------
 Piece.hpp | 11 ++++++-----
 2 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/Piece.cpp b/Piece.cpp
index 5146b4a..e5f9d23 100644
--- a/Piece.cpp
+++ b/Piece.cpp
@@ -2,7 +2,7 @@
 
 #include <ostream>
 
-Piece::Piece(PieceColor color, PieceType type) : _color(color), _type(type) {
+Piece::Piece(PieceColor color, PieceType type) : mColor(color), mType(type) {
 }
 
 Piece::Optional Piece::fromSymbol(char symbol) {
@@ -12,37 +12,30 @@ Piece::Optional Piece::fromSymbol(char symbol) {
     auto tryType = static_cast<PieceType>(toupper(symbol));
 
     switch (tryType) {
-        case PieceType::Pawn:
-            type = PieceType::Pawn;
-            break;
-        case PieceType::Knight:
-            type = PieceType::Knight;
-            break;
-        case PieceType::Bishop:
-            type = PieceType::Bishop;
-            break;
-        case PieceType::Rook:
-            type = PieceType::Rook;
-            break;
-        case PieceType::Queen:
-            type = PieceType::Queen;
-            break;
-        case PieceType::King:
-            type = PieceType::King;
-            break;
-        default:
-            return std::nullopt;
+    case PieceType::Pawn:type = PieceType::Pawn;
+        break;
+    case PieceType::Knight:type = PieceType::Knight;
+        break;
+    case PieceType::Bishop:type = PieceType::Bishop;
+        break;
+    case PieceType::Rook:type = PieceType::Rook;
+        break;
+    case PieceType::Queen:type = PieceType::Queen;
+        break;
+    case PieceType::King:type = PieceType::King;
+        break;
+    default:return std::nullopt;
     }
 
     return Piece(color, type);
 }
 
 PieceColor Piece::color() const {
-    return _color;
+    return mColor;
 }
 
 PieceType Piece::type() const {
-    return _type;
+    return mType;
 }
 
 bool operator==(const Piece &lhs, const Piece &rhs) {
diff --git a/Piece.hpp b/Piece.hpp
index 8478af7..c8c6e25 100644
--- a/Piece.hpp
+++ b/Piece.hpp
@@ -20,9 +20,6 @@ enum class PieceType {
 
 class Piece {
 
-    const PieceColor _color;
-    const PieceType _type;
-
 public:
 
     using Optional = std::optional<Piece>;
@@ -33,10 +30,14 @@ public:
 
     PieceColor color() const;
     PieceType type() const;
+
+private:
+    const PieceColor mColor;
+    const PieceType mType;
 };
 
-bool operator==(const Piece& lhs, const Piece& rhs);
-std::ostream& operator<<(std::ostream& os, const Piece& piece);
+bool operator==(const Piece &lhs, const Piece &rhs);
+std::ostream &operator<<(std::ostream &os, const Piece &piece);
 
 // Invert a color (White becomes Black and vice versa)
 PieceColor operator!(PieceColor color);