From 6c21712e458d6204184b31951e9c5578964dc82c Mon Sep 17 00:00:00 2001 From: RickyRister Date: Sun, 20 Apr 2025 21:04:01 -0700 Subject: [PATCH] use constants instead of static methods --- cockatrice/src/server/message_log_widget.cpp | 82 ++++++-------------- cockatrice/src/server/message_log_widget.h | 8 -- 2 files changed, 24 insertions(+), 66 deletions(-) diff --git a/cockatrice/src/server/message_log_widget.cpp b/cockatrice/src/server/message_log_widget.cpp index 7ee275377..9ac8ffb68 100644 --- a/cockatrice/src/server/message_log_widget.cpp +++ b/cockatrice/src/server/message_log_widget.cpp @@ -12,47 +12,13 @@ #include -const QString &MessageLogWidget::tableConstant() const -{ - static const QString constant("table"); - return constant; -} - -const QString &MessageLogWidget::graveyardConstant() const -{ - static const QString constant("grave"); - return constant; -} - -const QString &MessageLogWidget::exileConstant() const -{ - static const QString constant("rfg"); - return constant; -} - -const QString &MessageLogWidget::handConstant() const -{ - static const QString constant("hand"); - return constant; -} - -const QString &MessageLogWidget::deckConstant() const -{ - static const QString constant("deck"); - return constant; -} - -const QString &MessageLogWidget::sideboardConstant() const -{ - static const QString constant("sb"); - return constant; -} - -const QString &MessageLogWidget::stackConstant() const -{ - static const QString constant("stack"); - return constant; -} +static const QString TABLE_ZONE_NAME = "table"; +static const QString GRAVE_ZONE_NAME = "grave"; +static const QString EXILE_ZONE_NAME = "rfg"; +static const QString HAND_ZONE_NAME = "hand"; +static const QString DECK_ZONE_NAME = "deck"; +static const QString SIDEBOARD_ZONE_NAME = "sb"; +static const QString STACK_ZONE_NAME = "stack"; QString MessageLogWidget::sanitizeHtml(QString dirty) const { @@ -71,15 +37,15 @@ MessageLogWidget::getFromStr(CardZone *zone, QString cardName, int position, boo QString fromStr; QString zoneName = zone->getName(); - if (zoneName == tableConstant()) { + if (zoneName == TABLE_ZONE_NAME) { fromStr = tr(" from play"); - } else if (zoneName == graveyardConstant()) { + } else if (zoneName == GRAVE_ZONE_NAME) { fromStr = tr(" from their graveyard"); - } else if (zoneName == exileConstant()) { + } else if (zoneName == EXILE_ZONE_NAME) { fromStr = tr(" from exile"); - } else if (zoneName == handConstant()) { + } else if (zoneName == HAND_ZONE_NAME) { fromStr = tr(" from their hand"); - } else if (zoneName == deckConstant()) { + } else if (zoneName == DECK_ZONE_NAME) { if (position == 0) { if (cardName.isEmpty()) { if (ownerChange) { @@ -117,9 +83,9 @@ MessageLogWidget::getFromStr(CardZone *zone, QString cardName, int position, boo fromStr = tr(" from their library"); } } - } else if (zoneName == sideboardConstant()) { + } else if (zoneName == SIDEBOARD_ZONE_NAME) { fromStr = tr(" from sideboard"); - } else if (zoneName == stackConstant()) { + } else if (zoneName == STACK_ZONE_NAME) { fromStr = tr(" from the stack"); } @@ -291,9 +257,9 @@ void MessageLogWidget::logMoveCard(Player *player, bool ownerChanged = startZone->getPlayer() != targetZone->getPlayer(); // do not log if moved within the same zone - if ((startZoneName == tableConstant() && targetZoneName == tableConstant() && !ownerChanged) || - (startZoneName == handConstant() && targetZoneName == handConstant()) || - (startZoneName == exileConstant() && targetZoneName == exileConstant())) { + if ((startZoneName == TABLE_ZONE_NAME && targetZoneName == TABLE_ZONE_NAME && !ownerChanged) || + (startZoneName == HAND_ZONE_NAME && targetZoneName == HAND_ZONE_NAME) || + (startZoneName == EXILE_ZONE_NAME && targetZoneName == EXILE_ZONE_NAME)) { return; } @@ -322,20 +288,20 @@ void MessageLogWidget::logMoveCard(Player *player, QString finalStr; bool usesNewX = false; - if (targetZoneName == tableConstant()) { + if (targetZoneName == TABLE_ZONE_NAME) { soundEngine->playSound("play_card"); if (card->getFaceDown()) { finalStr = tr("%1 puts %2 into play%3 face down."); } else { finalStr = tr("%1 puts %2 into play%3."); } - } else if (targetZoneName == graveyardConstant()) { + } else if (targetZoneName == GRAVE_ZONE_NAME) { finalStr = tr("%1 puts %2%3 into their graveyard."); - } else if (targetZoneName == exileConstant()) { + } else if (targetZoneName == EXILE_ZONE_NAME) { finalStr = tr("%1 exiles %2%3."); - } else if (targetZoneName == handConstant()) { + } else if (targetZoneName == HAND_ZONE_NAME) { finalStr = tr("%1 moves %2%3 to their hand."); - } else if (targetZoneName == deckConstant()) { + } else if (targetZoneName == DECK_ZONE_NAME) { if (newX == -1) { finalStr = tr("%1 puts %2%3 into their library."); } else if (newX >= targetZone->getCards().size()) { @@ -347,9 +313,9 @@ void MessageLogWidget::logMoveCard(Player *player, usesNewX = true; finalStr = tr("%1 puts %2%3 into their library %4 cards from the top."); } - } else if (targetZoneName == sideboardConstant()) { + } else if (targetZoneName == SIDEBOARD_ZONE_NAME) { finalStr = tr("%1 moves %2%3 to sideboard."); - } else if (targetZoneName == stackConstant()) { + } else if (targetZoneName == STACK_ZONE_NAME) { soundEngine->playSound("play_card"); finalStr = tr("%1 plays %2%3."); } diff --git a/cockatrice/src/server/message_log_widget.h b/cockatrice/src/server/message_log_widget.h index ef66f21e7..d7cddc189 100644 --- a/cockatrice/src/server/message_log_widget.h +++ b/cockatrice/src/server/message_log_widget.h @@ -26,14 +26,6 @@ private: MessageContext currentContext; QString messagePrefix, messageSuffix; - const QString &tableConstant() const; - const QString &graveyardConstant() const; - const QString &exileConstant() const; - const QString &handConstant() const; - const QString &deckConstant() const; - const QString &sideboardConstant() const; - const QString &stackConstant() const; - QString sanitizeHtml(QString dirty) const; QString cardLink(QString cardName) const; QPair getFromStr(CardZone *zone, QString cardName, int position, bool ownerChange) const;