From 6f9555663291b4c4097f69415caffb15e060df87 Mon Sep 17 00:00:00 2001
From: ctrlaltca <ctrlaltca@gmail.com>
Date: Sun, 10 Mar 2019 23:15:24 +0100
Subject: [PATCH] Fix related cards menu in deck editor (#3649)

---
 cockatrice/src/cardinfotext.cpp    | 10 ++--------
 cockatrice/src/player.cpp          |  9 +++------
 cockatrice/src/tab_deck_editor.cpp |  5 +++--
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/cockatrice/src/cardinfotext.cpp b/cockatrice/src/cardinfotext.cpp
index 7cd60867..38caab8c 100644
--- a/cockatrice/src/cardinfotext.cpp
+++ b/cockatrice/src/cardinfotext.cpp
@@ -47,9 +47,8 @@ void CardInfoText::setCard(CardInfoPtr card)
             QString("<tr><td>%1</td><td></td><td>%2</td></tr>").arg(keyText, card->getProperty(key).toHtmlEscaped());
     }
 
-    auto relatedCards = card->getRelatedCards();
-    auto reverserelatedCards2Me = card->getReverseRelatedCards2Me();
-    if (!relatedCards.empty() || !reverserelatedCards2Me.empty()) {
+    auto relatedCards = card->getAllRelatedCards();
+    if (!relatedCards.empty()) {
         text += QString("<tr><td>%1</td><td width=\"5\"></td><td>").arg(tr("Related cards:"));
 
         for (auto *relatedCard : relatedCards) {
@@ -57,11 +56,6 @@ void CardInfoText::setCard(CardInfoPtr card)
             text += "<a href=\"" + tmp + "\">" + tmp + "</a><br>";
         }
 
-        for (auto *i : reverserelatedCards2Me) {
-            QString tmp = i->getName().toHtmlEscaped();
-            text += "<a href=\"" + tmp + "\">" + tmp + "</a><br>";
-        }
-
         text += "</td></tr>";
     }
 
diff --git a/cockatrice/src/player.cpp b/cockatrice/src/player.cpp
index c4898e49..e400246a 100644
--- a/cockatrice/src/player.cpp
+++ b/cockatrice/src/player.cpp
@@ -1229,9 +1229,7 @@ void Player::actCreateRelatedCard()
     }
     auto *action = static_cast<QAction *>(sender());
     // If there is a better way of passing a CardRelation through a QAction, please add it here.
-    QList<CardRelation *> relatedCards = QList<CardRelation *>();
-    relatedCards.append(sourceCard->getInfo()->getRelatedCards());
-    relatedCards.append(sourceCard->getInfo()->getReverseRelatedCards2Me());
+    auto relatedCards = sourceCard->getInfo()->getAllRelatedCards();
     CardRelation *cardRelation = relatedCards.at(action->data().toInt());
 
     /*
@@ -1251,9 +1249,8 @@ void Player::actCreateAllRelatedCards()
         return;
     }
 
-    QList<CardRelation *> relatedCards = sourceCard->getInfo()->getRelatedCards();
-    relatedCards.append(sourceCard->getInfo()->getReverseRelatedCards2Me());
-    if (relatedCards.empty()) {
+    auto relatedCards = sourceCard->getInfo()->getAllRelatedCards();
+    if (relatedCards.isEmpty()) {
         return;
     }
 
diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp
index 14b8344a..b60957aa 100644
--- a/cockatrice/src/tab_deck_editor.cpp
+++ b/cockatrice/src/tab_deck_editor.cpp
@@ -460,11 +460,12 @@ void TabDeckEditor::databaseCustomMenu(QPoint point)
     // filling out the related cards submenu
     auto *relatedMenu = new QMenu(tr("Show Related cards"));
     menu.addMenu(relatedMenu);
-    if (info->getRelatedCards().isEmpty()) {
+    auto relatedCards = info->getAllRelatedCards();
+    if (relatedCards.isEmpty()) {
         relatedMenu->setDisabled(true);
     } else {
         auto *signalMapper = new QSignalMapper(this);
-        for (const CardRelation *rel : info->getRelatedCards()) {
+        for (const CardRelation *rel : relatedCards) {
             QAction *relatedCard;
             relatedCard = relatedMenu->addAction(rel->getName());
             connect(relatedCard, SIGNAL(triggered()), signalMapper, SLOT(map()));