clean up warnings and formatting

miru28 · miru28 · commit 3a6b536ce7fc · 2025-01-09T16:57:22.000+02:00
diff --git a/.idea/QtSettings.xml b/.idea/QtSettings.xml
diff --git a/include/Interface/DisplayBoard.h b/include/Interface/DisplayBoard.h
@@ -9,28 +9,28 @@
 #include <vector>
 #include "GameComponents/Board.h"
 
-class DisplayBoard : public QWidget {
-Q_OBJECT
+class DisplayBoard final : public QWidget {
+    Q_OBJECT
 
 public:
     explicit DisplayBoard(QWidget *parent = nullptr, int lines = 10, int columns = 10);
-    void setBoard(const Board& board);
-    void onDraw();
-    void insertCard(const Card& card, const std::pair<int, int>& position, PlayerTurn turn);
+    void SetBoard(const Board &board);
+    void OnDraw();
+    void InsertCard(const Card &card, const std::pair<int, int> &position, const PlayerTurn &turn);
 
 public slots:
-    void placeCard(const Card& card);
+    void PlaceCard(const Card &card);
 
 protected:
     void paintEvent(QPaintEvent *event) override;
     void mousePressEvent(QMouseEvent *event) override;
 
 private:
     Board m_Board;
-    int m_Lines;
-    int m_Columns;
-    Card m_SelectedCard;
-    bool m_CardSelected;
+    int   m_Lines;
+    int   m_Columns;
+    Card  m_SelectedCard;
+    bool  m_CardSelected;
 };
 
-#endif // ETER_DISPLAYBOARD_H
+#endif // ETER_DISPLAYBOARD_H
diff --git a/include/Interface/DisplayHand.h b/include/Interface/DisplayHand.h
@@ -9,25 +9,25 @@
 #include <vector>
 #include "GameComponents/Card.h"
 
-class DisplayHand : public QWidget {
-Q_OBJECT
+class DisplayHand final : public QWidget {
+    Q_OBJECT
 
 public:
     explicit DisplayHand(QWidget *parent = nullptr);
-    void setCards(const std::vector<Card>& cards);
-    void onDraw();
-    Card getSelectedCard() const;
+    void               SetCards(const std::vector<Card> &cards);
+    void               OnDraw();
+    [[nodiscard]] Card GetSelectedCard() const;
 
 signals:
-    void cardSelected(const Card& card);
+    void CardSelected(const Card &card);
 
 protected:
     void paintEvent(QPaintEvent *event) override;
     void mousePressEvent(QMouseEvent *event) override;
 
 private:
     std::vector<Card> m_Cards;
-    int m_SelectedCardIndex;
+    int               m_SelectedCardIndex;
 };
 
-#endif // ETER_DISPLAYHAND_H
+#endif // ETER_DISPLAYHAND_H
diff --git a/include/Interface/MainWindow.h b/include/Interface/MainWindow.h
@@ -63,8 +63,8 @@ private slots:
 
     // Helper Functions
     static void         CreateLabel(const QString &text, QWidget *parent);
-    void         CreateSlider(int &value, QWidget *parent);
-    void         CreateColorPicker(const QString &labelText, QColor &color, QWidget *parent);
+    void                CreateSlider(int &value, QWidget *parent);
+    void                CreateColorPicker(const QString &labelText, QColor &color, QWidget *parent);
     static QVBoxLayout *CreateLimitedLayout(QWidget *widget);
 
     std::string m_CurrentGameMode;
diff --git a/include/Powers/ElementPower.h b/include/Powers/ElementPower.h
@@ -36,7 +36,7 @@ enum class ElementIndexPower {
 
 class ElementPower {
     static ElementIndexPower RandomPower();
-    std::string              GetElementPowerDescription(ElementIndexPower power);
+    static std::string              GetElementPowerDescription(ElementIndexPower power);
 
 public:
     explicit ElementPower(ElementIndexPower power);
diff --git a/include/Powers/Explosion.h b/include/Powers/Explosion.h
@@ -8,7 +8,7 @@ class Explosion {
     enum class Effect { Nothing, Eliminate, Return, Hole };
 
     explicit Explosion(const std::vector<std::vector<Effect>> &effectMap);
-    Explosion Generate(int size);
+    static Explosion Generate(int size);
 
 private:
     std::vector<std::vector<Effect>> m_Effects;
diff --git a/include/Powers/Wizard.h b/include/Powers/Wizard.h
@@ -30,7 +30,7 @@ class Wizard {
     Wizard &operator=(const Wizard &other)     = default;
     Wizard &operator=(Wizard &&other) noexcept = default;
     Wizard();
-    ~Wizard();
+    ~Wizard() = default;
 
     [[nodiscard]] std::string GetWizardPowerDescription() const;
 
diff --git a/src/GameComponents/Card.cpp b/src/GameComponents/Card.cpp
@@ -4,6 +4,7 @@
 #include <stdexcept>
 
 Card::Card(const int value) {
+    // todo: initialise mplaced by here (?)
     if (value > 4 || value < 1) {
         throw std::invalid_argument("Invalid card value");
     }
diff --git a/src/GameModes/Antrenament.cpp b/src/GameModes/Antrenament.cpp
@@ -8,7 +8,7 @@
 // meci: 2/3;
 
 // todo: move this to somewhere more permanent
-const auto createCards = [](const std::array<int, 7> &values, const PlayerTurn &player) {
+const auto CREATE_CARDS = [](const std::array<int, 7> &values, const PlayerTurn &player) {
     std::vector<Card> cards;
     for (int value : values) {
         cards.emplace_back(value, player);
@@ -17,8 +17,8 @@ const auto createCards = [](const std::array<int, 7> &values, const PlayerTurn &
 };
 
 constexpr std::array    CARD_VALUES{1, 1, 2, 2, 3, 3, 4};
-const std::vector<Card> CARDS_PLAYER1 = createCards(CARD_VALUES, PlayerTurn::Player1);
-const std::vector<Card> CARDS_PLAYER2 = createCards(CARD_VALUES, PlayerTurn::Player2);
+const std::vector<Card> CARDS_PLAYER1 = CREATE_CARDS(CARD_VALUES, PlayerTurn::Player1);
+const std::vector<Card> CARDS_PLAYER2 = CREATE_CARDS(CARD_VALUES, PlayerTurn::Player2);
 
 Antrenament::Antrenament(const std::string &nameOne, const std::string &nameTwo) :
     Game(3, 2, nameOne, nameTwo) {
diff --git a/src/Interface/DisplayBoard.cpp b/src/Interface/DisplayBoard.cpp
@@ -3,67 +3,69 @@
 //
 
 #include "Interface/DisplayBoard.h"
-#include "GameComponents/Board.h"
-#include <QPainter>
 #include <QMouseEvent>
+#include <QPainter>
+#include "GameComponents/Board.h"
 
-DisplayBoard::DisplayBoard(QWidget *parent, int lines, int columns)
-        : QWidget(parent), m_Board(10), m_Lines(lines), m_Columns(columns), m_SelectedCard(1), m_CardSelected(false) {}
+DisplayBoard::DisplayBoard(QWidget *parent, const int lines, const int columns) :
+    QWidget(parent), m_Board(10), m_Lines(lines), m_Columns(columns), m_SelectedCard(1),
+    m_CardSelected(false) {}
 
-void DisplayBoard::setBoard(const Board& board) {
+void DisplayBoard::SetBoard(const Board &board) {
     m_Board = board;
     update();
 }
 
-void DisplayBoard::onDraw() {
-    update();
-}
+void DisplayBoard::OnDraw() { update(); }
 
-void DisplayBoard::insertCard(const Card& card, const std::pair<int, int>& position, PlayerTurn turn) {
+void DisplayBoard::InsertCard(const Card &card, const std::pair<int, int> &position,
+                              const PlayerTurn &turn) {
     m_Board.InsertCard(card, position, turn);
     update();
 }
 
-void DisplayBoard::placeCard(const Card& card) {
+void DisplayBoard::PlaceCard(const Card &card) {
     m_SelectedCard = card;
     m_CardSelected = true;
 }
 
 void DisplayBoard::paintEvent(QPaintEvent *event) {
     Q_UNUSED(event);
 
-    QPainter painter(this);
-    int cellSize = 50;
-    int xOffset = 10;
-    int yOffset = 10;
+    QPainter      painter(this);
+    constexpr int cellSize = 50;
+    constexpr int xOffset  = 10;
+    constexpr int yOffset  = 10;
 
     for (int row = 0; row < m_Lines; ++row) {
         for (int col = 0; col < m_Columns; ++col) {
-            int x = xOffset + col * cellSize;
-            int y = yOffset + row * cellSize;
+            const int x = xOffset + col * cellSize;
+            const int y = yOffset + row * cellSize;
 
             painter.drawRect(x, y, cellSize, cellSize);
 
             Position pos{col, row};
-            if (m_Board.GetGameBoard().count(pos) && !m_Board.GetGameBoard().at(pos).empty()) {
-                painter.drawText(x + 10, y + 20, QString::number(m_Board.GetGameBoard().at(pos).top().GetValue()));
+            if (m_Board.GetGameBoard().contains(pos) && !m_Board.GetGameBoard().at(pos).empty()) {
+                painter.drawText(x + 10, y + 20,
+                                 QString::number(m_Board.GetGameBoard().at(pos).top().GetValue()));
             }
         }
     }
 }
 
 void DisplayBoard::mousePressEvent(QMouseEvent *event) {
     if (m_CardSelected) {
-        int cellSize = 50;
-        int xOffset = 10;
-        int yOffset = 10;
+        constexpr int cellSize = 50;
+        constexpr int xOffset  = 10;
+        constexpr int yOffset  = 10;
 
-        int col = (event->x() - xOffset) / cellSize;
-        int row = (event->y() - yOffset) / cellSize;
+        const int col = (event->position().x() - xOffset) / cellSize;
+        const int row = (event->position().y() - yOffset) / cellSize;
 
         if (col >= 0 && col < m_Columns && row >= 0 && row < m_Lines) {
-            insertCard(m_SelectedCard, {col, row}, PlayerTurn::Player1); // Assuming Player1 for simplicity
+            InsertCard(m_SelectedCard, {col, row},
+                       PlayerTurn::Player1); // Assuming Player1 for simplicity
             m_CardSelected = false;
         }
     }
-}
+}
diff --git a/src/Interface/DisplayHand.cpp b/src/Interface/DisplayHand.cpp
@@ -3,22 +3,20 @@
 //
 
 #include "Interface/DisplayHand.h"
-#include "GameComponents/Card.h"
-#include <QPainter>
 #include <QMouseEvent>
+#include <QPainter>
+#include "GameComponents/Card.h"
 
 DisplayHand::DisplayHand(QWidget *parent) : QWidget(parent), m_SelectedCardIndex(-1) {}
 
-void DisplayHand::setCards(const std::vector<Card>& cards) {
+void DisplayHand::SetCards(const std::vector<Card> &cards) {
     m_Cards = cards;
     update();
 }
 
-void DisplayHand::onDraw() {
-    update();
-}
+void DisplayHand::OnDraw() { update(); }
 
-Card DisplayHand::getSelectedCard() const {
+Card DisplayHand::GetSelectedCard() const {
     if (m_SelectedCardIndex >= 0 && m_SelectedCardIndex < m_Cards.size()) {
         return m_Cards[m_SelectedCardIndex];
     }
@@ -29,11 +27,11 @@ void DisplayHand::paintEvent(QPaintEvent *event) {
     Q_UNUSED(event);
 
     QPainter painter(this);
-    int x = 10;
-    int y = 10;
-    int cardWidth = 100;
-    int cardHeight = 150;
-    int spacing = 10;
+    int      x          = 10;
+    int      y          = 10;
+    int      cardWidth  = 100;
+    int      cardHeight = 150;
+    int      spacing    = 10;
 
     for (int i = 0; i < m_Cards.size(); ++i) {
         if (i == m_SelectedCardIndex) {
@@ -48,20 +46,20 @@ void DisplayHand::paintEvent(QPaintEvent *event) {
 }
 
 void DisplayHand::mousePressEvent(QMouseEvent *event) {
-    int x = 10;
-    int y = 10;
-    int cardWidth = 100;
+    int x          = 10;
+    int y          = 10;
+    int cardWidth  = 100;
     int cardHeight = 150;
-    int spacing = 10;
+    int spacing    = 10;
 
     for (int i = 0; i < m_Cards.size(); ++i) {
         QRect cardRect(x, y, cardWidth, cardHeight);
         if (cardRect.contains(event->pos())) {
             m_SelectedCardIndex = i;
-            emit cardSelected(m_Cards[m_SelectedCardIndex]);
+            emit CardSelected(m_Cards[m_SelectedCardIndex]);
             update();
             break;
         }
         x += cardWidth + spacing;
     }
-}
+}
diff --git a/src/Interface/MainWindow.cpp b/src/Interface/MainWindow.cpp
@@ -54,7 +54,7 @@ void MainWindow::DrawMenu() {
         buttonFont.setPointSize(20);
         button->setFont(buttonFont);
 
-        connect(button, &QPushButton::clicked, this, [this, slot]() { (this->*slot)(); });
+        connect(button, &QPushButton::clicked, this, [this, slot] { (this->*slot)(); });
         layout->addWidget(button);
     };
 
@@ -71,7 +71,6 @@ void MainWindow::DrawMenu() {
     // m_ScoreLabel->hide();
 }
 
-
 void MainWindow::DrawNewGame() {
     const auto newGameWidget = new QWidget(this);
     const auto layout        = new QVBoxLayout(newGameWidget);
@@ -123,11 +122,12 @@ void MainWindow::DrawNewGame() {
                 m_CurrentGameMode = buttonGroup->checkedButton()->text().toStdString();
                 std::cout << "Selected game mode: " << m_CurrentGameMode << '\n';
                 std::map<std::string, std::function<void()>> gameModeMap = {
-//                        {"Antrenament",
-//                         [this, player1Name, player2Name] {
-//                             AntrenamentWidget(player1Name.toStdString(), player2Name.toStdString(),
-//                                               m_StackedWidget, this);
-//                         }},
+                        //                        {"Antrenament",
+                        //                         [this, player1Name, player2Name] {
+                        //                             AntrenamentWidget(player1Name.toStdString(),
+                        //                             player2Name.toStdString(),
+                        //                                               m_StackedWidget, this);
+                        //                         }},
                         // {"&Duelul Vrajitorilor",
                         //  [this, player1Name, player2Name] {
                         //      m_CurrentGame = std::make_unique<Antrenament>(
@@ -279,7 +279,7 @@ void MainWindow::CreateColorPicker(const QString &labelText, QColor &color, QWid
         colorFrame->setStyleSheet(QString("background-color: %1; border: 1px solid black;")
                                           .arg(color.isValid() ? color.name() : "#FFFFFF"));
 
-        connect(colorPicker, &QPushButton::clicked, this, [this, &color, colorFrame]() {
+        connect(colorPicker, &QPushButton::clicked, this, [this, &color, colorFrame] {
             const auto newColor = QColorDialog::getColor(color, this, "Select Color");
             if (newColor.isValid()) {
                 color = newColor;
diff --git a/src/Powers/Explosion.cpp b/src/Powers/Explosion.cpp
@@ -10,8 +10,8 @@ Explosion Explosion::Generate(const int size) {
         throw std::invalid_argument("Dimensiunea trebuie să fie 3 sau 4.");
     }
 
-    const int minEffects = (size == 3) ? 2 : 3;
-    const int maxEffects = (size == 3) ? 4 : 6;
+    const int minEffects = size == 3 ? 2 : 3;
+    const int maxEffects = size == 3 ? 4 : 6;
 
     const int numEffects = RandomInt(minEffects, maxEffects);
 
diff --git a/src/Powers/Wizard.cpp b/src/Powers/Wizard.cpp
diff --git a/src/main.cpp b/src/main.cpp

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`#include <stdexcept>`
`5`	`5`
`6`	`6`	`Card::Card(const int value) {`
	`7`	`+ // todo: initialise mplaced by here (?)`
`7`	`8`	`if (value > 4 \|\| value < 1) {`
`8`	`9`	`throw std::invalid_argument("Invalid card value");`
`9`	`10`	`}`